Fix multi-paragraph list items in OPTIONS section

This patch makes the html docs right, makes the asciidoc docs a bit odd
but consistent with what is there already, and makes the manpages look
OK using docbook-xsl 1.68, but miss a paragraph separator when using 1.69.

For the manpages, current is like

-A <author_file>
Read a file with lines on the form

username = User's Full Name <email@addr.es>

and use "User's Full Name <email@addr.es>" as the GIT

With this patch, docbook-xsl v1.68 looks like

-A <author_file>
Read a file with lines on the form

username = User's Full Name <email@addr.es>

and use "User's Full Name <email@addr.es>" as the GIT author and

while docbook-xsl v1.69 becomes

-A <author_file>
Read a file with lines on the form

username = User's Full Name <email@addr.es>
and use "User's Full Name <email@addr.es>" as the GIT author and

The extra indentation is to keep the v1.69 manpage looking sane.

diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index 57027b448f52a1357d89b569f5b94c8a928f7f56..b0c6d7c30323c775f49dc65b3895855eed0f4e19 100644 (file)
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/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
        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>
 
        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
 ------
 
 OUTPUT
 ------

diff --git a/Documentation/git-svnimport.txt b/Documentation/git-svnimport.txt
index 9d3865719c37b9cef435b6a5b77afe3ff9aa7b40..b1b87c2fcd9b60aef6fb937bd4d28572f1cb8463 100644 (file)
--- a/Documentation/git-svnimport.txt
+++ b/Documentation/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
 
 -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
 
 -m::
        Attempt to detect merges based on the commit message. This option