rst2man does a poor job of creating man pages that can be read on Solaris.

Some of the changes in this patch make the Solaris *roff tools do the right

thing:

  - Getting rid of the rst2man header before the SYNOPSIS

  - Changing "\(aq" to "'", and making sure that single quotes don't start

    a line (at least in a couple of places where it's not safe)

  - Changing ".ft C" and ".ft P" to simply ".ft"

  - Removing "\%" and "\:"

Groff also makes hash of an .IP terminated by .RE (the .RE sends the

following paragraphs all the way to the left margin, rather than simply

terminating the indented paragraph).  It needs a preceding .RS to do the

right thing, and .RS 0 seems to give the best effect.  Probably most

.INDENT/.UNINDENT pairs should be converted to .RS/.RE, too.

We also get rid of references to other operating systems, since there

aren't many, and they may confuse the reader.

--- mercurial-2.2.1/doc/hg.1	Thu May  3 14:06:34 2012

+++ mercurial-2.2.1/doc/hg.1	Sat May 12 17:39:08 2012

@@ -1,35 +1,9 @@

+'\" t

 .\" Man page generated from reStructeredText.

 .

 .TH HG 1 "" "" "Mercurial Manual"

 .SH NAME

 hg \- Mercurial source code management system

-.

-.nr rst2man-indent-level 0

-.

-.de1 rstReportMargin

-\\$1 \\n[an-margin]

-level \\n[rst2man-indent-level]

-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]

--

-\\n[rst2man-indent0]

-\\n[rst2man-indent1]

-\\n[rst2man-indent2]

-..

-.de1 INDENT

-.\" .rstReportMargin pre:

-. RS \\$1

-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]

-. nr rst2man-indent-level +1

-.\" .rstReportMargin post:

-..

-.de UNINDENT

-. RE

-.\" indent \\n[an-margin]

-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]

-.nr rst2man-indent-level -1

-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]

-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u

-..

 .SH SYNOPSIS

 .sp

 \fBhg\fP \fIcommand\fP [\fIoption\fP]... [\fIargument\fP]...

@@ -43,7 +17,7 @@

 .B files...

 .

 indicates one or more filename or relative path filenames; see

-\%File Name Patterns\: for information on pattern matching

+File Name Patterns for information on pattern matching

 .TP

 .B path

 .

@@ -85,7 +59,7 @@

 .TP

 .B \-\-config

 .

