Commit 3ce636bc authored by mmoss@chromium.org's avatar mmoss@chromium.org

Fix manpage creation error.

When running make_docs.sh, I get the error:
  asciidoc: FAILED: manpage document title is mandatory
  make: *** [git-cherry-pick-upload.xml] Error 1

I don't fully understand why, or why this hasn't come up before, but it
seems to be complaining about the formatting of "===" in
git-cherry-pick-upload.txt. This was with xmlto version 0.0.25 on
Precise.

R=iannucci@google.com

Review URL: https://codereview.chromium.org/489143003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@290939 0039d316-1c4b-4281-b951-d872f2087c98
parent 787e3061
...@@ -755,7 +755,7 @@ git-cherry-pick-upload(1) Manual Page ...@@ -755,7 +755,7 @@ git-cherry-pick-upload(1) Manual Page
<h2 id="_synopsis">SYNOPSIS</h2> <h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody"> <div class="sectionbody">
<div class="verseblock"> <div class="verseblock">
<pre class="content"><em>git cherry-pick-upload --branch &lt;remote_branch_name&gt; &lt;commit_hash&gt;</em></pre> <pre class="content"><em>git cherry-pick-upload</em> --branch &lt;remote_branch_name&gt; &lt;commit_hash&gt;</pre>
<div class="attribution"> <div class="attribution">
</div></div> </div></div>
</div> </div>
...@@ -817,7 +817,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> ...@@ -817,7 +817,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
<div id="footnotes"><hr /></div> <div id="footnotes"><hr /></div>
<div id="footer"> <div id="footer">
<div id="footer-text"> <div id="footer-text">
Last updated 2014-07-23 14:38:36 PDT Last updated 2014-08-20 09:39:48 PDT
</div> </div>
</div> </div>
</body> </body>
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
.\" Title: git-cherry-pick-upload .\" Title: git-cherry-pick-upload
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
.\" Date: 07/23/2014 .\" Date: 08/20/2014
.\" Manual: Chromium depot_tools Manual .\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools dff725e .\" Source: depot_tools 8d3348f
.\" Language: English .\" Language: English
.\" .\"
.TH "GIT\-CHERRY-PICK-UPLOAD" "1" "07/23/2014" "depot_tools dff725e" "Chromium depot_tools Manual" .TH "GIT\-CHERRY\-PICK\-U" "1" "08/20/2014" "depot_tools 8d3348f" "Chromium depot_tools Manual"
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.\" * Define some portability stuff .\" * Define some portability stuff
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
...@@ -32,12 +32,12 @@ git-cherry-pick-upload \- Upload the diff between a revision and its parent to r ...@@ -32,12 +32,12 @@ git-cherry-pick-upload \- Upload the diff between a revision and its parent to r
.SH "SYNOPSIS" .SH "SYNOPSIS"
.sp .sp
.nf .nf
\fIgit cherry-pick-upload\fR \-\-branch <remote_branch_name> <commit_hash> \fIgit cherry\-pick\-upload\fR \-\-branch <remote_branch_name> <commit_hash>
.fi .fi
.sp .sp
.SH "DESCRIPTION" .SH "DESCRIPTION"
.sp .sp
git cherry-pick-upload is used to upload a cherry pick to rietveld\&. It uses your view of the remote to generate the diff between a revision and its parent, and then uploads that diff to rietveld\&. git cherry\-pick\-upload is used to upload a cherry pick to rietveld\&. It uses your view of the remote to generate the diff between a revision and its parent, and then uploads that diff to rietveld\&.
.sp .sp
The commit message is annotated with "(cherry picked from commit [parent sha1])" as if it were generated by git cherry\-pick \-x\&. The commit message is annotated with "(cherry picked from commit [parent sha1])" as if it were generated by git cherry\-pick \-x\&.
.SH "EXAMPLE" .SH "EXAMPLE"
...@@ -48,7 +48,7 @@ The commit message is annotated with "(cherry picked from commit [parent sha1])" ...@@ -48,7 +48,7 @@ The commit message is annotated with "(cherry picked from commit [parent sha1])"
.RS 4 .RS 4
.\} .\}
.nf .nf
\fB$ git cherry-pick-upload \-h\fR \fB$ git cherry\-pick\-upload \-h\fR
usage: git_cherry_pick_upload\&.py [\-h] \-\-branch <branch> <commit> usage: git_cherry_pick_upload\&.py [\-h] \-\-branch <branch> <commit>
positional arguments: positional arguments:
...@@ -59,7 +59,7 @@ optional arguments: ...@@ -59,7 +59,7 @@ optional arguments:
\-\-branch <branch>, \-b <branch> \-\-branch <branch>, \-b <branch>
The upstream branch to cherry pick to\&. The upstream branch to cherry pick to\&.
\fB$ git cherry-pick-upload \-b my_branch c02b7d24a066adb747fdeb12deb21bfa\fR \fB$ git cherry\-pick\-upload \-b my_branch c02b7d24a066adb747fdeb12deb21bfa\fR
Found parent revision: b96d69fda53845a205151613a9c4cc93 Found parent revision: b96d69fda53845a205151613a9c4cc93
Loaded authentication cookies from \&.codereview_upload_cookies Loaded authentication cookies from \&.codereview_upload_cookies
Issue created\&. URL: https://codereview\&.chromium\&.org/1234567890 Issue created\&. URL: https://codereview\&.chromium\&.org/1234567890
......
git-cherry-pick-upload(1) git-cherry-pick-upload(1)
============= =========================
NAME NAME
---- ----
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment