From 3ce636bc5d785054b0d9bcf5ec64514c78823736 Mon Sep 17 00:00:00 2001 From: "mmoss@chromium.org" Date: Wed, 20 Aug 2014 22:54:14 +0000 Subject: [PATCH] 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 --- man/html/git-cherry-pick-upload.html | 4 ++-- man/man1/git-cherry-pick-upload.1 | 14 +++++++------- man/src/git-cherry-pick-upload.txt | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/man/html/git-cherry-pick-upload.html b/man/html/git-cherry-pick-upload.html index b212bd410..58b42e8f1 100644 --- a/man/html/git-cherry-pick-upload.html +++ b/man/html/git-cherry-pick-upload.html @@ -755,7 +755,7 @@ git-cherry-pick-upload(1) Manual Page

SYNOPSIS

-
git cherry-pick-upload --branch <remote_branch_name> <commit_hash>
+
git cherry-pick-upload --branch <remote_branch_name> <commit_hash>
@@ -817,7 +817,7 @@ from
diff --git a/man/man1/git-cherry-pick-upload.1 b/man/man1/git-cherry-pick-upload.1 index aaf249c91..6c327a9e1 100644 --- a/man/man1/git-cherry-pick-upload.1 +++ b/man/man1/git-cherry-pick-upload.1 @@ -2,12 +2,12 @@ .\" Title: git-cherry-pick-upload .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: 07/23/2014 +.\" Date: 08/20/2014 .\" Manual: Chromium depot_tools Manual -.\" Source: depot_tools dff725e +.\" Source: depot_tools 8d3348f .\" 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 .\" ----------------------------------------------------------------- @@ -32,12 +32,12 @@ git-cherry-pick-upload \- Upload the diff between a revision and its parent to r .SH "SYNOPSIS" .sp .nf -\fIgit cherry-pick-upload\fR \-\-branch +\fIgit cherry\-pick\-upload\fR \-\-branch .fi .sp .SH "DESCRIPTION" .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 The commit message is annotated with "(cherry picked from commit [parent sha1])" as if it were generated by git cherry\-pick \-x\&. .SH "EXAMPLE" @@ -48,7 +48,7 @@ The commit message is annotated with "(cherry picked from commit [parent sha1])" .RS 4 .\} .nf -\fB$ git cherry-pick-upload \-h\fR +\fB$ git cherry\-pick\-upload \-h\fR usage: git_cherry_pick_upload\&.py [\-h] \-\-branch positional arguments: @@ -59,7 +59,7 @@ optional arguments: \-\-branch , \-b 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 Loaded authentication cookies from \&.codereview_upload_cookies Issue created\&. URL: https://codereview\&.chromium\&.org/1234567890 diff --git a/man/src/git-cherry-pick-upload.txt b/man/src/git-cherry-pick-upload.txt index 88f9b6f7c..cf6888e52 100644 --- a/man/src/git-cherry-pick-upload.txt +++ b/man/src/git-cherry-pick-upload.txt @@ -1,5 +1,5 @@ git-cherry-pick-upload(1) -============= +========================= NAME ----