Autogenerated HTML docs for v1.6.2.1-299-g88f78

1 files changed, 8 insertions, 9 deletions

diff --git a/git-shortlog.html b/git-shortlog.html
index 832dd1e27..3a63fac64 100644
--- a/git-shortlog.html
+++ b/git-shortlog.html
@@ -403,24 +403,23 @@ is used to map author and committer names and email addresses to
 canonical real names and email addresses.</p></div>

 <div class="para"><p>In the simple form, each line in the file consists of the canonical

 real name of an author, whitespace, and an email address used in the

-commit (enclosed by <em>&lt;</em> and <em>&gt;</em>) to map to the name. Thus, looks like

-this</p></div>

+commit (enclosed by <em>&lt;</em> and <em>&gt;</em>) to map to the name. For example:</p></div>

 <div class="literalblock">

 <div class="content">

 <pre><tt>Proper Name &lt;commit@email.xx&gt;</tt></pre>

 </div></div>

-<div class="para"><p>The more complex forms are</p></div>

+<div class="para"><p>The more complex forms are:</p></div>

 <div class="literalblock">

 <div class="content">

 <pre><tt>&lt;proper@email.xx&gt; &lt;commit@email.xx&gt;</tt></pre>

 </div></div>

-<div class="para"><p>which allows mailmap to replace only the email part of a commit, and</p></div>

+<div class="para"><p>which allows mailmap to replace only the email part of a commit, and:</p></div>

 <div class="literalblock">

 <div class="content">

 <pre><tt>Proper Name &lt;proper@email.xx&gt; &lt;commit@email.xx&gt;</tt></pre>

 </div></div>

 <div class="para"><p>which allows mailmap to replace both the name and the email of a

-commit matching the specified commit email address, and</p></div>

+commit matching the specified commit email address, and:</p></div>

 <div class="literalblock">

 <div class="content">

 <pre><tt>Proper Name &lt;proper@email.xx&gt; Commit Name &lt;commit@email.xx&gt;</tt></pre>

@@ -445,8 +444,8 @@ would look like:</p></div>
 <pre><tt>Jane Doe         &lt;jane@desktop.(none)&gt;

 Joe R. Developer &lt;joe@example.com&gt;</tt></pre>

 </div></div>

-<div class="para"><p>Note how we don't need an entry for &lt;jane@laptop.(none)&gt;, because the

-real name of that author is correct already.</p></div>

+<div class="para"><p>Note how there is no need for an entry for &lt;jane@laptop.(none)&gt;, because the

+real name of that author is already correct.</p></div>

 <div class="para"><p>Example 2: Your repository contains commits from the following

 authors:</p></div>

 <div class="listingblock">

@@ -458,7 +457,7 @@ santa &lt;me@company.xx&gt;
 claus &lt;me@company.xx&gt;

 CTO &lt;cto@coompany.xx&gt;</tt></pre>

 </div></div>

-<div class="para"><p>Then, you might want a <tt>.mailmap</tt> file looking like:</p></div>

+<div class="para"><p>Then you might want a <tt>.mailmap</tt> file that looks like:</p></div>

 <div class="listingblock">

 <div class="content">

 <pre><tt>&lt;cto@company.xx&gt;                       &lt;cto@coompany.xx&gt;

@@ -484,7 +483,7 @@ the email address.</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2009-02-15 10:37:55 UTC

+Last updated 2009-03-22 08:21:22 UTC

 </div>

 </div>

 </body>