Merge 1.5.5.4 in

diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 2dec2ec1cffddfc4ad9f3a5547cc350ab67132c2..76277bd178b17c5b1630ea2bae3cb727ca194bc5 100644 (file)
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -206,4 +206,4 @@ Documentation by Junio C Hamano
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite