Merge branch 'ab/grep-preparatory-cleanup' into sb/submodule-blanket-recursive

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 96e9cf8b730cd0ab0b2152180a92cad32c7ca8e9..e0b9fd0bc38a08077896240384f0bb1690532884 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2623,9 +2623,8 @@ receive.advertiseAtomic::
        capability, set this variable to false.
 
 receive.advertisePushOptions::
-       By default, git-receive-pack will advertise the push options
-       capability to its clients. If you don't want to advertise this
-       capability, set this variable to false.
+       When set to true, git-receive-pack will advertise the push options
+       capability to its clients. False by default.
 
 receive.autogc::
        By default, git-receive-pack will run "git-gc --auto" after