Merge branch 'va/fix-git-p4-tests'

diff --git a/Documentation/git-receive-pack.txt b/Documentation/git-receive-pack.txt
index 9016960e27164a11d687ed16b34245667e271fe3..000ee8dba2ab3069e0459defe3df9d7140541a59 100644 (file)
--- a/Documentation/git-receive-pack.txt
+++ b/Documentation/git-receive-pack.txt
@@ -100,7 +100,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