Merge branch 'master' into next

diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index 886fb7c02c290baff2ddc5eefe1ee9150dbb5604..753fc0866d2883af59ed54fd7ca566f7694172e3 100644 (file)
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -1,6 +1,5 @@
 git-status(1)
 =============
-v0.99.4, Aug 2005
 
 NAME
 ----
@@ -9,7 +8,7 @@ git-status - Show working tree status.
 
 SYNOPSIS
 --------
-'git status'
+'git-status'
 
 DESCRIPTION
 -----------
@@ -42,5 +41,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite