Merge branch 'maint-1.6.4' into maint-1.6.5

diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index acc408d7e621a5055322ff4157c43734a20ebce8..3ab4f4d42ccb4a7448ef4f4cbd99934f569f4036 100644 (file)
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -245,7 +245,7 @@ Both standard output and standard error output are forwarded to
 for the user.
 
 The default 'update' hook, when enabled--and with
-`hooks.allowunannotated` config option turned on--prevents
+`hooks.allowunannotated` config option unset or set to false--prevents
 unannotated tags to be pushed.
 
 [[post-receive]]