Merge branch 'master' into next

diff --git a/Documentation/git-stripspace.txt b/Documentation/git-stripspace.txt
index 4f82efb4f97f562f632d286e0650ea320867a791..3a03dd04106d45cc3c233230d1773874f3ca1cef 100644 (file)
--- a/Documentation/git-stripspace.txt
+++ b/Documentation/git-stripspace.txt
@@ -3,7 +3,7 @@ git-stripspace(1)
 
 NAME
 ----
-git-stripspace - Filter out empty lines.
+git-stripspace - Filter out empty lines
 
 
 SYNOPSIS
@@ -29,5 +29,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite