Merge branch 'ab/gitweb-use-same-scheme'

diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index ac7006e6400d85c31bf31a3022a38225373fe3f7..b4c2e24849b1154fb55608fa95cead9e405a03bf 100644 (file)
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -128,7 +128,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.
 
@@ -160,7 +160,7 @@ EXAMPLES
 
        Same as above, but the format is inferred from the output file.
 
-`git archive --format=tar --prefix=git-1.4.0/ v1.4.0{caret}\{tree\} | gzip >git-1.4.0.tar.gz`::
+`git archive --format=tar --prefix=git-1.4.0/ v1.4.0^{tree} | gzip >git-1.4.0.tar.gz`::
 
        Create a compressed tarball for v1.4.0 release, but without a
        global extended pax header.