Merge branch 'maint-2.11' into maint

diff --cc Documentation/git.txt
index 88c39d3ed5d5239ffd485711d01d51e546dedde6,cc215361f130f197df8655584a8b6e768dced475..f40d6c4b194fc6f24e9105ee0d109ed760ae6d42
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -44,16 -44,10 +44,17 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
 -* link:v2.11.2/git.html[documentation for release 2.11.2]
 +* link:v2.12.2/git.html[documentation for release 2.12.2]
 +
 +* release notes for
 +  link:RelNotes/2.12.2.txt[2.12.2].
 +  link:RelNotes/2.12.1.txt[2.12.1].
 +  link:RelNotes/2.12.0.txt[2.12].
 +
 +* link:v2.11.1/git.html[documentation for release 2.11.1]
  
  * release notes for
+   link:RelNotes/2.11.2.txt[2.11.2],
    link:RelNotes/2.11.1.txt[2.11.1],
    link:RelNotes/2.11.0.txt[2.11].