Merge branch 'sb/diff-cleanup'

diff --git a/Documentation/git-receive-pack.txt b/Documentation/git-receive-pack.txt
index 9016960e27164a11d687ed16b34245667e271fe3..0ccd5fbc781deb3adcca4d28ec8a4ed0d9db9977 100644 (file)
--- a/Documentation/git-receive-pack.txt
+++ b/Documentation/git-receive-pack.txt
@@ -33,6 +33,9 @@ post-update hooks found in the Documentation/howto directory.
 option, which tells it if updates to a ref should be denied if they
 are not fast-forwards.
 
+A number of other receive.* config options are available to tweak
+its behavior, see linkgit:git-config[1].
+
 OPTIONS
 -------
 <directory>::
@@ -100,7 +103,7 @@ the following environment variables:
        starting time is different by this many seconds from the
        current session.  Only meaningful when
        `GIT_PUSH_CERT_NONCE_STATUS` says `SLOP`.
-       Also read about `receive.certnonceslop` variable in
+       Also read about `receive.certNonceSlop` variable in
        linkgit:git-config[1].
 
 This hook is called before any refname is updated and before any