From bdeff822de152c9855766ea84cfd2534ebc19f52 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junio@hera.kernel.org>
Date: Mon, 30 Jul 2007 09:07:17 +0000
Subject: [PATCH] Autogenerated HTML docs for v1.5.3-rc3-91-g5c75

---
 git-diff.html      | 9 +++------
 git-diff.txt       | 7 ++-----
 gitattributes.html | 4 ++--
 gitattributes.txt  | 2 +-
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/git-diff.html b/git-diff.html
index 8dc5c68ad..f64ce2cd5 100644
--- a/git-diff.html
+++ b/git-diff.html
@@ -833,7 +833,7 @@ Limiting the diff output
 <div class="listingblock">
 <div class="content">
 <pre><tt>$ git diff --diff-filter=MRC            <b>(1)</b>
-$ git diff --name-status -r             <b>(2)</b>
+$ git diff --name-status                <b>(2)</b>
 $ git diff arch/i386 include/asm-i386   <b>(3)</b></tt></pre>
 </div></div>
 <ol>
@@ -846,10 +846,7 @@ nor deletion.
 <li>
 <p>
 show only names and the nature of change, but not actual
-diff output.  --name-status disables usual patch generation
-which in turn also disables recursive behavior, so without -r
-you would only see the directory name if there is a change in a
-file in a subdirectory.
+diff output.
 </p>
 </li>
 <li>
@@ -898,7 +895,7 @@ output diff in reverse.
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 27-Jul-2007 07:25:25 UTC
+Last updated 30-Jul-2007 09:06:57 UTC
 </div>
 </div>
 </body>
diff --git a/git-diff.txt b/git-diff.txt
index 639b96931..b1f5e7f93 100644
--- a/git-diff.txt
+++ b/git-diff.txt
@@ -102,17 +102,14 @@ Limiting the diff output::
 +
 ------------
 $ git diff --diff-filter=MRC            <1>
-$ git diff --name-status -r             <2>
+$ git diff --name-status                <2>
 $ git diff arch/i386 include/asm-i386   <3>
 ------------
 +
 <1> show only modification, rename and copy, but not addition
 nor deletion.
 <2> show only names and the nature of change, but not actual
-diff output.  --name-status disables usual patch generation
-which in turn also disables recursive behavior, so without -r
-you would only see the directory name if there is a change in a
-file in a subdirectory.
+diff output.
 <3> limit diff output to named subtrees.
 
 Munging the diff output::
diff --git a/gitattributes.html b/gitattributes.html
index 6e0a9e14b..1a093eb3f 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -675,7 +675,7 @@ Then it examines <tt>.gitattributes</tt> (which is in the parent
 </li>
 <li>
 <p>
-Finally it examines <tt>$GIT_DIR/info/gitattributes</tt>.  This file
+Finally it examines <tt>$GIT_DIR/info/attributes</tt>.  This file
    is used to override the in-tree settings.  The first line is
    a match, and <tt>foo</tt> is set, <tt>bar</tt> is reverted to unspecified
    state, and <tt>baz</tt> is unset.
@@ -698,7 +698,7 @@ frotz   unspecified</tt></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 19-Jul-2007 02:10:00 UTC
+Last updated 30-Jul-2007 09:06:57 UTC
 </div>
 </div>
 </body>
diff --git a/gitattributes.txt b/gitattributes.txt
index 810df0721..8b90a5b98 100644
--- a/gitattributes.txt
+++ b/gitattributes.txt
@@ -405,7 +405,7 @@ the attributes given to path `t/abc` are computed as follows:
    and `bar` attributes should be given to this path, so it
    leaves `foo` and `bar` unset.  Attribute `baz` is set.
 
-3. Finally it examines `$GIT_DIR/info/gitattributes`.  This file
+3. Finally it examines `$GIT_DIR/info/attributes`.  This file
    is used to override the in-tree settings.  The first line is
    a match, and `foo` is set, `bar` is reverted to unspecified
    state, and `baz` is unset.
-- 
2.26.2