Merge branch 'maint-1.5.5' into maint-1.5.6

diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index c95ad9f1451fd5db2e4fcbdb64f606f81f39ff14..58fb906ef68e8b800b0616a5655aa757a362ed6e 100644 (file)
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -348,7 +348,7 @@ middle of doing, and when your working tree is ready (i.e. you
 have finished your work-in-progress), attempt the merge again.
 
 
-See Also
+SEE ALSO
 --------
 linkgit:git-write-tree[1]; linkgit:git-ls-files[1];
 linkgit:gitignore[5]
@@ -364,4 +364,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite