@matheusbsbs / matheus-bagliano / commits / 3070b603ab
Fork 0

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.

Francis Daly committed Mar 20, 2006 at 10:41 UTC 3070b603ab349674fd357b1b7f9ba4698f2b86b7
2 files changed +29 -23
Documentation/git-cvsimport.txt
+15 -12
@@ -99,21 +99,24 @@ If you need to pass multiple options, separate them with a comma.
99 CVS by default uses the unix username when writing its
100 commit logs. Using this option and an author-conv-file
101 in this format
102 -
102 ++
103 +---------
104 exon=Andreas Ericsson <ae@op5.se>
105 spawn=Simon Pawn <spawn@frog-pond.org>
106
106 - git-cvsimport will make it appear as those authors had
107 - their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly
108 - all along.
109 -
110 - For convenience, this data is saved to $GIT_DIR/cvs-authors
111 - each time the -A option is provided and read from that same
112 - file each time git-cvsimport is run.
113 -
114 - It is not recommended to use this feature if you intend to
115 - export changes back to CVS again later with
116 - git-link[1]::git-cvsexportcommit.
107 +---------
108 ++
109 +git-cvsimport will make it appear as those authors had
110 +their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly
111 +all along.
112 ++
113 +For convenience, this data is saved to $GIT_DIR/cvs-authors
114 +each time the -A option is provided and read from that same
115 +file each time git-cvsimport is run.
116 ++
117 +It is not recommended to use this feature if you intend to
118 +export changes back to CVS again later with
119 +git-link[1]::git-cvsexportcommit.
120
121 OUTPUT
122 ------
Documentation/git-svnimport.txt
+14 -11
@@ -75,18 +75,21 @@ When importing incrementally, you might need to edit the .git/svn2git file.
75
76 -A <author_file>::
77 Read a file with lines on the form
78 ++
79 +------
80 + username = User's Full Name <email@addr.es>
81
79 - username = User's Full Name <email@addr.es>
80 -
81 - and use "User's Full Name <email@addr.es>" as the GIT
82 - author and committer for Subversion commits made by
83 - "username". If encountering a commit made by a user not in the
84 - list, abort.
85 -
86 - For convenience, this data is saved to $GIT_DIR/svn-authors
87 - each time the -A option is provided, and read from that same
88 - file each time git-svnimport is run with an existing GIT
89 - repository without -A.
82 +------
83 ++
84 +and use "User's Full Name <email@addr.es>" as the GIT
85 +author and committer for Subversion commits made by
86 +"username". If encountering a commit made by a user not in the
87 +list, abort.
88 ++
89 +For convenience, this data is saved to $GIT_DIR/svn-authors
90 +each time the -A option is provided, and read from that same
91 +file each time git-svnimport is run with an existing GIT
92 +repository without -A.
93
94 -m::
95 Attempt to detect merges based on the commit message. This option