Merge branch 'maint-1.5.4' into maint

diff --git a/Documentation/git-check-attr.txt b/Documentation/git-check-attr.txt
index ceb51959b1d28a7298ddd42b0e3e968c568195a7..290f10f169b55aec37068f170ddf0a2c9a851624 100644 (file)
--- a/Documentation/git-check-attr.txt
+++ b/Documentation/git-check-attr.txt
@@ -23,6 +23,11 @@ OPTIONS
        be treated as an attribute.
 
 
+SEE ALSO
+--------
+linkgit:gitattributes[5].
+
+
 Author
 ------
 Written by Junio C Hamano <junkio@cox.net>
@@ -33,5 +38,4 @@ Documentation by James Bowes.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
-
+Part of the linkgit:git[7] suite