Autogenerated HTML docs for v1.5.4-rc1-23-g3a96

diff --git a/git-shortlog.html b/git-shortlog.html
index cff79738f98110a1db1511c8c3195ff85fe349ca..96cd49eab0c43854b1dd2a6d9da777d308cb7637 100644 (file)
--- a/git-shortlog.html
+++ b/git-shortlog.html
@@ -323,15 +323,11 @@ the first line of the commit message will be shown.</p>
 </div>\r
 <h2>FILES</h2>\r
 <div class="sectionbody">\r
-<div class="literalblock">\r
-<div class="title">mailmap::</div>\r
-<div class="content">\r
-<pre><tt>If this file exists, it will be used for mapping author email\r
-addresses to a real author name. One mapping per line, first\r
+<p>If the file <tt>.mailmap</tt> exists, it will be used for mapping author\r
+email addresses to a real author name. One mapping per line, first\r
 the author name followed by the email address enclosed by\r
-'&lt;' and '&gt;'. Use hash '#' for comments. Example:</tt></pre>\r
-</div></div>\r
-<div class="literalblock">\r
+<em>&lt;</em> and <em>&gt;</em>. Use hash <em>#</em> for comments. Example:</p>\r
+<div class="listingblock">\r
 <div class="content">\r
 <pre><tt># Keep alphabetized\r
 Adam Morrow &lt;adam@localhost.localdomain&gt;\r
@@ -352,7 +348,7 @@ Eve Jones &lt;eve@laptop.(none)&gt;</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 13-Dec-2007 02:42:55 UTC\r
+Last updated 24-Dec-2007 19:31:23 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-shortlog.txt b/git-shortlog.txt
index e14720b73ff6b44d0300e9a8ad0fbd781738440d..36510a845125a806992fddce125883a749569235 100644 (file)
--- a/git-shortlog.txt
+++ b/git-shortlog.txt
@@ -38,15 +38,16 @@ OPTIONS
 FILES
 -----
 
-.mailmap::
-       If this file exists, it will be used for mapping author email
-       addresses to a real author name. One mapping per line, first
-       the author name followed by the email address enclosed by
-       '<' and '>'. Use hash '#' for comments. Example:
-
-               # Keep alphabetized
-               Adam Morrow <adam@localhost.localdomain>
-               Eve Jones <eve@laptop.(none)>
+If the file `.mailmap` exists, it will be used for mapping author
+email addresses to a real author name. One mapping per line, first
+the author name followed by the email address enclosed by
+'<' and '>'. Use hash '#' for comments. Example:
+
+------------
+# Keep alphabetized
+Adam Morrow <adam@localhost.localdomain>
+Eve Jones <eve@laptop.(none)>
+------------
 
 Author
 ------