Autogenerated HTML docs for v1.2.4-gac74

diff --git a/git-cvsimport.html b/git-cvsimport.html
index 2f22c30..dcae53b 100644 (file)
--- a/git-cvsimport.html
+++ b/git-cvsimport.html
@@ -439,29 +439,21 @@ the old cvs2git tool.</p>
         commit logs. Using this option and an author-conv-file\r
         in this format\r
 </p>\r
-<div class="literalblock">\r
+<div class="listingblock">\r
 <div class="content">\r
-<pre><tt>exon=Andreas Ericsson &lt;ae@op5.se&gt;\r
-spawn=Simon Pawn &lt;spawn@frog-pond.org&gt;</tt></pre>\r
+<pre><tt>        exon=Andreas Ericsson &lt;ae@op5.se&gt;\r
+        spawn=Simon Pawn &lt;spawn@frog-pond.org&gt;\r
+</tt></pre>\r
 </div></div>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>git-cvsimport will make it appear as those authors had\r
+<p>git-cvsimport will make it appear as those authors had\r
 their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly\r
-all along.</tt></pre>\r
-</div></div>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>For convenience, this data is saved to $GIT_DIR/cvs-authors\r
+all along.</p>\r
+<p>For convenience, this data is saved to $GIT_DIR/cvs-authors\r
 each time the -A option is provided and read from that same\r
-file each time git-cvsimport is run.</tt></pre>\r
-</div></div>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>It is not recommended to use this feature if you intend to\r
+file each time git-cvsimport is run.</p>\r
+<p>It is not recommended to use this feature if you intend to\r
 export changes back to CVS again later with\r
-git-link[1]::git-cvsexportcommit.</tt></pre>\r
-</div></div>\r
+git-link[1]::git-cvsexportcommit.</p>\r
 </dd>\r
 </dl>\r
 </div>\r
@@ -486,7 +478,7 @@ various participants of the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 08-Mar-2006 01:42:24 UTC\r
+Last updated 21-Mar-2006 08:33:42 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-cvsimport.txt b/git-cvsimport.txt
index 57027b4..b0c6d7c 100644 (file)
--- a/git-cvsimport.txt
+++ b/git-cvsimport.txt
@@ -99,21 +99,24 @@ If you need to pass multiple options, separate them with a comma.
        CVS by default uses the unix username when writing its
        commit logs. Using this option and an author-conv-file
        in this format
-
++
+---------
        exon=Andreas Ericsson <ae@op5.se>
        spawn=Simon Pawn <spawn@frog-pond.org>
 
-       git-cvsimport will make it appear as those authors had
-       their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly
-       all along.
-
-       For convenience, this data is saved to $GIT_DIR/cvs-authors
-       each time the -A option is provided and read from that same
-       file each time git-cvsimport is run.
-
-       It is not recommended to use this feature if you intend to
-       export changes back to CVS again later with
-       git-link[1]::git-cvsexportcommit.
+---------
++
+git-cvsimport will make it appear as those authors had
+their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly
+all along.
++
+For convenience, this data is saved to $GIT_DIR/cvs-authors
+each time the -A option is provided and read from that same
+file each time git-cvsimport is run.
++
+It is not recommended to use this feature if you intend to
+export changes back to CVS again later with
+git-link[1]::git-cvsexportcommit.
 
 OUTPUT
 ------

diff --git a/git-svnimport.html b/git-svnimport.html
index 3ccba37..ea04c0f 100644 (file)
--- a/git-svnimport.html
+++ b/git-svnimport.html
@@ -384,24 +384,19 @@ incremental SVN imports.</p>
 <p>\r
         Read a file with lines on the form\r
 </p>\r
-<div class="literalblock">\r
+<div class="listingblock">\r
 <div class="content">\r
-<pre><tt>username = User's Full Name &lt;email@addr.es&gt;</tt></pre>\r
+<pre><tt>        username = User's Full Name &lt;email@addr.es&gt;\r
+</tt></pre>\r
 </div></div>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>and use "User's Full Name &lt;email@addr.es&gt;" as the GIT\r
+<p>and use "User's Full Name &lt;email@addr.es&gt;" as the GIT\r
 author and committer for Subversion commits made by\r
 "username". If encountering a commit made by a user not in the\r
-list, abort.</tt></pre>\r
-</div></div>\r
-<div class="literalblock">\r
-<div class="content">\r
-<pre><tt>For convenience, this data is saved to $GIT_DIR/svn-authors\r
+list, abort.</p>\r
+<p>For convenience, this data is saved to $GIT_DIR/svn-authors\r
 each time the -A option is provided, and read from that same\r
 file each time git-svnimport is run with an existing GIT\r
-repository without -A.</tt></pre>\r
-</div></div>\r
+repository without -A.</p>\r
 </dd>\r
 <dt>\r
 -m\r
@@ -517,7 +512,7 @@ various participants of the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Mar-2006 23:19:38 UTC\r
+Last updated 21-Mar-2006 08:33:43 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-svnimport.txt b/git-svnimport.txt
index 9d38657..b1b87c2 100644 (file)
--- a/git-svnimport.txt
+++ b/git-svnimport.txt
@@ -75,18 +75,21 @@ When importing incrementally, you might need to edit the .git/svn2git file.
 
 -A <author_file>::
        Read a file with lines on the form
++
+------
+       username = User's Full Name <email@addr.es>
 
-         username = User's Full Name <email@addr.es>
-
-       and use "User's Full Name <email@addr.es>" as the GIT
-       author and committer for Subversion commits made by
-       "username". If encountering a commit made by a user not in the
-       list, abort.
-
-       For convenience, this data is saved to $GIT_DIR/svn-authors
-       each time the -A option is provided, and read from that same
-       file each time git-svnimport is run with an existing GIT
-       repository without -A.
+------
++
+and use "User's Full Name <email@addr.es>" as the GIT
+author and committer for Subversion commits made by
+"username". If encountering a commit made by a user not in the
+list, abort.
++
+For convenience, this data is saved to $GIT_DIR/svn-authors
+each time the -A option is provided, and read from that same
+file each time git-svnimport is run with an existing GIT
+repository without -A.
 
 -m::
        Attempt to detect merges based on the commit message. This option