Autogenerated HTML docs for v1.6.2-rc2-22-g1d035

1 files changed, 14 insertions, 14 deletions

diff --git a/git-apply.html b/git-apply.html
index f885a8471..923a50bc2 100644
--- a/git-apply.html
+++ b/git-apply.html
@@ -342,7 +342,7 @@ and a work tree.</p></div>
 </dt>

 <dd>

 <p>

-        The files to read patch from.  <em>-</em> can be used to read

+        The files to read the patch from.  <em>-</em> can be used to read

         from the standard input.

 </p>

 </dd>

@@ -360,8 +360,8 @@ and a work tree.</p></div>
 </dt>

 <dd>

 <p>

-        Similar to --stat, but shows number of added and

-        deleted lines in decimal notation and pathname without

+        Similar to --stat, but shows the number of added and

+        deleted lines in decimal notation and the pathname without

         abbreviation, to make it more machine friendly.  For

         binary files, outputs two <tt>-</tt> instead of saying

         <tt>0 0</tt>.  Turns off "apply".

@@ -407,8 +407,8 @@ and a work tree.</p></div>
 </dt>

 <dd>

 <p>

-        Apply a patch without touching the working tree. Instead, take the

-        cached data, apply the patch, and store the result in the index,

+        Apply a patch without touching the working tree. Instead take the

+        cached data, apply the patch, and store the result in the index

         without using the working tree. This implies <em>--index</em>.

 </p>

 </dd>

@@ -420,7 +420,7 @@ and a work tree.</p></div>
         Newer <em>git-diff</em> output has embedded <em>index information</em>

         for each blob to help identify the original version that

         the patch applies to.  When this flag is given, and if

-        the original versions of the blobs is available locally,

+        the original versions of the blobs are available locally,

         builds a temporary index containing those blobs.

 </p>

 <div class="para"><p>When a pure mode change is encountered (which has no index information),

@@ -492,7 +492,7 @@ the information is read from the current index instead.</p></div>
         applying a diff generated with --unified=0. To bypass these

         checks use <em>--unidiff-zero</em>.

 </p>

-<div class="para"><p>Note, for the reasons stated above usage of context-free patches are

+<div class="para"><p>Note, for the reasons stated above usage of context-free patches is

 discouraged.</p></div>

 </dd>

 <dt>

@@ -502,7 +502,7 @@ discouraged.</p></div>
 <p>

         If you use any of the options marked "Turns off

         <em>apply</em>" above, <em>git-apply</em> reads and outputs the

-        information you asked without actually applying the

+        requested information without actually applying the

         patch.  Give this flag after those flags to also apply

         the patch.

 </p>

@@ -516,7 +516,7 @@ discouraged.</p></div>
         patch.  This can be used to extract the common part between

         two files by first running <em>diff</em> on them and applying

         the result with this option, which would apply the

-        deletion part but not addition part.

+        deletion part but not the addition part.

 </p>

 </dd>

 <dt>

@@ -574,7 +574,7 @@ on the command line, and ignored if there is any include pattern.</p></div>
 <div class="para"><p>By default, the command outputs warning messages but applies the patch.

 When <tt>git-apply</tt> is used for statistics and not applying a

 patch, it defaults to <tt>nowarn</tt>.</p></div>

-<div class="para"><p>You can use different <tt>&lt;action&gt;</tt> to control this

+<div class="para"><p>You can use different <tt>&lt;action&gt;</tt> values to control this

 behavior:</p></div>

 <div class="ilist"><ul>

 <li>

@@ -592,7 +592,7 @@ behavior:</p></div>
 <p>

 <tt>fix</tt> outputs warnings for a few such errors, and applies the

   patch after fixing them (<tt>strip</tt> is a synonym --- the tool

-  used to consider only trailing whitespaces as errors, and the

+  used to consider only trailing whitespace characters as errors, and the

   fix involved <em>stripping</em> them, but modern gits do more).

 </p>

 </li>

@@ -649,7 +649,7 @@ behavior:</p></div>
 </dt>

 <dd>

 <p>

-        Prepend &lt;root&gt; to all filenames.  If a "-p" argument was passed, too,

+        Prepend &lt;root&gt; to all filenames.  If a "-p" argument was also passed,

         it is applied before prepending the new root.

 </p>

 <div class="para"><p>For example, a patch that talks about updating <tt>a/git-gui.sh</tt> to <tt>b/git-gui.sh</tt>

@@ -682,7 +682,7 @@ of the submodules are checked-out, then these check-outs are completely
 ignored, i.e., they are not required to be up-to-date or clean and they

 are not updated.</p></div>

 <div class="para"><p>If --index is not specified, then the submodule commits in the patch

-are ignored and only the absence of presence of the corresponding

+are ignored and only the absence or presence of the corresponding

 subdirectory is checked and (if possible) updated.</p></div>

 </div>

 <h2 id="_author">Author</h2>

@@ -699,7 +699,7 @@ subdirectory is checked and (if possible) updated.</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2009-03-01 08:02:35 UTC

+Last updated 2009-03-03 08:28:31 UTC

 </div>

 </div>

 </body>