Merge branch 'dn/gpg-doc' into maint

diff --git a/Documentation/git.txt b/Documentation/git.txt
index cd213a7e3b36c6245668cb7a3ba0a458336e9fb0..b0611eaab468879c0138204143bbac020c2f7353 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.9.0/git.html[documentation for release 2.9]
+
+* release notes for
+  link:RelNotes/2.9.0.txt[2.9].
+
 * link:v2.8.4/git.html[documentation for release 2.8.4]
 
 * release notes for
@@ -991,7 +996,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`::