Autogenerated HTML docs for v1.6.3-rc4-29-g8146

1 files changed, 15 insertions, 15 deletions

diff --git a/git-am.html b/git-am.html
index 2928eccff..4c5cde0d0 100644
--- a/git-am.html
+++ b/git-am.html
@@ -356,7 +356,7 @@ current branch.</p></div>
 </dt>

 <dd>

 <p>

-        Add <tt>Signed-off-by:</tt> line to the commit message, using

+        Add a <tt>Signed-off-by:</tt> line to the commit message, using

         the committer identity of yourself.

 </p>

 </dd>

@@ -453,7 +453,7 @@ default.   You can use <tt>--no-utf8</tt> to override this.</p></div>
         message as the commit author date, and uses the time of

         commit creation as the committer date. This allows the

         user to lie about the committer date by using the same

-        timestamp as the author date.

+        value as the author date.

 </p>

 </dd>

 <dt>

@@ -464,8 +464,8 @@ default.   You can use <tt>--no-utf8</tt> to override this.</p></div>
         By default the command records the date from the e-mail

         message as the commit author date, and uses the time of

         commit creation as the committer date. This allows the

-        user to lie about author timestamp by using the same

-        timestamp as the committer date.

+        user to lie about the author date by using the same

+        value as the committer date.

 </p>

 </dd>

 <dt>

@@ -518,19 +518,19 @@ default.   You can use <tt>--no-utf8</tt> to override this.</p></div>
 <h2 id="_discussion">DISCUSSION</h2>

 <div class="sectionbody">

 <div class="para"><p>The commit author name is taken from the "From: " line of the

-message, and commit author time is taken from the "Date: " line

+message, and commit author date is taken from the "Date: " line

 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 (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>

+The "Subject: " line is supposed to concisely describe what the

+commit is about in one line of text.</p></div>

+<div class="para"><p>"From: " and "Subject: " lines starting the body (the rest of the

+message after the blank line terminating the RFC2822 headers)

+override the respective commit author name and title values taken

+from the headers.</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 whitespace characters at the end of the

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

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

+line is automatically stripped.</p></div>

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

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

 <div class="ilist"><ul>

@@ -552,7 +552,7 @@ 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 the names of the mailboxes

+<div class="para"><p>When initially invoking <tt>git am</tt>, 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>

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

 <div id="footer">

 <div id="footer-text">

-Last updated 2009-04-02 06:49:44 UTC

+Last updated 2009-05-06 07:38:30 UTC

 </div>

 </div>

 </body>