Merge branch 'dp/pid-uintmax'

diff --git a/Documentation/git-check-attr.txt b/Documentation/git-check-attr.txt
index 47cb1bdfa3d741a42c73d5234317ed68f1f90d5c..2b821f2a1d70fa108ce279135fd5028453a04fd9 100644 (file)
--- a/Documentation/git-check-attr.txt
+++ b/Documentation/git-check-attr.txt
@@ -8,7 +8,7 @@ git-check-attr - Display gitattributes information.
 
 SYNOPSIS
 --------
-'git-check-attr' attr... [--] pathname...
+'git check-attr' attr... [--] pathname...
 
 DESCRIPTION
 -----------
@@ -25,12 +25,12 @@ OPTIONS
 
 SEE ALSO
 --------
-gitlink:gitattributes[5].
+linkgit:gitattributes[5].
 
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 Documentation
 --------------
@@ -38,4 +38,4 @@ Documentation by James Bowes.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[1] suite