Merge 'fixes' branch

diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index d05827f611968c84fb6c9c61fccb5c92e78a602f..9c5ef8e7a41425a02eeda8b28fafa26907aa7f47 100644 (file)
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -88,7 +88,7 @@ For an unmerged path, instead of recording a single mode/SHA1 pair,
 the dircache records up to three such pairs; one from tree O in stage
 1, A in stage 2, and B in stage 3.  This information can be used by
 the user (or the porcelain) to see what should eventually be recorded at the
-path. (see read-cache for more information on state)
+path. (see git-read-tree for more information on state)
 
 
 Exclude Patterns
@@ -180,7 +180,7 @@ An example:
 
 See Also
 --------
-link:read-cache.html[read-cache]
+link:git-read-tree.html[git-read-tree]
 
 
 Author