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

1 files changed, 19 insertions, 19 deletions

diff --git a/git-am.html b/git-am.html
index 0d7b0f7ba..c89419b46 100644
--- a/git-am.html
+++ b/git-am.html
@@ -344,8 +344,8 @@ current branch.</p></div>
 <dd>

 <p>

         The list of mailbox files to read patches from. If you do not

-        supply this argument, reads from the standard input. If you supply

-        directories, they'll be treated as Maildirs.

+        supply this argument, the command reads from the standard input.

+        If you supply directories, they will be treated as Maildirs.

 </p>

 </dd>

 <dt>

@@ -386,7 +386,7 @@ current branch.</p></div>
         preferred encoding if it is not UTF-8).

 </p>

 <div class="para"><p>This was optional in prior versions of git, but now it is the

-default.   You could use <tt>--no-utf8</tt> to override this.</p></div>

+default.   You can use <tt>--no-utf8</tt> to override this.</p></div>

 </dd>

 <dt>

 --no-utf8

@@ -406,8 +406,8 @@ default.   You could use <tt>--no-utf8</tt> to override this.</p></div>
 <dd>

 <p>

         When the patch does not apply cleanly, fall back on

-        3-way merge, if the patch records the identity of blobs

-        it is supposed to apply to, and we have those blobs

+        3-way merge if the patch records the identity of blobs

+        it is supposed to apply to and we have those blobs

         available locally.

 </p>

 </dd>

@@ -523,16 +523,16 @@ of the message.  The "Subject: " line is used as the title of
 the commit, after stripping common prefix "[PATCH &lt;anything&gt;]".

 It is supposed to describe what the commit is about concisely as

 a one line text.</p></div>

-<div class="para"><p>The body of the message (iow, after a blank line that terminates

-RFC2822 headers) can begin with "Subject: " and "From: " lines

-that are different from those of the mail header, to override

-the values of these fields.</p></div>

+<div class="para"><p>The body of the message (the rest of the message after the blank line

+that terminates the RFC2822 headers) can begin with "Subject: " and

+"From: " lines that are different from those of the mail header,

+to override the values of these fields.</p></div>

 <div class="para"><p>The commit message is formed by the title taken from the

 "Subject: ", a blank line and the body of the message up to

-where the patch begins.  Excess whitespaces at the end of the

+where the patch begins.  Excess whitespace characters at the end of the

 lines are automatically stripped.</p></div>

 <div class="para"><p>The patch is expected to be inline, directly following the

-message.  Any line that is of form:</p></div>

+message.  Any line that is of the form:</p></div>

 <div class="ilist"><ul>

 <li>

 <p>

@@ -552,25 +552,25 @@ a line that begins with "Index: "
 </ul></div>

 <div class="para"><p>is taken as the beginning of a patch, and the commit log message

 is terminated before the first occurrence of such a line.</p></div>

-<div class="para"><p>When initially invoking it, you give it names of the mailboxes

-to crunch.  Upon seeing the first patch that does not apply, it

-aborts in the middle,.  You can recover from this in one of two ways:</p></div>

+<div class="para"><p>When initially invoking it, you give it the names of the mailboxes

+to process.  Upon seeing the first patch that does not apply, it

+aborts in the middle.  You can recover from this in one of two ways:</p></div>

 <div class="olist"><ol>

 <li>

 <p>

-skip the current patch by re-running the command with <em>--skip</em>

+skip the current patch by re-running the command with the <em>--skip</em>

   option.

 </p>

 </li>

 <li>

 <p>

 hand resolve the conflict in the working directory, and update

-  the index file to bring it in a state that the patch should

-  have produced.  Then run the command with <em>--resolved</em> option.

+  the index file to bring it into a state that the patch should

+  have produced.  Then run the command with the <em>--resolved</em> option.

 </p>

 </li>

 </ol></div>

-<div class="para"><p>The command refuses to process new mailboxes while <tt>.git/rebase-apply</tt>

+<div class="para"><p>The command refuses to process new mailboxes while the <tt>.git/rebase-apply</tt>

 directory exists, so if you decide to start over from scratch,

 run <tt>rm -f -r .git/rebase-apply</tt> before running the command with mailbox

 names.</p></div>

@@ -598,7 +598,7 @@ errors in the "From:" lines).</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2009-02-14 08:18:00 UTC

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

 </div>

 </div>

 </body>