Merge branch 'sp/doc-info-attributes'

Doc update.

* sp/doc-info-attributes:
doc: Mention info/attributes in gitrepository-layout

diff --combined Documentation/gitrepository-layout.txt
index adf9554ad2f84cb69a6b0a940e4d3e0e336df9ff,5932868cef88fd60871c38b1a1e9ca7c6ee12e6c..c60bcad44aa581b2449a7a638b6487c1c73e8c23
--- 1/Documentation/gitrepository-layout.txt
--- 2/Documentation/gitrepository-layout.txt
+++ b/Documentation/gitrepository-layout.txt
@@@ -71,7 -71,7 +71,7 @@@ objects/info/packs:
        This file is to help dumb transports discover what packs
        are available in this object store.  Whenever a pack is
        added or removed, `git update-server-info` should be run
 -      to keep this file up-to-date if the repository is
 +      to keep this file up to date if the repository is
        published for dumb transports.  'git repack' does this
        by default.
  
@@@ -208,6 -208,10 +208,10 @@@ info/exclude:
        'git clean' look at it but the core Git commands do not look
        at it.  See also: linkgit:gitignore[5].
  
+ info/attributes::
+       Defines which attributes to assign to a path, similar to per-directory
+       `.gitattributes` files.   See also: linkgit:gitattributes[5].
+ 
  info/sparse-checkout::
        This file stores sparse checkout patterns.
        See also: linkgit:git-read-tree[1].