Merge branch 'qq/maint' into maint

diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt
index dccf0e20eccd20d45ac83828dbc7c67fa6a86e1a..baaf2bc8feefe4fb88a1ec43d2f70bbfdfe6fbf6 100644 (file)
--- a/Documentation/git-show.txt
+++ b/Documentation/git-show.txt
@@ -79,8 +79,6 @@ Documentation
 -------------
 Documentation by David Greaves, Petr Baudis and the git-list <git@vger.kernel.org>.
 
-This manual page is a stub. You can help the git documentation by expanding it.
-
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite