Merge master into aw/mirror-push

diff --git a/Documentation/git-stripspace.txt b/Documentation/git-stripspace.txt
index 5212358306a684c006e8ca30c3f7e21fb3c97afb..f80526ba7e013ef58ec43e8861b03696729aaa5b 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>::