Merge master into aw/mirror-push

diff --git a/Documentation/repository-layout.txt b/Documentation/repository-layout.txt
index 0459bd9ca1732beec1150e4354f1a03eafd53fe4..4c92e375fed4592f7190086dd40ef6dd1241d238 100644 (file)
--- a/Documentation/repository-layout.txt
+++ b/Documentation/repository-layout.txt
@@ -155,8 +155,7 @@ info/exclude::
        exclude pattern list. `.gitignore` is the per-directory
        ignore file.  `git status`, `git add`, `git rm` and `git
        clean` look at it but the core git commands do not look
-       at it.  See also: gitlink:git-ls-files[1] `--exclude-from`
-       and `--exclude-per-directory`.
+       at it.  See also: gitlink:gitignore[5].
 
 remotes::
        Stores shorthands to be used to give URL and default
@@ -178,4 +177,3 @@ shallow::
        This is similar to `info/grafts` but is internally used
        and maintained by shallow clone mechanism.  See `--depth`
        option to gitlink:git-clone[1] and gitlink:git-fetch[1].
-