Merge branch 'fc/completion'

diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index 59d73e532fc4eaaec0c9d6c01d36b1d2da0cda38..250e5228a35165e72f2f55fd347941c3a2a1d08c 100644 (file)
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -56,7 +56,8 @@ OPTIONS
        Write the archive to <file> instead of stdout.
 
 --worktree-attributes::
-       Look for attributes in .gitattributes in working directory too.
+       Look for attributes in .gitattributes files in the working tree
+       as well (see <<ATTRIBUTES>>).
 
 <extra>::
        This can be any options that the archiver backend understands.
@@ -120,6 +121,7 @@ tar.<format>.remote::
        user-defined formats, but true for the "tar.gz" and "tgz"
        formats.
 
+[[ATTRIBUTES]]
 ATTRIBUTES
 ----------
 
@@ -128,7 +130,7 @@ export-ignore::
        added to archive files.  See linkgit:gitattributes[5] for details.
 
 export-subst::
-       If the attribute export-subst is set for a file then git will
+       If the attribute export-subst is set for a file then Git will
        expand several placeholders when adding this file to an archive.
        See linkgit:gitattributes[5] for details.