Merge branch 'maint-2.9' into maint-2.10

diff --cc Documentation/git.txt
index ed717e4336060e06ccf698c515cf9be5f85bae2c,80da7b7993f435e71c4a88963524122e31175b8c..3cb55cdd7b66ff6ae6c4aeafd83738e6b60bc8f4
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,16 -43,11 +43,17 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
 +* link:v2.10.2/git.html[documentation for release 2.10.2]
 +
 +* release notes for
 +  link:RelNotes/2.10.2.txt[2.10.2],
 +  link:RelNotes/2.10.1.txt[2.10.1],
 +  link:RelNotes/2.10.0.txt[2.10].
  
- * link:v2.9.3/git.html[documentation for release 2.9.3]
+ * link:v2.9.4/git.html[documentation for release 2.9.4]
  
  * release notes for
+   link:RelNotes/2.9.4.txt[2.9.4],
    link:RelNotes/2.9.3.txt[2.9.3],
    link:RelNotes/2.9.2.txt[2.9.2],
    link:RelNotes/2.9.1.txt[2.9.1],