Merge branch 'maint-2.8' into maint-2.9

diff --cc Documentation/git.txt
index 923aa49db7f67ca6cb4510852f941654c55c59b2,8fdb0c8c233988021b4f6508b7b60997b38af376..cfe4570b518f9b45bb893fc184b5f1e0b1d5c057
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,17 -43,10 +43,18 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v2.8.4/git.html[documentation for release 2.8.4]
 +* link:v2.9.3/git.html[documentation for release 2.9.3]
 +
 +* release notes for
 +  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],
 +  link:RelNotes/2.9.0.txt[2.9].
 +
+ * link:v2.8.5/git.html[documentation for release 2.8.5]
  
  * release notes for
+   link:RelNotes/2.8.5.txt[2.8.5],
    link:RelNotes/2.8.4.txt[2.8.4],
    link:RelNotes/2.8.3.txt[2.8.3],
    link:RelNotes/2.8.2.txt[2.8.2],

diff --cc shell.c
Simple merge