Sync with maint

diff --combined Documentation/git.txt
index 59e8335055faf6051d42842e715adcff4fafa273,085bc34eb112f264c8530857e06363d60fe00b80..e125c4227fc93d8457932766c66fea65a1dcc6a3
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,9 -43,10 +43,10 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v2.3.5/git.html[documentation for release 2.3.5]
+ * link:v2.3.6/git.html[documentation for release 2.3.6]
  
  * release notes for
+   link:RelNotes/2.3.6.txt[2.3.6],
    link:RelNotes/2.3.5.txt[2.3.5],
    link:RelNotes/2.3.4.txt[2.3.4],
    link:RelNotes/2.3.3.txt[2.3.3],
@@@ -922,7 -923,7 +923,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'::