-set/override config option (use \(aqsection.name=value\(aq)

+set/override config option (use 'section.name=value')

 .TP

 .B \-\-debug

 .

@@ -127,9 +101,9 @@

 .SS add

 .sp

 .nf

-.ft C

+.ft

 hg add [OPTION]... [FILE]...

-.ft P

+.ft

 .fi

 .sp

 Schedule files to be version controlled and added to the

@@ -136,15 +110,15 @@

 repository.

 .sp

 The files will be added to the repository at the next commit. To

-undo an add before that, see \%\fBhg forget\fP\:.

+undo an add before that, see \fBhg forget\fP.

 .sp

 If no names are given, add all files to the repository.

 .sp

 An example showing how new (unknown) files are added

-automatically by \%\fBhg add\fP\::

+automatically by \fBhg add\fP:

 .sp

 .nf

-.ft C

+.ft

 $ ls

 foo.c

 $ hg status

@@ -153,7 +127,7 @@

 adding foo.c

 $ hg status

 A foo.c

-.ft P

+.ft

 .fi

 .sp

 Returns 0 if all files are successfully added.

@@ -180,9 +154,9 @@

 .SS addremove

 .sp

 .nf

-.ft C

+.ft

 hg addremove [OPTION]... [FILE]...

-.ft P

+.ft

 .fi

 .sp

 Add all new files and remove all missing files from the

@@ -197,7 +171,7 @@

 every added file and records those similar enough as renames. This

 option takes a percentage between 0 (disabled) and 100 (files must

 be identical) as its parameter. Detecting renamed files this way

-can be expensive. After using this option, \%\fBhg status \-C\fP\: can be

+can be expensive. After using this option, \fBhg status \-C\fP can be

 used to check which files were identified as moved or renamed.

 .sp

 Returns 0 if all files are successfully added.

@@ -224,9 +198,9 @@

 .SS annotate

 .sp

 .nf

-.ft C

+.ft

 hg annotate [\-r REV] [\-f] [\-a] [\-u] [\-d] [\-n] [\-c] [\-l] FILE...

-.ft P

+.ft

 .fi

 .sp

 List changes in files, showing the revision id responsible for

@@ -255,7 +229,7 @@

 .TP

 .B \-\-no\-follow

 .

-don\(aqt follow copies and renames

+don't follow copies and renames

 .TP

 .B \-a,  \-\-text

 .

@@ -310,9 +284,9 @@

 .SS archive

 .sp

 .nf

-.ft C

+.ft

 hg archive [OPTION]... DEST

-.ft P

+.ft

 .fi

 .sp

 By default, the revision used is the parent of the working

@@ -328,9 +302,9 @@

 create a zip file containing the 1.0 release:

 .sp

 .nf

-.ft C

+.ft

 hg archive \-r 1.0 project\-1.0.zip

-.ft P

+.ft

 .fi

 .IP \(bu 2

 .

@@ -337,9 +311,9 @@

 create a tarball excluding .hg files:

 .sp

 .nf

-.ft C

+.ft

 hg archive project.tar.gz \-X ".hg*"

-.ft P

+.ft

 .fi

 .UNINDENT

 .sp

@@ -372,7 +346,7 @@

 .UNINDENT

 .sp

 The exact name of the destination archive or directory is given

-using a format string; see \%\fBhg help export\fP\: for details.

+using a format string; see \fBhg help export\fP for details.

 .sp

 Each member added to an archive file has a directory prefix

 prepended. Use \-p/\-\-prefix to specify a format string for the

@@ -415,9 +389,9 @@

 .SS backout

 .sp

 .nf

-.ft C

+.ft

 hg backout [OPTION]... [\-r] REV

-.ft P

+.ft

 .fi

 .sp

 Prepare a new changeset with the effect of REV undone in the

@@ -426,6 +400,7 @@

 If REV is the parent of the working directory, then this new changeset

 is committed automatically. Otherwise, hg needs to merge the

 changes and the merged result is left uncommitted.

+.RS 0

 .IP Note

 .

 backout cannot be used to fix either an unwanted or

@@ -438,11 +413,11 @@

 working directory and a new child of REV that simply undoes REV.

 .sp

 Before version 1.7, the behavior without \-\-merge was equivalent

-to specifying \-\-merge followed by \%\fBhg update \-\-clean .\fP\: to

+to specifying \-\-merge followed by \fBhg update \-\-clean .\fP to

 cancel the merge and leave the child of REV as a head to be

 merged separately.

 .sp

-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.

+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.

 .sp

 Returns 0 on success.

 .sp

@@ -492,9 +467,9 @@

 .SS bisect

 .sp

 .nf

-.ft C

+.ft

 hg bisect [\-gbsr] [\-U] [\-c CMD] [REV]

-.ft P

+.ft

 .fi

 .sp

 This command helps to find changesets which introduce problems. To

@@ -522,10 +497,10 @@

 start a bisection with known bad revision 12, and good revision 34:

 .sp

 .nf

-.ft C

+.ft

 hg bisect \-\-bad 34

 hg bisect \-\-good 12

-.ft P

+.ft

 .fi

 .IP \(bu 2

 .

@@ -533,10 +508,10 @@

 bad:

 .sp

 .nf

-.ft C

+.ft

 hg bisect \-\-good

 hg bisect \-\-bad

-.ft P

+.ft

 .fi

 .IP \(bu 2

 .

@@ -544,10 +519,10 @@

 that revision is not usable because of another issue):

 .sp

 .nf

-.ft C

+.ft

 hg bisect \-\-skip

 hg bisect \-\-skip 23

-.ft P

+.ft

 .fi

 .IP \(bu 2

 .

@@ -554,22 +529,22 @@

 forget the current bisection:

 .sp

 .nf

-.ft C

+.ft

 hg bisect \-\-reset

-.ft P

+.ft

 .fi

 .IP \(bu 2

 .

-use \(aqmake && make tests\(aq to automatically find the first broken

+use 'make && make tests' to automatically find the first broken

 revision:

 .sp

 .nf

-.ft C

+.ft

 hg bisect \-\-reset

 hg bisect \-\-bad 34

 hg bisect \-\-good 12

-hg bisect \-\-command \(aqmake && make tests\(aq

-.ft P

+hg bisect \-\-command 'make && make tests'

+.ft

 .fi

 .IP \(bu 2

 .

@@ -577,9 +552,9 @@

 bisection:

 .sp

 .nf

-.ft C

+.ft

 hg log \-r "bisect(pruned)"

-.ft P

+.ft

 .fi

 .IP \(bu 2

 .

@@ -586,9 +561,9 @@

 see all changesets that took part in the current bisection:

 .sp

 .nf

-.ft C

+.ft

 hg log \-r "bisect(range)"

-.ft P

+.ft

 .fi

 .IP \(bu 2

 .

@@ -595,13 +570,13 @@

 with the graphlog extension, you can even get a nice graph:

 .sp

 .nf

-.ft C

+.ft

 hg log \-\-graph \-r "bisect(range)"

-.ft P

+.ft

 .fi

 .UNINDENT

 .sp

-See \%\fBhg help revsets\fP\: for more about the \fIbisect()\fP keyword.

+See \fBhg help revsets\fP for more about the \fIbisect()\fP keyword.

 .sp

 Returns 0 on success.

 .sp

@@ -639,23 +614,23 @@

 .SS bookmarks

 .sp

 .nf

-.ft C

+.ft

 hg bookmarks [\-f] [\-d] [\-i] [\-m NAME] [\-r REV] [NAME]

-.ft P

+.ft

 .fi

 .sp

 Bookmarks are pointers to certain commits that move when committing.

 Bookmarks are local. They can be renamed, copied and deleted. It is

-possible to use \%\fBhg merge NAME\fP\: to merge from a given bookmark, and

-\%\fBhg update NAME\fP\: to update to a given bookmark.

+possible to use \fBhg merge NAME\fP to merge from a given bookmark, and

+\fBhg update NAME\fP to update to a given bookmark.

 .sp

-You can use \%\fBhg bookmark NAME\fP\: to set a bookmark on the working

-directory\(aqs parent revision with the given name. If you specify

+You can use \fBhg bookmark NAME\fP to set a bookmark on the working

+directory's parent revision with the given name. If you specify

 a revision using \-r REV (where REV may be an existing bookmark),

 the bookmark is assigned to that revision.

 .sp

-Bookmarks can be pushed and pulled between repositories (see \%\fBhg help

-push\fP\: and \%\fBhg help pull\fP\:). This requires both the local and remote

+Bookmarks can be pushed and pulled between repositories (see \fBhg help

+push\fP and \fBhg help pull\fP). This requires both the local and remote

 repositories to support bookmarks. For versions prior to 1.8, this means

 the bookmarks extension must be enabled.

 .sp

@@ -690,14 +665,15 @@

 .SS branch

 .sp

 .nf

-.ft C

+.ft

 hg branch [\-fC] [NAME]

-.ft P

+.ft

 .fi

+.RS 0

 .IP Note

 .

-Branch names are permanent and global. Use \%\fBhg bookmark\fP\: to create a

-light\-weight bookmark instead. See \%\fBhg help glossary\fP\: for more

+Branch names are permanent and global. Use \fBhg bookmark\fP to create a

+light\-weight bookmark instead. See \fBhg help glossary\fP for more

 information about named branches and bookmarks.

 .RE

 .sp

@@ -704,18 +680,18 @@

 With no argument, show the current branch name. With one argument,

 set the working directory branch name (the branch will not exist

 in the repository until the next commit). Standard practice

-recommends that primary development take place on the \(aqdefault\(aq

+recommends that primary development take place on the 'default'

 branch.

 .sp

 Unless \-f/\-\-force is specified, branch will not let you set a

-branch name that already exists, even if it\(aqs inactive.

+branch name that already exists, even if it's inactive.

 .sp

 Use \-C/\-\-clean to reset the working directory branch to that of

 the parent of the working directory, negating a previous branch

 change.

 .sp

-Use the command \%\fBhg update\fP\: to switch to an existing branch. Use

-\%\fBhg commit \-\-close\-branch\fP\: to mark this branch as closed.

+Use the command \fBhg update\fP to switch to an existing branch. Use

+\fBhg commit \-\-close\-branch\fP to mark this branch as closed.

 .sp

 Returns 0 on success.

 .sp

@@ -733,19 +709,19 @@

 .SS branches

 .sp

 .nf

-.ft C

+.ft

 hg branches [\-ac]

-.ft P

+.ft

 .fi

 .sp

-List the repository\(aqs named branches, indicating which ones are

+List the repository's named branches, indicating which ones are

 inactive. If \-c/\-\-closed is specified, also list branches which have

-been marked closed (see \%\fBhg commit \-\-close\-branch\fP\:).

+been marked closed (see \fBhg commit \-\-close\-branch\fP).

 .sp

 If \-a/\-\-active is specified, only show active branches. A branch

 is considered active if it contains repository heads.

 .sp

-Use the command \%\fBhg update\fP\: to switch to an existing branch.

+Use the command \fBhg update\fP to switch to an existing branch.

 .sp

 Returns 0.

 .sp

@@ -763,9 +739,9 @@

 .SS bundle

 .sp

 .nf

-.ft C

+.ft

 hg bundle [\-f] [\-t TYPE] [\-a] [\-r REV]... [\-\-base REV]... FILE [DEST]

-.ft P

+.ft

 .fi

 .sp

 Generate a compressed changegroup file collecting changesets not

@@ -832,9 +808,9 @@

 .SS cat

 .sp

 .nf

-.ft C

+.ft

 hg cat [OPTION]... FILE...

-.ft P

+.ft

 .fi

 .sp

 Print the specified files as they were at the given revision. If

@@ -852,7 +828,7 @@

 .TP

 .B \fB%d\fP

 .sp

-dirname of file being printed, or \(aq.\(aq if in repository root

+dirname of file being printed, or '.' if in repository root

 .TP

 .B \fB%p\fP

 .sp