Merge branch 'jc/apply' into next

diff --git a/Documentation/git-diff-stages.txt b/Documentation/git-diff-stages.txt
index 2084c7041f852759452b4c16026744eef9ce360e..32739186276da09935c4905eb01d351cd5faa587 100644 (file)
--- a/Documentation/git-diff-stages.txt
+++ b/Documentation/git-diff-stages.txt
@@ -1,10 +1,9 @@
 git-diff-stages(1)
 ==================
-v0.1, June 2005
 
 NAME
 ----
-git-diff-stages - Compares content and mode of blobs between stages in an unmerged index file.
+git-diff-stages - Compares content and mode of blobs between stages in an unmerged index file
 
 
 SYNOPSIS
@@ -38,4 +37,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite