view components/mercurial/patches/manpages.patch @ 400:675bae2e4833

7060246 Update Mercurial to 1.8.4
author Danek Duvall <danek.duvall@oracle.com>
date Thu, 14 Jul 2011 10:55:47 -0700
parents 816e398e992c
children
line wrap: on
line source

--- mercurial-1.8.2/doc/hg.1	Fri Apr  1 10:42:06 2011
+++ mercurial-1.8.2/doc/hg.1	Fri Apr  1 11:18:00 2011
@@ -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
 .
@@ -73,7 +47,7 @@
 .TP
 .B \-y,  \-\-noninteractive
 .
-do not prompt, assume \(aqyes\(aq for any required answers
+do not prompt, assume 'yes' for any required answers
 .TP
 .B \-q,  \-\-quiet
 .
@@ -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
 .
@@ -298,9 +272,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
@@ -338,7 +312,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
@@ -381,9 +355,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
@@ -399,11 +373,11 @@
 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 cancel
+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
@@ -453,9 +427,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
@@ -508,23 +482,23 @@
 .SS bookmarks
 .sp
 .nf
-.ft C
+.ft
 hg bookmarks [\-f] [\-d] [\-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 bookmark names in \%\fBhg merge\fP\: and
-\%\fBhg update\fP\: to merge and update respectively to a given bookmark.
+deleted. It is possible to use bookmark names in \fBhg merge\fP and
+\fBhg update\fP to merge and update respectively 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
@@ -550,26 +524,26 @@
 .SS branch
 .sp
 .nf
-.ft C
+.ft
 hg branch [\-fC] [NAME]
-.ft P
+.ft
 .fi
 .sp
 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
@@ -587,19 +561,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
@@ -617,9 +591,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
@@ -686,9 +660,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
@@ -706,7 +680,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
@@ -741,9 +715,9 @@
 .SS clone
 .sp
 .nf
-.ft C
+.ft
 hg clone [OPTION]... SOURCE [DEST]
-.ft P
+.ft
 .fi
 .sp
 Create a copy of an existing repository in a new directory.
@@ -751,14 +725,14 @@
 If no destination directory name is specified, it defaults to the
 basename of the source.
 .sp
-The location of the source is added to the new repository\(aqs
+The location of the source is added to the new repository's
 \fB.hg/hgrc\fP file, as the default to be used for future pulls.
 .sp
-See \%\fBhg help urls\fP\: for valid source format details.
+See \fBhg help urls\fP for valid source format details.
 .sp
 It is possible to specify an \fBssh://\fP URL as the destination, but no
 \fB.hg/hgrc\fP and working directory will be created on the remote side.
-Please see \%\fBhg help urls\fP\: for important details about \fBssh://\fP URLs.
+Please see \fBhg help urls\fP for important details about \fBssh://\fP URLs.
 .sp
 A set of changesets (tags, or branch names) to pull may be specified
 by listing each changeset (tag, or branch name) with \-r/\-\-rev.
@@ -769,7 +743,7 @@
 No subsequent changesets (including subsequent tags) will be present
 in the destination.
 .sp
-Using \-r/\-\-rev (or \(aqclone src#rev dest\(aq) implies \-\-pull, even for
+Using \-r/\-\-rev (or 'clone src#rev dest') implies \-\-pull, even for
 local source repositories.
 .sp
 For efficiency, hardlinks are used for cloning whenever the source
@@ -783,9 +757,9 @@
 using full hardlinks with
 .sp
 .nf
-.ft C
-$ cp \-al REPO REPOCLONE
-.ft P
+.ft
+$ /usr/gnu/bin/cp \-al REPO REPOCLONE
+.ft
 .fi
 .sp
 This is the fastest way to clone, but it is not always safe. The
@@ -804,7 +778,7 @@
 .IP b. 3
 .
 if \-u . and the source repository is local, the first parent of
-the source repository\(aqs working directory
+the source repository's working directory
 .IP c. 3
 .
 the changeset specified with \-u (if a branch name, this means the
@@ -870,16 +844,16 @@
 .SS commit
 .sp
 .nf
-.ft C
+.ft
 hg commit [OPTION]... [FILE]...
-.ft P
+.ft
 .fi
 .sp
 Commit changes to the given files into the repository. Unlike a
 centralized SCM, this operation is a local operation. See
-\%\fBhg push\fP\: for a way to actively distribute your changes.
+\fBhg push\fP for a way to actively distribute your changes.
 .sp
-If a list of files is omitted, all changes reported by \%\fBhg status\fP\:
+If a list of files is omitted, all changes reported by \fBhg status\fP
 will be committed.
 .sp
 If you are committing the result of a merge, do not provide any
@@ -890,7 +864,7 @@
 commit fails, you will find a backup of your message in
 \fB.hg/last\-message.txt\fP.
 .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, 1 if nothing changed.
 .sp
@@ -934,9 +908,9 @@
 .SS copy
 .sp
 .nf
-.ft C
+.ft
 hg copy [OPTION]... [SOURCE]... DEST
-.ft P
+.ft
 .fi
 .sp
 Mark dest as having copies of source files. If dest is a
@@ -948,7 +922,7 @@
 operation is recorded, but no copying is performed.
 .sp
 This command takes effect with the next commit. To undo a copy
-before that, see \%\fBhg revert\fP\:.
+before that, see \fBhg revert\fP.
 .sp
 Returns 0 on success, 1 if errors are encountered.
 .sp
@@ -980,9 +954,9 @@
 .SS diff
 .sp
 .nf
-.ft C
+.ft
 hg diff [OPTION]... ([\-c REV] | [\-r REV1 [\-r REV2]]) [FILE]...
-.ft P
+.ft
 .fi
 .sp
 Show differences between revisions for the specified files.
@@ -991,7 +965,7 @@
 .IP Note
 .
 diff may generate unexpected results for merges, as it will
-default to comparing against the working directory\(aqs first
+default to comparing against the working directory's first
 parent changeset if no revisions are specified.
 .RE
 .sp
@@ -1009,7 +983,7 @@
 anyway, probably with undesirable results.
 .sp
 Use the \-g/\-\-git option to generate diffs in the git extended diff
-format. For more information, read \%\fBhg help diffs\fP\:.
+format. For more information, read \fBhg help diffs\fP.
 .sp
 Returns 0 on success.
 .sp
@@ -1079,9 +1053,9 @@
 .SS export
 .sp
 .nf
-.ft C
+.ft
 hg export [OPTION]... [\-o OUTFILESPEC] REV...
-.ft P
+.ft
 .fi
 .sp
 Print the changeset header and diffs for one or more revisions.
@@ -1138,7 +1112,7 @@
 diff anyway, probably with undesirable results.
 .sp
 Use the \-g/\-\-git option to generate diffs in the git extended diff
-format. See \%\fBhg help diffs\fP\: for more information.
+format. See \fBhg help diffs\fP for more information.
 .sp
 With the \-\-switch\-parent option, the diff will be against the
 second parent. It can be useful to review a merge.
@@ -1175,9 +1149,9 @@
 .SS forget
 .sp
 .nf
-.ft C
+.ft
 hg forget [OPTION]... FILE...
-.ft P
+.ft
 .fi
 .sp
 Mark the specified files so they will no longer be tracked
@@ -1187,7 +1161,7 @@
 entire project history, and it does not delete them from the
 working directory.
 .sp
-To undo a forget before the next commit, see \%\fBhg add\fP\:.
+To undo a forget before the next commit, see \fBhg add\fP.
 .sp
 Returns 0 on success.
 .sp
@@ -1205,9 +1179,9 @@
 .SS grep
 .sp
 .nf
-.ft C
+.ft
 hg grep [OPTION]... PATTERN [FILE]...
-.ft P
+.ft
 .fi
 .sp
 Search revisions of files for a regular expression.
@@ -1275,9 +1249,9 @@
 .SS heads
 .sp
 .nf
-.ft C
+.ft
 hg heads [\-ac] [\-r STARTREV] [REV]...
-.ft P
+.ft
 .fi
 .sp
 With no arguments, show all repository branch heads.
@@ -1291,7 +1265,7 @@
 associated with the specified changesets are shown.
 .sp
 If \-c/\-\-closed is specified, also show branch heads marked closed
-(see \%\fBhg commit \-\-close\-branch\fP\:).
+(see \fBhg commit \-\-close\-branch\fP).
 .sp
 If STARTREV is specified, only those heads that are descendants of
 STARTREV will be displayed.
@@ -1331,9 +1305,9 @@
 .SS help
 .sp
 .nf
-.ft C
+.ft
 hg help [TOPIC]
-.ft P
+.ft
 .fi
 .sp
 With no arguments, print a list of commands with short help messages.
@@ -1345,9 +1319,9 @@
 .SS identify
 .sp
 .nf
-.ft C
+.ft
 hg identify [\-nibtB] [\-r REV] [SOURCE]
-.ft P
+.ft
 .fi
 .sp
 With no revision, print a summary of the current state of the
@@ -1395,9 +1369,9 @@
 .SS import
 .sp
 .nf
-.ft C
+.ft
 hg import [OPTION]... PATCH...
-.ft P
+.ft
 .fi
 .sp
 Import a list of patches and commit them individually (unless
@@ -1413,7 +1387,7 @@
 text/plain body parts before first diff are added to commit
 message.
 .sp
-If the imported patch was generated by \%\fBhg export\fP\:, user and
+If the imported patch was generated by \fBhg export\fP, user and
 description from patch override values from message headers and
 body. Values given on command line with \-m/\-\-message and \-u/\-\-user
 override these.
@@ -1425,11 +1399,11 @@
 deficiencies in the text patch format.
 .sp
 With \-s/\-\-similarity, hg will attempt to discover renames and
-copies in the patch in the same way as \(aqaddremove\(aq.
+copies in the patch in the same way as 'addremove'.
 .sp
 To read a patch from standard input, use "\-" as the patch name. If
 a URL is specified, the patch will be downloaded from it.
-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
@@ -1450,7 +1424,7 @@
 .TP
 .B \-\-no\-commit
 .
-don\(aqt commit, just update the working directory
+don't commit, just update the working directory
 .TP
 .B \-\-exact
 .
@@ -1485,9 +1459,9 @@
 .SS incoming
 .sp
 .nf
-.ft C
+.ft
 hg incoming [\-p] [\-n] [\-M] [\-f] [\-r REV]... [\-\-bundle FILENAME] [SOURCE]
-.ft P
+.ft
 .fi
 .sp
 Show new changesets found in the specified path/URL or the default
@@ -1577,9 +1551,9 @@
 .SS init
 .sp
 .nf
-.ft C
+.ft
 hg init [\-e CMD] [\-\-remotecmd CMD] [DEST]
-.ft P
+.ft
 .fi
 .sp
 Initialize a new repository in the given directory. If the given
@@ -1588,7 +1562,7 @@
 If no directory is given, the current directory is used.
 .sp
 It is possible to specify an \fBssh://\fP URL as the destination.
-See \%\fBhg help urls\fP\: for more information.
+See \fBhg help urls\fP for more information.
 .sp
 Returns 0 on success.
 .sp
@@ -1610,9 +1584,9 @@
 .SS locate
 .sp
 .nf
-.ft C
+.ft
 hg locate [OPTION]... [PATTERN]...
-.ft P
+.ft
 .fi
 .sp
 Print files under Mercurial control in the working directory whose
@@ -1658,9 +1632,9 @@
 .SS log
 .sp
 .nf
-.ft C
+.ft
 hg log [OPTION]... [FILE]
-.ft P
+.ft
 .fi
 .sp
 Print the revision history of the specified files or the entire
@@ -1675,9 +1649,9 @@
 If no revision range is specified, the default is \fBtip:0\fP unless
 \-\-follow is set, in which case the working directory parent is
 used as the starting revision. You can specify a revision set for
-log, see \%\fBhg help revsets\fP\: for more information.
+log, see \fBhg help revsets\fP for more information.
 .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
 By default this command prints revision number and changeset id,
 tags, non\-trivial parents, user, date and time, and a summary for
@@ -1785,9 +1759,9 @@
 .SS manifest
 .sp
 .nf
-.ft C
+.ft
 hg manifest [\-r REV]
-.ft P
+.ft
 .fi
 .sp
 Print a list of version controlled files for the given revision.
@@ -1809,9 +1783,9 @@
 .SS merge
 .sp
 .nf
-.ft C
+.ft
 hg merge [\-P] [\-f] [[\-r] REV]
-.ft P
+.ft
 .fi
 .sp
 The current working directory is updated with all changes made in
@@ -1826,14 +1800,14 @@
 merges. It overrides the HGMERGE environment variable and your
 configuration files.
 .sp
-If no revision is specified, the working directory\(aqs parent is a
+If no revision is specified, the working directory's parent is a
 head revision, and the current branch contains exactly one other
 head, the other head is merged with by default. Otherwise, an
 explicit revision with which to merge with must be provided.
 .sp
-\%\fBhg resolve\fP\: must be used to resolve unresolved files.
+\fBhg resolve\fP must be used to resolve unresolved files.
 .sp
-To undo an uncommitted merge, use \%\fBhg update \-\-clean .\fP\: which
+To undo an uncommitted merge, use \fBhg update \-\-clean .\fP which
 will check out a clean copy of the original merge parent, losing
 all changes.
 .sp
@@ -1861,9 +1835,9 @@
 .SS outgoing
 .sp
 .nf
-.ft C
+.ft
 hg outgoing [\-M] [\-p] [\-n] [\-f] [\-r REV]... [DEST]
-.ft P
+.ft
 .fi
 .sp
 Show changesets not found in the specified destination repository
@@ -1946,12 +1920,12 @@
 .SS parents
 .sp
 .nf
-.ft C
+.ft
 hg parents [\-r REV] [FILE]
-.ft P
+.ft
 .fi
 .sp
-Print the working directory\(aqs parent revisions. If a revision is
+Print the working directory's parent revisions. If a revision is
 given via \-r/\-\-rev, the parent of that revision will be printed.
 If a file argument is given, the revision in which the file was
 last changed (before the working directory revision or the
@@ -1977,9 +1951,9 @@
 .SS paths
 .sp
 .nf
-.ft C
+.ft
 hg paths [NAME]
-.ft P
+.ft
 .fi
 .sp
 Show definition of symbolic path name NAME. If no name is given,
@@ -1997,18 +1971,18 @@
 as the fallback for both.  When cloning a repository, the clone
 source is written as \fBdefault\fP in \fB.hg/hgrc\fP.  Note that
 \fBdefault\fP and \fBdefault\-push\fP apply to all inbound (e.g.
-\%\fBhg incoming\fP\:) and outbound (e.g. \%\fBhg outgoing\fP\:, \%\fBhg email\fP\: and
-\%\fBhg bundle\fP\:) operations.
+\fBhg incoming\fP) and outbound (e.g. \fBhg outgoing\fP, \fBhg email\fP and
+\fBhg bundle\fP) operations.
 .sp
-See \%\fBhg help urls\fP\: for more information.
+See \fBhg help urls\fP for more information.
 .sp
 Returns 0 on success.
 .SS pull
 .sp
 .nf
-.ft C
+.ft
 hg pull [\-u] [\-f] [\-r REV]... [\-e CMD] [\-\-remotecmd CMD] [SOURCE]
-.ft P
+.ft
 .fi
 .sp
 Pull changes from a remote repository to a local one.
@@ -2018,13 +1992,13 @@
 \-R is specified). By default, this does not update the copy of the
 project in the working directory.
 .sp
-Use \%\fBhg incoming\fP\: if you want to see what would have been added
+Use \fBhg incoming\fP if you want to see what would have been added
 by a pull at the time you issued this command. If you then decide
-to add those changes to the repository, you should use \%\fBhg pull
-\-r X\fP\: where \fBX\fP is the last changeset listed by \%\fBhg incoming\fP\:.
+to add those changes to the repository, you should use \fBhg pull
+\-r X\fP where \fBX\fP is the last changeset listed by \fBhg incoming\fP.
 .sp
-If SOURCE is omitted, the \(aqdefault\(aq path will be used.
-See \%\fBhg help urls\fP\: for more information.
+If SOURCE is omitted, the 'default' path will be used.
+See \fBhg help urls\fP for more information.
 .sp
 Returns 0 on success, 1 if an update had unresolved files.
 .sp
@@ -2066,9 +2040,9 @@
 .SS push
 .sp
 .nf
-.ft C
+.ft
 hg push [\-f] [\-r REV]... [\-e CMD] [\-\-remotecmd CMD] [DEST]
-.ft P
+.ft
 .fi
 .sp
 Push changesets from the local repository to the specified
@@ -2092,7 +2066,7 @@
 If \-r/\-\-rev is used, the specified revision and all its ancestors
 will be pushed to the remote repository.
 .sp
-Please see \%\fBhg help urls\fP\: for important details about \fBssh://\fP
+Please see \fBhg help urls\fP for important details about \fBssh://\fP
 URLs. If DESTINATION is omitted, a default path will be used.
 .sp
 Returns 0 if push was successful, 1 if nothing to push.
@@ -2135,9 +2109,9 @@
 .SS recover
 .sp
 .nf
-.ft C
+.ft
 hg recover
-.ft P
+.ft
 .fi
 .sp
 Recover from an interrupted commit or pull.
@@ -2150,9 +2124,9 @@
 .SS remove
 .sp
 .nf
-.ft C
+.ft
 hg remove [OPTION]... FILE...
-.ft P
+.ft
 .fi
 .sp
 Schedule the indicated files for removal from the repository.
@@ -2166,21 +2140,21 @@
 The following table details the behavior of remove for different
 file states (columns) and option combinations (rows). The file
 states are Added [A], Clean [C], Modified [M] and Missing [!] (as
-reported by \%\fBhg status\fP\:). The actions are Warn, Remove (from
+reported by \fBhg status\fP). The actions are Warn, Remove (from
 branch) and Delete (from disk):
 .sp
 .nf
-.ft C
+.ft
        A  C  M  !
 none   W  RD W  R
 \-f     R  RD RD R
 \-A     W  W  W  R
 \-Af    R  R  R  R
-.ft P
+.ft
 .fi
 .sp
 This command schedules the files to be removed at the next commit.
-To undo a remove before that, see \%\fBhg revert\fP\:.
+To undo a remove before that, see \fBhg revert\fP.
 .sp
 Returns 0 on success, 1 if any warnings encountered.
 .sp
@@ -2208,9 +2182,9 @@
 .SS rename
 .sp
 .nf
-.ft C
+.ft
 hg rename [OPTION]... SOURCE... DEST
-.ft P
+.ft
 .fi
 .sp
 Mark dest as copies of sources; mark sources for deletion. If dest
@@ -2222,7 +2196,7 @@
 operation is recorded, but no copying is performed.
 .sp
 This command takes effect at the next commit. To undo a rename
-before that, see \%\fBhg revert\fP\:.
+before that, see \fBhg revert\fP.
 .sp
 Returns 0 on success, 1 if errors are encountered.
 .sp
@@ -2254,9 +2228,9 @@
 .SS resolve
 .sp
 .nf
-.ft C
+.ft
 hg resolve [OPTION]... [FILE]...
-.ft P
+.ft
 .fi
 .sp
 Merges with unresolved conflicts are often the result of
@@ -2263,7 +2237,7 @@
 non\-interactive merging using the \fBinternal:merge\fP configuration
 setting, or a command\-line merge tool like \fBdiff3\fP. The resolve
 command is used to manage the files involved in a merge, after
-\%\fBhg merge\fP\: has been run, and before \%\fBhg commit\fP\: is run (i.e. the
+\fBhg merge\fP has been run, and before \fBhg commit\fP is run (i.e. the
 working directory must have two parents).
 .sp
 The resolve command can be used in the following ways:
@@ -2270,7 +2244,7 @@
 .INDENT 0.0
 .IP \(bu 2
 .
-\%\fBhg resolve [\-\-tool TOOL] FILE...\fP\:: attempt to re\-merge the specified
+\fBhg resolve [\-\-tool TOOL] FILE...\fP: attempt to re\-merge the specified
 files, discarding any previous merge attempts. Re\-merging is not
 performed for files already marked as resolved. Use \fB\-\-all/\-a\fP
 to selects all unresolved files. \fB\-\-tool\fP can be used to specify
@@ -2278,21 +2252,21 @@
 environment variable and your configuration files.
 .IP \(bu 2
 .
-\%\fBhg resolve \-m [FILE]\fP\:: mark a file as having been resolved
+\fBhg resolve \-m [FILE]\fP: mark a file as having been resolved
 (e.g. after having manually fixed\-up the files). The default is
 to mark all unresolved files.
 .IP \(bu 2
 .
-\%\fBhg resolve \-u [FILE]...\fP\:: mark a file as unresolved. The
+\fBhg resolve \-u [FILE]...\fP: mark a file as unresolved. The
 default is to mark all resolved files.
 .IP \(bu 2
 .
-\%\fBhg resolve \-l\fP\:: list files which had or still have conflicts.
+\fBhg resolve \-l\fP: list files which had or still have conflicts.
 In the printed list, \fBU\fP = unresolved and \fBR\fP = resolved.
 .UNINDENT
 .sp
 Note that Mercurial will not let you commit files with unresolved
-merge conflicts. You must use \%\fBhg resolve \-m ...\fP\: before you can
+merge conflicts. You must use \fBhg resolve \-m ...\fP before you can
 commit after a conflicting merge.
 .sp
 Returns 0 on success, 1 if any files fail a resolve attempt.
@@ -2335,9 +2309,9 @@
 .SS revert
 .sp
 .nf
-.ft C
+.ft
 hg revert [OPTION]... [\-r REV] [NAME]...
-.ft P
+.ft
 .fi
 .IP Note
 .
@@ -2344,8 +2318,8 @@
 This command is most likely not what you are looking for.
 Revert will partially overwrite content in the working
 directory without changing the working directory parents. Use
-\%\fBhg update \-r rev\fP\: to check out earlier revisions, or
-\%\fBhg update \-\-clean .\fP\: to undo a merge which has added another
+\fBhg update \-r rev\fP to check out earlier revisions, or
+\fBhg update \-\-clean .\fP to undo a merge which has added another
 parent.
 .RE
 .sp
@@ -2358,8 +2332,8 @@
 .sp
 Using the \-r/\-\-rev option, revert the given files or directories
 to their contents as of a specific revision. This can be helpful
-to "roll back" some or all of an earlier change. See \%\fBhg help
-dates\fP\: for a list of formats valid for \-d/\-\-date.
+to "roll back" some or all of an earlier change. See \fBhg help
+dates\fP for a list of formats valid for \-d/\-\-date.
 .sp
 Revert modifies the working directory. It does not commit any
 changes, or change the parent of the working directory. If you
@@ -2412,9 +2386,9 @@
 .SS rollback
 .sp
 .nf
-.ft C
+.ft
 hg rollback
-.ft P
+.ft
 .fi
 .sp
 This command should be used with care. There is only one level of
@@ -2464,9 +2438,9 @@
 .SS root
 .sp
 .nf
-.ft C
+.ft
 hg root
-.ft P
+.ft
 .fi
 .sp
 Print the root directory of the current repository.
@@ -2475,9 +2449,9 @@
 .SS serve
 .sp
 .nf
-.ft C
+.ft
 hg serve [OPTION]...
-.ft P
+.ft
 .fi
 .sp
 Start a local HTTP repository browser and pull server. You can use
@@ -2571,9 +2545,9 @@
 .SS showconfig
 .sp
 .nf
-.ft C
+.ft
 hg showconfig [\-u] [NAME]...
-.ft P
+.ft
 .fi
 .sp
 With no arguments, print names and values of all config items.
@@ -2601,9 +2575,9 @@
 .SS status
 .sp
 .nf
-.ft C
+.ft
 hg status [OPTION]... [FILE]...
-.ft P
+.ft
 .fi
 .sp
 Show status of files in the repository. If names are given, only
@@ -2631,7 +2605,7 @@
 The codes used to show the status of files are:
 .sp
 .nf
-.ft C
+.ft
 M = modified
 A = added
 R = removed
@@ -2640,7 +2614,7 @@
 ? = not tracked
 I = ignored
   = origin of the previous file listed as A (added)
-.ft P
+.ft
 .fi
 .sp
 Returns 0 on success.
@@ -2717,9 +2691,9 @@
 .SS summary
 .sp
 .nf
-.ft C
+.ft
 hg summary [\-\-remote]
-.ft P
+.ft
 .fi
 .sp
 This generates a brief summary of the working directory state,
@@ -2742,9 +2716,9 @@
 .SS tag
 .sp
 .nf
-.ft C
+.ft
 hg tag [\-f] [\-l] [\-m TEXT] [\-d DATE] [\-u USER] [\-r REV] NAME...
-.ft P
+.ft
 .fi
 .sp
 Name a particular revision using <name>.
@@ -2765,11 +2739,11 @@
 repositories).
 .sp
 Tag commits are usually made at the head of a branch. If the parent
-of the working directory is not a branch head, \%\fBhg tag\fP\: aborts; use
+of the working directory is not a branch head, \fBhg tag\fP aborts; use
 \-f/\-\-force to force the tag commit to be based on a non\-head
 changeset.
 .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
 Since tag names have priority over branch names during revision
 lookup, using an existing branch name as a tag name is discouraged.
@@ -2814,9 +2788,9 @@
 .SS tags
 .sp
 .nf
-.ft C
+.ft
 hg tags
-.ft P
+.ft
 .fi
 .sp
 This lists both regular and local tags. When the \-v/\-\-verbose
@@ -2826,9 +2800,9 @@
 .SS tip
 .sp
 .nf
-.ft C
+.ft
 hg tip [\-p] [\-g]
-.ft P
+.ft
 .fi
 .sp
 The tip revision (usually just called the tip) is the changeset
@@ -2864,9 +2838,9 @@
 .SS unbundle
 .sp
 .nf
-.ft C
+.ft
 hg unbundle [\-u] FILE...
-.ft P
+.ft
 .fi
 .sp
 Apply one or more compressed changegroup files generated by the
@@ -2884,16 +2858,16 @@
 .SS update
 .sp
 .nf
-.ft C
+.ft
 hg update [\-c] [\-C] [\-d DATE] [[\-r] REV]
-.ft P
+.ft
 .fi
 .sp
-Update the repository\(aqs working directory to the specified
+Update the repository's working directory to the specified
 changeset. If no changeset is specified, update to the tip of the
 current named branch.
 .sp
-If the changeset is not a descendant of the working directory\(aqs
+If the changeset is not a descendant of the working directory's
 parent, the update is aborted. With the \-c/\-\-check option, the
 working directory is checked for uncommitted changes; if none are
 found, the working directory is updated to the specified
@@ -2906,7 +2880,7 @@
 .
 If neither \-c/\-\-check nor \-C/\-\-clean is specified, and if
 the requested changeset is an ancestor or descendant of
-the working directory\(aqs parent, the uncommitted changes
+the working directory's parent, the uncommitted changes
 are merged into the requested changeset and the merged
 result is left uncommitted. If the requested changeset is
 not an ancestor or descendant (that is, it is on another
@@ -2923,12 +2897,12 @@
 .UNINDENT
 .sp
 Use null as the changeset to remove the working directory (like
-\%\fBhg clone \-U\fP\:).
+\fBhg clone \-U\fP).
 .sp
 If you want to update just one file to an older changeset, use
-\%\fBhg revert\fP\:.
+\fBhg revert\fP.
 .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, 1 if there are unresolved files.
 .sp
@@ -2956,14 +2930,14 @@
 .SS verify
 .sp
 .nf
-.ft C
+.ft
 hg verify
-.ft P
+.ft
 .fi
 .sp
 Verify the integrity of the current repository.
 .sp
-This will perform an extensive check of the repository\(aqs
+This will perform an extensive check of the repository's
 integrity, validating the hashes and checksums of each entry in
 the changelog, manifest, and tracked files, as well as the
 integrity of their crosslinks and indices.
@@ -2972,9 +2946,9 @@
 .SS version
 .sp
 .nf
-.ft C
+.ft
 hg version
-.ft P
+.ft
 .fi
 .sp
 output version and copyright information
@@ -3040,9 +3014,9 @@
 the active user, Mercurial will warn you that the file is skipped:
 .sp
 .nf
-.ft C
+.ft
 not trusting file <repo>/.hg/hgrc from untrusted user USER, group GROUP
-.ft P
+.ft
 .fi
 .sp
 If this bothers you, the warning can be silenced (the file would still
@@ -3065,11 +3039,11 @@
 and followed by \fBname = value\fP entries:
 .sp
 .nf
-.ft C
+.ft
 [ui]
 username = Firstname Lastname <firstname.lastname@example.net>
 verbose = True
-.ft P
+.ft
 .fi
 .sp
 The above entries will be referred to as \fBui.username\fP and
@@ -3081,7 +3055,7 @@
 on Unix\-like systems: \fBman hgrc\fP
 .IP \(bu 2
 .
-online: \%http://www.selenic.com/mercurial/hgrc.5.html\:
+online: http://www.selenic.com/mercurial/hgrc.5.html
 .UNINDENT
 .SH DATE FORMATS
 .sp
@@ -3138,7 +3112,7 @@
 \fB12/6/6\fP (Dec 6 2006)
 .UNINDENT
 .sp
-Lastly, there is Mercurial\(aqs internal format:
+Lastly, there is Mercurial's internal format:
 .INDENT 0.0
 .IP \(bu 2
 .
@@ -3197,17 +3171,17 @@
 Plain examples:
 .sp
 .nf
-.ft C
+.ft
 path:foo/bar   a name bar in a directory named foo in the root
                of the repository
 path:path:name a file or directory named "path:name"
-.ft P
+.ft
 .fi
 .sp
 Glob examples:
 .sp
 .nf
-.ft C
+.ft
 glob:*.c       any name ending in ".c" in the current directory
 *.c            any name ending in ".c" in the current directory
 **.c           any name ending in ".c" in any subdirectory of the
@@ -3215,24 +3189,24 @@
 foo/*.c        any name ending in ".c" in the directory foo
 foo/**.c       any name ending in ".c" in any subdirectory of foo
                including itself.
-.ft P
+.ft
 .fi
 .sp
 Regexp examples:
 .sp
 .nf
-.ft C
+.ft
 re:.*\e.c$      any name ending in ".c", anywhere in the repository
-.ft P
+.ft
 .fi
 .sp
 File examples:
 .sp
 .nf
-.ft C
+.ft
 listfile:list.txt  read list from list.txt with one file pattern per line
 listfile0:list.txt read list from list.txt with null byte delimiters
-.ft P
+.ft
 .fi
 .SH ENVIRONMENT VARIABLES
 .INDENT 0.0
@@ -3239,10 +3213,10 @@
 .TP
 .B HG
 .
-Path to the \(aqhg\(aq executable, automatically passed when running
+Path to the 'hg' executable, automatically passed when running
 hooks, extensions or external tools. If unset or empty, this is
-the hg executable\(aqs name if it\(aqs frozen, or an executable named
-\(aqhg\(aq (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on
+the hg executable's name if it's frozen, or an executable named
+\'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on
 Windows) is searched.
 .TP
 .B HGEDITOR
@@ -3260,9 +3234,9 @@
 .TP
 .B HGENCODINGMODE
 .
-This sets Mercurial\(aqs behavior for handling unknown characters
+This sets Mercurial's behavior for handling unknown characters
 while transcoding user input. The default is "strict", which
-causes Mercurial to abort if it can\(aqt map a character. Other
+causes Mercurial to abort if it can't map a character. Other
 settings include "replace", which replaces unknown characters, and
 "ignore", which drops them. This setting can be overridden with
 the \-\-encodingmode command\-line option.
@@ -3269,7 +3243,7 @@
 .TP
 .B HGENCODINGAMBIGUOUS
 .
-This sets Mercurial\(aqs behavior for handling characters with
+This sets Mercurial's behavior for handling characters with
 "ambiguous" widths like accented Latin characters with East Asian
 fonts. By default, Mercurial assumes ambiguous characters are
 narrow, set this variable to "wide" if such characters cause
@@ -3294,7 +3268,7 @@
 .INDENT 7.0
 .IP \(bu 2
 .
-if it\(aqs a directory, all files ending with .rc are added
+if it's a directory, all files ending with .rc are added
 .IP \(bu 2
 .
 otherwise, the file itself will be added
@@ -3303,7 +3277,7 @@
 .B HGPLAIN
 .
 When set, this disables any configuration settings that might
-change Mercurial\(aqs default output. This includes encoding,
+change Mercurial's default output. This includes encoding,
 defaults, verbose mode, debug mode, quiet mode, tracebacks, and
 localization. This can be useful when scripting against Mercurial
 in the face of existing user configuration.
@@ -3354,7 +3328,7 @@
 editor it uses is determined by looking at the environment
 variables HGEDITOR, VISUAL and EDITOR, in that order. The first
 non\-empty one is chosen. If all of them are empty, the editor
-defaults to \(aqvi\(aq.
+defaults to 'vi'.
 .TP
 .B PYTHONPATH
 .
@@ -3422,7 +3396,7 @@
 .sp
 Special characters can be used in quoted identifiers by escaping them,
 e.g., \fB\en\fP is interpreted as a newline. To prevent them from being
-interpreted, strings can be prefixed with \fBr\fP, e.g. \fBr\(aq...\(aq\fP.
+interpreted, strings can be prefixed with \fBr\fP, e.g. \fBr'...'\fP.
 .sp
 There is a single prefix operator:
 .INDENT 0.0
@@ -3468,10 +3442,10 @@
 .\" predicatesmarker
 .
 .sp
-Command line equivalents for \%\fBhg log\fP\::
+Command line equivalents for \fBhg log\fP:
 .sp
 .nf
-.ft C
+.ft
 \-f    \->  ::.
 \-d x  \->  date(x)
 \-k x  \->  keyword(x)
@@ -3480,7 +3454,7 @@
 \-b x  \->  branch(x)
 \-P x  \->  !::x
 \-l x  \->  limit(expr, x)
-.ft P
+.ft
 .fi
 .sp
 Some sample queries:
@@ -3490,9 +3464,9 @@
 Changesets on the default branch:
 .sp
 .nf
-.ft C
+.ft
 hg log \-r "branch(default)"
-.ft P
+.ft
 .fi
 .IP \(bu 2
 .
@@ -3499,9 +3473,9 @@
 Changesets on the default branch since tag 1.5 (excluding merges):
 .sp
 .nf
-.ft C
+.ft
 hg log \-r "branch(default) and 1.5:: and not merge()"
-.ft P
+.ft
 .fi
 .IP \(bu 2
 .
@@ -3508,9 +3482,9 @@
 Open branch heads:
 .sp
 .nf
-.ft C
+.ft
 hg log \-r "head() and not closed()"
-.ft P
+.ft
 .fi
 .IP \(bu 2
 .
@@ -3518,9 +3492,9 @@
 \fBhgext/*\fP:
 .sp
 .nf
-.ft C
-hg log \-r "1.3::1.5 and keyword(bug) and file(\(aqhgext/*\(aq)"
-.ft P
+.ft
+hg log \-r "1.3::1.5 and keyword(bug) and file('hgext/*')"
+.ft
 .fi
 .IP \(bu 2
 .
@@ -3527,9 +3501,9 @@
 Changesets in committed May 2008, sorted by user:
 .sp
 .nf
-.ft C
-hg log \-r "sort(date(\(aqMay 2008\(aq), user)"
-.ft P
+.ft
+hg log \-r "sort(date('May 2008'), user)"
+.ft
 .fi
 .IP \(bu 2
 .
@@ -3537,14 +3511,14 @@
 release:
 .sp
 .nf
-.ft C
+.ft
 hg log \-r "(keyword(bug) or keyword(issue)) and not ancestors(tagged())"
-.ft P
+.ft
 .fi
 .UNINDENT
 .SH DIFF FORMATS
 .sp
-Mercurial\(aqs default format for showing changes between two versions of
+Mercurial's default format for showing changes between two versions of
 a file is compatible with the unified format of GNU diff, which can be
 used by GNU patch and many other standard tools.
 .sp
@@ -3571,15 +3545,15 @@
 format.
 .sp
 This means that when generating diffs from a Mercurial repository
-(e.g. with \%\fBhg export\fP\:), you should be careful about things like file
+(e.g. with \fBhg export\fP), you should be careful about things like file
 copies and renames or other things mentioned above, because when
 applying a standard diff to a different repository, this extra
-information is lost. Mercurial\(aqs internal operations (like push and
+information is lost. Mercurial's internal operations (like push and
 pull) are not affected by this, because they use an internal binary
 format for communicating changes.
 .sp
 To make Mercurial produce the git extended diff format, use the \-\-git
-option available for many commands, or set \(aqgit = True\(aq in the [diff]
+option available for many commands, or set 'git = True' in the [diff]
 section of your configuration file. You do not need to set this option
 when importing diffs in this format or using them in the mq extension.
 .SH MERGE TOOLS
@@ -3591,8 +3565,8 @@
 ancestor of the two file versions, so they can determine the changes
 made on both branches.
 .sp
-Merge tools are used both for \%\fBhg resolve\fP\:, \%\fBhg merge\fP\:, \%\fBhg update\fP\:,
-\%\fBhg backout\fP\: and in several extensions.
+Merge tools are used both for \fBhg resolve\fP, \fBhg merge\fP, \fBhg update\fP,
+\fBhg backout\fP and in several extensions.
 .sp
 Usually, the merge tool tries to automatically reconcile the files by
 combining all non\-overlapping changes that occurred separately in
@@ -3700,7 +3674,7 @@
 .IP Note
 .
 After selecting a merge program, Mercurial will by default attempt
-to merge the files using a simple merge algorithm first. Only if it doesn\(aqt
+to merge the files using a simple merge algorithm first. Only if it doesn't
 succeed because of conflicting changes Mercurial will actually execute the
 merge program. Whether to use the simple merge algorithm first can be
 controlled by the premerge setting of the merge tool. Premerge is enabled by
@@ -3725,9 +3699,9 @@
 Usage:
 .sp
 .nf
-.ft C
+.ft
 $ hg log \-r1 \-\-style changelog
-.ft P
+.ft
 .fi
 .sp
 A template is a piece of text, with markup to invoke variable
@@ -3734,10 +3708,10 @@
 expansion:
 .sp
 .nf
-.ft C
+.ft
 $ hg log \-r1 \-\-template "{node}\en"
 b56ce7b07c52de7d5fd79fb89701ea538af65746
-.ft P
+.ft
 .fi
 .sp
 Strings in curly braces are called keywords. The availability of
@@ -3834,15 +3808,15 @@
 The "date" keyword does not produce human\-readable output. If you
 want to use a date in your output, you can use a filter to process
 it. Filters are functions which return a string based on the input
-variable. Be sure to use the stringify filter first when you\(aqre
+variable. Be sure to use the stringify filter first when you're
 applying a string\-input filter to a list\-like input variable.
 You can also use a chain of filters to get the desired output:
 .sp
 .nf
-.ft C
+.ft
 $ hg tip \-\-template "{date|isodate}\en"
 2008\-08\-21 18:22 +0000
-.ft P
+.ft
 .fi
 .sp
 List of filters:
@@ -3911,7 +3885,7 @@
 .TP
 .B nonempty
 .
-Any text. Returns \(aq(none)\(aq if the string is empty.
+Any text. Returns '(none)' if the string is empty.
 .TP
 .B hgdate
 .
@@ -3989,24 +3963,24 @@
 Valid URLs are of the form:
 .sp
 .nf
-.ft C
+.ft
 local/filesystem/path[#revision]
 file://local/filesystem/path[#revision]
 http://[user[:pass]@]host[:port]/[path][#revision]
 https://[user[:pass]@]host[:port]/[path][#revision]
 ssh://[user@]host[:port]/[path][#revision]
-.ft P
+.ft
 .fi
 .sp
 Paths in the local filesystem can either point to Mercurial
-repositories or to bundle files (as created by \%\fBhg bundle\fP\: or :hg:\(ga
-incoming \-\-bundle\(ga). See also \%\fBhg help paths\fP\:.
+repositories or to bundle files (as created by \fBhg bundle\fP or :hg:\(ga
+incoming \-\-bundle\(ga). See also \fBhg help paths\fP.
 .sp
 An optional identifier after # indicates a particular branch, tag, or
-changeset to use from the remote repository. See also \%\fBhg help
-revisions\fP\:.
+changeset to use from the remote repository. See also \fBhg help
+revisions\fP.
 .sp
-Some features, such as pushing to \%http://\: and \%https://\: URLs are only
+Some features, such as pushing to http:// and https:// URLs are only
 possible if the feature is explicitly enabled on the remote Mercurial
 server.
 .sp
@@ -4021,26 +3995,26 @@
 and a copy of hg in the remote path or specified with as remotecmd.
 .IP \(bu 2
 .
-path is relative to the remote user\(aqs home directory by default. Use
+path is relative to the remote user's home directory by default. Use
 an extra slash at the start of a path to specify an absolute path:
 .sp
 .nf
-.ft C
+.ft
 ssh://example.com//tmp/repository
-.ft P
+.ft
 .fi
 .IP \(bu 2
 .
-Mercurial doesn\(aqt use its own compression via SSH; the right thing
+Mercurial doesn't use its own compression via SSH; the right thing
 to do is to configure it in your ~/.ssh/config, e.g.:
 .sp
 .nf
-.ft C
+.ft
 Host *.mylocalnetwork.example.com
   Compression no
 Host *
   Compression yes
-.ft P
+.ft
 .fi
 .sp
 Alternatively specify "ssh \-C" as your ssh command in your
@@ -4051,16 +4025,16 @@
 aliases under the [paths] section like so:
 .sp
 .nf
-.ft C
+.ft
 [paths]
 alias1 = URL1
 alias2 = URL2
 \&...
-.ft P
+.ft
 .fi
 .sp
 You can then use the alias for any command that uses a URL (for
-example \%\fBhg pull alias1\fP\: will be treated as \%\fBhg pull URL1\fP\:).
+example \fBhg pull alias1\fP will be treated as \fBhg pull URL1\fP).
 .sp
 Two path aliases are special because they are used as defaults when
 you do not provide the URL to a command:
@@ -4069,14 +4043,14 @@
 .B default:
 .
 When you create a repository with hg clone, the clone command saves
-the location of the source repository as the new repository\(aqs
-\(aqdefault\(aq path. This is then used when you omit path from push\- and
+the location of the source repository as the new repository's
+\'default' path. This is then used when you omit path from push\- and
 pull\-like commands (including incoming and outgoing).
 .TP
 .B default\-push:
 .
-The push command will look for a path named \(aqdefault\-push\(aq, and
-prefer it over \(aqdefault\(aq if both are defined.
+The push command will look for a path named 'default\-push', and
+prefer it over 'default' if both are defined.
 .UNINDENT
 .SH USING ADDITIONAL FEATURES
 .sp
@@ -4098,19 +4072,19 @@
 like this:
 .sp
 .nf
-.ft C
+.ft
 [extensions]
 foo =
-.ft P
+.ft
 .fi
 .sp
 You may also specify the full path to an extension:
 .sp
 .nf
-.ft C
+.ft
 [extensions]
 myfeature = ~/.hgext/myfeature.py
-.ft P
+.ft
 .fi
 .sp
 To explicitly disable an extension enabled in a configuration file of
@@ -4117,13 +4091,13 @@
 broader scope, prepend its path with !:
 .sp
 .nf
-.ft C
+.ft
 [extensions]
 # disabling extension bar residing in /path/to/extension/bar.py
 bar = !/path/to/extension/bar.py
 # ditto, but no path was supplied for extension baz
 baz = !
-.ft P
+.ft
 .fi
 .sp
 disabled extensions:
@@ -4189,7 +4163,7 @@
 .TP
 .B inotify
 .
-accelerate status report using Linux\(aqs inotify service
+accelerate status report using Linux's inotify service
 .TP
 .B interhg
 .
@@ -4287,7 +4261,7 @@
 .INDENT 3.0
 .INDENT 3.5
 .sp
-path/to/nested = \%https://example.com/nested/repo/path\:
+path/to/nested = https://example.com/nested/repo/path
 .UNINDENT
 .UNINDENT
 .sp
@@ -4362,7 +4336,7 @@
 their state and finally committing it in the parent
 repository. Mercurial can be made to abort if any subrepository
 content is modified by setting "ui.commitsubrepos=no" in a
-configuration file (see \%\fBhg help config\fP\:).
+configuration file (see \fBhg help config\fP).
 .TP
 .B diff
 .
@@ -4386,7 +4360,7 @@
 .B pull
 .
 pull is not recursive since it is not clear what to pull prior
-to running \%\fBhg update\fP\:. Listing and retrieving all
+to running \fBhg update\fP. Listing and retrieving all
 subrepositories changes referenced by the parent repository pulled
 changesets is expensive at best, impossible in the Subversion
 case.
@@ -4423,7 +4397,7 @@
 hgrc(5) for more details.
 .SH CONFIGURING HGWEB
 .sp
-Mercurial\(aqs internal web server, hgweb, can serve either a single
+Mercurial's internal web server, hgweb, can serve either a single
 repository, or a collection of them. In the latter case, a special
 configuration file can be used to specify the repository paths to use
 and global web configuration options.
@@ -4447,7 +4421,7 @@
 .UNINDENT
 .sp
 The \fBweb\fP section can specify all the settings described in the web
-section of the hgrc(5) documentation. See \%\fBhg help config\fP\: for
+section of the hgrc(5) documentation. See \fBhg help config\fP\: for
 information on where to find the manual page.
 .sp
 The \fBpaths\fP section provides mappings of physical repository
@@ -4454,7 +4428,7 @@
 paths to virtual ones. For instance:
 .sp
 .nf
-.ft C
+.ft
 [paths]
 projects/a = /foo/bar
 projects/b = /baz/quux
@@ -4461,7 +4435,7 @@
 web/root = /real/root/*
 / = /real/root2/*
 virtual/root2 = /real/root2/**
-.ft P
+.ft
 .fi
 .INDENT 0.0
 .IP \(bu 2
@@ -4470,14 +4444,14 @@
 appear under the same directory in the web interface
 .IP \(bu 2
 .
-The third entry maps every Mercurial repository found in \(aq/real/root\(aq
-into \(aqweb/root\(aq. This format is preferred over the [collections] one,
+The third entry maps every Mercurial repository found in '/real/root'
+into 'web/root'. This format is preferred over the [collections] one,
 since using absolute paths as configuration keys is not supported on every
 platform (especially on Windows).
 .IP \(bu 2
 .
 The fourth entry is a special case mapping all repositories in
-\(aq/real/root2\(aq in the root of the virtual directory.
+\'/real/root2' in the root of the virtual directory.
 .IP \(bu 2
 .
 The fifth entry recursively finds all repositories under the real
@@ -4489,10 +4463,10 @@
 preferred. For instance:
 .sp
 .nf
-.ft C
+.ft
 [collections]
 /foo = /foo
-.ft P
+.ft
 .fi
 .sp
 Here, the left side will be stripped off all repositories found in the
@@ -4507,15 +4481,15 @@
 changesets from a given changeset. More precisely, the ancestors
 of a changeset can be defined by two properties: a parent of a
 changeset is an ancestor, and a parent of an ancestor is an
-ancestor. See also: \(aqDescendant\(aq.
+ancestor. See also: 'Descendant'.
 .TP
 .B Branch
 .
 (Noun) A child changeset that has been created from a parent that
 is not a head. These are known as topological branches, see
-\(aqBranch, topological\(aq. If a topological branch is named, it becomes
+\'Branch, topological'. If a topological branch is named, it becomes
 a named branch. If a topological branch is not named, it becomes
-an anonymous branch. See \(aqBranch, anonymous\(aq and \(aqBranch, named\(aq.
+an anonymous branch. See 'Branch, anonymous' and 'Branch, named'.
 .sp
 Branches may be created when changes are pulled from or pushed to
 a remote repository, since new heads may be created by these
@@ -4530,7 +4504,7 @@
 (Verb) The action of creating a child changeset which results in
 its parent having more than one child.
 .sp
-Example: "I\(aqm going to branch at X".
+Example: "I'm going to branch at X".
 .TP
 .B Branch, anonymous
 .
@@ -4549,19 +4523,19 @@
 .TP
 .B Branch head
 .
-See \(aqHead, branch\(aq.
+See 'Head, branch'.
 .TP
 .B Branch, inactive
 .
 If a named branch has no topological heads, it is considered to be
 inactive. As an example, a feature branch becomes inactive when it
-is merged into the default branch. The \%\fBhg branches\fP\: command
+is merged into the default branch. The \fBhg branches\fP command
 shows inactive branches by default, though they can be hidden with
-\%\fBhg branches \-\-active\fP\:.
+\fBhg branches \-\-active\fP.
 .sp
 NOTE: this concept is deprecated because it is too implicit.
-Branches should now be explicitly closed using \%\fBhg commit
-\-\-close\-branch\fP\: when they are no longer needed.
+Branches should now be explicitly closed using \fBhg commit
+\-\-close\-branch\fP when they are no longer needed.
 .TP
 .B Branch, named
 .
@@ -4568,8 +4542,8 @@
 A collection of changesets which have the same branch name. By
 default, children of a changeset in a named branch belong to the
 same named branch. A child can be explicitly assigned to a
-different branch. See \%\fBhg help branch\fP\:, \%\fBhg help branches\fP\: and
-\%\fBhg commit \-\-close\-branch\fP\: for more information on managing
+different branch. See \fBhg help branch\fP, \fBhg help branches\fP and
+\fBhg commit \-\-close\-branch\fP for more information on managing
 branches.
 .sp
 Named branches can be thought of as a kind of namespace, dividing
@@ -4582,7 +4556,7 @@
 .TP
 .B Branch tip
 .
-See \(aqTip, branch\(aq.
+See 'Tip, branch'.
 .TP
 .B Branch, topological
 .
@@ -4632,24 +4606,24 @@
 revision. This use should probably be avoided where possible, as
 changeset is much more appropriate than checkout in this context.
 .sp
-Example: "I\(aqm using checkout X."
+Example: "I'm using checkout X."
 .sp
 (Verb) Updating the working directory to a specific changeset. See
-\%\fBhg help update\fP\:.
+\fBhg help update\fP.
 .sp
-Example: "I\(aqm going to check out changeset X."
+Example: "I'm going to check out changeset X."
 .TP
 .B Child changeset
 .
-See \(aqChangeset, child\(aq.
+See 'Changeset, child'.
 .TP
 .B Close changeset
 .
-See \(aqChangeset, close\(aq.
+See 'Changeset, close'.
 .TP
 .B Closed branch
 .
-See \(aqBranch, closed\(aq.
+See 'Branch, closed'.
 .TP
 .B Clone
 .
@@ -4658,13 +4632,13 @@
 .sp
 Example: "Is your clone up to date?".
 .sp
-(Verb) The process of creating a clone, using \%\fBhg clone\fP\:.
+(Verb) The process of creating a clone, using \fBhg clone\fP.
 .sp
-Example: "I\(aqm going to clone the repository".
+Example: "I'm going to clone the repository".
 .TP
 .B Closed branch head
 .
-See \(aqHead, closed branch\(aq.
+See 'Head, closed branch'.
 .TP
 .B Commit
 .
@@ -4689,13 +4663,13 @@
 system (DVCS) can be described as a directed acyclic graph (DAG),
 consisting of nodes and edges, where nodes correspond to
 changesets and edges imply a parent \-> child relation. This graph
-can be visualized by graphical tools such as \%\fBhg glog\fP\:
+can be visualized by graphical tools such as \fBhg glog\fP
 (graphlog). In Mercurial, the DAG is limited by the requirement
 for children to have at most two parents.
 .TP
 .B Default branch
 .
-See \(aqBranch, default\(aq.
+See 'Branch, default'.
 .TP
 .B Descendant
 .
@@ -4703,7 +4677,7 @@
 from a given changeset. More precisely, the descendants of a
 changeset can be defined by two properties: the child of a
 changeset is a descendant, and the child of a descendant is a
-descendant. See also: \(aqAncestor\(aq.
+descendant. See also: 'Ancestor'.
 .TP
 .B Diff
 .
@@ -4728,19 +4702,19 @@
 Mercurial, that will be recorded in the next commit. The working
 directory initially corresponds to the snapshot at an existing
 changeset, known as the parent of the working directory. See
-\(aqParent, working directory\(aq. The state may be modified by changes
+\'Parent, working directory'. The state may be modified by changes
 to the files introduced manually or by a merge. The repository
 metadata exists in the .hg directory inside the working directory.
 .TP
 .B Graph
 .
-See DAG and \%\fBhg help graphlog\fP\:.
+See DAG and \fBhg help graphlog\fP.
 .TP
 .B Head
 .
-The term \(aqhead\(aq may be used to refer to both a branch head or a
-repository head, depending on the context. See \(aqHead, branch\(aq and
-\(aqHead, repository\(aq for specific definitions.
+The term 'head' may be used to refer to both a branch head or a
+repository head, depending on the context. See 'Head, branch' and
+\'Head, repository' for specific definitions.
 .sp
 Heads are where development generally takes place and are the
 usual targets for update and merge operations.
@@ -4752,9 +4726,9 @@
 .B Head, closed branch
 .
 A changeset that marks a head as no longer interesting. The closed
-head is no longer listed by \%\fBhg heads\fP\:. A branch is considered
+head is no longer listed by \fBhg heads\fP. A branch is considered
 closed when all its heads are closed and consequently is not
-listed by \%\fBhg branches\fP\:.
+listed by \fBhg branches\fP.
 .TP
 .B Head, repository
 .
@@ -4780,11 +4754,11 @@
 .TP
 .B Immutable history
 .
-See \(aqHistory, immutable\(aq.
+See 'History, immutable'.
 .TP
 .B Merge changeset
 .
-See \(aqChangeset, merge\(aq.
+See 'Changeset, merge'.
 .TP
 .B Manifest
 .
@@ -4801,7 +4775,7 @@
 .TP
 .B Named branch
 .
-See \(aqBranch, named\(aq.
+See 'Branch, named'.
 .TP
 .B Null changeset
 .
@@ -4808,30 +4782,30 @@
 The empty changeset. It is the parent state of newly\-initialized
 repositories and repositories with no checked out revision. It is
 thus the parent of root changesets and the effective ancestor when
-merging unrelated changesets. Can be specified by the alias \(aqnull\(aq
-or by the changeset ID \(aq000000000000\(aq.
+merging unrelated changesets. Can be specified by the alias 'null'
+or by the changeset ID '000000000000'.
 .TP
 .B Parent
 .
-See \(aqChangeset, parent\(aq.
+See 'Changeset, parent'.
 .TP
 .B Parent changeset
 .
-See \(aqChangeset, parent\(aq.
+See 'Changeset, parent'.
 .TP
 .B Parent, working directory
 .
 The working directory parent reflects a virtual revision which is
 the child of the changeset (or two changesets with an uncommitted
-merge) shown by \%\fBhg parents\fP\:. This is changed with
-\%\fBhg update\fP\:. Other commands to see the working directory parent
-are \%\fBhg summary\fP\: and \%\fBhg id\fP\:. Can be specified by the alias ".".
+merge) shown by \fBhg parents\fP. This is changed with
+\fBhg update\fP. Other commands to see the working directory parent
+are \fBhg summary\fP and \fBhg id\fP. Can be specified by the alias ".".
 .TP
 .B Patch
 .
 (Noun) The product of a diff operation.
 .sp
-Example: "I\(aqve sent you my patch."
+Example: "I've sent you my patch."
 .sp
 (Verb) The process of using a patch file to transform one
 changeset into another.
@@ -4844,7 +4818,7 @@
 not in the local repository are brought into the local
 repository. Note that this operation without special arguments
 only updates the repository, it does not update the files in the
-working directory. See \%\fBhg help pull\fP\:.
+working directory. See \fBhg help pull\fP.
 .TP
 .B Push
 .
@@ -4852,7 +4826,7 @@
 not in a remote repository are sent to the remote repository. Note
 that this operation only adds changesets which have been committed
 locally to the remote repository. Uncommitted changes are not
-sent. See \%\fBhg help push\fP\:.
+sent. See \fBhg help push\fP.
 .TP
 .B Repository
 .
@@ -4865,13 +4839,13 @@
 .TP
 .B Repository head
 .
-See \(aqHead, repository\(aq.
+See 'Head, repository'.
 .TP
 .B Revision
 .
 A state of the repository at some point in time. Earlier revisions
-can be updated to by using \%\fBhg update\fP\:.  See also \(aqRevision
-number\(aq; See also \(aqChangeset\(aq.
+can be updated to by using \fBhg update\fP.  See also 'Revision
+number'; See also 'Changeset'.
 .TP
 .B Revision number
 .
@@ -4880,7 +4854,7 @@
 to a repository, starting with revision number 0. Note that the
 revision number may be different in each clone of a repository. To
 identify changesets uniquely between different clones, see
-\(aqChangeset id\(aq.
+\'Changeset id'.
 .TP
 .B Revlog
 .
@@ -4891,7 +4865,7 @@
 .TP
 .B Rewriting history
 .
-See \(aqHistory, rewriting\(aq.
+See 'History, rewriting'.
 .TP
 .B Root
 .
@@ -4907,7 +4881,7 @@
 .
 The head of a given branch with the highest revision number. When
 a branch name is used as a revision identifier, it refers to the
-branch tip. See also \(aqBranch, head\(aq. Note that because revision
+branch tip. See also 'Branch, head'. Note that because revision
 numbers may be different in different repository clones, the
 branch tip may be different in different cloned repositories.
 .TP
@@ -4915,21 +4889,21 @@
 .
 (Noun) Another synonym of changeset.
 .sp
-Example: "I\(aqve pushed an update".
+Example: "I've pushed an update".
 .sp
 (Verb) This term is usually used to describe updating the state of
 the working directory to that of a specific changeset. See
-\%\fBhg help update\fP\:.
+\fBhg help update\fP.
 .sp
 Example: "You should update".
 .TP
 .B Working directory
 .
-See \(aqDirectory, working\(aq.
+See 'Directory, working'.
 .TP
 .B Working directory parent
 .
-See \(aqParent, working directory\(aq.
+See 'Parent, working directory'.
 .UNINDENT
 .SH EXTENSIONS
 .sp
@@ -5011,7 +4985,7 @@
 .SS Example Configuration
 .sp
 .nf
-.ft C
+.ft
 [hooks]
 
 # Use this if you want to check access restrictions at commit time
@@ -5087,7 +5061,7 @@
 src/main/resources/** = *
 
 \&.hgtags = release_engineer
-.ft P
+.ft
 .fi
 .SS bugzilla
 .sp
@@ -5102,8 +5076,8 @@
 .sp
 The hook relies on a Bugzilla script to send bug change notification
 emails. That script changes between Bugzilla versions; the
-\(aqprocessmail\(aq script used prior to 2.18 is replaced in 2.18 and
-subsequent versions by \(aqconfig/sendbugmail.pl\(aq. Note that these will
+\'processmail' script used prior to 2.18 is replaced in 2.18 and
+subsequent versions by 'config/sendbugmail.pl'. Note that these will
 be run by Mercurial as the user pushing the change; you will need to
 ensure the Bugzilla install file permissions are set appropriately.
 .sp
@@ -5117,11 +5091,11 @@
 .TP
 .B db
 .
-Name of the Bugzilla database in MySQL. Default \(aqbugs\(aq.
+Name of the Bugzilla database in MySQL. Default 'bugs'.
 .TP
 .B user
 .
-Username to use to access MySQL server. Default \(aqbugs\(aq.
+Username to use to access MySQL server. Default 'bugs'.
 .TP
 .B password
 .
@@ -5133,8 +5107,8 @@
 .TP
 .B version
 .
-Bugzilla version. Specify \(aq3.0\(aq for Bugzilla versions 3.0 and later,
-\(aq2.18\(aq for Bugzilla versions from 2.18 and \(aq2.16\(aq for versions prior
+Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,
+\'2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior
 to 2.18.
 .TP
 .B bzuser
@@ -5145,13 +5119,13 @@
 .B bzdir
 .
 Bugzilla install directory. Used by default notify. Default
-\(aq/var/www/html/bugzilla\(aq.
+\'/var/www/html/bugzilla'.
 .TP
 .B notify
 .
 The command to run to get Bugzilla to send bug change notification
-emails. Substitutes from a map with 3 keys, \(aqbzdir\(aq, \(aqid\(aq (bug id)
-and \(aquser\(aq (committer bugzilla email). Default depends on version;
+emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)
+and 'user' (committer bugzilla email). Default depends on version;
 from 2.18 it is "cd %(bzdir)s && perl \-T contrib/sendbugmail.pl
 %(id)s %(user)s".
 .TP
@@ -5158,9 +5132,9 @@
 .B regexp
 .
 Regular expression to match bug IDs in changeset commit message.
-Must contain one "()" group. The default expression matches \(aqBug
-1234\(aq, \(aqBug no. 1234\(aq, \(aqBug number 1234\(aq, \(aqBugs 1234,5678\(aq, \(aqBug
-1234 and 5678\(aq and variations thereof. Matching is case insensitive.
+Must contain one "()" group. The default expression matches 'Bug
+1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug
+1234 and 5678' and variations thereof. Matching is case insensitive.
 .TP
 .B style
 .
@@ -5173,18 +5147,18 @@
 extension specifies:
 .sp
 .nf
-.ft C
+.ft
 {bug}       The Bugzilla bug ID.
 {root}      The full pathname of the Mercurial repository.
 {webroot}   Stripped pathname of the Mercurial repository.
 {hgweb}     Base URL for browsing Mercurial repositories.
-.ft P
+.ft
 .fi
 .INDENT 7.0
 .TP
-.B Default \(aqchangeset {node|short} in repo {root} refers \(aq
+.B Default 'changeset {node|short} in repo {root} refers '
 .
-\(aqto bug {bug}.ndetails:nt{desc|tabindent}\(aq
+\'to bug {bug}.ndetails:nt{desc|tabindent}'
 .UNINDENT
 .TP
 .B strip
@@ -5215,7 +5189,7 @@
 Activating the extension:
 .sp
 .nf
-.ft C
+.ft
 [extensions]
 bugzilla =
 
@@ -5222,7 +5196,7 @@
 [hooks]
 # run bugzilla hook on every change pulled or pushed in here
 incoming.bugzilla = python:hgext.bugzilla.hook
-.ft P
+.ft
 .fi
 .sp
 Example configuration:
@@ -5232,7 +5206,7 @@
 installation in /opt/bugzilla\-3.2.
 .sp
 .nf
-.ft C
+.ft
 [bugzilla]
 host=localhost
 password=XYZZY
@@ -5249,18 +5223,18 @@
 
 [usermap]
 user@emaildomain.com=user.name@bugzilladomain.com
-.ft P
+.ft
 .fi
 .sp
 Commits add a comment to the Bugzilla bug record of the form:
 .sp
 .nf
-.ft C
+.ft
 Changeset 3b16791d6642 in repository\-name.
 http://dev.domain.com/hg/repository\-name/rev/3b16791d6642
 
 Changeset commit comment. Bug 1234.
-.ft P
+.ft
 .fi
 .SS children
 .sp
@@ -5269,12 +5243,12 @@
 .SS children
 .sp
 .nf
-.ft C
+.ft
 hg children [\-r REV] [FILE]
-.ft P
+.ft
 .fi
 .sp
-Print the children of the working directory\(aqs revisions. If a
+Print the children of the working directory's revisions. If a
 revision is given via \-r/\-\-rev, the children of that revision will
 be printed. If a file argument is given, revision in which the
 file was last changed (after the working directory revision or the
@@ -5302,9 +5276,9 @@
 .SS churn
 .sp
 .nf
-.ft C
+.ft
 hg churn [\-d DATE] [\-r REV] [\-\-aliases FILE] [FILE]
-.ft P
+.ft
 .fi
 .sp
 This command will display a histogram representing the number
@@ -5320,19 +5294,19 @@
 Examples:
 .sp
 .nf
-.ft C
+.ft
 # display count of changed lines for every committer
-hg churn \-t \(aq{author|email}\(aq
+hg churn \-t '{author|email}'
 
 # display daily activity graph
-hg churn \-f \(aq%H\(aq \-s \-c
+hg churn \-f '%H' \-s \-c
 
 # display activity of developers by month
-hg churn \-f \(aq%Y\-%m\(aq \-s \-c
+hg churn \-f '%Y\-%m' \-s \-c
 
 # display count of lines changed in every year
-hg churn \-f \(aq%Y\(aq \-s
-.ft P
+hg churn \-f '%Y' \-s
+.ft
 .fi
 .sp
 It is possible to map alternate email addresses to a main address
@@ -5339,9 +5313,9 @@
 by providing a file using the following format:
 .sp
 .nf
-.ft C
+.ft
 <alias email> = <actual email>
-.ft P
+.ft
 .fi
 .sp
 Such a file may be specified with the \-\-aliases option, otherwise
@@ -5407,7 +5381,7 @@
 Default effects may be overridden from your configuration file:
 .sp
 .nf
-.ft C
+.ft
 [color]
 status.modified = blue bold underline red_background
 status.added = green bold
@@ -5416,7 +5390,7 @@
 status.unknown = magenta bold underline
 status.ignored = black bold
 
-# \(aqnone\(aq turns off all effects
+# 'none' turns off all effects
 status.clean = none
 status.copied = none
 
@@ -5443,7 +5417,7 @@
 branches.closed = black bold
 branches.current = green
 branches.inactive = none
-.ft P
+.ft
 .fi
 .sp
 The color extension will try to detect whether to use ANSI codes or
@@ -5450,13 +5424,13 @@
 Win32 console APIs, unless it is made explicit:
 .sp
 .nf
-.ft C
+.ft
 [color]
 mode = ansi
-.ft P
+.ft
 .fi
 .sp
-Any value other than \(aqansi\(aq, \(aqwin32\(aq, or \(aqauto\(aq will disable color.
+Any value other than 'ansi', 'win32', or 'auto' will disable color.
 .SS convert
 .sp
 import revisions from foreign VCS repositories into Mercurial
@@ -5464,9 +5438,9 @@
 .SS convert
 .sp
 .nf
-.ft C
+.ft
 hg convert [OPTION]... SOURCE [DEST [REVMAP]]
-.ft P
+.ft
 .fi
 .sp
 Accepted source formats [identifiers]:
@@ -5516,7 +5490,7 @@
 .sp
 If no destination directory name is specified, it defaults to the
 basename of the source with \fB\-hg\fP appended. If the destination
-repository doesn\(aqt exist, it will be created.
+repository doesn't exist, it will be created.
 .sp
 By default, all sources except Mercurial will use \-\-branchsort.
 Mercurial uses \-\-sourcesort to preserve original revision numbers
@@ -5542,19 +5516,19 @@
 supported by Mercurial sources.
 .UNINDENT
 .sp
-If \fBREVMAP\fP isn\(aqt given, it will be put in a default location
+If \fBREVMAP\fP isn't given, it will be put in a default location
 (\fB<dest>/.hg/shamap\fP by default). The \fBREVMAP\fP is a simple
 text file that maps each source commit ID to the destination ID
 for that revision, like so:
 .sp
 .nf
-.ft C
+.ft
 <source ID> <destination ID>
-.ft P
+.ft
 .fi
 .sp
-If the file doesn\(aqt exist, it\(aqs automatically created. It\(aqs
-updated on each commit copied, so \%\fBhg convert\fP\: can be interrupted
+If the file doesn't exist, it's automatically created. It's
+updated on each commit copied, so \fBhg convert\fP can be interrupted
 and can be run repeatedly to copy new commits.
 .sp
 The authormap is a simple text file that maps each source commit
@@ -5563,9 +5537,9 @@
 author mapping and the line format is:
 .sp
 .nf
-.ft C
+.ft
 source author = destination author
-.ft P
+.ft
 .fi
 .sp
 Empty lines and lines starting with a \fB#\fP are ignored.
@@ -5575,13 +5549,13 @@
 directives:
 .sp
 .nf
-.ft C
+.ft
 include path/to/file\-or\-dir
 
 exclude path/to/file\-or\-dir
 
 rename path/to/source path/to/destination
-.ft P
+.ft
 .fi
 .sp
 Comment lines start with \fB#\fP. A specified path matches if it
@@ -5605,9 +5579,9 @@
 comma\-separated values:
 .sp
 .nf
-.ft C
+.ft
 key parent1, parent2
-.ft P
+.ft
 .fi
 .sp
 The key is the revision ID in the source
@@ -5627,9 +5601,9 @@
 lines of the form:
 .sp
 .nf
-.ft C
+.ft
 original_branch_name new_branch_name
-.ft P
+.ft
 .fi
 .sp
 where "original_branch_name" is the name of the branch in the
@@ -5876,9 +5850,9 @@
 Files with the declared format of \fBCRLF\fP or \fBLF\fP are always
 checked out and stored in the repository in that format and files
 declared to be binary (\fBBIN\fP) are left unchanged. Additionally,
-\fBnative\fP is an alias for checking out in the platform\(aqs default line
+\fBnative\fP is an alias for checking out in the platform's default line
 ending: \fBLF\fP on Unix (including Mac OS X) and \fBCRLF\fP on
-Windows. Note that \fBBIN\fP (do nothing to line endings) is Mercurial\(aqs
+Windows. Note that \fBBIN\fP (do nothing to line endings) is Mercurial's
 default behaviour; it is only needed if you need to override a later,
 more general pattern.
 .sp
@@ -5895,7 +5869,7 @@
 Example versioned \fB.hgeol\fP file:
 .sp
 .nf
-.ft C
+.ft
 [patterns]
 **.py = native
 **.vcproj = CRLF
@@ -5905,7 +5879,7 @@
 
 [repository]
 native = LF
-.ft P
+.ft
 .fi
 .IP Note
 .
@@ -5921,7 +5895,7 @@
 .
 \fBeol.native\fP (default \fBos.linesep\fP) can be set to \fBLF\fP or
 \fBCRLF\fP to override the default interpretation of \fBnative\fP for
-checkout. This can be used with \%\fBhg archive\fP\: on Unix, say, to
+checkout. This can be used with \fBhg archive\fP on Unix, say, to
 generate an archive where files have line endings for Windows.
 .IP \(bu 2
 .
@@ -5944,7 +5918,7 @@
 Remember to enable the eol extension in the repository where you
 install the hook.
 .sp
-See \%\fBhg help patterns\fP\: for more information about the glob patterns
+See \fBhg help patterns\fP for more information about the glob patterns
 used.
 .SS extdiff
 .sp
@@ -5957,12 +5931,12 @@
 files to compare.
 .sp
 The extdiff extension also allows to configure new diff commands, so
-you do not need to type \%\fBhg extdiff \-p kdiff3\fP\: always.
+you do not need to type \fBhg extdiff \-p kdiff3\fP always.
 .sp
 .nf
-.ft C
+.ft
 [extdiff]
-# add new command that runs GNU diff(1) in \(aqcontext diff\(aq mode
+# add new command that runs GNU diff(1) in 'context diff' mode
 cdiff = gdiff \-Nprc5
 ## or the old way:
 #cmd.cdiff = gdiff
@@ -5978,19 +5952,19 @@
 # (see http://www.vim.org/scripts/script.php?script_id=102) Non
 # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in
 # your .vimrc
-vimdiff = gvim \-f \(aq+next\(aq \(aq+execute "DirDiff" argv(0) argv(1)\(aq
-.ft P
+vimdiff = gvim \-f '+next' '+execute "DirDiff" argv(0) argv(1)'
+.ft
 .fi
 .sp
 Tool arguments can include variables that are expanded at runtime:
 .sp
 .nf
-.ft C
+.ft
 $parent1, $plabel1 \- filename, descriptive label of first parent
 $child,   $clabel  \- filename, descriptive label of child revision
 $parent2, $plabel2 \- filename, descriptive label of second parent
 $parent is an alias for $parent1.
-.ft P
+.ft
 .fi
 .sp
 The extdiff extension will look in your [diff\-tools] and [merge\-tools]
@@ -5997,17 +5971,17 @@
 sections for diff tool arguments, when none are specified in [extdiff].
 .sp
 .nf
-.ft C
+.ft
 [extdiff]
 kdiff3 =
 
 [diff\-tools]
-kdiff3.diffargs=\-\-L1 \(aq$plabel1\(aq \-\-L2 \(aq$clabel\(aq $parent $child
-.ft P
+kdiff3.diffargs=\-\-L1 '$plabel1' \-\-L2 '$clabel' $parent $child
+.ft
 .fi
 .sp
 You can use \-I/\-X and list of file or directory names like normal
-\%\fBhg diff\fP\: command. The extdiff extension makes snapshots of only
+\fBhg diff\fP command. The extdiff extension makes snapshots of only
 needed files, so running the external diff program will actually be
 pretty fast (at least faster than having to compare the entire tree).
 .SS Commands
@@ -6014,9 +5988,9 @@
 .SS extdiff
 .sp
 .nf
-.ft C
+.ft
 hg extdiff [OPT]... [FILE]...
-.ft P
+.ft
 .fi
 .sp
 Show differences between revisions for the specified files, using
@@ -6068,9 +6042,9 @@
 .SS fetch
 .sp
 .nf
-.ft C
+.ft
 hg fetch [SOURCE]
-.ft P
+.ft
 .fi
 .sp
 This finds all changes from the repository at the specified path
@@ -6086,7 +6060,7 @@
 parent, with local changes as the second. To switch the merge
 order, use \-\-switch\-parent.
 .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
@@ -6144,9 +6118,9 @@
 .SS sigcheck
 .sp
 .nf
-.ft C
+.ft
 hg sigcheck REVISION
-.ft P
+.ft
 .fi
 .sp
 verify all the signatures there may be for a particular revision
@@ -6153,15 +6127,15 @@
 .SS sign
 .sp
 .nf
-.ft C
+.ft
 hg sign [OPTION]... [REVISION]...
-.ft P
+.ft
 .fi
 .sp
 If no revision is given, the parent of the working directory is used,
 or tip if no revision is checked out.
 .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
 Options:
 .INDENT 0.0
@@ -6197,9 +6171,9 @@
 .SS sigs
 .sp
 .nf
-.ft C
+.ft
 hg sigs
-.ft P
+.ft
 .fi
 .sp
 list signed changesets
@@ -6214,9 +6188,9 @@
 .SS glog
 .sp
 .nf
-.ft C
+.ft
 hg glog [OPTION]... [FILE]
-.ft P
+.ft
 .fi
 .sp
 Print a revision history alongside a revision graph drawn with
@@ -6256,7 +6230,7 @@
 configure it, set the following options in your hgrc:
 .sp
 .nf
-.ft C
+.ft
 [cia]
 # your registered CIA user name
 user = foo
@@ -6286,7 +6260,7 @@
 [web]
 # If you want hyperlinks (optional)
 baseurl = http://server/path/to/repo
-.ft P
+.ft
 .fi
 .SS hgk
 .sp
@@ -6302,15 +6276,15 @@
 the contrib directory, and the extension is shipped in the hgext
 repository, and needs to be enabled.
 .sp
-The \%\fBhg view\fP\: command will launch the hgk Tcl script. For this command
+The \fBhg view\fP command will launch the hgk Tcl script. For this command
 to work, hgk must be in your search path. Alternately, you can specify
 the path to hgk in your configuration file:
 .sp
 .nf
-.ft C
+.ft
 [hgk]
 path=/location/of/hgk
-.ft P
+.ft
 .fi
 .sp
 hgk can make use of the extdiff extension to visualize revisions.
@@ -6317,10 +6291,10 @@
 Assuming you had already configured extdiff vdiff command, just add:
 .sp
 .nf
-.ft C
+.ft
 [hgk]
 vdiff=vdiff
-.ft P
+.ft
 .fi
 .sp
 Revisions context menu will now display additional entries to fire
@@ -6329,9 +6303,9 @@
 .SS view
 .sp
 .nf
-.ft C
+.ft
 hg view [\-l LIMIT] [REVRANGE]
-.ft P
+.ft
 .fi
 .sp
 start interactive history viewer
@@ -6348,28 +6322,28 @@
 syntax highlighting for hgweb (requires Pygments)
 .sp
 It depends on the Pygments syntax highlighting library:
-\%http://pygments.org/\:
+http://pygments.org/
 .sp
 There is a single configuration option:
 .sp
 .nf
-.ft C
+.ft
 [web]
 pygments_style = <style>
-.ft P
+.ft
 .fi
 .sp
-The default is \(aqcolorful\(aq.
+The default is 'colorful'.
 .SS inotify
 .sp
-accelerate status report using Linux\(aqs inotify service
+accelerate status report using Linux's inotify service
 .SS Commands
 .SS inserve
 .sp
 .nf
-.ft C
+.ft
 hg inserve [OPTION]...
-.ft P
+.ft
 .fi
 .sp
 start an inotify server for this repository
@@ -6405,12 +6379,12 @@
 in your hgrc:
 .sp
 .nf
-.ft C
+.ft
 [interhg]
 issues = s!issue(\ed+)!<a href="http://bts/issue\e1">issue\e1</a>!
 bugzilla = s!((?:bug|b=|(?=#?\ed{4,}))(?:\es*#?)(\ed+))!<a..=\e2">\e1</a>!i
 boldify = s!(^|\es)#(\ed+)\eb! <b>#\e2</b>!
-.ft P
+.ft
 .fi
 .SS keyword
 .sp
@@ -6432,7 +6406,7 @@
 Example:
 .sp
 .nf
-.ft C
+.ft
 [keyword]
 # expand keywords in every python file except those matching "x*"
 **.py =
@@ -6441,7 +6415,7 @@
 [keywordset]
 # prefer svn\- over cvs\-like default keywordmaps
 svn = True
-.ft P
+.ft
 .fi
 .IP Note
 .
@@ -6450,39 +6424,39 @@
 .RE
 .sp
 For [keywordmaps] template mapping and expansion demonstration and
-control run \%\fBhg kwdemo\fP\:. See \%\fBhg help templates\fP\: for a list of
+control run \fBhg kwdemo\fP. See \fBhg help templates\fP for a list of
 available templates and filters.
 .sp
 Three additional date template filters are provided:
 .sp
 .nf
-.ft C
+.ft
 utcdate      "2006/09/18 15:13:13"
 svnutcdate   "2006\-09\-18 15:13:13Z"
 svnisodate   "2006\-09\-18 08:13:13 \-700 (Mon, 18 Sep 2006)"
-.ft P
+.ft
 .fi
 .sp
-The default template mappings (view with \%\fBhg kwdemo \-d\fP\:) can be
+The default template mappings (view with \fBhg kwdemo \-d\fP) can be
 replaced with customized keywords and templates. Again, run
-\%\fBhg kwdemo\fP\: to control the results of your configuration changes.
+\fBhg kwdemo\fP to control the results of your configuration changes.
 .sp
-Before changing/disabling active keywords, you must run \%\fBhg kwshrink\fP\:
+Before changing/disabling active keywords, you must run \fBhg kwshrink\fP
 to avoid storing expanded keywords in the change history.
 .sp
 To force expansion after enabling it, or a configuration change, run
-\%\fBhg kwexpand\fP\:.
+\fBhg kwexpand\fP.
 .sp
 Expansions spanning more than one line and incremental expansions,
-like CVS\(aq $Log$, are not supported. A keyword template map "Log =
+like CVS' $Log$, are not supported. A keyword template map "Log =
 {desc}" expands to the first line of the changeset description.
 .SS Commands
 .SS kwdemo
 .sp
 .nf
-.ft C
+.ft
 hg kwdemo [\-d] [\-f RCFILE] [TEMPLATEMAP]...
-.ft P
+.ft
 .fi
 .sp
 Show current, custom, or default keyword template maps and their
@@ -6493,7 +6467,7 @@
 .sp
 Use \-d/\-\-default to disable current configuration.
 .sp
-See \%\fBhg help templates\fP\: for information on templates and filters.
+See \fBhg help templates\fP for information on templates and filters.
 .sp
 Options:
 .INDENT 0.0
@@ -6509,9 +6483,9 @@
 .SS kwexpand
 .sp
 .nf
-.ft C
+.ft
 hg kwexpand [OPTION]... [FILE]...
-.ft P
+.ft
 .fi
 .sp
 Run after (re)enabling keyword expansion.
@@ -6532,9 +6506,9 @@
 .SS kwfiles
 .sp
 .nf
-.ft C
+.ft
 hg kwfiles [OPTION]... [FILE]...
-.ft P
+.ft
 .fi
 .sp
 List which files in the working directory are matched by the
@@ -6544,7 +6518,7 @@
 execution by including only files that are actual candidates for
 expansion.
 .sp
-See \%\fBhg help keyword\fP\: on how to construct patterns both for
+See \fBhg help keyword\fP on how to construct patterns both for
 inclusion and exclusion of files.
 .sp
 With \-A/\-\-all and \-v/\-\-verbose the codes used to show the status
@@ -6551,12 +6525,12 @@
 of files are:
 .sp
 .nf
-.ft C
+.ft
 K = keyword expansion candidate
 k = keyword expansion candidate (not tracked)
 I = ignored
 i = ignored (not tracked)
-.ft P
+.ft
 .fi
 .sp
 Options:
@@ -6585,9 +6559,9 @@
 .SS kwshrink
 .sp
 .nf
-.ft C
+.ft
 hg kwshrink [OPTION]... [FILE]...
-.ft P
+.ft
 .fi
 .sp
 Must be run before changing/disabling active keywords.
@@ -6616,10 +6590,10 @@
 Known patches are represented as patch files in the .hg/patches
 directory. Applied patches are both patch files and changesets.
 .sp
-Common tasks (use \%\fBhg help command\fP\: for more details):
+Common tasks (use \fBhg help command\fP for more details):
 .sp
 .nf
-.ft C
+.ft
 create new patch                          qnew
 import existing patch                     qimport
 
@@ -6629,7 +6603,7 @@
 add known patch to applied stack          qpush
 remove patch from applied stack           qpop
 refresh contents of top applied patch     qrefresh
-.ft P
+.ft
 .fi
 .sp
 By default, mq will automatically use git patches when required to
@@ -6637,26 +6611,26 @@
 files creations or deletions. This behaviour can be configured with:
 .sp
 .nf
-.ft C
+.ft
 [mq]
 git = auto/keep/yes/no
-.ft P
+.ft
 .fi
 .sp
-If set to \(aqkeep\(aq, mq will obey the [diff] section configuration while
-preserving existing git patches upon qrefresh. If set to \(aqyes\(aq or
-\(aqno\(aq, mq will override the [diff] section and always generate git or
+If set to 'keep', mq will obey the [diff] section configuration while
+preserving existing git patches upon qrefresh. If set to 'yes' or
+\'no', mq will override the [diff] section and always generate git or
 regular patches, possibly losing data in the second case.
 .sp
 You will by default be managing a patch queue named "patches". You can
-create other, independent patch queues with the \%\fBhg qqueue\fP\: command.
+create other, independent patch queues with the \fBhg qqueue\fP command.
 .SS Commands
 .SS qapplied
 .sp
 .nf
-.ft C
+.ft
 hg qapplied [\-1] [\-s] [PATCH]
-.ft P
+.ft
 .fi
 .sp
 Returns 0 on success.
@@ -6675,9 +6649,9 @@
 .SS qclone
 .sp
 .nf
-.ft C
+.ft
 hg qclone [OPTION]... SOURCE [DEST]
-.ft P
+.ft
 .fi
 .sp
 If source is local, destination will have no patches applied. If
@@ -6690,7 +6664,7 @@
 default. Use \-p <url> to change.
 .sp
 The patch directory must be a nested Mercurial repository, as
-would be created by \%\fBhg init \-\-mq\fP\:.
+would be created by \fBhg init \-\-mq\fP.
 .sp
 Return 0 on success.
 .sp
@@ -6728,12 +6702,12 @@
 .SS qcommit
 .sp
 .nf
-.ft C
+.ft
 hg qcommit [OPTION]... [FILE]...
-.ft P
+.ft
 .fi
 .sp
-This command is deprecated; use \%\fBhg commit \-\-mq\fP\: instead.
+This command is deprecated; use \fBhg commit \-\-mq\fP instead.
 .sp
 Options:
 .INDENT 0.0
@@ -6775,9 +6749,9 @@
 .SS qdelete
 .sp
 .nf
-.ft C
+.ft
 hg qdelete [\-k] [PATCH]...
-.ft P
+.ft
 .fi
 .sp
 The patches must not be applied, and at least one patch is required. With
@@ -6784,7 +6758,7 @@
 \-k/\-\-keep, the patch files are preserved in the patch directory.
 .sp
 To stop managing a patch and move it into permanent history,
-use the \%\fBhg qfinish\fP\: command.
+use the \fBhg qfinish\fP command.
 .sp
 Options:
 .INDENT 0.0
@@ -6802,9 +6776,9 @@
 .SS qdiff
 .sp
 .nf
-.ft C
+.ft
 hg qdiff [OPTION]... [FILE]...
-.ft P
+.ft
 .fi
 .sp
 Shows a diff which includes the current patch as well as any
@@ -6812,8 +6786,8 @@
 last refresh (thus showing what the current patch would become
 after a qrefresh).
 .sp
-Use \%\fBhg diff\fP\: if you only want to see the changes made since the
-last qrefresh, or \%\fBhg export qtip\fP\: if you want to see changes
+Use \fBhg diff\fP if you only want to see the changes made since the
+last qrefresh, or \fBhg export qtip\fP if you want to see changes
 made by the current patch without including changes made since the
 qrefresh.
 .sp
@@ -6873,9 +6847,9 @@
 .SS qfinish
 .sp
 .nf
-.ft C
+.ft
 hg qfinish [\-a] [REV]...
-.ft P
+.ft
 .fi
 .sp
 Finishes the specified revisions (corresponding to applied
@@ -6903,9 +6877,9 @@
 .SS qfold
 .sp
 .nf
-.ft C
+.ft
 hg qfold [\-e] [\-k] [\-m TEXT] [\-l FILE] PATCH...
-.ft P
+.ft
 .fi
 .sp
 Patches must not yet be applied. Each patch will be successively
@@ -6942,9 +6916,9 @@
 .SS qgoto
 .sp
 .nf
-.ft C
+.ft
 hg qgoto [OPTION]... PATCH
-.ft P
+.ft
 .fi
 .sp
 Returns 0 on success.
@@ -6959,15 +6933,15 @@
 .SS qguard
 .sp
 .nf
-.ft C
+.ft
 hg qguard [\-l] [\-n] [PATCH] [\-\- [+GUARD]... [\-GUARD]...]
-.ft P
+.ft
 .fi
 .sp
 Guards control whether a patch can be pushed. A patch with no
 guards is always pushed. A patch with a positive guard ("+foo") is
-pushed only if the \%\fBhg qselect\fP\: command has activated it. A patch with
-a negative guard ("\-foo") is never pushed if the \%\fBhg qselect\fP\: command
+pushed only if the \fBhg qselect\fP command has activated it. A patch with
+a negative guard ("\-foo") is never pushed if the \fBhg qselect\fP command
 has activated it.
 .sp
 With no arguments, print the currently active guards.
@@ -6974,15 +6948,15 @@
 With arguments, set guards for the named patch.
 .IP Note
 .
-Specifying negative guards now requires \(aq\-\-\(aq.
+Specifying negative guards now requires '\-\-'.
 .RE
 .sp
 To set guards on another patch:
 .sp
 .nf
-.ft C
+.ft
 hg qguard other.patch \-\- +2.6.17 \-stable
-.ft P
+.ft
 .fi
 .sp
 Returns 0 on success.
@@ -7001,9 +6975,9 @@
 .SS qheader
 .sp
 .nf
-.ft C
+.ft
 hg qheader [PATCH]
-.ft P
+.ft
 .fi
 .sp
 Returns 0 on success.
@@ -7010,9 +6984,9 @@
 .SS qimport
 .sp
 .nf
-.ft C
+.ft
 hg qimport [\-e] [\-n NAME] [\-f] [\-g] [\-P] [\-r REV]... FILE...
-.ft P
+.ft
 .fi
 .sp
 The patch is inserted into the series after the last applied
@@ -7042,9 +7016,9 @@
 To import an existing patch while renaming it:
 .sp
 .nf
-.ft C
+.ft
 hg qimport \-e existing\-patch \-n new\-name
-.ft P
+.ft
 .fi
 .sp
 Returns 0 if import succeeded.
@@ -7079,9 +7053,9 @@
 .SS qinit
 .sp
 .nf
-.ft C
+.ft
 hg qinit [\-c]
-.ft P
+.ft
 .fi
 .sp
 The queue repository is unversioned by default. If
@@ -7090,8 +7064,8 @@
 an unversioned patch repository into a versioned one). You can use
 qcommit to commit changes to this queue repository.
 .sp
-This command is deprecated. Without \-c, it\(aqs implied by other relevant
-commands. With \-c, use \%\fBhg init \-\-mq\fP\: instead.
+This command is deprecated. Without \-c, it's implied by other relevant
+commands. With \-c, use \fBhg init \-\-mq\fP instead.
 .sp
 Options:
 .INDENT 0.0
@@ -7103,9 +7077,9 @@
 .SS qnew
 .sp
 .nf
-.ft C
+.ft
 hg qnew [\-e] [\-m TEXT] [\-l FILE] PATCH [FILE]...
-.ft P
+.ft
 .fi
 .sp
 qnew creates a new patch on top of the currently\-applied patch (if
@@ -7121,7 +7095,7 @@
 .sp
 \-e/\-\-edit, \-m/\-\-message or \-l/\-\-logfile set the patch header as
 well as the commit message. If none is specified, the header is
-empty and the commit message is \(aq[mq]: PATCH\(aq.
+empty and the commit message is '[mq]: PATCH'.
 .sp
 Use the \-g/\-\-git option to keep the patch in the git extended diff
 format. Read the diffs help topic for more information on why this
@@ -7180,9 +7154,9 @@
 .SS qnext
 .sp
 .nf
-.ft C
+.ft
 hg qnext [\-s]
-.ft P
+.ft
 .fi
 .sp
 Returns 0 on success.
@@ -7197,9 +7171,9 @@
 .SS qpop
 .sp
 .nf
-.ft C
+.ft
 hg qpop [\-a] [\-f] [PATCH | INDEX]
-.ft P
+.ft
 .fi
 .sp
 By default, pops off the top of the patch stack. If given a patch
@@ -7226,9 +7200,9 @@
 .SS qprev
 .sp
 .nf
-.ft C
+.ft
 hg qprev [\-s]
-.ft P
+.ft
 .fi
 .sp
 Returns 0 on success.
@@ -7243,9 +7217,9 @@
 .SS qpush
 .sp
 .nf
-.ft C
+.ft
 hg qpush [\-f] [\-l] [\-a] [\-\-move] [PATCH | INDEX]
-.ft P
+.ft
 .fi
 .sp
 When \-f/\-\-force is applied, all local changes in patched files
@@ -7287,9 +7261,9 @@
 .SS qqueue
 .sp
 .nf
-.ft C
+.ft
 hg qqueue [OPTION] [QUEUE]
-.ft P
+.ft
 .fi
 .sp
 Supports switching between different patch queues, as well as creating
@@ -7335,9 +7309,9 @@
 .SS qrefresh
 .sp
 .nf
-.ft C
+.ft
 hg qrefresh [\-I] [\-X] [\-e] [\-m TEXT] [\-l FILE] [\-s] [FILE]...
-.ft P
+.ft
 .fi
 .sp
 If any file patterns are provided, the refreshed patch will
@@ -7408,9 +7382,9 @@
 .SS qrename
 .sp
 .nf
-.ft C
+.ft
 hg qrename PATCH1 [PATCH2]
-.ft P
+.ft
 .fi
 .sp
 With one argument, renames the current patch to PATCH1.
@@ -7426,12 +7400,12 @@
 .SS qrestore
 .sp
 .nf
-.ft C
+.ft
 hg qrestore [\-d] [\-u] REV
-.ft P
+.ft
 .fi
 .sp
-This command is deprecated, use \%\fBhg rebase\fP\: instead.
+This command is deprecated, use \fBhg rebase\fP instead.
 .sp
 Options:
 .INDENT 0.0
@@ -7447,12 +7421,12 @@
 .SS qsave
 .sp
 .nf
-.ft C
+.ft
 hg qsave [\-m TEXT] [\-l FILE] [\-c] [\-n NAME] [\-e] [\-f]
-.ft P
+.ft
 .fi
 .sp
-This command is deprecated, use \%\fBhg rebase\fP\: instead.
+This command is deprecated, use \fBhg rebase\fP instead.
 .sp
 Options:
 .INDENT 0.0
@@ -7484,12 +7458,12 @@
 .SS qselect
 .sp
 .nf
-.ft C
+.ft
 hg qselect [OPTION]... [GUARD]...
-.ft P
+.ft
 .fi
 .sp
-Use the \%\fBhg qguard\fP\: command to set or print guards on patch, then use
+Use the \fBhg qguard\fP command to set or print guards on patch, then use
 qselect to tell mq which guards to use. A patch will be pushed if
 it has no guards or any positive guards match the currently
 selected guard, but will not be pushed if any negative guards
@@ -7496,11 +7470,11 @@
 match the current guard. For example:
 .sp
 .nf
-.ft C
+.ft
 qguard foo.patch \-\- \-stable    (negative guard)
 qguard bar.patch    +stable    (positive guard)
 qselect stable
-.ft P
+.ft
 .fi
 .sp
 This activates the "stable" guard. mq will skip foo.patch (because
@@ -7547,9 +7521,9 @@
 .SS qseries
 .sp
 .nf
-.ft C
+.ft
 hg qseries [\-ms]
-.ft P
+.ft
 .fi
 .sp
 Returns 0 on success.
@@ -7568,9 +7542,9 @@
 .SS qtop
 .sp
 .nf
-.ft C
+.ft
 hg qtop [\-s]
-.ft P
+.ft
 .fi
 .sp
 Returns 0 on success.
@@ -7585,9 +7559,9 @@
 .SS qunapplied
 .sp
 .nf
-.ft C
+.ft
 hg qunapplied [\-1] [\-s] [PATCH]
-.ft P
+.ft
 .fi
 .sp
 Returns 0 on success.
@@ -7606,9 +7580,9 @@
 .SS strip
 .sp
 .nf
-.ft C
+.ft
 hg strip [\-k] [\-f] [\-n] REV...
-.ft P
+.ft
 .fi
 .sp
 The strip command removes the specified changesets and all their
@@ -7621,8 +7595,8 @@
 completes.
 .sp
 Any stripped changesets are stored in \fB.hg/strip\-backup\fP as a
-bundle (see \%\fBhg help bundle\fP\: and \%\fBhg help unbundle\fP\:). They can
-be restored by running \%\fBhg unbundle .hg/strip\-backup/BUNDLE\fP\:,
+bundle (see \fBhg help bundle\fP and \fBhg help unbundle\fP). They can
+be restored by running \fBhg unbundle .hg/strip\-backup/BUNDLE\fP,
 where BUNDLE is the bundle file created by the strip. Note that
 the local revision numbers will in general be different after the
 restore.
@@ -7666,7 +7640,7 @@
 this:
 .sp
 .nf
-.ft C
+.ft
 [extensions]
 notify =
 
@@ -7678,21 +7652,21 @@
 
 [notify]
 # config items go here
-.ft P
+.ft
 .fi
 .sp
 Required configuration items:
 .sp
 .nf
-.ft C
+.ft
 config = /path/to/file # file containing subscriptions
-.ft P
+.ft
 .fi
 .sp
 Optional configuration items:
 .sp
 .nf
-.ft C
+.ft
 test = True            # print messages to stdout for testing
 strip = 3              # number of slashes to strip for url paths
 domain = example.com   # domain to use if committer missing domain
@@ -7710,7 +7684,7 @@
 from = user@host.com   # email address to send as if none given
 [web]
 baseurl = http://hgserver/... # root of hg web site for browsing commits
-.ft P
+.ft
 .fi
 .sp
 The notify config file has same format as a regular hgrc file. It has
@@ -7718,7 +7692,7 @@
 handier for you.
 .sp
 .nf
-.ft C
+.ft
 [usersubs]
 # key is subscriber email, value is ","\-separated list of glob patterns
 user@host = pattern
@@ -7726,7 +7700,7 @@
 [reposubs]
 # key is glob pattern, value is ","\-separated list of subscriber emails
 pattern = user@host
-.ft P
+.ft
 .fi
 .sp
 Glob patterns are matched against path to repository root.
@@ -7740,10 +7714,10 @@
 To set the pager that should be used, set the application variable:
 .sp
 .nf
-.ft C
+.ft
 [pager]
 pager = less \-FRSX
-.ft P
+.ft
 .fi
 .sp
 If no pager is set, the pager extensions uses the environment variable
@@ -7753,10 +7727,10 @@
 setting:
 .sp
 .nf
-.ft C
+.ft
 [pager]
 quiet = True
-.ft P
+.ft
 .fi
 .sp
 You can disable the pager for certain commands by adding them to the
@@ -7763,10 +7737,10 @@
 pager.ignore list:
 .sp
 .nf
-.ft C
+.ft
 [pager]
 ignore = version, help, update
-.ft P
+.ft
 .fi
 .sp
 You can also enable the pager only for certain commands using
@@ -7773,10 +7747,10 @@
 pager.attend. Below is the default list of commands to be paged:
 .sp
 .nf
-.ft C
+.ft
 [pager]
 attend = annotate, cat, diff, export, glog, log, qdiff
-.ft P
+.ft
 .fi
 .sp
 Setting pager.attend to an empty value will cause all commands to be
@@ -7784,7 +7758,7 @@
 .sp
 If pager.attend is present, pager.ignore will be ignored.
 .sp
-To ignore global commands like \%\fBhg version\fP\: or \%\fBhg help\fP\:, you have
+To ignore global commands like \fBhg version\fP or \fBhg help\fP, you have
 to specify them in your user configuration file.
 .sp
 The \-\-pager=... option can also be used to control when the pager is
@@ -7800,7 +7774,7 @@
 For example, if you can refer to a revision as "foo", then:
 .sp
 .nf
-.ft C
+.ft
 foo^N = Nth parent of foo
 foo^0 = foo
 foo^1 = first parent of foo
@@ -7811,7 +7785,7 @@
 foo~0 = foo
 foo~1 = foo^1 = foo^ = first parent of foo
 foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo
-.ft P
+.ft
 .fi
 .SS patchbomb
 .sp
@@ -7832,7 +7806,7 @@
 [Optional] The result of running diffstat on the patch.
 .IP \(bu 2
 .
-The patch itself, as generated by \%\fBhg export\fP\:.
+The patch itself, as generated by \fBhg export\fP.
 .UNINDENT
 .sp
 Each message refers to the first in the series using the In\-Reply\-To
@@ -7843,7 +7817,7 @@
 configuration file:
 .sp
 .nf
-.ft C
+.ft
 [email]
 from = My Name <my@email>
 to = recipient1, recipient2, ...
@@ -7850,13 +7824,13 @@
 cc = cc1, cc2, ...
 bcc = bcc1, bcc2, ...
 reply\-to = address1, address2, ...
-.ft P
+.ft
 .fi
 .sp
 Use \fB[patchbomb]\fP as configuration section name if you need to
 override global \fB[email]\fP address settings.
 .sp
-Then you can use the \%\fBhg email\fP\: command to mail a series of
+Then you can use the \fBhg email\fP command to mail a series of
 changesets as a patchbomb.
 .sp
 You can also either configure the method option in the email section
@@ -7868,13 +7842,13 @@
 .SS email
 .sp
 .nf
-.ft C
+.ft
 hg email [OPTION]... [DEST]...
-.ft P
+.ft
 .fi
 .sp
 By default, diffs are sent in the format generated by
-\%\fBhg export\fP\:, one per message. The series starts with a "[PATCH 0
+\fBhg export\fP, one per message. The series starts with a "[PATCH 0
 of N]" introduction, which describes the series as a whole.
 .sp
 Each patch email has a Subject line of "[PATCH M of N] ...", using
@@ -7885,7 +7859,7 @@
 With the \-d/\-\-diffstat option, if the diffstat program is
 installed, the result of running diffstat on the patch is inserted.
 .sp
-Finally, the patch itself, as generated by \%\fBhg export\fP\:.
+Finally, the patch itself, as generated by \fBhg export\fP.
 .sp
 With the \-d/\-\-diffstat or \-c/\-\-confirm options, you will be presented
 with a final summary of all messages and asked for confirmation before
@@ -7923,7 +7897,7 @@
 Examples:
 .sp
 .nf
-.ft C
+.ft
 hg email \-r 3000          # send patch 3000 only
 hg email \-r 3000 \-r 3001  # send patches 3000 and 3001
 hg email \-r 3000:3005     # send patches 3000 through 3005
@@ -7944,7 +7918,7 @@
 hg email \-o \-m mbox &&    # generate an mbox file ...
   formail \-s sendmail \e   # ... and use formail to send from the mbox
     \-bm \-t < mbox         # ... using sendmail
-.ft P
+.ft
 .fi
 .sp
 Before using this command, you will need to enable email in your
@@ -8077,7 +8051,7 @@
 The following settings are available:
 .sp
 .nf
-.ft C
+.ft
 [progress]
 delay = 3 # number of seconds (float) before showing the progress bar
 refresh = 0.1 # time in seconds between refreshes of the progress bar
@@ -8084,11 +8058,11 @@
 format = topic bar number estimate # format of the progress bar
 width = <none> # if set, the maximum width of the progress information
                # (that is, min(width, term width) will be used)
-clear\-complete = True # clear the progress bar after it\(aqs done
-disable = False # if true, don\(aqt show a progress bar
+clear\-complete = True # clear the progress bar after it's done
+disable = False # if true, don't show a progress bar
 assume\-tty = False # if true, ALWAYS show a progress bar, unless
                    # disable is given
-.ft P
+.ft
 .fi
 .sp
 Valid entries for the format field are topic, bar, number, unit,
@@ -8103,9 +8077,9 @@
 .SS purge
 .sp
 .nf
-.ft C
+.ft
 hg purge [OPTION]... [DIR]...
-.ft P
+.ft
 .fi
 .sp
 Delete files not known to Mercurial. This is useful to test local
@@ -8115,7 +8089,7 @@
 .INDENT 0.0
 .IP \(bu 2
 .
-Unknown files: files marked with "?" by \%\fBhg status\fP\:
+Unknown files: files marked with "?" by \fBhg status\fP
 .IP \(bu 2
 .
 Empty directories: in fact Mercurial ignores directories unless
@@ -8132,7 +8106,7 @@
 Ignored files (unless \-\-all is specified)
 .IP \(bu 2
 .
-New files added to the repository (with \%\fBhg add\fP\:)
+New files added to the repository (with \fBhg add\fP)
 .UNINDENT
 .sp
 If directories are given on the command line, only files in these
@@ -8180,15 +8154,15 @@
 repository.
 .sp
 For more information:
-\%http://mercurial.selenic.com/wiki/RebaseExtension\:
+http://mercurial.selenic.com/wiki/RebaseExtension
 .SS Commands
 .SS rebase
 .sp
 .nf
-.ft C
+.ft
 hg rebase [\-s REV | \-b REV] [\-d REV] [options]
 hg rebase {\-a|\-c}
-.ft P
+.ft
 .fi
 .sp
 Rebase uses repeated merging to graft changesets from one part of
@@ -8201,7 +8175,7 @@
 same rebase or they will end up with duplicated changesets after
 pulling in your rebased changesets.
 .sp
-If you don\(aqt specify a destination changeset (\fB\-d/\-\-dest\fP),
+If you don't specify a destination changeset (\fB\-d/\-\-dest\fP),
 rebase uses the tipmost head of the current named branch as the
 destination. (The destination changeset is not modified by
 rebasing, but new changesets are added as its descendants.)
@@ -8228,7 +8202,7 @@
 and source branch is that, unlike \fBmerge\fP, rebase will do
 nothing if you are at the latest (tipmost) head of a named branch
 with two heads. You need to explicitly specify source and/or
-destination (or \fBupdate\fP to the other head, if it\(aqs the head of
+destination (or \fBupdate\fP to the other head, if it's the head of
 the intended source branch).
 .sp
 If a rebase is interrupted to manually resolve a merge, it can be
@@ -8290,15 +8264,15 @@
 .SS record
 .sp
 .nf
-.ft C
+.ft
 hg record [OPTION]... [FILE]...
-.ft P
+.ft
 .fi
 .sp
-If a list of files is omitted, all changes reported by \%\fBhg status\fP\:
+If a list of files is omitted, all changes reported by \fBhg status\fP
 will be candidates for recording.
 .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
 You will be prompted for whether to record changes to each
 modified file, and for files with multiple changes, for each
@@ -8306,7 +8280,7 @@
 possible:
 .sp
 .nf
-.ft C
+.ft
 y \- record this change
 n \- skip this change
 
@@ -8318,7 +8292,7 @@
 q \- quit, recording no changes
 
 ? \- display help
-.ft P
+.ft
 .fi
 .sp
 This command is not available when committing a merge.
@@ -8365,9 +8339,9 @@
 .SS relink
 .sp
 .nf
-.ft C
+.ft
 hg relink [ORIGIN]
-.ft P
+.ft
 .fi
 .sp
 When repositories are cloned locally, their data files will be
@@ -8399,18 +8373,18 @@
 lot of repositories to act like a scheme, for example:
 .sp
 .nf
-.ft C
+.ft
 [schemes]
 py = http://code.python.org/hg/
-.ft P
+.ft
 .fi
 .sp
 After that you can use it like:
 .sp
 .nf
-.ft C
+.ft
 hg clone py://trunk/
-.ft P
+.ft
 .fi
 .sp
 Additionally there is support for some more complex schemas, for
@@ -8417,10 +8391,10 @@
 example used by Google Code:
 .sp
 .nf
-.ft C
+.ft
 [schemes]
 gcode = http://{1}.googlecode.com/hg/
-.ft P
+.ft
 .fi
 .sp
 The syntax is taken from Mercurial templates, and you have unlimited
@@ -8432,7 +8406,7 @@
 For convenience, the extension adds these schemes by default:
 .sp
 .nf
-.ft C
+.ft
 [schemes]
 py = http://hg.python.org/
 bb = https://bitbucket.org/
@@ -8439,7 +8413,7 @@
 bb+ssh = ssh://hg@bitbucket.org/
 gcode = https://{1}.googlecode.com/hg/
 kiln = https://{1}.kilnhg.com/Repo/
-.ft P
+.ft
 .fi
 .sp
 You can override a predefined scheme by defining a new scheme with the
@@ -8451,9 +8425,9 @@
 .SS share
 .sp
 .nf
-.ft C
+.ft
 hg share [\-U] SOURCE [DEST]
-.ft P
+.ft
 .fi
 .sp
 Initialize a new repository and working directory that shares its
@@ -8490,9 +8464,9 @@
 .SS transplant
 .sp
 .nf
-.ft C
+.ft
 hg transplant [\-s REPO] [\-b BRANCH [\-a]] [\-p REV] [\-m REV] [REV]...
-.ft P
+.ft
 .fi
 .sp
 Selected changesets will be applied on top of the current working
@@ -8505,9 +8479,9 @@
 of the form:
 .sp
 .nf
-.ft C
+.ft
 (transplanted from CHANGESETHASH)
-.ft P
+.ft
 .fi
 .sp
 You can rewrite the changelog message with the \-\-filter option.
@@ -8521,7 +8495,7 @@
 transplanted, otherwise you will be prompted to select the
 changesets you want.
 .sp
-\%\fBhg transplant \-\-branch REVISION \-\-all\fP\: will transplant the
+\fBhg transplant \-\-branch REVISION \-\-all\fP\: will transplant the
 selected branch (up to the named revision) onto your current
 working directory.
 .sp
@@ -8530,12 +8504,12 @@
 of a merged transplant, and you can merge descendants of them
 normally instead of transplanting them.
 .sp
-If no merges or revisions are provided, \%\fBhg transplant\fP\: will
+If no merges or revisions are provided, \fBhg transplant\fP will
 start an interactive changeset browser.
 .sp
 If a changeset application fails, you can fix the merge by hand
-and then resume where you left off by calling \%\fBhg transplant
-\-\-continue/\-c\fP\:.
+and then resume where you left off by calling \fBhg transplant
+\-\-continue/\-c\fP.
 .sp
 Options:
 .INDENT 0.0
@@ -8624,10 +8598,10 @@
 You can specify the encoding by config option:
 .sp
 .nf
-.ft C
+.ft
 [win32mbcs]
 encoding = sjis
-.ft P
+.ft
 .fi
 .sp
 It is useful for the users who want to commit with UTF\-8 log message.
@@ -8650,7 +8624,7 @@
 To perform automatic newline conversion, use:
 .sp
 .nf
-.ft C
+.ft
 [extensions]
 win32text =
 [encode]
@@ -8660,17 +8634,17 @@
 [decode]
 ** = cleverdecode:
 # or ** = macdecode:
-.ft P
+.ft
 .fi
 .sp
 If not doing conversion, to make sure you do not commit CRLF/CR by accident:
 .sp
 .nf
-.ft C
+.ft
 [hooks]
 pretxncommit.crlf = python:hgext.win32text.forbidcrlf
 # or pretxncommit.cr = python:hgext.win32text.forbidcr
-.ft P
+.ft
 .fi
 .sp
 To do the same check on a server to prevent CRLF/CR from being
@@ -8677,11 +8651,11 @@
 pushed or pulled:
 .sp
 .nf
-.ft C
+.ft
 [hooks]
 pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf
 # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr
-.ft P
+.ft
 .fi
 .SS zeroconf
 .sp
@@ -8692,23 +8666,23 @@
 without knowing their actual IP address.
 .sp
 To allow other people to discover your repository using run
-\%\fBhg serve\fP\: in your repository:
+\fBhg serve\fP in your repository:
 .sp
 .nf
-.ft C
+.ft
 $ cd test
 $ hg serve
-.ft P
+.ft
 .fi
 .sp
 You can discover Zeroconf\-enabled repositories by running
-\%\fBhg paths\fP\::
+\fBhg paths\fP:
 .sp
 .nf
-.ft C
+.ft
 $ hg paths
 zc\-test = http://example.com:8000/test
-.ft P
+.ft
 .fi
 .SH FILES
 .INDENT 0.0
@@ -8717,7 +8691,7 @@
 .sp
 This file contains regular expressions (one per line) that
 describe file names that should be ignored by \fBhg\fP. For details,
-see \%\fBhgignore\fP(5)\:.
+see \fBhgignore\fP(5).
 .TP
 .B \fB.hgtags\fP
 .sp
@@ -8730,7 +8704,7 @@
 This file contains defaults and configuration. Values in
 \fB.hg/hgrc\fP override those in \fB$HOME/.hgrc\fP, and these override
 settings made in the global \fB/etc/mercurial/hgrc\fP configuration.
-See \%\fBhgrc\fP(5)\: for details of the contents and format of these
+See \fBhgrc\fP(5) for details of the contents and format of these
 files.
 .UNINDENT
 .sp
@@ -8737,23 +8711,28 @@
 Some commands (e.g. revert) produce backup files ending in \fB.orig\fP,
 if the \fB.orig\fP file already exists and is not tracked by Mercurial,
 it will be overwritten.
+.TP
+.B /usr/demo/mercurial
+This directory contains assorted files which are part of the Mercurial
+distribution, but not core to its functionality.  They will generally
+need to be copied elsewhere to be of use.
 .SH BUGS
 .sp
-Probably lots, please post them to the mailing list (see \%Resources\:
+Probably lots, please post them to the mailing list (see Resources
 below) when you find them.
 .SH SEE ALSO
 .sp
-\%\fBhgignore\fP(5)\:, \%\fBhgrc\fP(5)\:
+\fBhgignore\fP(5), \fBhgrc\fP(5)
 .SH AUTHOR
 .sp
-Written by Matt Mackall <\%mpm@selenic.com\:>
+Written by Matt Mackall <mpm@selenic.com>
 .SH RESOURCES
 .sp
-Main Web Site: \%http://mercurial.selenic.com/\:
+Main Web Site: http://mercurial.selenic.com/
 .sp
-Source code repository: \%http://selenic.com/hg\:
+Source code repository: http://selenic.com/hg
 .sp
-Mailing list: \%http://selenic.com/mailman/listinfo/mercurial\:
+Mailing list: http://selenic.com/mailman/listinfo/mercurial
 .SH COPYING
 .sp
 Copyright (C) 2005\-2010 Matt Mackall.
--- mercurial-1.8/doc/hgignore.5	Tue Mar  1 14:01:42 2011
+++ mercurial-1.8/doc/hgignore.5	Mon Mar  7 21:16:24 2011
@@ -1,35 +1,9 @@
+'\" t
 .\" Man page generated from reStructeredText.
 .
 .TH HGIGNORE 5 "" "" "Mercurial Manual"
 .SH NAME
 hgignore \- syntax for Mercurial ignore files
-.
-.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
 The Mercurial system uses a file called \fB.hgignore\fP in the root
@@ -54,12 +28,12 @@
 if any pattern in \fB.hgignore\fP matches \fBa/b/file.c\fP, \fBa/b\fP or \fBa\fP.
 .sp
 In addition, a Mercurial configuration file can reference a set of
-per\-user or global ignore files. See the \%\fBhgrc\fP(5)\: man page for details
+per\-user or global ignore files. See the \fBhgrc\fP(5) man page for details
 of how to configure these files. Look for the "ignore" entry in the
 "ui" section.
 .sp
-To control Mercurial\(aqs handling of files that it manages, see the
-\%\fBhg\fP(1)\: man page. Look for the \fB\-I\fP and \fB\-X\fP options.
+To control Mercurial's handling of files that it manages, see the
+\fBhg\fP(1) man page. Look for the \fB\-I\fP and \fB\-X\fP options.
 .SH SYNTAX
 .sp
 An ignore file is a plain text file consisting of a list of patterns,
@@ -73,9 +47,9 @@
 To change the syntax used, use a line of the following form:
 .sp
 .nf
-.ft C
+.ft
 syntax: NAME
-.ft P
+.ft
 .fi
 .sp
 where \fBNAME\fP is one of the following:
@@ -102,7 +76,7 @@
 Here is an example ignore file.
 .sp
 .nf
-.ft C
+.ft
 # use glob syntax.
 syntax: glob
 
@@ -113,16 +87,16 @@
 # switch to regexp syntax.
 syntax: regexp
 ^\e.pc/
-.ft P
+.ft
 .fi
 .SH AUTHOR
 .sp
-Vadim Gelfer <\%vadim.gelfer@gmail.com\:>
+Vadim Gelfer <vadim.gelfer@gmail.com>
 .sp
-Mercurial was written by Matt Mackall <\%mpm@selenic.com\:>.
+Mercurial was written by Matt Mackall <mpm@selenic.com>.
 .SH SEE ALSO
 .sp
-\%\fBhg\fP(1)\:, \%\fBhgrc\fP(5)\:
+\fBhg\fP(1), \fBhgrc\fP(5)
 .SH COPYING
 .sp
 This manual page is copyright 2006 Vadim Gelfer.
--- mercurial-1.8.1/doc/hgrc.5	Thu Mar 10 09:30:43 2011
+++ mercurial-1.8.1/doc/hgrc.5	Mon Mar  7 21:24:26 2011
@@ -1,35 +1,9 @@
+'\" t
 .\" Man page generated from reStructeredText.
 .
 .TH HGRC 5 "" "" "Mercurial Manual"
 .SH NAME
 hgrc \- configuration files for Mercurial
-.
-.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
 The Mercurial system uses a set of configuration files to control
@@ -44,7 +18,7 @@
 ones.
 .sp
 .nf
-(Unix, Windows) \fB<repo>/.hg/hgrc\fP
+\fB<repo>/.hg/hgrc\fP
 .fi
 .sp
 .INDENT 0.0
@@ -53,35 +27,30 @@
 Per\-repository configuration options that only apply in a
 particular repository. This file is not version\-controlled, and
 will not get transferred during a "clone" operation. Options in
-this file override options in all other configuration files. On
-Unix, most of this file will be ignored if it doesn\(aqt belong to a
+this file override options in all other configuration files.
+Most of this file will be ignored if it doesn't belong to a
 trusted user or to a trusted group. See the documentation for the
-\%trusted\: section below for more details.
+trusted section below for more details.
 .UNINDENT
 .UNINDENT
 .sp
 .nf
-(Unix) \fB$HOME/.hgrc\fP
-(Windows) \fB%USERPROFILE%\e.hgrc\fP
-(Windows) \fB%USERPROFILE%\eMercurial.ini\fP
-(Windows) \fB%HOME%\e.hgrc\fP
-(Windows) \fB%HOME%\eMercurial.ini\fP
+\fB$HOME/.hgrc\fP
 .fi
 .sp
 .INDENT 0.0
 .INDENT 3.5
 .sp
-Per\-user configuration file(s), for the user running Mercurial. On
-Windows 9x, \fB%HOME%\fP is replaced by \fB%APPDATA%\fP. Options in these
-files apply to all Mercurial commands executed by this user in any
-directory. Options in these files override per\-system and per\-installation
-options.
+Per\-user configuration file(s), for the user running Mercurial.
+Options in this file apply to all Mercurial commands executed by this
+user in any directory. Options in this file override per\-system and
+per\-installation options.
 .UNINDENT
 .UNINDENT
 .sp
 .nf
-(Unix) \fB/etc/mercurial/hgrc\fP
-(Unix) \fB/etc/mercurial/hgrc.d/*.rc\fP
+\fB/etc/mercurial/hgrc\fP
+\fB/etc/mercurial/hgrc.d/*.rc\fP
 .fi
 .sp
 .INDENT 0.0
@@ -93,44 +62,6 @@
 override per\-installation options.
 .UNINDENT
 .UNINDENT
-.sp
-.nf
-(Unix) \fB<install\-root>/etc/mercurial/hgrc\fP
-(Unix) \fB<install\-root>/etc/mercurial/hgrc.d/*.rc\fP
-.fi
-.sp
-.INDENT 0.0
-.INDENT 3.5
-.sp
-Per\-installation configuration files, searched for in the
-directory where Mercurial is installed. \fB<install\-root>\fP is the
-parent directory of the \fBhg\fP executable (or symlink) being run. For
-example, if installed in \fB/shared/tools/bin/hg\fP, Mercurial will look
-in \fB/shared/tools/etc/mercurial/hgrc\fP. Options in these files apply
-to all Mercurial commands executed by any user in any directory.
-.UNINDENT
-.UNINDENT
-.sp
-.nf
-(Windows) \fB<install\-dir>\eMercurial.ini\fP
-(Windows) \fB<install\-dir>\ehgrc.d\e*.rc\fP
-(Windows) \fBHKEY_LOCAL_MACHINE\eSOFTWARE\eMercurial\fP
-.fi
-.sp
-.INDENT 0.0
-.INDENT 3.5
-.sp
-Per\-installation/system configuration files, for the system on
-which Mercurial is running. Options in these files apply to all
-Mercurial commands executed by any user in any directory. Registry
-keys contain PATH\-like strings, every part of which must reference
-a \fBMercurial.ini\fP file or be a directory where \fB*.rc\fP files will
-be read.  Mercurial checks each of these locations in the specified
-order until one or more configuration files are detected.  If the
-pywin32 extensions are not installed, Mercurial will only look for
-site\-wide configuration in \fBC:\eMercurial\eMercurial.ini\fP.
-.UNINDENT
-.UNINDENT
 .SH SYNTAX
 .sp
 A configuration file consists of sections, led by a \fB[section]\fP header
@@ -138,12 +69,12 @@
 \fBconfiguration keys\fP):
 .sp
 .nf
-.ft C
+.ft
 [spam]
 eggs=ham
 green=
    eggs
-.ft P
+.ft
 .fi
 .sp
 Each line contains one entry. If the lines that follow are indented,
@@ -155,12 +86,12 @@
 will use the value that was configured last. As an example:
 .sp
 .nf
-.ft C
+.ft
 [spam]
 eggs=large
 ham=serrano
 eggs=small
-.ft P
+.ft
 .fi
 .sp
 This would set the configuration key named \fBeggs\fP to \fBsmall\fP.
@@ -169,7 +100,7 @@
 be redefined on the same and/or on different hgrc files. For example:
 .sp
 .nf
-.ft C
+.ft
 [foo]
 eggs=large
 ham=serrano
@@ -184,7 +115,7 @@
 ham=prosciutto
 eggs=medium
 bread=toasted
-.ft P
+.ft
 .fi
 .sp
 This would set the \fBeggs\fP, \fBham\fP, and \fBbread\fP configuration keys
@@ -206,9 +137,9 @@
 \fBfile\fP. This lets you do something like:
 .sp
 .nf
-.ft C
+.ft
 %include ~/.hgrc.d/$HOST.rc
-.ft P
+.ft
 .fi
 .sp
 to include a different configuration file on each computer you use.
@@ -225,9 +156,9 @@
 placed in double quotation marks:
 .sp
 .nf
-.ft C
+.ft
 allow_read = "John Doe, PhD", brian, betty
-.ft P
+.ft
 .fi
 .sp
 Quotation marks can be escaped by prefixing them with a backslash. Only
@@ -247,17 +178,17 @@
 Alias definitions consist of lines of the form:
 .sp
 .nf
-.ft C
+.ft
 <alias> = <command> [<argument]...
-.ft P
+.ft
 .fi
 .sp
 For example, this definition:
 .sp
 .nf
-.ft C
+.ft
 latest = log \-\-limit 5
-.ft P
+.ft
 .fi
 .sp
 creates a new command \fBlatest\fP that shows only the five most recent
@@ -264,9 +195,9 @@
 changesets. You can define subsequent aliases using earlier ones:
 .sp
 .nf
-.ft C
+.ft
 stable5 = latest \-b stable
-.ft P
+.ft
 .fi
 .IP Note
 .
@@ -278,15 +209,15 @@
 .sp
 Authentication credentials for HTTP authentication. This section
 allows you to store usernames and passwords for use when logging
-\fIinto\fP HTTP servers. See the \%web\: configuration section if you want to
+\fIinto\fP HTTP servers. See the web configuration section if you want to
 configure \fIwho\fP can login to your HTTP server.
 .sp
 Each line has the following format:
 .sp
 .nf
-.ft C
+.ft
 <name>.<argument> = <value>
-.ft P
+.ft
 .fi
 .sp
 where \fB<name>\fP is used to group arguments into authentication
@@ -293,7 +224,7 @@
 entries. Example:
 .sp
 .nf
-.ft C
+.ft
 foo.prefix = hg.intevation.org/mercurial
 foo.username = foo
 foo.password = bar
@@ -303,7 +234,7 @@
 bar.key = path/to/file.key
 bar.cert = path/to/file.cert
 bar.schemes = https
-.ft P
+.ft
 .fi
 .sp
 Supported arguments:
@@ -314,7 +245,7 @@
 Either \fB*\fP or a URI prefix with or without the scheme part.
 The authentication entry with the longest matching prefix is used
 (where \fB*\fP matches everything and counts as a match of length
-1). If the prefix doesn\(aqt include a scheme, the match is performed
+1). If the prefix doesn't include a scheme, the match is performed
 against the URI with its scheme stripped as well, and the schemes
 argument, q.v., is then subsequently consulted.
 .TP
@@ -344,7 +275,7 @@
 .B \fBschemes\fP
 .sp
 Optional. Space separated list of URI schemes to use this
-authentication entry with. Only used if the prefix doesn\(aqt include
+authentication entry with. Only used if the prefix doesn't include
 a scheme. Supported schemes are http and https. They will match
 static\-http and static\-https respectively, as well.
 Default: https.
@@ -374,7 +305,7 @@
 Pipe example:
 .sp
 .nf
-.ft C
+.ft
 [encode]
 # uncompress gzip files on checkin to improve delta compression
 # note: not necessarily a good idea, just an example
@@ -382,9 +313,9 @@
 
 [decode]
 # recompress gzip files when writing them to the working dir (we
-# can safely omit "pipe:", because it\(aqs the default)
+# can safely omit "pipe:", because it's the default)
 *.gz = gzip
-.ft P
+.ft
 .fi
 .sp
 A \fBtempfile:\fP command is a template. The string \fBINFILE\fP is replaced
@@ -392,12 +323,6 @@
 filtered by the command. The string \fBOUTFILE\fP is replaced with the name
 of an empty temporary file, where the filtered data must be written by
 the command.
-.IP Note
-.
-The tempfile mechanism is recommended for Windows systems,
-where the standard shell I/O redirection operators often have
-strange effects and may corrupt the contents of your files.
-.RE
 .sp
 This filter mechanism is used internally by the \fBeol\fP extension to
 translate line ending characters between Windows (CRLF) and Unix (LF)
@@ -404,20 +329,20 @@
 format. We suggest you use the \fBeol\fP extension for convenience.
 .SS \fBdefaults\fP
 .sp
-(defaults are deprecated. Don\(aqt use them. Use aliases instead)
+(defaults are deprecated. Don't use them. Use aliases instead)
 .sp
 Use the \fB[defaults]\fP section to define command defaults, i.e. the
 default options/arguments to pass to the specified commands.
 .sp
-The following example makes \%\fBhg log\fP\: run in verbose mode, and
-\%\fBhg status\fP\: show only the modified files, by default:
+The following example makes \fBhg log\fP run in verbose mode, and
+\fBhg status\fP show only the modified files, by default:
 .sp
 .nf
-.ft C
+.ft
 [defaults]
 log = \-v
 status = \-m
-.ft P
+.ft
 .fi
 .sp
 The actual commands, instead of their aliases, must be used when
@@ -435,7 +360,7 @@
 .TP
 .B \fBnodates\fP
 .sp
-Don\(aqt include dates in diff headers.
+Don't include dates in diff headers.
 .TP
 .B \fBshowfunc\fP
 .sp
@@ -469,22 +394,22 @@
 .TP
 .B \fBto\fP
 .sp
-Optional. Comma\-separated list of recipients\(aq email addresses.
+Optional. Comma\-separated list of recipients' email addresses.
 .TP
 .B \fBcc\fP
 .sp
-Optional. Comma\-separated list of carbon copy recipients\(aq
+Optional. Comma\-separated list of carbon copy recipients'
 email addresses.
 .TP
 .B \fBbcc\fP
 .sp
-Optional. Comma\-separated list of blind carbon copy recipients\(aq
+Optional. Comma\-separated list of blind carbon copy recipients'
 email addresses.
 .TP
 .B \fBmethod\fP
 .sp
 Optional. Method to use to send email messages. If value is \fBsmtp\fP
-(default), use SMTP (see the \%SMTP\: section for configuration).
+(default), use SMTP (see the SMTP section for configuration).
 Otherwise, use as name of program to run that acts like sendmail
 (takes \fB\-f\fP option for sender, list of recipients on command line,
 message on stdin). Normally, setting this to \fBsendmail\fP or
@@ -523,7 +448,7 @@
 Email example:
 .sp
 .nf
-.ft C
+.ft
 [email]
 from = Joseph User <joe.user@example.com>
 method = /usr/sbin/sendmail
@@ -530,7 +455,7 @@
 # charsets for western Europeans
 # us\-ascii, utf\-8 omitted, as they are tried first and last
 charsets = iso\-8859\-1, iso\-8859\-15, windows\-1252
-.ft P
+.ft
 .fi
 .SS \fBextensions\fP
 .sp
@@ -537,7 +462,7 @@
 Mercurial has an extension mechanism for adding new features. To
 enable an extension, create an entry for it in this section.
 .sp
-If you know that the extension is already in Python\(aqs search path,
+If you know that the extension is already in Python's search path,
 you can give the name of the module, followed by \fB=\fP, with nothing
 after the \fB=\fP.
 .sp
@@ -553,13 +478,13 @@
 Example for \fB~/.hgrc\fP:
 .sp
 .nf
-.ft C
+.ft
 [extensions]
-# (the mq extension will get loaded from Mercurial\(aqs path)
+# (the mq extension will get loaded from Mercurial's path)
 mq =
 # (this extension will get loaded from the file specified)
 myfeature = ~/.hgext/myfeature.py
-.ft P
+.ft
 .fi
 .SS \fBhostfingerprints\fP
 .sp
@@ -573,10 +498,10 @@
 For example:
 .sp
 .nf
-.ft C
+.ft
 [hostfingerprints]
 hg.intevation.org = 38:76:52:7c:87:26:9a:8f:4a:f8:d3:de:08:45:3b:ea:d6:4b:ee:cc
-.ft P
+.ft
 .fi
 .sp
 This feature is only supported when using Python 2.6 or later.
@@ -620,11 +545,11 @@
 Example:
 .sp
 .nf
-.ft C
+.ft
 [merge\-patterns]
 **.c = kdiff3
 **.jpg = myimgmerge
-.ft P
+.ft
 .fi
 .SS \fBmerge\-tools\fP
 .sp
@@ -634,7 +559,7 @@
 Example \fB~/.hgrc\fP:
 .sp
 .nf
-.ft C
+.ft
 [merge\-tools]
 # Override stock tool location
 kdiff3.executable = ~/bin/kdiff3
@@ -647,7 +572,7 @@
 myHtmlTool.args = \-m $local $other $base $output
 myHtmlTool.regkey = Software\eFooSoftware\eHtmlMerge
 myHtmlTool.priority = 1
-.ft P
+.ft
 .fi
 .sp
 Supported arguments:
@@ -660,8 +585,7 @@
 .TP
 .B \fBexecutable\fP
 .sp
-Either just the name of the executable or its pathname.  On Windows,
-the path can use environment variables with ${ProgramFiles} syntax.
+Either just the name of the executable or its pathname.
 Default: the tool name.
 .TP
 .B \fBargs\fP
@@ -724,32 +648,6 @@
 .B \fBgui\fP
 .sp
 This tool requires a graphical interface to run. Default: False
-.TP
-.B \fBregkey\fP
-.sp
-Windows registry key which describes install location of this
-tool. Mercurial will search for this key first under
-\fBHKEY_CURRENT_USER\fP and then under \fBHKEY_LOCAL_MACHINE\fP.
-Default: None
-.TP
-.B \fBregkeyalt\fP
-.sp
-An alternate Windows registry key to try if the first key is not
-found.  The alternate key uses the same \fBregname\fP and \fBregappend\fP
-semantics of the primary key.  The most common use for this key
-is to search for 32bit applications on 64bit operating systems.
-Default: None
-.TP
-.B \fBregname\fP
-.sp
-Name of value to read from specified registry key. Defaults to the
-unnamed (default) value.
-.TP
-.B \fBregappend\fP
-.sp
-String to append to the value read from the registry, typically
-the executable name of the tool.
-Default: None
 .UNINDENT
 .SS \fBhooks\fP
 .sp
@@ -762,7 +660,7 @@
 Example \fB.hg/hgrc\fP:
 .sp
 .nf
-.ft C
+.ft
 [hooks]
 # update working directory after adding changesets
 changegroup.update = hg update
@@ -770,7 +668,7 @@
 incoming =
 incoming.email = /my/email/hook
 incoming.autobuild = /my/build/hook
-.ft P
+.ft
 .fi
 .sp
 Most hooks are run with environment variables set that give useful
@@ -820,7 +718,7 @@
 representations of the data internally passed to <command>. \fB$HG_OPTS\fP
 is a  dictionary of options (with unspecified options set to their
 defaults). \fB$HG_PATS\fP is a list of arguments. If the hook returns
-failure, the command doesn\(aqt execute and Mercurial returns the failure
+failure, the command doesn't execute and Mercurial returns the failure
 code.
 .TP
 .B \fBprechangegroup\fP
@@ -902,21 +800,14 @@
 Also, hooks like "commit" will be called in all contexts that
 generate a commit (e.g. tag) and not just the commit command.
 .RE
-.IP Note
-.
-Environment variables with empty values may not be passed to
-hooks on platforms such as Windows. As an example, \fB$HG_PARENT2\fP
-will have an empty value under Unix\-like platforms for non\-merge
-changesets, while it will not be available at all under Windows.
-.RE
 .sp
 The syntax for Python hooks is as follows:
 .sp
 .nf
-.ft C
+.ft
 hookname = python:modulename.submodule.callable
 hookname = python:/path/to/python/module.py:callable
-.ft P
+.ft
 .fi
 .sp
 Python hooks are run within the Mercurial process. Each hook is
@@ -988,18 +879,18 @@
 .TP
 .B \fBlocal_hostname\fP
 .sp
-Optional. It\(aqs the hostname that the sender can use to identify
+Optional. It's the hostname that the sender can use to identify
 itself to the MTA.
 .UNINDENT
 .SS \fBpatch\fP
 .sp
-Settings used when applying patches, for instance through the \(aqimport\(aq
+Settings used when applying patches, for instance through the 'import'
 command or with Mercurial Queues extension.
 .INDENT 0.0
 .TP
 .B \fBeol\fP
 .sp
-When set to \(aqstrict\(aq patch content and patched files end of lines
+When set to 'strict' patch content and patched files end of lines
 are preserved. When set to \fBlf\fP or \fBcrlf\fP, both files end of
 lines are ignored when patching and the result line endings are
 normalized to either LF (Unix) or CRLF (Windows). When set to
@@ -1031,8 +922,8 @@
 .SS \fBprofiling\fP
 .sp
 Specifies profiling format and file output. In this section
-description, \(aqprofiling data\(aq stands for the raw data collected
-during profiling, while \(aqprofiling report\(aq stands for a statistical
+description, 'profiling data' stands for the raw data collected
+during profiling, while 'profiling report' stands for a statistical
 text report generated from the profiling data. The profiling is done
 using lsprof.
 .INDENT 0.0
@@ -1091,9 +982,9 @@
 Defines subrepositories source locations rewriting rules of the form:
 .sp
 .nf
-.ft C
+.ft
 <pattern> = <replacement>
-.ft P
+.ft
 .fi
 .sp
 Where \fBpattern\fP is a regular expression matching the source and
@@ -1102,9 +993,9 @@
 instance:
 .sp
 .nf
-.ft C
+.ft
 http://server/(.*)\-hg/ = http://hg.server/\e1/
-.ft P
+.ft
 .fi
 .sp
 rewrites \fBhttp://server/foo\-hg/\fP into \fBhttp://hg.server/foo/\fP.
@@ -1112,8 +1003,8 @@
 All patterns are applied in definition order.
 .SS \fBtrusted\fP
 .sp
-Mercurial will not use the settings in the
-\fB.hg/hgrc\fP file from a repository if it doesn\(aqt belong to a trusted
+Mercurial will not use the settings in the \fB.hg/hgrc\fP file from a
+repository if it doesn't belong to a trusted
 user or to a trusted group, as various hgrc features allow arbitrary
 commands to be run. This issue is often encountered when configuring
 hooks or extensions for shared repositories or servers. However,
@@ -1144,7 +1035,7 @@
 .sp
 Whether to include the .hg_archival.txt file containing meta data
 (hashes for the repository base and for tip) in archives created
-by the \%\fBhg archive\fP\: command or downloaded via hgweb.
+by the \fBhg archive\fP command or downloaded via hgweb.
 Default is True.
 .TP
 .B \fBaskusername\fP
@@ -1172,7 +1063,7 @@
 .TP
 .B \fBfallbackencoding\fP
 .sp
-Encoding to try if it\(aqs not possible to decode the changelog using
+Encoding to try if it's not possible to decode the changelog using
 UTF\-8. Default is ISO\-8859\-1.
 .TP
 .B \fBignore\fP
@@ -1182,7 +1073,7 @@
 option supports hook syntax, so if you want to specify multiple
 ignore files, you can do so by setting something like
 \fBignore.other = ~/.hgignore2\fP. For details of the ignore file
-format, see the \%\fBhgignore\fP(5)\: man page.
+format, see the \fBhgignore\fP(5) man page.
 .TP
 .B \fBinteractive\fP
 .sp
@@ -1195,8 +1086,8 @@
 .B \fBmerge\fP
 .sp
 The conflict resolution program to use during a manual merge.
-For more information on merge tools see \%\fBhg help merge\-tools\fP\:.
-For configuring merge tools see the \%merge\-tools\: section.
+For more information on merge tools see \fBhg help merge\-tools\fP.
+For configuring merge tools see the merge\-tools section.
 .TP
 .B \fBpatch\fP
 .sp
@@ -1252,7 +1143,7 @@
 .B \fBusername\fP
 .sp
 The committer of a changeset created when running "commit".
-Typically a person\(aqs name and email address, e.g. \fBFred Widget
+Typically a person's name and email address, e.g. \fBFred Widget
 <fred@example.com>\fP. Default is \fB$EMAIL\fP or \fBusername@hostname\fP. If
 the username in hgrc is empty, it has to be specified manually or
 in a different hgrc file (e.g. \fB$HOME/.hgrc\fP, if the admin set
@@ -1266,7 +1157,7 @@
 .SS \fBweb\fP
 .sp
 Web interface configuration. The settings in this section apply to
-both the builtin webserver (started by \%\fBhg serve\fP\:) and the script you
+both the builtin webserver (started by \fBhg serve\fP) and the script you
 run through a webserver (\fBhgweb.cgi\fP and the derivatives for FastCGI
 and WSGI).
 .sp
@@ -1282,9 +1173,9 @@
 command line:
 .sp
 .nf
-.ft C
+.ft
 $ hg \-\-config web.allow_push=* \-\-config web.push_ssl=False serve
-.ft P
+.ft
 .fi
 .sp
 Note that this will allow anybody to push anything to the server and
@@ -1363,7 +1254,7 @@
 with these certificates. The form must be as follows:
 .sp
 .nf
-.ft C
+.ft
 \-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-
 \&... (certificate in base64 PEM encoding) ...
 \-\-\-\-\-END CERTIFICATE\-\-\-\-\-
@@ -1370,7 +1261,7 @@
 \-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-
 \&... (certificate in base64 PEM encoding) ...
 \-\-\-\-\-END CERTIFICATE\-\-\-\-\-
-.ft P
+.ft
 .fi
 .sp
 This feature is only supported when using Python 2.6 or later. If you wish
@@ -1378,7 +1269,7 @@
 version of the ssl library that is available from
 \fBhttp://pypi.python.org\fP.
 .sp
-You can use OpenSSL\(aqs CA certificate file if your platform has one.
+You can use OpenSSL's CA certificate file if your platform has one.
 On most Linux systems this will be \fB/etc/ssl/certs/ca\-certificates.crt\fP.
 Otherwise you will have to generate this file manually.
 .sp
@@ -1422,7 +1313,7 @@
 .TP
 .B \fBdescription\fP
 .sp
-Textual description of the repository\(aqs purpose or contents.
+Textual description of the repository's purpose or contents.
 Default is "unknown".
 .TP
 .B \fBencoding\fP
@@ -1462,7 +1353,7 @@
 .TP
 .B \fBprefix\fP
 .sp
-Prefix path to serve from. Default is \(aq\(aq (server root).
+Prefix path to serve from. Default is '' (server root).
 .TP
 .B \fBpush_ssl\fP
 .sp
@@ -1491,15 +1382,15 @@
 .UNINDENT
 .SH AUTHOR
 .sp
-Bryan O\(aqSullivan <\%bos@serpentine.com\:>.
+Bryan O'Sullivan <bos@serpentine.com>.
 .sp
-Mercurial was written by Matt Mackall <\%mpm@selenic.com\:>.
+Mercurial was written by Matt Mackall <mpm@selenic.com>.
 .SH SEE ALSO
 .sp
-\%\fBhg\fP(1)\:, \%\fBhgignore\fP(5)\:
+\fBhg\fP(1), \fBhgignore\fP(5)
 .SH COPYING
 .sp
-This manual page is copyright 2005 Bryan O\(aqSullivan.
+This manual page is copyright 2005 Bryan O'Sullivan.
 Mercurial is copyright 2005\-2010 Matt Mackall.
 Free use of this software is granted under the terms of the GNU General
 Public License version 2 or any later version.