Merge branch 'sb/line-log-plug-pairdiff-leak'

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 8704ffd2ffb8188974bc7b9a717adcccc63af551..c71e818cf445d55e793229dd9cb46777e5f53a98 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,6 +43,11 @@ unreleased) version of Git, that is available from the 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
+* link:v2.4.0/git.html[documentation for release 2.4]
+
+* release notes for
+  link:RelNotes/2.4.0.txt[2.4].
+
 * link:v2.3.7/git.html[documentation for release 2.3.7]
 
 * release notes for
@@ -924,7 +929,7 @@ for further details.
        If this environment variable is set, then Git commands which need to
        acquire passwords or passphrases (e.g. for HTTP or IMAP authentication)
        will call this program with a suitable prompt as command-line argument
-       and read the password from its STDOUT. See also the 'core.askpass'
+       and read the password from its STDOUT. See also the 'core.askPass'
        option in linkgit:git-config[1].
 
 'GIT_TERMINAL_PROMPT'::