Merge branch 'maint-1.5.4' into maint

diff --git a/Documentation/git-stripspace.txt b/Documentation/git-stripspace.txt
index 5212358306a684c006e8ca30c3f7e21fb3c97afb..fc5687502e519f55b3be0dec5d89778e8b8d4d13 100644 (file)
--- a/Documentation/git-stripspace.txt
+++ b/Documentation/git-stripspace.txt
@@ -16,7 +16,7 @@ Remove multiple empty lines, and empty lines at beginning and end.
 
 OPTIONS
 -------
--s\|--strip-comments::
+-s|--strip-comments::
        In addition to empty lines, also strip lines starting with '#'.
 
 <stream>::
@@ -32,4 +32,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite