Merge branch 'maint-1.5.4' into maint

diff --git a/Documentation/git-check-attr.txt b/Documentation/git-check-attr.txt
index 47cb1bdfa3d741a42c73d5234317ed68f1f90d5c..290f10f169b55aec37068f170ddf0a2c9a851624 100644 (file)
--- a/Documentation/git-check-attr.txt
+++ b/Documentation/git-check-attr.txt
@@ -25,7 +25,7 @@ OPTIONS
 
 SEE ALSO
 --------
-gitlink:gitattributes[5].
+linkgit:gitattributes[5].
 
 
 Author
@@ -38,4 +38,4 @@ Documentation by James Bowes.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite