upstream/oracle/userland-gate: comparison components/mercurial/patches/manpages.patch

equal deleted inserted replaced

-:641ccaff7546
+:12d330c594ac
---- mercurial-2.8.2/doc/hg.1	Wed Jan  1 19:46:47 2014
+--- mercurial-3.2.3/doc/hg.1.orig	Thu Dec 18 12:59:32 2014
-+++ mercurial-2.8.2/doc/hg.1	Tue Jan  7 15:28:46 2014
++++ mercurial-3.2.3/doc/hg.1	Thu Dec 18 18:23:28 2014
 @@ -3,33 +3,6 @@
 .TH HG 1 "" "" "Mercurial Manual"
 .SH NAME
 hg \- Mercurial source code management system
 -.
 +.RE
 .SH OPTIONS
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-R,  \-\-repository
+.BI \-R,  \-\-repository \ <REPO>
 .
 @@ -85,7 +58,7 @@
 .TP
-.B \-\-config
+.BI \-\-config \ <CONFIG[+]>
 .
 -set/override config option (use \(aqsection.name=value\(aq)
 +set/override config option (use 'section.name=value')
 .TP
 .B \-\-debug
 .
-@@ -126,14 +99,14 @@
+@@ -126,7 +99,7 @@
 .B \-\-hidden
 .
 consider hidden changesets
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SH COMMANDS
-.SS add
+@@ -135,9 +108,9 @@
+add the specified files on the next commit:
 .sp
 .nf
 -.ft C
 +.ft
 hg add [OPTION]... [FILE]...
 -.ft P
 +.ft
 .fi
 .sp
 Schedule files to be version controlled and added to the
-@@ -140,15 +113,15 @@
+@@ -144,15 +117,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.
 -.ft C
 +.ft
 $ ls
 foo.c
 $ hg status
-@@ -157,13 +130,13 @@
+@@ -161,13 +134,13 @@
 adding foo.c
 $ hg status
 A foo.c
 -.ft P
 +.ft
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-I,  \-\-include
+.BI \-I,  \-\-include \ <PATTERN[+]>
 .
-@@ -180,13 +153,13 @@
+@@ -184,7 +157,7 @@
 .B \-n,  \-\-dry\-run
 .
 do not perform actions, just print output
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS addremove
+@@ -192,9 +165,9 @@
+add all new files, delete all missing files:
 .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
-@@ -193,7 +166,7 @@
+@@ -201,7 +174,7 @@
 repository.
 .sp
 New files are ignored if they match any of the patterns in
 -\fB.hgignore\fP. As with add, these changes take effect at the next
 +\fB\&.hgignore\fP. As with add, these changes take effect at the next
 commit.
 .sp
 Use the \-s/\-\-similarity option to detect renamed files. This
-@@ -201,7 +174,7 @@
+@@ -209,7 +182,7 @@
 be identical) as its parameter. With a parameter greater than 0,
 this compares every removed file with every added file and records
 those similar enough as renames. 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. If
 not specified, \-s/\-\-similarity defaults to 100 and only renames of
 identical files are detected.
-@@ -209,7 +182,7 @@
+@@ -217,7 +190,7 @@
 Returns 0 if all files are successfully added.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-s,  \-\-similarity
+.BI \-s,  \-\-similarity \ <SIMILARITY>
 .
-@@ -226,13 +199,13 @@
+@@ -234,7 +207,7 @@
 .B \-n,  \-\-dry\-run
 .
 do not perform actions, just print output
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS annotate
+@@ -242,9 +215,9 @@
+show changeset information by line for each file:
 .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
-@@ -249,7 +222,7 @@
+@@ -261,7 +234,7 @@
 Returns 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-r,  \-\-rev
+.BI \-r,  \-\-rev \ <REV>
 .
-@@ -261,7 +234,7 @@
+@@ -273,7 +246,7 @@
 .TP
 .B \-\-no\-follow
 .
 -don\(aqt follow copies and renames
 +don't follow copies and renames
 .TP
 .B \-a,  \-\-text
 .
-@@ -312,13 +285,13 @@
+@@ -326,23 +299,23 @@
-exclude names matching the given patterns
+.BI \-T,  \-\-template \ <TEMPLATE>
+.
+display with template (DEPRECATED)
+-.UNINDENT
++.RE
+.sp
+[+] marked option can be specified multiple times
+-.INDENT 0.0
+-.INDENT 3.5
++.RS 0
++.RS 3
 .sp
 aliases: blame
 -.UNINDENT
+-.UNINDENT
++.RE
 +.RE
 .SS archive
 .sp
+create an unversioned archive of a repository revision:
+.sp
 .nf
 -.ft C
 +.ft
 hg archive [OPTION]... DEST
 -.ft P
 +.ft
 .fi
 .sp
 By default, the revision used is the parent of the working
-@@ -328,15 +301,15 @@
+@@ -352,15 +325,15 @@
 extension (or override using \-t/\-\-type).
 .sp
 Examples:
 -.INDENT 0.0
 +.RS 0
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -343,14 +316,14 @@
+@@ -367,14 +340,14 @@
 create a tarball excluding .hg files:
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBfiles\fP
 .sp
-@@ -375,10 +348,10 @@
+@@ -399,10 +372,10 @@
 .B \fBzip\fP
 .sp
 zip archive, compressed using deflate
 -.UNINDENT
 +.RE
 -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
-@@ -388,7 +361,7 @@
+@@ -412,7 +385,7 @@
 Returns 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-\-no\-decode
 .
-@@ -417,13 +390,13 @@
+@@ -441,7 +414,7 @@
-.B \-X,  \-\-exclude
+.BI \-X,  \-\-exclude \ <PATTERN[+]>
 .
 exclude names matching the given patterns
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS backout
+@@ -449,9 +422,9 @@
+reverse effect of earlier changeset:
 .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
-@@ -444,16 +417,16 @@
+@@ -472,17 +445,17 @@
 working directory and a new child of REV that simply undoes REV.
 .sp
 Before version 1.7, the behavior without \-\-merge was equivalent
 -to specifying \-\-merge followed by \%\fBhg update \-\-clean .\fP\: to
 +to specifying \-\-merge followed by \fBhg update \-\-clean .\fP to
 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.
+Returns 0 on success, 1 if nothing to backout or there are unresolved
+files.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-\-merge
 .
-@@ -494,13 +467,13 @@
+@@ -527,7 +500,7 @@
-.B \-u,  \-\-user
+.BI \-u,  \-\-user \ <USER>
 .
 record the specified user as committer
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS bisect
+@@ -535,9 +508,9 @@
+subdivision search of changesets:
 .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
-@@ -524,16 +497,16 @@
+@@ -561,16 +534,16 @@
 is bad.
 .sp
 Some examples:
 -.INDENT 0.0
 +.RS 0
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -541,10 +514,10 @@
+@@ -578,10 +551,10 @@
 bad:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -552,10 +525,10 @@
+@@ -589,10 +562,10 @@
 that revision is not usable because of another issue):
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -562,9 +535,9 @@
+@@ -599,9 +572,9 @@
 skip all revisions that do not touch directories \fBfoo\fP or \fBbar\fP:
 .sp
 .nf
 -.ft C
 -hg bisect \-\-skip "!( file(\(aqpath:foo\(aq) & file(\(aqpath:bar\(aq) )"
 +hg bisect \-\-skip "!( file('path:foo') & file('path:bar') )"
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -571,22 +544,22 @@
+@@ -608,22 +581,22 @@
 forget the current bisection:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -594,9 +567,9 @@
+@@ -631,9 +604,9 @@
 bisection:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -604,9 +577,9 @@
+@@ -641,9 +614,9 @@
 if running with \-U/\-\-noupdate):
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -613,9 +586,9 @@
+@@ -650,9 +623,9 @@
 see all changesets that took part in the current bisection:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -622,18 +595,18 @@
+@@ -659,18 +632,18 @@
 you can even get a nice graph:
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-r,  \-\-reset
 .
-@@ -662,31 +635,31 @@
+@@ -699,15 +672,15 @@
 .B \-U,  \-\-noupdate
 .
 do not update to target
 -.UNINDENT
 +.RE
 .SS bookmarks
 .sp
+create a new bookmark or list existing bookmarks:
+.sp
 .nf
 -.ft C
 +.ft
 hg bookmarks [OPTIONS]... [NAME]...
 -.ft P
 +.ft
 .fi
 .sp
-Bookmarks are pointers to certain commits that move when committing.
+Bookmarks are labels on changesets to help track lines of development.
-Bookmarks are local. They can be renamed, copied and deleted. It is
+@@ -714,30 +687,30 @@
--possible to use \%\fBhg merge NAME\fP\: to merge from a given bookmark, and
+Bookmarks are unversioned and can be moved, renamed and deleted.
--\%\fBhg update NAME\fP\: to update to a given bookmark.
+Deleting or moving a bookmark has no effect on the associated changesets.
-+possible to use \fBhg merge NAME\fP to merge from a given bookmark, and
+.sp
-+\fBhg update NAME\fP to update to a given bookmark.
+-Creating or updating to a bookmark causes it to be marked as \(aqactive\(aq.
-.sp
+-The active bookmark is indicated with a \(aq*\(aq.
--You can use \%\fBhg bookmark NAME\fP\: to set a bookmark on the working
++Creating or updating to a bookmark causes it to be marked as 'active'.
--directory\(aqs parent revision with the given name. If you specify
++The active bookmark is indicated with a '*'.
-+You can use \fBhg bookmark NAME\fP to set a bookmark on the working
+When a commit is made, the active bookmark will advance to the new commit.
-+directory's parent revision with the given name. If you specify
+-A plain \%\fBhg update\fP\: will also advance an active bookmark, if possible.
-a revision using \-r REV (where REV may be an existing bookmark),
++A plain \fBhg update\fP will also advance an active bookmark, if possible.
-the bookmark is assigned to that revision.
+Updating away from a bookmark will cause it to be deactivated.
 .sp
--Bookmarks can be pushed and pulled between repositories (see \%\fBhg help
+Bookmarks can be pushed and pulled between repositories (see
--push\fP\: and \%\fBhg help pull\fP\:). This requires both the local and remote
+-\%\fBhg help push\fP\: and \%\fBhg help pull\fP\:). If a shared bookmark has
-+Bookmarks can be pushed and pulled between repositories (see \fBhg help
+-diverged, a new \(aqdivergent bookmark\(aq of the form \%\(aqname@path\:\(aq will
-+push\fP and \fBhg help pull\fP). This requires both the local and remote
+-be created. Using \%\fBhg merge\fP\: will resolve the divergence.
-repositories to support bookmarks. For versions prior to 1.8, this means
++\fBhg help push\fP and \fBhg help pull\fP). If a shared bookmark has
-the bookmarks extension must be enabled.
++diverged, a new 'divergent bookmark' of the form \&'name@path\&' will
-.sp
++be created. Using \fBhg merge\fP will resolve the divergence.
--If you set a bookmark called \(aq@\(aq, new clones of the repository will
+.sp
-+If you set a bookmark called '@', new clones of the repository will
+-A bookmark named \(aq@\(aq has the special property that \%\fBhg clone\fP\: will
-have that revision checked out (and the bookmark made active) by
++A bookmark named '@' has the special property that \fBhg clone\fP will
-default.
+check it out by default if it exists.
 .sp
-@@ -696,7 +669,7 @@
+Examples:
-current active bookmark will be marked inactive.
+-.INDENT 0.0
++.RS 0
+.IP \(bu 2
+.
+create an active bookmark for a new line of development:
+.sp
+.nf
+-.ft C
++.ft
+hg book new\-feature
+-.ft P
++.ft
+.fi
+.IP \(bu 2
+.
+@@ -744,9 +717,9 @@
+create an inactive bookmark as a place marker:
+.sp
+.nf
+-.ft C
++.ft
+hg book \-i reviewed
+-.ft P
++.ft
+.fi
+.IP \(bu 2
+.
+@@ -753,23 +726,23 @@
+create an inactive bookmark on another changeset:
+.sp
+.nf
+-.ft C
++.ft
+hg book \-r .^ tested
+-.ft P
++.ft
+.fi
+.IP \(bu 2
+.
+-move the \(aq@\(aq bookmark from another branch:
++move the '@' bookmark from another branch:
+.sp
+.nf
+-.ft C
++.ft
+hg book \-f @
+-.ft P
++.ft
+.fi
+-.UNINDENT
++.RE
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-f,  \-\-force
 .
-@@ -719,18 +692,18 @@
+@@ -796,20 +769,20 @@
-mark a bookmark inactive
+display with template (DEPRECATED)
 .sp
 aliases: bookmark
 -.UNINDENT
 +.RE
 .SS branch
+.sp
+set or show the current branch name:
 .sp
 .nf
 -.ft C
 +.ft
 hg branch [\-fC] [NAME]
 +Branch names are permanent and global. Use \fBhg bookmark\fP to create a
 +light\-weight bookmark instead. See \fBhg help glossary\fP for more
 information about named branches and bookmarks.
 .RE
 .sp
-@@ -737,23 +710,23 @@
+@@ -816,23 +789,23 @@
 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'
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-f,  \-\-force
 .
-@@ -762,28 +735,28 @@
+@@ -841,30 +814,30 @@
 .B \-C,  \-\-clean
 .
 reset branch name to parent branch name
 -.UNINDENT
 +.RE
 .SS branches
+.sp
+list repository named branches:
 .sp
 .nf
 -.ft C
 +.ft
 hg branches [\-ac]
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-a,  \-\-active
 .
-@@ -792,13 +765,13 @@
+@@ -877,15 +850,15 @@
-.B \-c,  \-\-closed
+.BI \-T,  \-\-template \ <TEMPLATE>
 .
-show normal and closed branches
+display with template (DEPRECATED)
 -.UNINDENT
 +.RE
 .SS bundle
 .sp
+create a changegroup file:
+.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
-@@ -824,7 +797,7 @@
+@@ -911,7 +884,7 @@
 Returns 0 on success, 1 if no changes found.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-f,  \-\-force
 .
-@@ -861,13 +834,13 @@
+@@ -948,7 +921,7 @@
 .B \-\-insecure
 .
 do not verify server certificate (ignoring web.cacerts config)
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS cat
+@@ -956,9 +929,9 @@
+output the current or given revision of files:
 .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
-@@ -876,7 +849,7 @@
+@@ -966,7 +939,7 @@
+.sp
 Output may be to a file, in which case the name of the file is
-given using a format string. The formatting rules are the same as
+given using a format string. The formatting rules as follows:
-for the export command, with the following additions:
+-.INDENT 0.0
--.INDENT 0.0
++.RS 0
-+.RS 0
+.TP
-.TP
+.B \fB%%\fP
-.B \fB%s\fP
+.sp
-.sp
+@@ -978,7 +951,7 @@
-@@ -884,17 +857,17 @@
 .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
-root\-relative path name of file being printed
+@@ -1003,12 +976,12 @@
+.B \fB%b\fP
+.sp
+basename of the exporting repository
 -.UNINDENT
 +.RE
 .sp
 Returns 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-o,  \-\-output
+.BI \-o,  \-\-output \ <FORMAT>
 .
-@@ -915,13 +888,13 @@
+@@ -1029,7 +1002,7 @@
-.B \-X,  \-\-exclude
+.BI \-X,  \-\-exclude \ <PATTERN[+]>
 .
 exclude names matching the given patterns
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS clone
+@@ -1037,9 +1010,9 @@
+make a copy of an existing repository:
 .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.
-@@ -929,22 +902,22 @@
+@@ -1047,22 +1020,22 @@
 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
 -\fB.hg/hgrc\fP file, as the default to be used for future pulls.
 -If the source repository has a bookmark called \(aq@\(aq set, that
 +If the source repository has a bookmark called '@' set, that
 revision will be checked out in the new repository by default.
 .sp
 To check out a particular version, use \-u/\-\-update, or
-@@ -961,9 +934,9 @@
+@@ -1079,9 +1052,9 @@
 directory using full hardlinks with
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 This is the fastest way to clone, but it is not always safe. The
-@@ -975,7 +948,7 @@
+@@ -1093,7 +1066,7 @@
 .sp
 Mercurial will update the working directory to the first applicable
 revision from this list:
 -.INDENT 0.0
 +.RS 0
 .IP a. 3
 .
 null if \-U or the source repository has no changesets
-@@ -982,7 +955,7 @@
+@@ -1100,7 +1073,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
-@@ -998,7 +971,7 @@
+@@ -1116,7 +1089,7 @@
 the tipmost head specified with the url#branch source syntax
 .IP g. 3
 .
 -the revision marked with the \(aq@\(aq bookmark, if present
 +the revision marked with the '@' bookmark, if present
 .IP h. 3
 .
 the tipmost head of the default branch
-@@ -1005,18 +978,18 @@
+@@ -1123,18 +1096,18 @@
 .IP i. 3
 .
 tip
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -1023,9 +996,9 @@
+@@ -1141,9 +1114,9 @@
 create a lightweight local clone:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -1032,9 +1005,9 @@
+@@ -1150,9 +1123,9 @@
 clone from an absolute path on an ssh server (note double\-slash):
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -1042,9 +1015,9 @@
+@@ -1160,9 +1133,9 @@
 specified version:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -1051,9 +1024,9 @@
+@@ -1169,9 +1142,9 @@
 create a repository without changesets after a particular revision:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -1060,18 +1033,18 @@
+@@ -1178,18 +1151,18 @@
 clone (and track) a particular named branch:
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-U,  \-\-noupdate
 .
-@@ -1108,20 +1081,20 @@
+@@ -1226,7 +1199,7 @@
 .B \-\-insecure
 .
 do not verify server certificate (ignoring web.cacerts config)
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS commit
+@@ -1234,16 +1207,16 @@
+commit the specified files or all outstanding changes:
 .sp
 .nf
 -.ft C
 +.ft
 hg commit [OPTION]... [FILE]...
 -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
-@@ -1130,28 +1103,28 @@
+@@ -1252,28 +1225,28 @@
 If no commit message is specified, Mercurial starts your
 configured editor where you can enter a message. In case your
 commit fails, you will find a backup of your message in
 -\fB.hg/last\-message.txt\fP.
 +\fB\&.hg/last\-message.txt\fP.
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-A,  \-\-addremove
 .
-@@ -1198,13 +1171,13 @@
+@@ -1322,23 +1295,23 @@
+.B \-S,  \-\-subrepos
+.
 recurse into subrepositories
+-.UNINDENT
++.RE
+.sp
+[+] marked option can be specified multiple times
+-.INDENT 0.0
+-.INDENT 3.5
++.RS 0
++.RS 3
 .sp
 aliases: ci
 -.UNINDENT
+-.UNINDENT
++.RE
++.RE
+.SS config
+.sp
+show combined config settings from all hgrc files:
+.sp
+.nf
+-.ft C
++.ft
+hg config [\-u] [NAME]...
+-.ft P
++.ft
+.fi
+.sp
+With no arguments, print names and values of all config items.
+@@ -1356,12 +1329,12 @@
+With \-\-debug, the source (filename and line number) is printed
+for each config item.
+.sp
+-See \%\fBhg help config\fP\: for more information about config files.
++See \fBhg help config\fP for more information about config files.
+.sp
+Returns 0 on success, 1 if NAME does not exist.
+.sp
+Options:
+-.INDENT 0.0
++.RS 0
+.TP
+.B \-u,  \-\-untrusted
+.
+@@ -1380,15 +1353,15 @@
+edit global config
+.sp
+aliases: showconfig debugconfig
+-.UNINDENT
 +.RE
 .SS copy
 .sp
+mark files as copied for the next commit:
+.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
-@@ -1216,12 +1189,12 @@
+@@ -1400,12 +1373,12 @@
 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.
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-A,  \-\-after
 .
-@@ -1244,13 +1217,13 @@
+@@ -1426,23 +1399,23 @@
+.B \-n,  \-\-dry\-run
+.
 do not perform actions, just print output
+-.UNINDENT
++.RE
+.sp
+[+] marked option can be specified multiple times
+-.INDENT 0.0
+-.INDENT 3.5
++.RS 0
++.RS 3
 .sp
 aliases: cp
 -.UNINDENT
+-.UNINDENT
++.RE
 +.RE
 .SS diff
 .sp
+diff repository (or selected files):
+.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.
-@@ -1259,7 +1232,7 @@
+@@ -1451,7 +1424,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
-@@ -1277,18 +1250,18 @@
+@@ -1469,18 +1442,18 @@
 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.
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -1295,9 +1268,9 @@
+@@ -1487,9 +1460,9 @@
 compare two historical versions of a directory, with rename info:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -1304,9 +1277,9 @@
+@@ -1496,9 +1469,9 @@
 get change stats relative to the last change on some date:
 .sp
 .nf
 -.ft C
 -hg diff \-\-stat \-r "date(\(aqmay 2\(aq)"
 +hg diff \-\-stat \-r "date('may 2')"
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -1313,9 +1286,9 @@
+@@ -1505,9 +1478,9 @@
 diff all newly\-added files that contain a keyword:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -1322,18 +1295,18 @@
+@@ -1514,18 +1487,18 @@
 compare a revision and its parents:
 .sp
 .nf
 -.ft C
 +.ft
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-r,  \-\-rev
+.BI \-r,  \-\-rev \ <REV[+]>
 .
-@@ -1394,13 +1367,13 @@
+@@ -1586,7 +1559,7 @@
 .B \-S,  \-\-subrepos
 .
 recurse into subrepositories
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS export
+@@ -1594,9 +1567,9 @@
+dump the header and diffs for one or more changesets:
 .sp
 .nf
 -.ft C
 +.ft
 hg export [OPTION]... [\-o OUTFILESPEC] [\-r] [REV]...
 -.ft P
 +.ft
 .fi
 .sp
 Print the changeset header and diffs for one or more revisions.
-@@ -1418,7 +1391,7 @@
+@@ -1614,7 +1587,7 @@
 .sp
 Output may be to a file, in which case the name of the file is
 given using a format string. The formatting rules are as follows:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fB%%\fP
 .sp
-@@ -1455,7 +1428,7 @@
+@@ -1651,7 +1624,7 @@
 .B \fB%r\fP
 .sp
 zero\-padded changeset revision number
 -.UNINDENT
 +.RE
 .sp
 Without the \-a/\-\-text option, export will avoid generating diffs
 of files it detects as binary. With \-a, export will generate a
-@@ -1462,13 +1435,13 @@
+@@ -1658,13 +1631,13 @@
 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.
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 .
 use export and import to transplant a bugfix to the current
-@@ -1475,9 +1448,9 @@
+@@ -1671,9 +1644,9 @@
 branch:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -1485,9 +1458,9 @@
+@@ -1681,9 +1654,9 @@
 rename information:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -1495,16 +1468,16 @@
+@@ -1691,16 +1664,16 @@
 descriptive names:
 .sp
 .nf
 -.ft C
 +.ft
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-o,  \-\-output
+.BI \-o,  \-\-output \ <FORMAT>
 .
-@@ -1529,13 +1502,13 @@
+@@ -1725,7 +1698,7 @@
 .B \-\-nodates
 .
 omit dates from diff headers
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
+.SS files
+@@ -1733,9 +1706,9 @@
+list tracked files:
+.sp
+.nf
+-.ft C
++.ft
+hg files [OPTION]... [PATTERN]...
+-.ft P
++.ft
+.fi
+.sp
+Print files under Mercurial control in the working directory or
+@@ -1746,15 +1719,15 @@
+of all files under Mercurial control in the working copy.
+.sp
+Examples:
+-.INDENT 0.0
++.RS 0
+.IP \(bu 2
+.
+list all files under the current directory:
+.sp
+.nf
+-.ft C
++.ft
+hg files .
+-.ft P
++.ft
+.fi
+.IP \(bu 2
+.
+@@ -1761,9 +1734,9 @@
+shows sizes and flags for current revision:
+.sp
+.nf
+-.ft C
++.ft
+hg files \-vr .
+-.ft P
++.ft
+.fi
+.IP \(bu 2
+.
+@@ -1770,9 +1743,9 @@
+list all files named README:
+.sp
+.nf
+-.ft C
++.ft
+hg files \-I "**/README"
+-.ft P
++.ft
+.fi
+.IP \(bu 2
+.
+@@ -1779,9 +1752,9 @@
+list all binary files:
+.sp
+.nf
+-.ft C
++.ft
+hg files "set:binary()"
+-.ft P
++.ft
+.fi
+.IP \(bu 2
+.
+@@ -1788,9 +1761,9 @@
+find files containing a regular expression:
+.sp
+.nf
+-.ft C
+-hg files "set:grep(\(aqbob\(aq)"
+-.ft P
++.ft
++hg files "set:grep('bob')"
++.ft
+.fi
+.IP \(bu 2
+.
+@@ -1797,19 +1770,19 @@
+search tracked file contents with xargs and grep:
+.sp
+.nf
+-.ft C
++.ft
+hg files \-0 | xargs \-0 grep foo
+-.ft P
++.ft
+.fi
+-.UNINDENT
++.RE
+.sp
+-See \%\fBhg help patterns\fP\: and \%\fBhg help filesets\fP\: for more information
++See \fBhg help patterns\fP and \fBhg help filesets\fP for more information
+on specifying file patterns.
+.sp
+Returns 0 if a match is found, 1 otherwise.
+.sp
+Options:
+-.INDENT 0.0
++.RS 0
+.TP
+.BI \-r,  \-\-rev \ <REV>
+.
+@@ -1830,7 +1803,7 @@
+.BI \-T,  \-\-template \ <TEMPLATE>
+.
+display with template (DEPRECATED)
+-.UNINDENT
++.RE
+.sp
+[+] marked option can be specified multiple times
 .SS forget
+@@ -1838,9 +1811,9 @@
+forget the specified files on the next commit:
 .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
-@@ -1545,18 +1518,18 @@
+@@ -1850,18 +1823,18 @@
 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.
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -1563,16 +1536,16 @@
+@@ -1868,16 +1841,16 @@
 forget files that would be excluded by .hgignore:
 .sp
 .nf
 -.ft C
 +.ft
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-I,  \-\-include
+.BI \-I,  \-\-include \ <PATTERN[+]>
 .
-@@ -1581,19 +1554,19 @@
+@@ -1886,7 +1859,7 @@
-.B \-X,  \-\-exclude
+.BI \-X,  \-\-exclude \ <PATTERN[+]>
 .
 exclude names matching the given patterns
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS graft
+@@ -1894,15 +1867,15 @@
+copy changes from other branches onto the current branch:
 .sp
 .nf
 -.ft C
 +.ft
 hg graft [OPTION]... [\-r] REV...
 +history graph. This is sometimes known as 'backporting' or
 +\&'cherry\-picking'. By default, graft will copy user, date, and
 description from the source changesets.
 .sp
 Changesets that are ancestors of the current revision, that have
-@@ -1603,9 +1576,9 @@
+@@ -1912,9 +1885,9 @@
 of the form:
 .sp
 .nf
 -.ft C
 +.ft
 (grafted from CHANGESETHASH)
 -.ft P
 +.ft
 .fi
 .sp
-If a graft merge results in conflicts, the graft process is
+If \-\-force is specified, revisions will be grafted even if they
-@@ -1618,16 +1591,16 @@
+@@ -1932,16 +1905,16 @@
 .RE
 .sp
 Examples:
 -.INDENT 0.0
 +.RS 0
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -1634,9 +1607,9 @@
+@@ -1948,9 +1921,9 @@
 graft a range of changesets with one exception, updating dates:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -1643,9 +1616,9 @@
+@@ -1957,9 +1930,9 @@
 continue a graft after resolving conflicts:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -1652,16 +1625,16 @@
+@@ -1966,19 +1939,19 @@
 show the source of a grafted changeset:
 .sp
 .nf
 -.ft C
 +.ft
 +.ft
 .fi
 -.UNINDENT
 +.RE
 .sp
+-See \%\fBhg help revisions\fP\: and \%\fBhg help revsets\fP\: for more about
++See \fBhg help revisions\fP and \fBhg help revsets\fP for more about
+specifying revisions.
+.sp
 Returns 0 on successful completion.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-r,  \-\-rev
+.BI \-r,  \-\-rev \ <REV[+]>
 .
-@@ -1702,13 +1675,13 @@
+@@ -2023,7 +1996,7 @@
 .B \-n,  \-\-dry\-run
 .
 do not perform actions, just print output
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS grep
+@@ -2031,9 +2004,9 @@
+search for a pattern in specified files and revisions:
 .sp
 .nf
 -.ft C
 +.ft
 hg grep [OPTION]... PATTERN [FILE]...
 -.ft P
 +.ft
 .fi
 .sp
 Search revisions of files for a regular expression.
-@@ -1727,7 +1700,7 @@
+@@ -2052,7 +2025,7 @@
 Returns 0 if a match is found, 1 otherwise.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-0,  \-\-print0
 .
-@@ -1776,13 +1749,13 @@
+@@ -2101,7 +2074,7 @@
-.B \-X,  \-\-exclude
+.BI \-X,  \-\-exclude \ <PATTERN[+]>
 .
 exclude names matching the given patterns
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS heads
+@@ -2109,9 +2082,9 @@
+show branch heads:
 .sp
 .nf
 -.ft C
 +.ft
 hg heads [\-ct] [\-r STARTREV] [REV]...
 -.ft P
 +.ft
 .fi
 .sp
 With no arguments, show all open branch heads in the repository.
-@@ -1792,11 +1765,11 @@
+@@ -2121,11 +2094,11 @@
 .sp
 If one or more REVs are given, only open branch heads on the
 branches associated with the specified changesets are shown. This
 -means that you can use \%\fBhg heads .\fP\: to see the heads on the
 +means that you can use \fBhg heads .\fP to see the heads on the
 -(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.
-@@ -1807,7 +1780,7 @@
+@@ -2136,7 +2109,7 @@
 Returns 0 if matching heads are found, 1 if not.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-r,  \-\-rev
+.BI \-r,  \-\-rev \ <STARTREV>
 .
-@@ -1832,13 +1805,13 @@
+@@ -2161,15 +2134,15 @@
-.B \-\-template
+.BI \-T,  \-\-template \ <TEMPLATE>
 .
 display with template
 -.UNINDENT
 +.RE
 .SS help
 .sp
+show help for a given topic or a help overview:
+.sp
 .nf
 -.ft C
 +.ft
 hg help [\-ec] [TOPIC]
 -.ft P
 +.ft
 .fi
 .sp
 With no arguments, print a list of commands with short help messages.
-@@ -1849,7 +1822,7 @@
+@@ -2180,7 +2153,7 @@
 Returns 0 if successful.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-e,  \-\-extension
 .
-@@ -1862,13 +1835,13 @@
+@@ -2193,15 +2166,15 @@
-.B \-k,  \-\-keyword
+.BI \-k,  \-\-keyword \ <VALUE>
 .
 show topics matching keyword
 -.UNINDENT
 +.RE
 .SS identify
 .sp
+identify the working copy or specified revision:
+.sp
 .nf
 -.ft C
 +.ft
 hg identify [\-nibtB] [\-r REV] [SOURCE]
 -.ft P
 +.ft
 .fi
 .sp
 Print a summary identifying the repository state at REV using one or
-@@ -1883,15 +1856,15 @@
+@@ -2216,15 +2189,15 @@
 cause lookup to operate on that repository/bundle.
 .sp
 Examples:
 -.INDENT 0.0
 +.RS 0
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -1898,9 +1871,9 @@
+@@ -2231,9 +2204,9 @@
 find the revision corresponding to a tag:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -1907,16 +1880,16 @@
+@@ -2240,16 +2213,16 @@
 check the most recent revision of a remote repository:
 .sp
 .nf
 -.ft C
 +.ft
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-r,  \-\-rev
+.BI \-r,  \-\-rev \ <REV>
 .
-@@ -1955,13 +1928,13 @@
+@@ -2288,15 +2261,15 @@
 do not verify server certificate (ignoring web.cacerts config)
 .sp
 aliases: id
 -.UNINDENT
 +.RE
 .SS import
 .sp
+import an ordered set of patches:
+.sp
 .nf
 -.ft C
 +.ft
 hg import [OPTION]... PATCH...
 -.ft P
 +.ft
 .fi
 .sp
 Import a list of patches and commit them individually (unless
-@@ -1977,7 +1950,7 @@
+@@ -2312,7 +2285,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.
-@@ -1994,22 +1967,22 @@
+@@ -2329,32 +2302,32 @@
 revision.
 .sp
 With \-s/\-\-similarity, hg will attempt to discover renames and
 -copies in the patch in the same way as \%\fBhg addremove\fP\:.
 +copies in the patch in the same way as \fBhg addremove\fP.
+.sp
+Use \-\-partial to ensure a changeset will be created from the patch
+even if some hunks fail to apply. Hunks that fail to apply will be
+written to a <target\-file>.rej file. Conflicts can then be resolved
+-by hand before \%\fBhg commit \-\-amend\fP\: is run to update the created
++by hand before \fBhg commit \-\-amend\fP is run to update the created
+changeset. This flag exists to let people import patches that
+partially apply without losing the associated metadata (author,
+date, description, ...). Note that when none of the hunk applies
+-cleanly, \%\fBhg import \-\-partial\fP\: will create an empty changeset,
++cleanly, \fBhg import \-\-partial\fP will create an empty changeset,
+importing only the patch metadata.
 .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.
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -2016,9 +1989,9 @@
+@@ -2361,9 +2334,9 @@
 import a changeset from an hgweb server:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -2025,9 +1998,9 @@
+@@ -2370,9 +2343,9 @@
 import all the patches in an Unix\-style mbox:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -2035,16 +2008,16 @@
+@@ -2380,16 +2353,16 @@
 possible):
 .sp
 .nf
 -.ft C
 +.ft
 +.ft
 .fi
 -.UNINDENT
 +.RE
 .sp
-Returns 0 on success.
+Returns 0 on success, 1 on partial success (see \-\-partial).
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-p,  \-\-strip
+.BI \-p,  \-\-strip \ <NUM>
 .
-@@ -2064,7 +2037,7 @@
+@@ -2409,7 +2382,7 @@
 .TP
 .B \-\-no\-commit
 .
 -don\(aqt commit, just update the working directory
 +don't commit, just update the working directory
 .TP
 .B \-\-bypass
 .
-@@ -2099,13 +2072,13 @@
+@@ -2448,15 +2421,15 @@
 guess renamed files by similarity (0<=s<=100)
 .sp
 aliases: patch
 -.UNINDENT
 +.RE
 .SS incoming
 .sp
+show new changesets found in source:
+.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
-@@ -2120,7 +2093,7 @@
+@@ -2469,15 +2442,15 @@
+See pull for valid source format details.
+.sp
+Examples:
+-.INDENT 0.0
++.RS 0
+.IP \(bu 2
+.
+show incoming changes with patches and full description:
+.sp
+.nf
+-.ft C
++.ft
+hg incoming \-vp
+-.ft P
++.ft
+.fi
+.IP \(bu 2
+.
+@@ -2484,10 +2457,10 @@
+show incoming changes excluding merges, store a bundle:
+.sp
+.nf
+-.ft C
++.ft
+hg in \-vpM \-\-bundle incoming.hg
+hg pull incoming.hg
+-.ft P
++.ft
+.fi
+.IP \(bu 2
+.
+@@ -2494,16 +2467,16 @@
+briefly list changes inside a bundle:
+.sp
+.nf
+-.ft C
++.ft
+hg in changes.hg \-T "{desc|firstline}\en"
+-.ft P
++.ft
+.fi
+-.UNINDENT
++.RE
+.sp
 Returns 0 if there are incoming changes, 1 otherwise.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-f,  \-\-force
 .
-@@ -2195,13 +2168,13 @@
+@@ -2576,23 +2549,23 @@
+.B \-S,  \-\-subrepos
+.
 recurse into subrepositories
+-.UNINDENT
++.RE
+.sp
+[+] marked option can be specified multiple times
+-.INDENT 0.0
+-.INDENT 3.5
++.RS 0
++.RS 3
 .sp
 aliases: in
 -.UNINDENT
+-.UNINDENT
++.RE
 +.RE
 .SS init
 .sp
+create a new repository in the given directory:
+.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
-@@ -2210,12 +2183,12 @@
+@@ -2601,12 +2574,12 @@
 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
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-e,  \-\-ssh
+.BI \-e,  \-\-ssh \ <CMD>
 .
-@@ -2228,13 +2201,13 @@
+@@ -2619,15 +2592,15 @@
 .B \-\-insecure
 .
 do not verify server certificate (ignoring web.cacerts config)
 -.UNINDENT
 +.RE
 .SS locate
 .sp
+locate files matching specific patterns (DEPRECATED):
+.sp
 .nf
 -.ft C
 +.ft
 hg locate [OPTION]... [PATTERN]...
 -.ft P
 +.ft
 .fi
 .sp
 Print files under Mercurial control in the working directory whose
-@@ -2255,7 +2228,7 @@
+@@ -2645,12 +2618,12 @@
+will avoid the problem of "xargs" treating single filenames that
+contain whitespace as multiple filenames.
+.sp
+-See \%\fBhg help files\fP\: for a more versatile command.
++See \fBhg help files\fP for a more versatile command.
+.sp
 Returns 0 if a match is found, 1 otherwise.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-r,  \-\-rev
+.BI \-r,  \-\-rev \ <REV>
 .
-@@ -2276,13 +2249,13 @@
+@@ -2671,7 +2644,7 @@
-.B \-X,  \-\-exclude
+.BI \-X,  \-\-exclude \ <PATTERN[+]>
 .
 exclude names matching the given patterns
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS log
+@@ -2679,9 +2652,9 @@
+show revision history of entire repository or files:
 .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
-@@ -2317,15 +2290,15 @@
+@@ -2703,9 +2676,9 @@
+.sp
+With \-\-graph the revisions are shown as an ASCII art DAG with the most
+recent changeset at the top.
+-\(aqo\(aq is a changeset, \(aq@\(aq is a working directory parent, \(aqx\(aq is obsolete,
+-and \(aq+\(aq represents a fork where the changeset from the lines below is a
+-parent of the \(aqo\(aq merge on the same line.
++\&'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
++and '+' represents a fork where the changeset from the lines below is a
++parent of the 'o' merge on the same line.
+.IP Note
+.
+log \-p/\-\-patch may generate unexpected diff output for merge
+@@ -2721,15 +2694,15 @@
 .RE
 .sp
 Some examples:
 -.INDENT 0.0
 +.RS 0
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -2332,9 +2305,9 @@
+@@ -2736,9 +2709,9 @@
 changesets ancestral to the working directory:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -2341,9 +2314,9 @@
+@@ -2745,9 +2718,9 @@
 last 10 commits on the current branch:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -2350,9 +2323,9 @@
+@@ -2754,9 +2727,9 @@
 changesets showing all modifications of a file, including removals:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -2359,9 +2332,9 @@
+@@ -2763,9 +2736,9 @@
 all changesets that touch a directory, with diffs, excluding merges:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -2368,9 +2341,9 @@
+@@ -2772,9 +2745,9 @@
 all revision numbers that match a keyword:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -2377,9 +2350,9 @@
+@@ -2781,9 +2754,9 @@
-check if a given changeset is included is a tagged release:
+list available log templates:
+.sp
+.nf
+-.ft C
++.ft
+hg log \-T list
+-.ft P
++.ft
+.fi
+.IP \(bu 2
+.
+@@ -2790,9 +2763,9 @@
+check if a given changeset is included in a tagged release:
 .sp
 .nf
 -.ft C
 +.ft
 hg log \-r "a21ccf and ancestor(1.9)"
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -2386,9 +2359,9 @@
+@@ -2799,9 +2772,9 @@
 find all changesets by some user in a date range:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -2395,24 +2368,24 @@
+@@ -2808,24 +2781,24 @@
 summary of all changesets after the last tag:
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-f,  \-\-follow
 .
-@@ -2503,13 +2476,13 @@
+@@ -2914,23 +2887,23 @@
+.BI \-X,  \-\-exclude \ <PATTERN[+]>
+.
 exclude names matching the given patterns
+-.UNINDENT
++.RE
+.sp
+[+] marked option can be specified multiple times
+-.INDENT 0.0
+-.INDENT 3.5
++.RS 0
++.RS 3
 .sp
 aliases: history
 -.UNINDENT
+-.UNINDENT
++.RE
 +.RE
 .SS manifest
 .sp
+output the current or given revision of the project 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.
-@@ -2525,7 +2498,7 @@
+@@ -2946,7 +2919,7 @@
 Returns 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-r,  \-\-rev
+.BI \-r,  \-\-rev \ <REV>
 .
-@@ -2534,13 +2507,13 @@
+@@ -2959,15 +2932,15 @@
-.B \-\-all
+.BI \-T,  \-\-template \ <TEMPLATE>
 .
-list files from all revisions
+display with template (DEPRECATED)
 -.UNINDENT
 +.RE
 .SS merge
 .sp
+merge another revision into working directory:
+.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
-@@ -2553,16 +2526,16 @@
+@@ -2980,16 +2953,16 @@
 .sp
 \fB\-\-tool\fP can be used to specify the merge tool used for file
 merges. It overrides the HGMERGE environment variable and your
 -configuration files. See \%\fBhg help merge\-tools\fP\: for options.
 +configuration files. See \fBhg help merge\-tools\fP for options.
 -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
-@@ -2569,7 +2542,7 @@
+@@ -2996,7 +2969,7 @@
 Returns 0 on success, 1 if there are unresolved files.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-f,  \-\-force
 .
-@@ -2586,13 +2559,13 @@
+@@ -3013,15 +2986,15 @@
-.B \-t,  \-\-tool
+.BI \-t,  \-\-tool \ <VALUE>
 .
 specify merge tool
 -.UNINDENT
 +.RE
 .SS outgoing
 .sp
+show changesets not found in the destination:
+.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
-@@ -2604,7 +2577,7 @@
+@@ -3033,7 +3006,7 @@
 Returns 0 if there are outgoing changes, 1 otherwise.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-f,  \-\-force
 .
-@@ -2675,16 +2648,16 @@
+@@ -3102,37 +3075,37 @@
+.B \-S,  \-\-subrepos
+.
 recurse into subrepositories
+-.UNINDENT
++.RE
+.sp
+[+] marked option can be specified multiple times
+-.INDENT 0.0
+-.INDENT 3.5
++.RS 0
++.RS 3
 .sp
 aliases: out
 -.UNINDENT
+-.UNINDENT
++.RE
 +.RE
 .SS parents
+.sp
+show the parents of the working directory or revision (DEPRECATED):
 .sp
 .nf
 -.ft C
 +.ft
 hg parents [\-r REV] [FILE]
 -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
-@@ -2693,7 +2666,7 @@
+argument to \-\-rev if given) is printed.
+.sp
+-See \%\fBhg summary\fP\: and \%\fBhg help revsets\fP\: for related information.
++See \fBhg summary\fP and \fBhg help revsets\fP for related information.
+.sp
 Returns 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-r,  \-\-rev
+.BI \-r,  \-\-rev \ <REV>
 .
-@@ -2706,13 +2679,13 @@
+@@ -3145,15 +3118,15 @@
-.B \-\-template
+.BI \-T,  \-\-template \ <TEMPLATE>
 .
 display with template
 -.UNINDENT
 +.RE
 .SS paths
 .sp
+show aliases for remote repositories:
+.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,
-@@ -2733,18 +2706,18 @@
+@@ -3174,10 +3147,10 @@
 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.
 -See \%\fBhg help urls\fP\: for more information.
 +See \fBhg help urls\fP for more information.
 .sp
 Returns 0 on success.
 .SS phase
+@@ -3185,9 +3158,9 @@
+set or show the current phase name:
 .sp
 .nf
 -.ft C
 +.ft
 hg phase [\-p|\-d|\-s] [\-f] [\-r] REV...
 -.ft P
 +.ft
 .fi
 .sp
 With no argument, show the phase name of specified revisions.
-@@ -2752,13 +2725,13 @@
+@@ -3195,13 +3168,13 @@
 With one of \-p/\-\-public, \-d/\-\-draft or \-s/\-\-secret, change the
 phase value of the specified revisions.
 .sp
 -Unless \-f/\-\-force is specified, \%\fBhg phase\fP\: won\(aqt move changeset from a
 +Unless \-f/\-\-force is specified, \fBhg phase\fP won't move changeset from a
 public < draft < secret
 -.ft P
 +.ft
 .fi
 .sp
-Return 0 on success, 1 if no phases were changed or some could not
+Returns 0 on success, 1 if no phases were changed or some could not
-@@ -2765,7 +2738,7 @@
+@@ -3208,7 +3181,7 @@
 be changed.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-p,  \-\-public
 .
-@@ -2786,13 +2759,13 @@
+@@ -3229,7 +3202,7 @@
-.B \-r,  \-\-rev
+.BI \-r,  \-\-rev \ <REV[+]>
 .
 target revision
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS pull
+@@ -3237,9 +3210,9 @@
+pull changes from the specified source:
 .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.
-@@ -2802,18 +2775,18 @@
+@@ -3249,18 +3222,18 @@
 \-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
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-u,  \-\-update
 .
-@@ -2846,13 +2819,13 @@
+@@ -3293,7 +3266,7 @@
 .B \-\-insecure
 .
 do not verify server certificate (ignoring web.cacerts config)
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS push
+@@ -3301,9 +3274,9 @@
+push changes to the specified destination:
 .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
-@@ -2883,13 +2856,13 @@
+@@ -3334,13 +3307,13 @@
 ancestors, and the bookmark 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
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-f,  \-\-force
 .
-@@ -2922,13 +2895,13 @@
+@@ -3373,7 +3346,7 @@
 .B \-\-insecure
 .
 do not verify server certificate (ignoring web.cacerts config)
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS recover
+@@ -3381,9 +3354,9 @@
+roll back an interrupted transaction:
 .sp
 .nf
 -.ft C
 +.ft
 hg recover
 -.ft P
 +.ft
 .fi
 .sp
 Recover from an interrupted commit or pull.
-@@ -2941,16 +2914,16 @@
+@@ -3398,16 +3371,16 @@
-.SS remove
+remove the specified files on the next commit:
 .sp
 .nf
 -.ft C
 +.ft
 hg remove [OPTION]... FILE...
 +To undo a remove before that, see \fBhg revert\fP. To undo added
 +files, see \fBhg forget\fP.
 .sp
 \-A/\-\-after can be used to remove only files that have already
 been deleted, \-f/\-\-force can be used to force deletion, and \-Af
-@@ -2960,7 +2933,7 @@
+@@ -3417,7 +3390,7 @@
 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
 +(as reported by \fBhg status\fP). The actions are Warn, Remove
 (from branch) and Delete (from disk):
 .TS
 center;
-@@ -3034,7 +3007,7 @@
+@@ -3491,7 +3464,7 @@
 Returns 0 on success, 1 if any warnings encountered.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-A,  \-\-after
 .
-@@ -3053,13 +3026,13 @@
+@@ -3508,23 +3481,23 @@
+.BI \-X,  \-\-exclude \ <PATTERN[+]>
+.
 exclude names matching the given patterns
+-.UNINDENT
++.RE
+.sp
+[+] marked option can be specified multiple times
+-.INDENT 0.0
+-.INDENT 3.5
++.RS 0
++.RS 3
 .sp
 aliases: rm
 -.UNINDENT
+-.UNINDENT
++.RE
 +.RE
 .SS rename
 .sp
+rename files; equivalent of copy + remove:
+.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
-@@ -3071,12 +3044,12 @@
+@@ -3536,12 +3509,12 @@
 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.
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-A,  \-\-after
 .
-@@ -3099,13 +3072,13 @@
+@@ -3562,23 +3535,23 @@
+.B \-n,  \-\-dry\-run
+.
 do not perform actions, just print output
+-.UNINDENT
++.RE
+.sp
+[+] marked option can be specified multiple times
+-.INDENT 0.0
+-.INDENT 3.5
++.RS 0
++.RS 3
 .sp
 aliases: move mv
 -.UNINDENT
+-.UNINDENT
++.RE
 +.RE
 .SS resolve
 .sp
+redo merges or set/view the merge status of files:
+.sp
 .nf
 -.ft C
 +.ft
 hg resolve [OPTION]... [FILE]...
 -.ft P
 +.ft
 .fi
 .sp
 Merges with unresolved conflicts are often the result of
-@@ -3112,15 +3085,15 @@
+@@ -3585,15 +3558,15 @@
 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
 -working directory must have two parents). See \%\fBhg help
 -\%\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 select all unresolved files. \fB\-\-tool\fP can be used to specify
-@@ -3129,27 +3102,27 @@
+@@ -3602,27 +3575,27 @@
 contents are saved with a \fB.orig\fP suffix.
 .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
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-a,  \-\-all
 .
-@@ -3182,19 +3155,19 @@
+@@ -3655,7 +3628,7 @@
-.B \-X,  \-\-exclude
+.BI \-X,  \-\-exclude \ <PATTERN[+]>
 .
 exclude names matching the given patterns
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS revert
+@@ -3663,15 +3636,15 @@
+restore files to their checkout state:
 .sp
 .nf
 -.ft C
 +.ft
 hg revert [OPTION]... [\-r REV] [NAME]...
 -use \%\fBhg update \-\-clean .\fP\:.
 +use \fBhg update \-\-clean .\fP.
 .RE
 .sp
 With no revision specified, revert the specified files or directories
-@@ -3208,18 +3181,18 @@
+@@ -3685,18 +3658,18 @@
 directories to their states as of a specific revision. Because
 revert does not change the working directory parents, this will
 cause these files to appear modified. This can be helpful to "back
 -out" some or all of an earlier change. See \%\fBhg backout\fP\: for a
 +out" some or all of an earlier change. See \fBhg backout\fP for a
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-a,  \-\-all
 .
-@@ -3248,16 +3221,16 @@
+@@ -3725,7 +3698,7 @@
 .B \-n,  \-\-dry\-run
 .
 do not perform actions, just print output
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS rollback
+@@ -3733,12 +3706,12 @@
+roll back the last transaction (DANGEROUS) (DEPRECATED):
 .sp
 .nf
 -.ft C
 +.ft
 hg rollback
 -Please use \%\fBhg commit \-\-amend\fP\: instead of rollback to correct
 +Please use \fBhg commit \-\-amend\fP instead of rollback to correct
 mistakes in the last commit.
 .sp
 This command should be used with care. There is only one level of
-@@ -3272,7 +3245,7 @@
+@@ -3753,7 +3726,7 @@
 .sp
 For example, the following commands are transactional, and their
 effects can be rolled back:
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 .
 commit
-@@ -3288,10 +3261,10 @@
+@@ -3769,10 +3742,10 @@
 .IP \(bu 2
 .
 unbundle
 -.UNINDENT
 +.RE
 -commit transaction if it isn\(aqt checked out. Use \-\-force to
 +commit transaction if it isn't checked out. Use \-\-force to
 override this protection.
 .sp
 This command is not intended for use on public repositories. Once
-@@ -3304,7 +3277,7 @@
+@@ -3785,7 +3758,7 @@
 Returns 0 on success, 1 if no rollback data is available.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-n,  \-\-dry\-run
 .
-@@ -3313,13 +3286,13 @@
+@@ -3794,15 +3767,15 @@
 .B \-f,  \-\-force
 .
 ignore safety measures
 -.UNINDENT
 +.RE
 .SS root
 .sp
+print the root (top) of the current working directory:
+.sp
 .nf
 -.ft C
 +.ft
 hg root
 -.ft P
 +.ft
 .fi
 .sp
 Print the root directory of the current repository.
-@@ -3328,9 +3301,9 @@
+@@ -3813,9 +3786,9 @@
-.SS serve
+start stand\-alone webserver:
 .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
-@@ -3355,7 +3328,7 @@
+@@ -3840,7 +3813,7 @@
 Returns 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-A,  \-\-accesslog
+.BI \-A,  \-\-accesslog \ <FILE>
 .
-@@ -3424,13 +3397,13 @@
+@@ -3909,15 +3882,15 @@
-.B \-\-certificate
+.BI \-\-certificate \ <FILE>
 .
 SSL certificate file
 -.UNINDENT
 +.RE
-.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.
-@@ -3447,7 +3420,7 @@
-Returns 0 on success.
-.sp
-Options:
--.INDENT 0.0
-+.RS 0
-.TP
-.B \-u,  \-\-untrusted
-.
-@@ -3454,13 +3427,13 @@
-show untrusted configuration options
-.sp
-aliases: debugconfig
--.UNINDENT
-+.RE
 .SS status
 .sp
+show changed files in the working directory:
+.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
-@@ -3488,7 +3461,7 @@
+@@ -3945,7 +3918,7 @@
 The codes used to show the status of files are:
 .sp
 .nf
 -.ft C
 +.ft
 M = modified
 A = added
 R = removed
-@@ -3497,11 +3470,11 @@
+@@ -3954,11 +3927,11 @@
 ? = not tracked
 I = ignored
-= origin of the previous file listed as A (added)
+= origin of the previous file (with \-\-copies)
 -.ft P
 +.ft
 .fi
 .sp
 Examples:
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 .
 show changes in the working directory relative to a
-@@ -3508,9 +3481,9 @@
+@@ -3965,9 +3938,9 @@
 changeset:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -3517,9 +3490,9 @@
+@@ -3974,9 +3947,9 @@
 show all changes including copies in an existing changeset:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -3526,16 +3499,16 @@
+@@ -3983,16 +3956,16 @@
 get a NUL separated list of added files, suitable for xargs:
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-A,  \-\-all
 .
-@@ -3602,13 +3575,13 @@
+@@ -4061,23 +4034,23 @@
-recurse into subrepositories
+.BI \-T,  \-\-template \ <TEMPLATE>
+.
+display with template (DEPRECATED)
+-.UNINDENT
++.RE
+.sp
+[+] marked option can be specified multiple times
+-.INDENT 0.0
+-.INDENT 3.5
++.RS 0
++.RS 3
 .sp
 aliases: st
 -.UNINDENT
+-.UNINDENT
++.RE
 +.RE
 .SS summary
 .sp
+summarize working directory state:
+.sp
 .nf
 -.ft C
 +.ft
 hg summary [\-\-remote]
 -.ft P
 +.ft
 .fi
 .sp
 This generates a brief summary of the working directory state,
-@@ -3620,7 +3593,7 @@
+@@ -4089,7 +4062,7 @@
 Returns 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-\-remote
 .
-@@ -3627,13 +3600,13 @@
+@@ -4096,15 +4069,15 @@
 check for push and pull
 .sp
 aliases: sum
 -.UNINDENT
 +.RE
 .SS tag
 .sp
+add one or more tags for the current or given revision:
+.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>.
-@@ -3654,11 +3627,11 @@
+@@ -4125,11 +4098,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
 -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.
-@@ -3666,7 +3639,7 @@
+@@ -4137,7 +4110,7 @@
 Returns 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-f,  \-\-force
 .
-@@ -3699,13 +3672,13 @@
+@@ -4170,15 +4143,15 @@
-.B \-u,  \-\-user
+.BI \-u,  \-\-user \ <USER>
 .
 record the specified user as committer
 -.UNINDENT
 +.RE
 .SS tags
 .sp
+list repository tags:
+.sp
 .nf
 -.ft C
 +.ft
 hg tags
 -.ft P
 +.ft
 .fi
 .sp
 This lists both regular and local tags. When the \-v/\-\-verbose
-@@ -3715,9 +3688,9 @@
+@@ -4187,20 +4160,20 @@
+Returns 0 on success.
+.sp
+Options:
+-.INDENT 0.0
++.RS 0
+.TP
+.BI \-T,  \-\-template \ <TEMPLATE>
+.
+display with template (DEPRECATED)
+-.UNINDENT
++.RE
 .SS tip
 .sp
+show the tip revision (DEPRECATED):
+.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
-@@ -3729,12 +3702,12 @@
+@@ -4212,12 +4185,12 @@
 that repository becomes the current tip. The "tip" tag is special
 and cannot be renamed or assigned to a different changeset.
 .sp
 -This command is deprecated, please use \%\fBhg heads\fP\: instead.
 +This command is deprecated, please use \fBhg heads\fP instead.
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-p,  \-\-patch
 .
-@@ -3751,13 +3724,13 @@
+@@ -4234,15 +4207,15 @@
-.B \-\-template
+.BI \-T,  \-\-template \ <TEMPLATE>
 .
 display with template
 -.UNINDENT
 +.RE
 .SS unbundle
 .sp
+apply one or more changegroup files:
+.sp
 .nf
 -.ft C
 +.ft
 hg unbundle [\-u] FILE...
 -.ft P
 +.ft
 .fi
 .sp
 Apply one or more compressed changegroup files generated by the
-@@ -3766,30 +3739,30 @@
+@@ -4251,32 +4224,32 @@
 Returns 0 on success, 1 if an update has unresolved files.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .
 update to new branch head if changesets were unbundled
 -.UNINDENT
 +.RE
 .SS update
+.sp
+update working directory (or switch revisions):
 .sp
 .nf
 -.ft C
 +.ft
 hg update [\-c] [\-C] [\-d DATE] [[\-r] REV]
 -directory\(aqs parent, the update is aborted. With the \-c/\-\-check
 +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
 changeset.
-@@ -3796,12 +3769,12 @@
+@@ -4283,12 +4256,12 @@
 .sp
 The following rules apply when the working directory contains
 uncommitted changes:
 -.INDENT 0.0
 +.RS 0
 -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
-@@ -3815,23 +3788,23 @@
+@@ -4302,23 +4275,23 @@
 .
 With the \-C/\-\-clean option, uncommitted changes are discarded and
 the working directory is updated to the requested changeset.
 -.UNINDENT
 +.RE
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-C,  \-\-clean
 .
-@@ -3850,23 +3823,23 @@
+@@ -4341,25 +4314,25 @@
-revision
+specify merge tool
 .sp
 aliases: up checkout co
 -.UNINDENT
 +.RE
 .SS verify
+.sp
+verify the integrity of the repository:
 .sp
 .nf
 -.ft C
 +.ft
 hg verify
 -Please see \%http://mercurial.selenic.com/wiki/RepositoryCorruption\:
 +Please see http://mercurial.selenic.com/wiki/RepositoryCorruption
 for more information about recovery from corruption of the
 repository.
 .sp
-@@ -3874,9 +3847,9 @@
+@@ -4369,9 +4342,9 @@
-.SS version
+output version and copyright information:
 .sp
 .nf
 -.ft C
 +.ft
 hg version
 -.ft P
 +.ft
 .fi
 .sp
 output version and copyright information
-@@ -3883,7 +3856,7 @@
+@@ -4378,7 +4351,7 @@
 .SH DATE FORMATS
 .sp
 Some commands allow the user to specify a date, e.g.:
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 .
 backout, commit, import, tag: Specify the commit date.
-@@ -3890,10 +3863,10 @@
+@@ -4385,10 +4358,10 @@
 .IP \(bu 2
 .
 log, revert, update: Select revision(s) by date.
 -.UNINDENT
 +.RE
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 .
 \fBWed Dec 6 13:18:29 2006\fP (local timezone assumed)
-@@ -3942,14 +3915,14 @@
+@@ -4437,14 +4410,14 @@
 .IP \(bu 2
 .
 \fBnow\fP \- right now
 -.UNINDENT
 +.RE
 -.UNINDENT
 +.RE
 .sp
 This is the internal representation format for dates. The first number
 is the number of seconds since the epoch (1970\-01\-01 00:00 UTC). The
-@@ -3957,7 +3930,7 @@
+@@ -4452,7 +4425,7 @@
 (negative if the timezone is east of UTC).
 .sp
 The log command also accepts date ranges:
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 .
 \fB<DATE\fP \- at or before a given date/time
-@@ -3970,16 +3943,16 @@
+@@ -4465,16 +4438,16 @@
 .IP \(bu 2
 .
 \fB\-DAYS\fP \- within a given number of days of today
 -.UNINDENT
 +.RE
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 .
 executable status and other permission bits
-@@ -3992,7 +3965,7 @@
+@@ -4487,7 +4460,7 @@
 .IP \(bu 2
 .
 creation or deletion of empty files
 -.UNINDENT
 +.RE
 .sp
 Mercurial also supports the extended diff format from the git VCS
 which addresses these limitations. The git diff format is not produced
-@@ -4000,26 +3973,26 @@
+@@ -4495,26 +4468,26 @@
 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
 +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
-@@ -4037,9 +4010,9 @@
+@@ -4532,9 +4505,9 @@
 .TP
 .B HGENCODINGMODE
 .
 -This sets Mercurial\(aqs behavior for handling unknown characters
 +This sets Mercurial's behavior for handling unknown characters
 -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.
-@@ -4046,7 +4019,7 @@
+@@ -4541,7 +4514,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
-@@ -4068,19 +4041,19 @@
+@@ -4563,19 +4536,19 @@
 the .hg/hgrc from the current repository is read.
 .sp
 For each element in HGRCPATH:
 -.INDENT 7.0
 +.RS 7
 -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.
-@@ -4101,7 +4074,7 @@
+@@ -4596,7 +4569,7 @@
 .
 This is the string used as the author of a commit. If not set,
 available values will be considered in this order:
 -.INDENT 7.0
 +.RS 7
 .IP \(bu 2
 .
 HGUSER (deprecated)
-@@ -4117,7 +4090,7 @@
+@@ -4612,7 +4585,7 @@
 .IP \(bu 2
 .
 LOGNAME (with \fB@hostname\fP appended)
 -.UNINDENT
 +.RE
 .sp
 (deprecated, use configuration file)
 .TP
-@@ -4140,13 +4113,13 @@
+@@ -4635,13 +4608,13 @@
 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'.
 -.UNINDENT
 +.RE
 .SH USING ADDITIONAL FEATURES
 .sp
 Mercurial has the ability to add new features through the use of
-@@ -4159,22 +4132,22 @@
+@@ -4654,22 +4627,22 @@
 like this:
 .sp
 .nf
 -.ft C
 +.ft
 -See \%\fBhg help config\fP\: for more information on configuration files.
 +See \fBhg help config\fP for more information on configuration files.
 .sp
 Extensions are not loaded by default for a variety of reasons:
 they can increase startup overhead; they may be meant for advanced
-@@ -4188,19 +4161,19 @@
+@@ -4683,19 +4656,19 @@
 broader scope, prepend its path with !:
 .sp
 .nf
 -.ft C
 +.ft
 +.RS 3
 +.RS 0
 .TP
 .B acl
 .
-@@ -4272,7 +4245,7 @@
+@@ -4824,9 +4797,9 @@
-.TP
-.B inotify
-.
--accelerate status report using Linux\(aqs inotify service
-+accelerate status report using Linux's inotify service
-.TP
-.B interhg
-.
-@@ -4353,9 +4326,9 @@
 .B zeroconf
 .
 discover and advertise repositories on the local network
 -.UNINDENT
 -.UNINDENT
 +.RE
 +.RE
 .SH SPECIFYING FILE SETS
 .sp
 Mercurial supports a functional language for selecting a set of
-@@ -4362,7 +4335,7 @@
+@@ -4833,7 +4806,7 @@
 files.
 .sp
 Like other file patterns, this pattern type is indicated by a prefix,
 -\(aqset:\(aq. The language supports a number of predicates which are joined
 +\&'set:'. The language supports a number of predicates which are joined
 by infix operators. Parenthesis can be used for grouping.
 .sp
 Identifiers such as filenames or patterns must be quoted with single
-@@ -4373,18 +4346,18 @@
+@@ -4844,18 +4817,18 @@
 .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.
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBx and y\fP
 .sp
-@@ -4398,10 +4371,10 @@
+@@ -4869,10 +4842,10 @@
 .B \fBx \- y\fP
 .sp
 Files in x but not in y.
 -.UNINDENT
 +.RE
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBadded()\fP
 .sp
-@@ -4467,7 +4440,7 @@
+@@ -4938,7 +4911,7 @@
 .B \fBsize(expression)\fP
 .sp
 File size matches the given expression. Examples:
 -.INDENT 7.0
 +.RS 7
 .IP \(bu 2
 .
 1k (files from 1024 to 2047 bytes)
-@@ -4480,7 +4453,7 @@
+@@ -4951,7 +4924,7 @@
 .IP \(bu 2
 .
 4k \- 1MB (files from 4096 bytes to 1048576 bytes)
 -.UNINDENT
 +.RE
 .TP
 .B \fBsubrepo([pattern])\fP
 .sp
-@@ -4498,18 +4471,18 @@
+@@ -4969,18 +4942,18 @@
 .B \fBunresolved()\fP
 .sp
 File that is marked unresolved according to the resolve state.
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -4516,9 +4489,9 @@
+@@ -4987,9 +4960,9 @@
 Forget files that are in .hgignore but are already tracked:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -4525,9 +4498,9 @@
+@@ -4996,9 +4969,9 @@
 Find text files that contain a string:
 .sp
 .nf
 -.ft C
 +.ft
-hg locate "set:grep(magic) and not binary()"
+hg files "set:grep(magic) and not binary()"
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -4534,9 +4507,9 @@
+@@ -5005,9 +4978,9 @@
 Find C files in a non\-standard encoding:
 .sp
 .nf
 -.ft C
--hg locate "set:**.c and not encoding(\(aqUTF\-8\(aq)"
+-hg files "set:**.c and not encoding(\(aqUTF\-8\(aq)"
 -.ft P
 +.ft
-+hg locate "set:**.c and not encoding('UTF\-8')"
++hg files "set:**.c and not encoding('UTF\-8')"
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -4543,9 +4516,9 @@
+@@ -5014,9 +4987,9 @@
 Revert copies of large binary files:
 .sp
 .nf
 -.ft C
 -hg revert "set:copied() and binary() and size(\(aq>1M\(aq)"
 +hg revert "set:copied() and binary() and size('>1M')"
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -4552,15 +4525,15 @@
+@@ -5023,15 +4996,15 @@
 Remove files listed in foo.lst that contain the letter a or b:
 .sp
 .nf
 -.ft C
 -hg remove "set: \(aqlistfile:foo.lst\(aq and (**a* or **b*)"
 -.INDENT 0.0
 +.RS 0
 .TP
 .B Ancestor
 .
-@@ -4568,7 +4541,7 @@
+@@ -5039,7 +5012,7 @@
 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 Bookmark
 .
-@@ -4575,7 +4548,7 @@
+@@ -5046,7 +5019,7 @@
 Bookmarks are pointers to certain commits that move when
 committing. They are similar to tags in that it is possible to use
 bookmark names in all places where Mercurial expects a changeset
 -ID, e.g., with \%\fBhg update\fP\:. Unlike tags, bookmarks move along
 +ID, e.g., with \fBhg update\fP. Unlike tags, bookmarks move along
 when you make a commit.
 .sp
 Bookmarks can be renamed, copied and deleted. Bookmarks are local,
-@@ -4587,9 +4560,9 @@
+@@ -5058,9 +5031,9 @@
 .
 (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
 -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
-@@ -4604,7 +4577,7 @@
+@@ -5075,7 +5048,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
 .
-@@ -4623,19 +4596,19 @@
+@@ -5094,19 +5067,19 @@
 .TP
 .B Branch head
 .
 -See \(aqHead, branch\(aq.
 +See 'Head, branch'.
 +Branches should now be explicitly closed using \fBhg commit
 +\-\-close\-branch\fP when they are no longer needed.
 .TP
 .B Branch, named
 .
-@@ -4642,8 +4615,8 @@
+@@ -5113,8 +5086,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
-@@ -4656,7 +4629,7 @@
+@@ -5127,7 +5100,7 @@
 .TP
 .B Branch tip
 .
 -See \(aqTip, branch\(aq.
 +See 'Tip, branch'.
 .TP
 .B Branch, topological
 .
-@@ -4706,24 +4679,24 @@
+@@ -5177,24 +5150,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."
 -See \(aqBranch, closed\(aq.
 +See 'Branch, closed'.
 .TP
 .B Clone
 .
-@@ -4732,13 +4705,13 @@
+@@ -5203,13 +5176,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.
 -See \(aqHead, closed branch\(aq.
 +See 'Head, closed branch'.
 .TP
 .B Commit
 .
-@@ -4763,13 +4736,13 @@
+@@ -5234,7 +5207,7 @@
 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 log \-\-graph\fP\:. In
 +can be visualized by graphical tools such as \fBhg log \-\-graph\fP. In
 Mercurial, the DAG is limited by the requirement for children to
 have at most two parents.
 .TP
+@@ -5244,7 +5217,7 @@
+.TP
 .B Default branch
 .
 -See \(aqBranch, default\(aq.
 +See 'Branch, default'.
 .TP
 .B Descendant
 .
-@@ -4777,7 +4750,7 @@
+@@ -5252,7 +5225,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
 .
-@@ -4802,7 +4775,7 @@
+@@ -5277,7 +5250,7 @@
 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
-@@ -4810,17 +4783,17 @@
+@@ -5285,7 +5258,7 @@
 .
 Changesets in the draft phase have not been shared with publishing
 repositories and may thus be safely changed by history\-modifying
 -extensions. See \%\fBhg help phases\fP\:.
 +extensions. See \fBhg help phases\fP.
+.TP
+.B Experimental
+.
+@@ -5293,13 +5266,13 @@
 .TP
 .B Graph
 .
 -See DAG and \%\fBhg log \-\-graph\fP\:.
 +See DAG and \fBhg log \-\-graph\fP.
 +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.
-@@ -4832,9 +4805,9 @@
+@@ -5311,9 +5284,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
 -listed by \%\fBhg branches\fP\:.
 +listed by \fBhg branches\fP.
 .sp
 Closed heads can be re\-opened by committing new changeset as the
 child of the changeset that marks a head as closed.
-@@ -4863,11 +4836,11 @@
+@@ -5342,11 +5315,11 @@
 .TP
 .B Immutable history
 .
 -See \(aqHistory, immutable\(aq.
 +See 'History, immutable'.
 -See \(aqChangeset, merge\(aq.
 +See 'Changeset, merge'.
 .TP
 .B Manifest
 .
-@@ -4884,7 +4857,7 @@
+@@ -5363,7 +5336,7 @@
 .TP
 .B Named branch
 .
 -See \(aqBranch, named\(aq.
 +See 'Branch, named'.
 .TP
 .B Null changeset
 .
-@@ -4891,30 +4864,30 @@
+@@ -5370,30 +5343,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.
 -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.
-@@ -4924,13 +4897,13 @@
+@@ -5403,13 +5376,13 @@
 .B Phase
 .
 A per\-changeset state tracking how the changeset has been or
 -should be shared. See \%\fBhg help phases\fP\:.
 +should be shared. See \fBhg help phases\fP.
 +repositories and are therefore considered immutable. See \fBhg help
 +phases\fP.
 .TP
 .B Pull
 .
-@@ -4938,7 +4911,7 @@
+@@ -5417,7 +5390,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
 .
-@@ -4946,7 +4919,7 @@
+@@ -5425,7 +5398,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
 .
-@@ -4959,13 +4932,13 @@
+@@ -5438,13 +5411,13 @@
 .TP
 .B Repository head
 .
 -See \(aqHead, repository\(aq.
 +See 'Head, repository'.
 +can be updated to by using \fBhg update\fP.  See also 'Revision
 +number'; See also 'Changeset'.
 .TP
 .B Revision number
 .
-@@ -4974,7 +4947,7 @@
+@@ -5453,7 +5426,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
 .
-@@ -4985,7 +4958,7 @@
+@@ -5464,7 +5437,7 @@
 .TP
 .B Rewriting history
 .
 -See \(aqHistory, rewriting\(aq.
 +See 'History, rewriting'.
 .TP
 .B Root
 .
-@@ -4995,13 +4968,13 @@
+@@ -5474,13 +5447,13 @@
 .B Secret
 .
 Changesets in the secret phase may not be shared via push, pull,
 -or clone. See \%\fBhg help phases\fP\:.
 +or clone. See \fBhg help phases\fP.
 -\%\fBhg update\fP\:. The creation of a tag is stored in the history and
 +\fBhg update\fP. The creation of a tag is stored in the history and
 will thus automatically be shared with other using push and pull.
 .TP
 .B Tip
-@@ -5013,7 +4986,7 @@
+@@ -5492,7 +5465,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
-@@ -5021,22 +4994,22 @@
+@@ -5500,22 +5473,22 @@
 .
 (Noun) Another synonym of changeset.
 .sp
 -Example: "I\(aqve pushed an update".
 +Example: "I've pushed an update".
 +See 'Parent, working directory'.
 +.RE
 .SH SYNTAX FOR MERCURIAL IGNORE FILES
 .SS Synopsis
 .sp
-@@ -5063,16 +5036,16 @@
+@@ -5542,16 +5515,16 @@
 .sp
 In addition, a Mercurial configuration file can reference a set of
 per\-user or global ignore files. See the \fBignore\fP configuration
 -key on the \fB[ui]\fP section of \%\fBhg help config\fP\: for details of how to
 +key on the \fB[ui]\fP section of \fBhg help config\fP for details of how to
 -added with \%\fBhg add X\fP\:, even if X would be excluded by a pattern
 +added with \fBhg add X\fP, even if X would be excluded by a pattern
 in .hgignore.
 .SS Syntax
 .sp
-@@ -5087,13 +5060,13 @@
+@@ -5566,13 +5539,13 @@
 To change the syntax used, use a line of the following form:
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBregexp\fP
 .sp
-@@ -5102,7 +5075,7 @@
+@@ -5581,7 +5554,7 @@
 .B \fBglob\fP
 .sp
 Shell\-style glob.
 -.UNINDENT
 +.RE
 .sp
 The chosen syntax stays in effect when parsing all patterns that
 follow, until another syntax is selected.
-@@ -5114,7 +5087,7 @@
+@@ -5593,7 +5566,7 @@
 .IP Note
 .
 Patterns specified in other than \fB.hgignore\fP are always rooted.
 -Please see \%\fBhg help patterns\fP\: for details.
 +Please see \fBhg help patterns\fP for details.
 .RE
 .SS Example
 .sp
-@@ -5121,7 +5094,7 @@
+@@ -5600,7 +5573,7 @@
 Here is an example ignore file.
 .sp
 .nf
 -.ft C
 +.ft
 # use glob syntax.
 syntax: glob
-@@ -5132,21 +5105,21 @@
+@@ -5611,21 +5584,21 @@
 # switch to regexp syntax.
 syntax: regexp
 ^\e.pc/
 -.ft P
 +.ft
 +.RS 3
 +.RS 0
 .IP \(bu 2
 .
 web
-@@ -5156,11 +5129,11 @@
+@@ -5635,11 +5608,11 @@
 .IP \(bu 2
 .
 collections
 -.UNINDENT
 -.UNINDENT
 -The \fBweb\fP options are thoroughly described in \%\fBhg help config\fP\:.
 +The \fBweb\fP options are thoroughly described in \fBhg help config\fP.
 .sp
 The \fBpaths\fP section maps URL paths to paths of repositories in the
 filesystem. hgweb will not expose the filesystem directly \- only
-@@ -5175,7 +5148,7 @@
+@@ -5654,7 +5627,7 @@
 path ends with \fB*\fP or \fB**\fP the filesystem will be searched
 recursively for repositories below that point.
 With \fB*\fP it will not recurse into the repositories it finds (except for
 -\fB.hg/patches\fP).
 +\fB\&.hg/patches\fP).
 With \fB**\fP it will also search inside repository working directories
 and possibly find subrepositories.
 .sp
-@@ -5182,15 +5155,15 @@
+@@ -5661,15 +5634,15 @@
 In this example:
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 .
 The first two entries make two repositories in different directories
-@@ -5204,7 +5177,7 @@
+@@ -5683,7 +5656,7 @@
 .
 The fourth entry will publish both \fBhttp://server/user/bob/quux/\fP
 and \fBhttp://server/user/bob/quux/testsubrepo/\fP
 -.UNINDENT
 +.RE
 .sp
 The \fBcollections\fP section is deprecated and has been superseded by
 \fBpaths\fP.
-@@ -5217,8 +5190,8 @@
+@@ -5696,8 +5669,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
-@@ -5243,7 +5216,7 @@
+@@ -5722,7 +5695,7 @@
 .sp
 There are some internal merge tools which can be used. The internal
 merge tools are:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \fBinternal:dump\fP
+.B \fB:dump\fP
 .sp
-@@ -5278,7 +5251,7 @@
+@@ -5815,7 +5788,7 @@
-.sp
+.B \fB:tagmerge\fP
-Asks the user which of the local or the other version to keep as
+.sp
-the merged version.
+Uses the internal tag merge algorithm (experimental).
 -.UNINDENT
 +.RE
 .sp
 Internal tools are always available and do not require a GUI but will by default
 not handle symlinks or binary files.
-@@ -5285,7 +5258,7 @@
+@@ -5822,7 +5795,7 @@
 .SS Choosing a merge tool
 .sp
 Mercurial uses these rules when deciding which merge tool to use:
 -.INDENT 0.0
 +.RS 0
 .IP 1. 3
 .
 If a tool has been specified with the \-\-tool option to merge or resolve, it
-@@ -5322,11 +5295,11 @@
+@@ -5859,11 +5832,11 @@
 .IP 8. 3
 .
 The merge of the file fails and must be resolved before commit.
 -.UNINDENT
 +.RE
 -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
-@@ -5362,7 +5335,7 @@
+@@ -5899,7 +5872,7 @@
 .IP Note
 .
 Patterns specified in \fB.hgignore\fP are not rooted.
 -Please see \%\fBhg help hgignore\fP\: for details.
 +Please see \fBhg help hgignore\fP for details.
 .RE
 .sp
 To use a plain path name without any pattern matching, start it with
-@@ -5387,17 +5360,17 @@
+@@ -5928,17 +5901,17 @@
 Plain examples:
 .sp
 .nf
 -.ft C
 +.ft
 -.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
-@@ -5405,27 +5378,27 @@
+@@ -5946,27 +5919,27 @@
 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
 -See also \%\fBhg help filesets\fP\:.
 +See also \fBhg help filesets\fP.
 .SH WORKING WITH PHASES
 .SS What are phases?
 .sp
-@@ -5434,9 +5407,9 @@
+@@ -5975,9 +5948,9 @@
 (for instance, with the mq or rebase extensions).
 .sp
 Each changeset in a repository is in one of the following phases:
 -.INDENT 0.0
 -.INDENT 3.5
 +.RS 3
 +.RS 0
 .IP \(bu 2
 .
 public : changeset is visible on a public server
-@@ -5446,9 +5419,9 @@
+@@ -5987,9 +5960,9 @@
 .IP \(bu 2
 .
 secret : changeset should not be pushed, pulled, or cloned
 -.UNINDENT
 -.UNINDENT
 +.RE
 +.RE
 .sp
 These phases are ordered (public < draft < secret) and no changeset
 can be in a lower phase than its ancestors. For instance, if a
-@@ -5462,14 +5435,14 @@
+@@ -6003,14 +5976,14 @@
 .sp
 Once changesets become public, extensions like mq and rebase will
 refuse to operate on them to prevent creating duplicate changesets.
 -Phases can also be manually manipulated with the \%\fBhg phase\fP\: command
 -if needed. See \%\fBhg help \-v phase\fP\: for examples.
 -.ft C
 +.ft
 \- all draft changesets that are pulled or cloned appear in phase
 public on the client
-@@ -5477,7 +5450,7 @@
+@@ -6018,7 +5991,7 @@
 client and server
 \- secret changesets are neither pushed, pulled, or cloned
 -.ft P
 +.ft
 .fi
 .IP Note
 .
-@@ -5490,13 +5463,13 @@
+@@ -6031,13 +6004,13 @@
 repository to disable publishing in its configuration file:
 .sp
 .nf
 -.ft C
 +.ft
 -See \%\fBhg help config\fP\: for more information on configuration files.
 +See \fBhg help config\fP for more information on configuration files.
 .IP Note
 .
 Servers running older versions of Mercurial are treated as
-@@ -5503,17 +5476,17 @@
+@@ -6051,17 +6024,17 @@
-publishing.
+of the secret changeset may be communicated to the server.
 .RE
 .SS Examples
 -.INDENT 0.0
 -.INDENT 3.5
 -.INDENT 0.0
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -5520,9 +5493,9 @@
+@@ -6068,9 +6041,9 @@
 change all secret changesets to draft:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -5529,9 +5502,9 @@
+@@ -6077,9 +6050,9 @@
 forcibly move the current changeset and descendants from public to draft:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -5538,9 +5511,9 @@
+@@ -6086,9 +6059,9 @@
 show a list of changeset revision and phase:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -5547,15 +5520,15 @@
+@@ -6095,15 +6068,15 @@
 resynchronize draft changesets relative to a remote repository:
 .sp
 .nf
 -.ft C
 +.ft
 -See \%\fBhg help phase\fP\: for more information on manually manipulating phases.
 +See \fBhg help phase\fP for more information on manually manipulating phases.
 .SH SPECIFYING SINGLE REVISIONS
 .sp
 Mercurial supports several ways to specify individual revisions.
-@@ -5601,18 +5574,18 @@
+@@ -6149,18 +6122,18 @@
 .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.
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBx::y\fP
 .sp
-@@ -5651,18 +5624,18 @@
+@@ -6199,18 +6172,18 @@
 .B \fBx~n\fP
 .sp
 The nth first ancestor of x; \fBx~0\fP is x; \fBx~3\fP is \fBx^^^\fP.
 -.UNINDENT
 +.RE
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBadds(pattern)\fP
 .sp
-@@ -5691,7 +5664,7 @@
+@@ -6243,7 +6216,7 @@
 .B \fBbisect(string)\fP
 .sp
 Changesets marked in the specified bisect status:
 -.INDENT 7.0
 +.RS 7
 .IP \(bu 2
 .
 \fBgood\fP, \fBbad\fP, \fBskip\fP: csets explicitly marked as good/bad/skip
-@@ -5713,7 +5686,7 @@
+@@ -6265,7 +6238,7 @@
 .IP \(bu 2
 .
 \fBcurrent\fP            : the cset currently being bisected
 -.UNINDENT
 +.RE
 .TP
 .B \fBbookmark([name])\fP
 .sp
-@@ -5758,7 +5731,7 @@
+@@ -6310,8 +6283,8 @@
 .TP
 .B \fBcontains(pattern)\fP
 .sp
--Revision contains a file matching pattern. See \%\fBhg help patterns\fP\:
+-The revision\(aqs manifest contains a file matching pattern (but might not
-+Revision contains a file matching pattern. See \fBhg help patterns\fP
+-modify it). See \%\fBhg help patterns\fP\: for information about file patterns.
-for information about file patterns.
++The revision's manifest contains a file matching pattern (but might not
-.TP
++modify it). See \fBhg help patterns\fP for information about file patterns.
-.B \fBconverted([id])\fP
+.sp
-@@ -5768,7 +5741,7 @@
+The pattern without explicit kind like \fBglob:\fP is expected to be
+relative to the current directory and match against a file exactly
+@@ -6324,7 +6297,7 @@
 .TP
 .B \fBdate(interval)\fP
 .sp
 -Changesets within the interval, see \%\fBhg help dates\fP\:.
 +Changesets within the interval, see \fBhg help dates\fP.
 .TP
 .B \fBdesc(string)\fP
 .sp
-@@ -5817,7 +5790,7 @@
+@@ -6376,7 +6349,7 @@
-Changesets connected to the specified filelog.
+.sp
-.sp
+For performance reasons, visits only revisions mentioned in the file\-level
-For performance reasons, \fBfilelog()\fP does not show every changeset
+filelog, rather than filtering through all changesets (much faster, but
--that affects the requested file(s). See \%\fBhg help log\fP\: for details. For
+-doesn\(aqt include deletes or duplicate changes). For a slower, more accurate
-+that affects the requested file(s). See \fBhg help log\fP for details. For
++doesn't include deletes or duplicate changes). For a slower, more accurate
-a slower, more accurate result, use \fBfile()\fP.
+result, use \fBfile()\fP.
-.TP
+.sp
-.B \fBfirst(set, [n])\fP
+The pattern without explicit kind like \fBglob:\fP is expected to be
-@@ -5826,13 +5799,13 @@
+@@ -6389,13 +6362,13 @@
 .TP
 .B \fBfollow([file])\fP
 .sp
 -An alias for \fB::.\fP (ancestors of the working copy\(aqs first parent).
 +An alias for \fB::.\fP (ancestors of the working copy's first parent).
 -Like \fBkeyword(string)\fP but accepts a regex. Use \fBgrep(r\(aq...\(aq)\fP
 +Like \fBkeyword(string)\fP but accepts a regex. Use \fBgrep(r'...')\fP
 to ensure special escape characters are handled correctly. Unlike
 \fBkeyword(string)\fP, the match is case\-sensitive.
 .TP
-@@ -5937,7 +5910,7 @@
+@@ -6511,7 +6484,7 @@
 .TP
 .B \fBpresent(set)\fP
 .sp
 -An empty set, if any revision in set isn\(aqt found; otherwise,
 +An empty set, if any revision in set isn't found; otherwise,
 all revisions in set.
 .sp
 If any of specified revisions is not present in the local repository,
-@@ -5951,7 +5924,7 @@
+@@ -6525,7 +6498,7 @@
 .B \fBremote([id [,path]])\fP
 .sp
 Local revision that corresponds to the given identifier in a
 -remote repository, if present. Here, the \(aq.\(aq identifier is a
 +remote repository, if present. Here, the '.' identifier is a
 synonym for the current local branch.
 .TP
 .B \fBremoves(pattern)\fP
-@@ -5980,7 +5953,7 @@
+@@ -6558,7 +6531,7 @@
 as \fB\-key\fP to sort in descending order.
 .sp
 The keys can be:
 -.INDENT 7.0
 +.RS 7
 .IP \(bu 2
 .
 \fBrev\fP for the revision number,
-@@ -5996,7 +5969,7 @@
+@@ -6574,7 +6547,7 @@
 .IP \(bu 2
 .
 \fBdate\fP for the commit date
 -.UNINDENT
 +.RE
 .TP
 .B \fBtag([name])\fP
 .sp
-@@ -6013,15 +5986,15 @@
+@@ -6595,15 +6568,15 @@
 If \fIstring\fP starts with \fIre:\fP, the remainder of the string is treated as
 a regular expression. To match a user that actually contains \fIre:\fP, use
 the prefix \fIliteral:\fP.
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .sp
 in the \fBrevsetalias\fP section of a Mercurial configuration file. Arguments
-@@ -6031,21 +6004,21 @@
+@@ -6613,21 +6586,21 @@
 For example,
 .sp
 .nf
 -.ft C
 +.ft
 -.ft C
 +.ft
 \-f    \->  ::.
 \-d x  \->  date(x)
 \-k x  \->  keyword(x)
-@@ -6054,19 +6027,19 @@
+@@ -6636,19 +6609,19 @@
 \-b x  \->  branch(x)
 \-P x  \->  !::x
 \-l x  \->  limit(expr, x)
 -.ft P
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -6073,9 +6046,9 @@
+@@ -6655,9 +6628,9 @@
 Changesets on the default branch since tag 1.5 (excluding merges):
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -6082,9 +6055,9 @@
+@@ -6664,9 +6637,9 @@
 Open branch heads:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -6092,9 +6065,9 @@
+@@ -6674,9 +6647,9 @@
 \fBhgext/*\fP:
 .sp
 .nf
 -.ft C
 -hg log \-r "1.3::1.5 and keyword(bug) and file(\(aqhgext/*\(aq)"
 +hg log \-r "1.3::1.5 and keyword(bug) and file('hgext/*')"
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -6101,9 +6074,9 @@
+@@ -6683,9 +6656,9 @@
 Changesets committed in May 2008, sorted by user:
 .sp
 .nf
 -.ft C
 -hg log \-r "sort(date(\(aqMay 2008\(aq), user)"
 +hg log \-r "sort(date('May 2008'), user)"
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -6111,11 +6084,11 @@
+@@ -6693,11 +6666,11 @@
 release:
 .sp
 .nf
 -.ft C
 +.ft
 -.UNINDENT
 +.RE
 .SH SUBREPOSITORIES
 .sp
 Subrepositories let you nest external repositories or projects into a
-@@ -6126,7 +6099,7 @@
+@@ -6708,7 +6681,7 @@
 subrepositories.
 .sp
 Subrepositories are made of three components:
 -.INDENT 0.0
 +.RS 0
 .IP 1. 3
 .
 Nested repository checkouts. They can appear anywhere in the
-@@ -6139,18 +6112,18 @@
+@@ -6721,18 +6694,18 @@
 subrepositories are referenced like:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 where \fBpath/to/nested\fP is the checkout location relatively to the
-@@ -6173,7 +6146,7 @@
+@@ -6755,7 +6728,7 @@
 .
 The \fB.hgsubstate\fP file should not be edited manually.
 .RE
 -.UNINDENT
 +.RE
 .SS Adding a Subrepository
 .sp
 If \fB.hgsub\fP does not exist, create it and add it to the parent
-@@ -6181,7 +6154,7 @@
+@@ -6763,7 +6736,7 @@
 to live in the parent repository. Edit \fB.hgsub\fP and add the
 subrepository entry as described above. At this point, the
 subrepository is tracked and the next commit will record its state in
 -\fB.hgsubstate\fP and bind it to the committed changeset.
 +\fB\&.hgsubstate\fP and bind it to the committed changeset.
 .SS Synchronizing a Subrepository
 .sp
 Subrepos do not automatically track the latest changeset of their
-@@ -6198,7 +6171,7 @@
+@@ -6780,7 +6753,7 @@
 To remove a subrepository from the parent repository, delete its
 reference from \fB.hgsub\fP, then remove its files.
 .SS Interaction with Mercurial Commands
 -.INDENT 0.0
 +.RS 0
 .TP
 .B add
 .
-@@ -6220,7 +6193,7 @@
+@@ -6807,7 +6780,7 @@
 have been modified, Mercurial will abort.  Mercurial can be made
 to instead commit all modified subrepositories by specifying
 \-S/\-\-subrepos, or setting "ui.commitsubrepos=True" in a
 -configuration file (see \%\fBhg help config\fP\:).  After there are no
 +configuration file (see \fBhg help config\fP).  After there are no
 longer any modified subrepositories, it records their state and
 finally commits it in the parent repository.
 .TP
-@@ -6251,7 +6224,7 @@
+@@ -6838,7 +6811,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.
-@@ -6278,7 +6251,7 @@
+@@ -6865,7 +6838,7 @@
 changeset is not available in the current subrepository, Mercurial
 will pull it in first before updating.  This means that updating
 can require network access when using subrepositories.
 -.UNINDENT
 +.RE
 .SS Remapping Subrepositories Sources
 .sp
 A subrepository source location may change during a project life,
-@@ -6302,9 +6275,9 @@
+@@ -6883,12 +6856,12 @@
-Usage:
+outgoing, incoming, tip, parents, and heads.
 .sp
-.nf
+Some built\-in styles are packaged with Mercurial. These can be listed
--.ft C
+-with \%\fBhg log \-\-template list\fP\:. Example usage:
-+.ft
++with \fBhg log \-\-template list\fP. Example usage:
-$ hg log \-r1 \-\-style changelog
+.sp
+.nf
+-.ft C
++.ft
+$ hg log \-r1.0::1.1 \-\-template changelog
 -.ft P
 +.ft
 .fi
 .sp
 A template is a piece of text, with markup to invoke variable
-@@ -6311,16 +6284,16 @@
+@@ -6895,16 +6868,16 @@
 expansion:
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .B author
 .
-@@ -6406,24 +6379,24 @@
+@@ -6948,7 +6921,7 @@
+.TP
+.B extras
+.
+-List of dicts with key, value entries of the \(aqextras\(aq
++List of dicts with key, value entries of the 'extras'
+field of this changeset.
+.TP
+.B file_adds
+@@ -6994,24 +6967,24 @@
 .TP
 .B p1node
 .
 -String. The identification hash of the changeset\(aqs first parent,
 +String. The identification hash of the changeset's first parent,
 -Integer. The repository\-local revision number of the changeset\(aqs
 +Integer. The repository\-local revision number of the changeset's
 second parent, or \-1 if the changeset has no second parent.
 .TP
 .B parents
-@@ -6447,24 +6420,24 @@
+@@ -7039,24 +7012,24 @@
 .B tags
 .
 List of strings. Any tags associated with the changeset.
 -.UNINDENT
 +.RE
 -.INDENT 0.0
 +.RS 0
 .TP
 .B addbreaks
 .
-@@ -6548,7 +6521,7 @@
+@@ -7144,7 +7117,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 obfuscate
 .
-@@ -6614,13 +6587,13 @@
+@@ -7214,13 +7187,13 @@
 .
 Any text. Returns a short representation of a user name or email
 address.
 -.UNINDENT
 +.RE
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 .
 date(date[, fmt])
-@@ -6651,25 +6624,25 @@
+@@ -7272,25 +7245,25 @@
 .IP \(bu 2
 .
-sub(pat, repl, expr)
+word(number, text[, separator])
 -.UNINDENT
 +.RE
 .sp
 Also, for any expression that returns a list, there is a list operator:
 -.INDENT 0.0
 +$ hg log \-r 0 \-\-template "files:\en{files % '  {file}\en'}"
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -6676,9 +6649,9 @@
+@@ -7297,9 +7270,9 @@
 Join the list of files with a ", ":
 .sp
 .nf
 -.ft C
 -$ hg log \-r 0 \-\-template "files: {join(files, \(aq, \(aq)}\en"
 +$ hg log \-r 0 \-\-template "files: {join(files, ', ')}\en"
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -6685,9 +6658,9 @@
+@@ -7306,9 +7279,9 @@
+Modify each line of a commit description:
+.sp
+.nf
+-.ft C
+-$ hg log \-\-template "{splitlines(desc) % \(aq**** {line}\en\(aq}"
+-.ft P
++.ft
++$ hg log \-\-template "{splitlines(desc) % '**** {line}\en'}"
++.ft
+.fi
+.IP \(bu 2
+.
+@@ -7315,9 +7288,9 @@
 Format date:
 .sp
 .nf
 -.ft C
 -$ hg log \-r 0 \-\-template "{date(date, \(aq%Y\(aq)}\en"
 +$ hg log \-r 0 \-\-template "{date(date, '%Y')}\en"
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -6694,9 +6667,9 @@
+@@ -7324,9 +7297,9 @@
 Output the description set to a fill\-width of 30:
 .sp
 .nf
 -.ft C
 -$ hg log \-r 0 \-\-template "{fill(desc, \(aq30\(aq)}"
 +$ hg log \-r 0 \-\-template "{fill(desc, '30')}"
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -6703,10 +6676,10 @@
+@@ -7333,10 +7306,10 @@
 Use a conditional to test for the default branch:
 .sp
 .nf
 -.ft C
 -$ hg log \-r 0 \-\-template "{ifeq(branch, \(aqdefault\(aq, \(aqon the main branch\(aq,
 +\&'on branch {branch}')}\en"
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -6713,9 +6686,9 @@
+@@ -7343,9 +7316,9 @@
 Append a newline if not empty:
 .sp
 .nf
 -.ft C
 -$ hg tip \-\-template "{if(author, \(aq{author}\en\(aq)}"
 +$ hg tip \-\-template "{if(author, '{author}\en')}"
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -6722,9 +6695,9 @@
+@@ -7352,9 +7325,9 @@
 Label the output for use with the color extension:
 .sp
 .nf
 -.ft C
 -$ hg log \-r 0 \-\-template "{label(\(aqchangeset.{phase}\(aq, node|short)}\en"
 +$ hg log \-r 0 \-\-template "{label('changeset.{phase}', node|short)}\en"
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -6731,34 +6704,34 @@
+@@ -7361,36 +7334,36 @@
 Invert the firstline filter, i.e. everything but the first line:
 .sp
 .nf
 -.ft C
 -$ hg log \-r 0 \-\-template "{sub(r\(aq^.*\en?\en?\(aq, \(aq\(aq, desc)}\en"
 -.ft P
 +.ft
 +$ hg log \-r 0 \-\-template "{sub(r'^.*\en?\en?', '', desc)}\en"
++.ft
+.fi
+.IP \(bu 2
+.
+-Display the contents of the \(aqextra\(aq field, one per line:
++Display the contents of the 'extra' field, one per line:
+.sp
+.nf
+-.ft C
+-$ hg log \-r 0 \-\-template "{join(extras, \(aq\en\(aq)}\en"
+-.ft P
++.ft
++$ hg log \-r 0 \-\-template "{join(extras, '\en')}\en"
++.ft
+.fi
+.IP \(bu 2
+.
+-Mark the current bookmark with \(aq*\(aq:
++Mark the current bookmark with '*':
+.sp
+.nf
+-.ft C
+-$ hg log \-\-template "{bookmarks % \(aq{bookmark}{ifeq(bookmark, current, \e"*\e")} \(aq}\en"
+-.ft P
++.ft
++$ hg log \-\-template "{bookmarks % '{bookmark}{ifeq(bookmark, current, \e"*\e")} '}\en"
++.ft
+.fi
+.IP \(bu 2
+.
+-Mark the working copy parent with \(aq@\(aq:
++Mark the working copy parent with '@':
+.sp
+.nf
+-.ft C
+-$ hg log \-\-template "{ifcontains(rev, revset(\(aq.\(aq), \(aq@\(aq)}\en"
+-.ft P
++.ft
++$ hg log \-\-template "{ifcontains(rev, revset('.'), '@')}\en"
++.ft
+.fi
+.IP \(bu 2
+.
+@@ -7397,9 +7370,9 @@
+Show only commit descriptions that start with "template":
+.sp
+.nf
+-.ft C
++.ft
+$ hg log \-\-template "{startswith(\e"template\e", firstline(desc))}\en"
+-.ft P
++.ft
+.fi
+.IP \(bu 2
+.
+@@ -7406,34 +7379,34 @@
+Print the first word of each line of a commit message:
+.sp
+.nf
+-.ft C
++.ft
+$ hg log \-\-template "{word(\e"0\e", desc)}\en"
+-.ft P
 +.ft
 .fi
 -.UNINDENT
 +.RE
 .SH URL PATHS
 -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
-@@ -6766,7 +6739,7 @@
+@@ -7441,7 +7414,7 @@
 web.cacerts.
 .sp
 Some notes about using SSH with Mercurial:
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 .
 SSH requires an accessible shell account on the destination machine
-@@ -6773,63 +6746,63 @@
+@@ -7448,63 +7421,63 @@
 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
 +prefer it over 'default' if both are defined.
 +.RE
 .SH EXTENSIONS
 .sp
 This section contains help for extensions that are distributed together with Mercurial. Help for other extensions is available in the help system.
-@@ -6853,7 +6826,7 @@
+@@ -7528,7 +7501,7 @@
 distinguish them.
 .sp
 The order in which access checks are performed is:
 -.INDENT 0.0
 +.RS 0
 .IP 1. 3
 .
 Deny  list for branches (section \fBacl.deny.branches\fP)
-@@ -6866,7 +6839,7 @@
+@@ -7541,7 +7514,7 @@
 .IP 4. 3
 .
 Allow list for paths    (section \fBacl.allow\fP)
 -.UNINDENT
 +.RE
 .sp
 The allow and deny sections take key\-value pairs.
 .SS Branch\-based Access Control
-@@ -6874,7 +6847,7 @@
+@@ -7549,7 +7522,7 @@
 Use the \fBacl.deny.branches\fP and \fBacl.allow.branches\fP sections to
 have branch\-based access control. Keys in these sections can be
 either:
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 .
 a branch name, or
-@@ -6881,10 +6854,10 @@
+@@ -7556,10 +7529,10 @@
 .IP \(bu 2
 .
 an asterisk, to match any branch;
 -.UNINDENT
 +.RE
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 .
 a comma\-separated list containing users and groups, or
-@@ -6891,7 +6864,7 @@
+@@ -7566,7 +7539,7 @@
 .IP \(bu 2
 .
 an asterisk, to match anyone;
 -.UNINDENT
 +.RE
 .sp
 You can add the "!" prefix to a user or group name to invert the sense
 of the match.
-@@ -6913,7 +6886,7 @@
+@@ -7588,7 +7561,7 @@
 .SS Example Configuration
 .sp
 .nf
 -.ft C
 +.ft
 [hooks]
 # Use this if you want to check access restrictions at commit time
-@@ -6989,12 +6962,12 @@
+@@ -7664,12 +7637,12 @@
 src/main/resources/** = *
 \&.hgtags = release_engineer
 -.ft P
 +.ft
 +Suppose there's a branch that only a given user (or group) should be able to
 +push to, and you don't want to restrict access to any other branch that may
 be created.
 .sp
 The "!" prefix allows you to prevent anyone except a given user or group to
-@@ -7006,18 +6979,18 @@
+@@ -7681,18 +7654,18 @@
 3) Deny access to a file to anyone but user "gollum"
 .sp
 .nf
 -.ft C
 +.ft
 +# 2) only members of the group 'hobbit' can commit to branch 'lake';
 +# 'hobbit' members and anyone else can still commit to any other branch.
 lake = !@hobbit
 # You can also deny access based on file paths:
-@@ -7026,10 +6999,10 @@
+@@ -7701,10 +7674,10 @@
 # Empty
 [acl.deny]
 -# 3) only \(aqgollum\(aq can change the file below;
 -# \(aqgollum\(aq and anyone else can still change any other file.
 -.ft P
 +.ft
 .fi
 .SS blackbox
 .sp
-@@ -7040,7 +7013,7 @@
+@@ -7715,7 +7688,7 @@
 Examples:
 .sp
 .nf
 -.ft C
 +.ft
 [blackbox]
 track = *
-@@ -7055,26 +7028,26 @@
+@@ -7730,7 +7703,7 @@
 maxsize = 1.5 MB
 # rotate up to N log files when the current one gets too big
 maxfiles = 3
 -.ft P
 +.ft
 .fi
 .SS Commands
 .SS blackbox
+@@ -7738,20 +7711,20 @@
+view the recent repository events:
 .sp
 .nf
 -.ft C
 +.ft
 hg blackbox [OPTION]...
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-l,  \-\-limit
+.BI \-l,  \-\-limit \ <VALUE>
 .
 the number of events to show (default: 10)
 -.UNINDENT
 +.RE
 .SS bugzilla
 .sp
 hooks for integrating with the Bugzilla bug tracker
-@@ -7087,7 +7060,7 @@
+@@ -7764,7 +7737,7 @@
 hours spent working on the bug. Bugs can also be marked fixed.
 .sp
 Three basic modes of access to Bugzilla are provided:
 -.INDENT 0.0
 +.RS 0
 .IP 1. 3
 .
 Access via the Bugzilla XMLRPC interface. Requires Bugzilla 3.4 or later.
-@@ -7099,7 +7072,7 @@
+@@ -7776,7 +7749,7 @@
 .
 Writing directly to the Bugzilla database. Only Bugzilla installations
 using MySQL are supported. Requires Python MySQLdb.
 -.UNINDENT
 +.RE
 .sp
 Writing directly to the database is susceptible to schema changes, and
 relies on a Bugzilla contrib script to send out bug change
-@@ -7127,12 +7100,12 @@
+@@ -7804,12 +7777,12 @@
 works on all supported Bugzilla versions.
 .sp
 Configuration items common to all access modes:
 -.INDENT 0.0
 +.RS 0
 -.INDENT 7.0
 +.RS 7
 .TP
 .B \fBxmlrpc\fP
 .sp
-@@ -7155,7 +7128,7 @@
+@@ -7832,7 +7805,7 @@
 .sp
 MySQL access, Bugzilla 2.16 and up to but not
 including 2.18.
 -.UNINDENT
 +.RE
 .TP
 .B bugzilla.regexp
 .
-@@ -7200,7 +7173,7 @@
+@@ -7877,7 +7850,7 @@
 Template to use when formatting comments. Overrides style if
 specified. In addition to the usual Mercurial keywords, the
 extension specifies:
 -.INDENT 7.0
 +.RS 7
 .TP
 .B \fB{bug}\fP
 .sp
-@@ -7217,7 +7190,7 @@
+@@ -7894,7 +7867,7 @@
 .B \fB{hgweb}\fP
 .sp
 Base URL for browsing Mercurial repositories.
 -.UNINDENT
 +.RE
 .sp
 Default \fBchangeset {node|short} in repo {root} refers to bug
 {bug}.\endetails:\en\et{desc|tabindent}\fP
-@@ -7234,10 +7207,10 @@
+@@ -7911,10 +7884,10 @@
 .
 Base URL for browsing Mercurial repositories. Referenced from
 templates as \fB{hgweb}\fP.
 -.UNINDENT
 +.RE
 -.INDENT 0.0
 +.RS 0
 .TP
 .B bugzilla.usermap
 .
-@@ -7246,13 +7219,13 @@
+@@ -7923,13 +7896,13 @@
 line:
 .sp
 .nf
 -.ft C
 +.ft
 -.UNINDENT
 +.RE
 .sp
 The \fB[usermap]\fP section is used to specify mappings of Mercurial
 committer email to Bugzilla user email. See also \fBbugzilla.usermap\fP.
-@@ -7259,7 +7232,7 @@
+@@ -7936,7 +7909,7 @@
 Contains entries of the form \fBcommitter = Bugzilla user\fP.
 .sp
 XMLRPC access mode configuration:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B bugzilla.bzurl
 .
-@@ -7274,22 +7247,22 @@
+@@ -7951,22 +7924,22 @@
 .B bugzilla.password
 .
 The password for Bugzilla login.
 -.UNINDENT
 +.RE
 -.INDENT 0.0
 +.RS 0
 .TP
 .B bugzilla.host
 .
-@@ -7329,12 +7302,12 @@
+@@ -8006,12 +7979,12 @@
 id) and \fBuser\fP (committer bugzilla email). Default depends on
 version; from 2.18 it is "cd %(bzdir)s && perl \-T
 contrib/sendbugmail.pl %(id)s %(user)s".
 -.UNINDENT
 +.RE
 -.ft C
 +.ft
 [extensions]
 bugzilla =
-@@ -7341,7 +7314,7 @@
+@@ -8018,7 +7991,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 configurations:
-@@ -7353,7 +7326,7 @@
+@@ -8030,7 +8003,7 @@
 with a web interface at \fBhttp://my\-project.org/hg\fP.
 .sp
 .nf
 -.ft C
 +.ft
 [bugzilla]
 bzurl=http://my\-project.org/bugzilla
 user=bugmail@my\-project.org
-@@ -7366,7 +7339,7 @@
+@@ -8043,7 +8016,7 @@
 [web]
 baseurl=http://my\-project.org/hg
 -.ft P
 +.ft
 .fi
 .sp
 XMLRPC+email example configuration. This uses the Bugzilla at
-@@ -7378,7 +7351,7 @@
+@@ -8055,7 +8028,7 @@
 \fBbugzilla@my\-project.org\fP.
 .sp
 .nf
 -.ft C
 +.ft
 [bugzilla]
 bzurl=http://my\-project.org/bugzilla
 user=bugmail@my\-project.org
-@@ -7395,7 +7368,7 @@
+@@ -8072,7 +8045,7 @@
 [usermap]
 [email protected][email protected]
 -.ft P
 +.ft
 .fi
 .sp
 MySQL example configuration. This has a local Bugzilla 3.2 installation
-@@ -7406,7 +7379,7 @@
+@@ -8083,7 +8056,7 @@
 with a web interface at \fBhttp://my\-project.org/hg\fP.
 .sp
 .nf
 -.ft C
 +.ft
 [bugzilla]
 host=localhost
 password=XYZZY
-@@ -7423,35 +7396,35 @@
+@@ -8100,25 +8073,25 @@
 [usermap]
 [email protected][email protected]
 -.ft P
 +.ft
 +This extension is deprecated. You should use \fBhg log \-r
 +"children(REV)"\fP instead.
 .SS Commands
 .SS children
 .sp
+@@ -8125,12 +8098,12 @@
+show the children of the given or working directory revision:
+.sp
 .nf
 -.ft C
 +.ft
 hg children [\-r REV] [FILE]
 -.ft P
 -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
-@@ -7458,7 +7431,7 @@
+@@ -8137,7 +8110,7 @@
 argument to \-\-rev if given) is printed.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-r,  \-\-rev
+.BI \-r,  \-\-rev \ <REV>
 .
-@@ -7471,7 +7444,7 @@
+@@ -8150,7 +8123,7 @@
-.B \-\-template
+.BI \-T,  \-\-template \ <TEMPLATE>
 .
 display with template
 -.UNINDENT
 +.RE
 .SS churn
 .sp
 command to display statistics about repository history
-@@ -7479,9 +7452,9 @@
+@@ -8160,9 +8133,9 @@
-.SS churn
+histogram of changes to the repository:
 .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
-@@ -7497,7 +7470,7 @@
+@@ -8178,7 +8151,7 @@
 Examples:
 .sp
 .nf
 -.ft C
 +.ft
 # display count of changed lines for every committer
 hg churn \-t "{author|email}"
-@@ -7509,7 +7482,7 @@
+@@ -8190,7 +8163,7 @@
 # display count of lines changed in every year
 hg churn \-f "%Y" \-s
 -.ft P
 +.ft
 .fi
 .sp
 It is possible to map alternate email addresses to a main address
-@@ -7516,9 +7489,9 @@
+@@ -8197,9 +8170,9 @@
 by providing a file using the following format:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Such a file may be specified with the \-\-aliases option, otherwise
-@@ -7526,7 +7499,7 @@
+@@ -8207,7 +8180,7 @@
 Aliases will be split from the rightmost "=".
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-r,  \-\-rev
+.BI \-r,  \-\-rev \ <REV[+]>
 .
-@@ -7567,7 +7540,7 @@
+@@ -8248,7 +8221,7 @@
-.B \-X,  \-\-exclude
+.BI \-X,  \-\-exclude \ <PATTERN[+]>
 .
 exclude names matching the given patterns
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS color
-.sp
+@@ -8268,10 +8241,10 @@
-colorize output from some commands
+available, then effects are rendered with the ECMA\-48 SGR control
-@@ -7587,7 +7560,7 @@
+function (aka ANSI escape codes).
-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
-@@ -7596,7 +7569,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
-@@ -7635,13 +7608,13 @@
-shelve.name = blue bold
-histedit.remaining = red bold
--.ft P
-+.ft
-.fi
 .sp
 -The available effects in terminfo mode are \(aqblink\(aq, \(aqbold\(aq, \(aqdim\(aq,
 -\(aqinverse\(aq, \(aqinvisible\(aq, \(aqitalic\(aq, \(aqstandout\(aq, and \(aqunderline\(aq; in
 -ECMA\-48 mode, the options are \(aqbold\(aq, \(aqinverse\(aq, \(aqitalic\(aq, and
 -\(aqunderline\(aq.  How each is rendered depends on the terminal emulator.
 +\&'inverse', 'invisible', 'italic', 'standout', and 'underline'; in
 +ECMA\-48 mode, the options are 'bold', 'inverse', 'italic', and
 +\&'underline'.  How each is rendered depends on the terminal emulator.
 Some may not be available for a given terminal type, and will be
 silently ignored.
-.sp
+.SS Labels
-@@ -7648,7 +7621,7 @@
+@@ -8278,8 +8251,8 @@
-Note that on some systems, terminfo mode may cause problems when using
+.sp
-color with the pager extension and less \-R. less with the \-R option
+Text receives color effects depending on the labels that it has. Many
-will only display ECMA\-48 color codes, and terminfo mode may sometimes
+default Mercurial commands emit labelled text. You can also define
--emit codes that less doesn\(aqt understand. You can work around this by
+-your own labels in templates using the label function, see \%\fBhg help
-+emit codes that less doesn't understand. You can work around this by
+-templates\fP\:. A single portion of text may have more than one label. In
-either using ansi mode (or auto mode), or by using less \-r (which will
++your own labels in templates using the label function, see \fBhg help
-pass through all terminal control codes, not just color control
++templates\fP. A single portion of text may have more than one label. In
-codes).
+that case, effects given to the last label will override any other
-@@ -7658,18 +7631,18 @@
+effects. This includes the special "none" effect, which nullifies
+other effects.
+@@ -8287,18 +8260,18 @@
+Labels are normally invisible. In order to see these labels and their
+position in the text, use the global \-\-color=debug option. The same
+anchor text may be associated to multiple labels, e.g.
+-.INDENT 0.0
+-.INDENT 3.5
++.RS 0
++.RS 3
+.sp
+[log.changeset changeset.secret|changeset:   22611:6f0a53c8f587]
+-.UNINDENT
+-.UNINDENT
++.RE
++.RE
+.sp
+The following are the default effects for some default labels. 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
+@@ -8307,7 +8280,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
+@@ -8352,7 +8325,7 @@
+shelve.name = blue bold
+histedit.remaining = red bold
+-.ft P
++.ft
+.fi
+.SS Custom colors
+.sp
+@@ -8361,18 +8334,18 @@
 for your terminal type, assuming terminfo mode.  For instance:
 .sp
 .nf
 -.ft C
 +.ft
 +that have brighter colors defined in the upper eight) and, 'pink' and
 +\&'orange' to colors in 256\-color xterm's default color cube.  These
 defined colors may then be used as any of the pre\-defined eight,
 -including appending \(aq_background\(aq to set the background to that color.
 +including appending '_background' to set the background to that color.
+.SS Modes
 .sp
 By default, the color extension will use ANSI mode (or win32 mode on
-Windows) if it detects a terminal. To override auto mode (to enable
+@@ -8380,19 +8353,19 @@
-@@ -7676,13 +7649,13 @@
 terminfo mode, for example), set the following configuration option:
 .sp
 .nf
 -.ft C
 +.ft
 .fi
 .sp
 -Any value other than \(aqansi\(aq, \(aqwin32\(aq, \(aqterminfo\(aq, or \(aqauto\(aq will
 +Any value other than 'ansi', 'win32', 'terminfo', or 'auto' will
 disable color.
-.SS convert
+.sp
-.sp
+Note that on some systems, terminfo mode may cause problems when using
-@@ -7691,13 +7664,13 @@
+color with the pager extension and less \-R. less with the \-R option
-.SS convert
+will only display ECMA\-48 color codes, and terminfo mode may sometimes
+-emit codes that less doesn\(aqt understand. You can work around this by
++emit codes that less doesn't understand. You can work around this by
+either using ansi mode (or auto mode), or by using less \-r (which will
+pass through all terminal control codes, not just color control
+codes).
+@@ -8406,13 +8379,13 @@
+convert a foreign SCM repository to a Mercurial one.:
 .sp
 .nf
 -.ft C
 +.ft
 hg convert [OPTION]... SOURCE [DEST [REVMAP]]
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 .
 Mercurial [hg]
-@@ -7725,10 +7698,10 @@
+@@ -8440,10 +8413,10 @@
 .IP \(bu 2
 .
 Perforce [p4]
 -.UNINDENT
 +.RE
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 .
 Mercurial [hg]
-@@ -7735,7 +7708,7 @@
+@@ -8450,7 +8423,7 @@
 .IP \(bu 2
 .
 Subversion [svn] (history on branches is not preserved)
 -.UNINDENT
 +.RE
 .sp
 If no revision is given, all revisions will be converted.
 Otherwise, convert will only import up to the named revision
-@@ -7743,12 +7716,12 @@
+@@ -8458,12 +8431,12 @@
 .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.
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-\-branchsort
 .
-@@ -7773,21 +7746,21 @@
+@@ -8488,21 +8461,21 @@
 try to move closed revisions as close as possible
 to parent branches, only supported by Mercurial
 sources.
 -.UNINDENT
 +.RE
 +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
-@@ -7796,9 +7769,9 @@
+@@ -8511,9 +8484,9 @@
 author mapping and the line format is:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Empty lines and lines starting with a \fB#\fP are ignored.
-@@ -7808,13 +7781,13 @@
+@@ -8523,13 +8496,13 @@
 directives:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Comment lines start with \fB#\fP. A specified path matches if it
-@@ -7838,9 +7811,9 @@
+@@ -8562,9 +8535,9 @@
 comma\-separated values:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 The key is the revision ID in the source
-@@ -7860,9 +7833,9 @@
+@@ -8584,9 +8557,9 @@
 lines of the form:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 where "original_branch_name" is the name of the branch in the
-@@ -7874,7 +7847,7 @@
+@@ -8598,7 +8571,7 @@
 .sp
 The Mercurial source recognizes the following configuration
 options, which you can set on the command line with \fB\-\-config\fP:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B convert.hg.ignoreerrors
 .
-@@ -7891,7 +7864,7 @@
+@@ -8615,7 +8588,7 @@
 .B convert.hg.revs
 .
 revset specifying the source revisions to convert.
 -.UNINDENT
 +.RE
 .SS CVS Source
 .sp
 CVS source will use a sandbox (i.e. a checked\-out copy) from CVS
-@@ -7905,7 +7878,7 @@
+@@ -8629,7 +8602,7 @@
 sandbox is ignored.
 .sp
 The following options can be used with \fB\-\-config\fP:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B convert.cvsps.cache
 .
-@@ -7956,7 +7929,7 @@
+@@ -8680,7 +8653,7 @@
 the changesets are calculated from the CVS log. The
 function is passed a list with the changeset entries, and can
 modify the changesets in\-place, or add or delete them.
 -.UNINDENT
 +.RE
 .sp
 An additional "debugcvsps" Mercurial command allows the builtin
 changeset merging code to be run without doing a conversion. Its
-@@ -7976,7 +7949,7 @@
+@@ -8700,7 +8673,7 @@
 detection.
 .sp
 The following options can be set with \fB\-\-config\fP:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B convert.svn.branches
 .
-@@ -7998,18 +7971,18 @@
+@@ -8722,28 +8695,28 @@
 use local time (as determined by the TZ
 environment variable) for changeset date/times. The default
 is False (use UTC).
 -.UNINDENT
 +.RE
 .
 specify start Subversion revision number.
 The default is 0.
 -.UNINDENT
 +.RE
+.SS Git Source
+.sp
+The Git importer converts commits from all reachable branches (refs
+in refs/heads) and remotes (refs in refs/remotes) to Mercurial.
+Branches are converted to bookmarks with the same name, with the
+-leading \(aqrefs/heads\(aq stripped. Git submodules are converted to Git
++leading 'refs/heads' stripped. Git submodules are converted to Git
+subrepos in Mercurial.
+.sp
+The following options can be set with \fB\-\-config\fP:
+-.INDENT 0.0
++.RS 0
+.TP
+.B convert.git.similarity
+.
+@@ -8751,7 +8724,7 @@
+commit must be to be imported as renames or copies, as a
+percentage between \fB0\fP (disabled) and \fB100\fP (files must be
+identical). For example, \fB90\fP means that a delete/add pair will
+-be imported as a rename if more than 90% of the file hasn\(aqt
++be imported as a rename if more than 90% of the file hasn't
+changed. The default is \fB50\fP.
+.TP
+.B convert.git.findcopiesharder
+@@ -8760,7 +8733,7 @@
+files in the working copy instead of just changed ones. This
+is very expensive for large projects, and is only effective when
+\fBconvert.git.similarity\fP is greater than 0. The default is False.
+-.UNINDENT
++.RE
 .SS Perforce Source
 .sp
 The Perforce (P4) importer can be given a p4 depot path or a
-@@ -8021,17 +7994,17 @@
+@@ -8772,17 +8745,17 @@
 .sp
 It is possible to limit the amount of source history to be
 converted by specifying an initial Perforce revision:
 -.INDENT 0.0
 +.RS 0
 -.INDENT 0.0
 +.RS 0
 .TP
 .B convert.hg.clonebranches
 .
-@@ -8047,10 +8020,10 @@
+@@ -8798,10 +8771,10 @@
 .
 preserve branch names. The default is
 True.
 -.UNINDENT
 +.RE
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-\-authors
+.BI \-\-authors \ <FILE>
 .
-@@ -8099,7 +8072,7 @@
+@@ -8854,7 +8827,7 @@
 .B \-\-closesort
 .
 try to reorder closed revisions
 -.UNINDENT
 +.RE
 .SS eol
 .sp
 automatically manage newlines in repository files
-@@ -8111,7 +8084,7 @@
+@@ -8866,7 +8839,7 @@
 .sp
 The extension reads its configuration from a versioned \fB.hgeol\fP
 configuration file found in the root of the working copy. The
 -\fB.hgeol\fP file use the same syntax as all other Mercurial
 +\fB\&.hgeol\fP file use the same syntax as all other Mercurial
 configuration files. It uses two sections, \fB[patterns]\fP and
 \fB[repository]\fP.
 .sp
-@@ -8124,9 +8097,9 @@
+@@ -8879,9 +8852,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
 -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
-@@ -8143,7 +8116,7 @@
+@@ -8898,7 +8871,7 @@
 Example versioned \fB.hgeol\fP file:
 .sp
 .nf
 -.ft C
 +.ft
 [patterns]
 **.py = native
 **.vcproj = CRLF
-@@ -8153,7 +8126,7 @@
+@@ -8908,7 +8881,7 @@
 [repository]
 native = LF
 -.ft P
 +.ft
 .fi
 .IP Note
 .
-@@ -8165,12 +8138,12 @@
+@@ -8920,12 +8893,12 @@
 normal Mercurial configuration files and the \fB.hgeol\fP file, with the
 latter overriding the former. You can use that section to control the
 overall behavior. There are three settings:
 -.INDENT 0.0
 +.RS 0
 -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
 .
-@@ -8184,7 +8157,7 @@
+@@ -8939,7 +8912,7 @@
 \fBeol.fix\-trailing\-newline\fP (default False) can be set to True to
 ensure that converted files end with a EOL character (either \fB\en\fP
 or \fB\er\en\fP as per the configured patterns).
 -.UNINDENT
 +.RE
 .sp
 The extension provides \fBcleverencode:\fP and \fBcleverdecode:\fP filters
 like the deprecated win32text extension does. This means that you can
-@@ -8200,7 +8173,7 @@
+@@ -8955,7 +8928,7 @@
 \fBeol.checkallhook\fP hook. These hooks are best used as
 \fBpretxnchangegroup\fP hooks.
 .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
-@@ -8213,12 +8186,12 @@
+@@ -8968,12 +8941,12 @@
 files to compare.
 .sp
 The extdiff extension also allows you 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.
 -# 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
-@@ -8235,20 +8208,20 @@
+@@ -8990,20 +8963,20 @@
 # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in
 # your .vimrc
 vimdiff = gvim \-f "+next" \e
 -          "+execute \(aqDirDiff\(aq fnameescape(argv(0)) fnameescape(argv(1))"
 -.ft P
 -.ft P
 +.ft
 .fi
 .sp
 The extdiff extension will look in your [diff\-tools] and [merge\-tools]
-@@ -8255,17 +8228,17 @@
+@@ -9010,17 +8983,17 @@
 sections for diff tool arguments, when none are specified in [extdiff].
 .sp
 .nf
 -.ft C
 +.ft
 -\%\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
-@@ -8272,9 +8245,9 @@
+@@ -9029,9 +9002,9 @@
-.SS extdiff
+use external program to diff repository (or selected files):
 .sp
 .nf
 -.ft C
 +.ft
 hg extdiff [OPT]... [FILE]...
 -.ft P
 +.ft
 .fi
 .sp
 Show differences between revisions for the specified files, using
-@@ -8293,7 +8266,7 @@
+@@ -9050,7 +9023,7 @@
 to its parent.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-p,  \-\-program
+.BI \-p,  \-\-program \ <CMD>
 .
-@@ -8318,7 +8291,7 @@
+@@ -9075,7 +9048,7 @@
-.B \-X,  \-\-exclude
+.BI \-X,  \-\-exclude \ <PATTERN[+]>
 .
 exclude names matching the given patterns
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS factotum
-.sp
+@@ -9091,9 +9064,9 @@
-http authentication with factotum
-@@ -8332,9 +8305,9 @@
 By default, keys are specified as:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 If the factotum extension is unable to read the required key, one will be
-@@ -8344,12 +8317,12 @@
+@@ -9103,12 +9076,12 @@
 default, these entries are:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 The executable entry defines the full path to the factotum binary. The
-@@ -8362,9 +8335,9 @@
+@@ -9123,9 +9096,9 @@
-.SS fetch
+pull changes from a remote repository, merge new changes if needed.:
 .sp
 .nf
 -.ft C
 +.ft
 hg fetch [SOURCE]
 -.ft P
 +.ft
 .fi
 .sp
 This finds all changes from the repository at the specified path
-@@ -8379,12 +8352,12 @@
+@@ -9140,12 +9113,12 @@
 the newly pulled changes. Local changes are then merged into the
 pulled changes. 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
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-r,  \-\-rev
+.BI \-r,  \-\-rev \ <REV[+]>
 .
-@@ -8429,7 +8402,7 @@
+@@ -9190,7 +9163,7 @@
 .B \-\-insecure
 .
 do not verify server certificate (ignoring web.cacerts config)
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS gpg
-.sp
+@@ -9202,9 +9175,9 @@
-commands to sign and verify changesets
+verify all the signatures there may be for a particular revision:
-@@ -8437,9 +8410,9 @@
-.SS sigcheck
 .sp
 .nf
 -.ft C
 +.ft
 hg sigcheck REV
 -.ft P
 +.ft
 .fi
 .sp
 verify all the signatures there may be for a particular revision
-@@ -8446,18 +8419,18 @@
+@@ -9213,18 +9186,18 @@
-.SS sign
+add a signature for the current or given revision:
 .sp
 .nf
 -.ft C
 +.ft
 hg sign [OPTION]... [REV]...
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-l,  \-\-local
 .
-@@ -8486,13 +8459,13 @@
+@@ -9257,15 +9230,15 @@
-.B \-u,  \-\-user
+.BI \-u,  \-\-user \ <USER>
 .
 record the specified user as committer
 -.UNINDENT
 +.RE
 .SS sigs
 .sp
+list signed changesets:
+.sp
 .nf
 -.ft C
 +.ft
 hg sigs
 -.ft P
 +.ft
 .fi
 .sp
 list signed changesets
-@@ -8507,9 +8480,9 @@
+@@ -9285,9 +9258,9 @@
-.SS glog
+show revision history alongside an ASCII revision graph:
 .sp
 .nf
 -.ft C
 +.ft
 hg glog [OPTION]... [FILE]
 -.ft P
 +.ft
 .fi
 .sp
 Print a revision history alongside a revision graph drawn with
-@@ -8519,7 +8492,7 @@
+@@ -9297,7 +9270,7 @@
 directory.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-f,  \-\-follow
 .
-@@ -8608,7 +8581,7 @@
+@@ -9386,7 +9359,7 @@
-.B \-X,  \-\-exclude
+.BI \-X,  \-\-exclude \ <PATTERN[+]>
 .
 exclude names matching the given patterns
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS hgcia
-.sp
+@@ -9397,7 +9370,7 @@
-hooks for integrating with the CIA.vc notification service
-@@ -8617,7 +8590,7 @@
 configure it, set the following options in your hgrc:
 .sp
 .nf
 -.ft C
 +.ft
 [cia]
 # your registered CIA user name
 user = foo
-@@ -8649,7 +8622,7 @@
+@@ -9429,7 +9402,7 @@
 [web]
 # If you want hyperlinks (optional)
 baseurl = http://server/path/to/repo
 -.ft P
 +.ft
 .fi
 .SS hgk
 .sp
-@@ -8661,19 +8634,18 @@
+@@ -9441,19 +9414,18 @@
 .sp
 hgk consists of two parts: a Tcl script that does the displaying and
 querying of information, and an extension to Mercurial named hgk.py,
 -which provides hooks for hgk to get information. hgk can be found in
 -the contrib directory, and the extension is shipped in the hgext
 -.ft P
 +.ft
 .fi
 .sp
 hgk can make use of the extdiff extension to visualize revisions.
-@@ -8680,10 +8652,10 @@
+@@ -9460,10 +9432,10 @@
 Assuming you had already configured extdiff vdiff command, just add:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Revisions context menu will now display additional entries to fire
-@@ -8692,37 +8664,37 @@
+@@ -9474,37 +9446,37 @@
-.SS view
+start interactive history viewer:
 .sp
 .nf
 -.ft C
 +.ft
 hg view [\-l LIMIT] [REVRANGE]
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-l,  \-\-limit
+.BI \-l,  \-\-limit \ <NUM>
 .
 limit number of changes displayed
 -.UNINDENT
 +.RE
 .SS highlight
 -The default is \(aqcolorful\(aq.
 +The default is 'colorful'.
 .SS histedit
 .sp
 interactive history editing
-@@ -8731,7 +8703,7 @@
+@@ -9513,7 +9485,7 @@
 is as follows, assuming the following history:
 .sp
 .nf
 -.ft C
 +.ft
 @  3[tip]   7c2fd3b9020c   2009\-04\-27 18:04 \-0500   durin42
 |    Add delta
 |
-@@ -8743,7 +8715,7 @@
+@@ -9525,7 +9497,7 @@
 |
 o  0   d8d2fcd0e319   2009\-04\-27 18:04 \-0500   durin42
 Add alpha
 -.ft P
 +.ft
 .fi
 .sp
 If you were to run \fBhg histedit c561b4e977df\fP, you would see the following
-@@ -8750,7 +8722,7 @@
+@@ -9532,7 +9504,7 @@
 file open in your editor:
 .sp
 .nf
 -.ft C
 +.ft
 pick c561b4e977df Add beta
 pick 030b686bedc4 Add gamma
 pick 7c2fd3b9020c Add delta
-@@ -8764,7 +8736,7 @@
+@@ -9545,11 +9517,11 @@
+#  p, pick = use commit
+#  e, edit = use commit, but stop for amending
+#  f, fold = use commit, but combine it with the one above
+-#  r, roll = like fold, but discard this commit\(aqs description
++#  r, roll = like fold, but discard this commit's description
 #  d, drop = remove commit from history
 #  m, mess = edit message without changing commit content
 #
 -.ft P
 +.ft
 .fi
 .sp
 In this file, lines beginning with \fB#\fP are ignored. You must specify a rule
-@@ -8773,7 +8745,7 @@
+@@ -9558,7 +9530,7 @@
 would reorganize the file to look like this:
 .sp
 .nf
 -.ft C
 +.ft
 pick 030b686bedc4 Add gamma
 pick c561b4e977df Add beta
 fold 7c2fd3b9020c Add delta
-@@ -8787,7 +8759,7 @@
+@@ -9571,11 +9543,11 @@
+#  p, pick = use commit
+#  e, edit = use commit, but stop for amending
+#  f, fold = use commit, but combine it with the one above
+-#  r, roll = like fold, but discard this commit\(aqs description
++#  r, roll = like fold, but discard this commit's description
 #  d, drop = remove commit from history
 #  m, mess = edit message without changing commit content
 #
 -.ft P
 +.ft
 .fi
 .sp
 At which point you close the editor and \fBhistedit\fP starts working. When you
-@@ -8795,21 +8767,21 @@
+@@ -9583,21 +9555,21 @@
 those revisions together, offering you a chance to clean up the commit message:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft C
 +.ft
 @  2[tip]   989b4d060121   2009\-04\-27 18:04 \-0500   durin42
 |    Add beta and delta.
 |
-@@ -8818,12 +8790,12 @@
+@@ -9606,12 +9578,12 @@
 |
 o  0   d8d2fcd0e319   2009\-04\-27 18:04 \-0500   durin42
 Add alpha
 -.ft P
 +.ft
 -probably perform several strip operations when it\(aqs done. For the above example,
 +probably perform several strip operations when it's done. For the above example,
 it had to run strip twice. Strip can be slow depending on a variety of factors,
 so you might need to be a little patient. You can choose to keep the original
 revisions by passing the \fB\-\-keep\fP flag.
-@@ -8830,20 +8802,20 @@
+@@ -9618,20 +9590,20 @@
 .sp
 The \fBedit\fP operation will drop you back to a command prompt,
 allowing you to edit files freely, or even use \fBhg record\fP to commit
 -some changes as a separate commit. When you\(aqre done, any remaining
 +some changes as a separate commit. When you're done, any remaining
 +\fBedit\fP with the difference that it won't prompt you for a commit
 +message when done. If you decide at this point that you don't like how
 much work it will be to rearrange history, or that you made a mistake,
 you can use \fBhg histedit \-\-abort\fP to abandon the new changes you
 have made and return to the state before you attempted to edit your
-@@ -8853,7 +8825,7 @@
+@@ -9641,7 +9613,7 @@
 changes, such that we have the following history:
 .sp
 .nf
 -.ft C
 +.ft
 @  6[tip]   038383181893   2009\-04\-27 18:04 \-0500   stefan
 |    Add theta
 |
-@@ -8874,7 +8846,7 @@
+@@ -9662,7 +9634,7 @@
 |
 o  0   d8d2fcd0e319   2009\-04\-27 18:04 \-0500   durin42
 Add alpha
 -.ft P
 +.ft
 .fi
 .sp
 If you run \fBhg histedit \-\-outgoing\fP on the clone then it is the same
-@@ -8885,9 +8857,9 @@
+@@ -9675,9 +9647,9 @@
-.SS histedit
+interactively edit changeset history:
 .sp
 .nf
 -.ft C
 +.ft
 hg histedit ANCESTOR | \-\-outgoing [URL]
 -.ft P
 +.ft
 .fi
 .sp
 This command edits changesets between ANCESTOR and the parent of
-@@ -8895,7 +8867,7 @@
+@@ -9685,7 +9657,7 @@
 .sp
 With \-\-outgoing, this edits changesets not found in the
 destination repository. If URL of the destination is omitted, the
 -\(aqdefault\-push\(aq (or \(aqdefault\(aq) path will be used.
 +\&'default\-push' (or 'default') path will be used.
 .sp
 For safety, this command is aborted, also if there are ambiguous
 outgoing revisions which may confuse users: for example, there are
-@@ -8903,7 +8875,7 @@
+@@ -9693,7 +9665,7 @@
 .sp
 Use "min(outgoing() and ::.)" or similar revset specification
 instead of \-\-outgoing to specify edit target revision exactly in
 -such ambiguous situation. See \%\fBhg help revsets\fP\: for detail about
 +such ambiguous situation. See \fBhg help revsets\fP for detail about
 selecting revisions.
 .sp
 Returns 0 on success, 1 if user intervention is required (not only
-@@ -8911,7 +8883,7 @@
+@@ -9701,7 +9673,7 @@
 conflicts).
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-\-commands
+.BI \-\-commands \ <VALUE>
 .
-@@ -8923,7 +8895,7 @@
+@@ -9713,7 +9685,7 @@
 .TP
 .B \-k,  \-\-keep
 .
 -don\(aqt strip old nodes after edit is complete
 +don't strip old nodes after edit is complete
 .TP
 .B \-\-abort
 .
-@@ -8940,23 +8912,23 @@
+@@ -9730,7 +9702,7 @@
-.B \-r,  \-\-rev
+.BI \-r,  \-\-rev \ <VALUE[+]>
 .
 first revision to be edited
 -.UNINDENT
 +.RE
-.SS inotify
+.sp
-.sp
+[+] marked option can be specified multiple times
--accelerate status report using Linux\(aqs inotify service
+.SS keyword
-+accelerate status report using Linux's inotify service
+@@ -9753,7 +9725,7 @@
-.SS Commands
-.SS inserve
-.sp
-.nf
--.ft C
-+.ft
-hg inserve [OPTION]...
--.ft P
-+.ft
-.fi
-.sp
-start an inotify server for this repository
-.sp
-Options:
--.INDENT 0.0
-+.RS 0
-.TP
-.B \-d,  \-\-daemon
-.
-@@ -8973,7 +8945,7 @@
-.B \-\-pid\-file
-.
-name of file to write process ID to
--.UNINDENT
-+.RE
-.SS interhg
-.sp
-None
-@@ -8997,7 +8969,7 @@
 Example:
 .sp
 .nf
 -.ft C
 +.ft
 [keyword]
 # expand keywords in every python file except those matching "x*"
 **.py =
-@@ -9006,7 +8978,7 @@
+@@ -9762,7 +9734,7 @@
 [keywordset]
 # prefer svn\- over cvs\-like default keywordmaps
 svn = True
 -.ft P
 +.ft
 .fi
 .IP Note
 .
-@@ -9015,11 +8987,11 @@
+@@ -9771,11 +9743,11 @@
 .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
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fButcdate\fP
 .sp
-@@ -9032,28 +9004,28 @@
+@@ -9788,20 +9760,20 @@
 .B \fBsvnisodate\fP
 .sp
 "2006\-09\-18 08:13:13 \-700 (Mon, 18 Sep 2006)"
 -.UNINDENT
 +.RE
 -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
+@@ -9809,9 +9781,9 @@
+print [keywordmaps] configuration and an expansion example:
 .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
-@@ -9064,10 +9036,10 @@
+@@ -9822,10 +9794,10 @@
 .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.
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-d,  \-\-default
 .
-@@ -9076,13 +9048,13 @@
+@@ -9834,15 +9806,15 @@
-.B \-f,  \-\-rcfile
+.BI \-f,  \-\-rcfile \ <FILE>
 .
 read maps from rcfile
 -.UNINDENT
 +.RE
 .SS kwexpand
 .sp
+expand keywords in the working directory:
+.sp
 .nf
 -.ft C
 +.ft
 hg kwexpand [OPTION]... [FILE]...
 -.ft P
 +.ft
 .fi
 .sp
 Run after (re)enabling keyword expansion.
-@@ -9090,7 +9062,7 @@
+@@ -9850,7 +9822,7 @@
 kwexpand refuses to run if given files contain local changes.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-I,  \-\-include
+.BI \-I,  \-\-include \ <PATTERN[+]>
 .
-@@ -9099,13 +9071,13 @@
+@@ -9859,7 +9831,7 @@
-.B \-X,  \-\-exclude
+.BI \-X,  \-\-exclude \ <PATTERN[+]>
 .
 exclude names matching the given patterns
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS kwfiles
+@@ -9867,9 +9839,9 @@
+show files configured for keyword expansion:
 .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
-@@ -9115,7 +9087,7 @@
+@@ -9879,7 +9851,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
-@@ -9122,16 +9094,16 @@
+@@ -9886,16 +9858,16 @@
 of files are:
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-A,  \-\-all
 .
-@@ -9152,13 +9124,13 @@
+@@ -9916,7 +9888,7 @@
-.B \-X,  \-\-exclude
+.BI \-X,  \-\-exclude \ <PATTERN[+]>
 .
 exclude names matching the given patterns
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS kwshrink
+@@ -9924,9 +9896,9 @@
+revert expanded keywords in the working directory:
 .sp
 .nf
 -.ft C
 +.ft
 hg kwshrink [OPTION]... [FILE]...
 -.ft P
 +.ft
 .fi
 .sp
 Must be run before changing/disabling active keywords.
-@@ -9166,7 +9138,7 @@
+@@ -9934,7 +9906,7 @@
 kwshrink refuses to run if given files contain local changes.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-I,  \-\-include
+.BI \-I,  \-\-include \ <PATTERN[+]>
 .
-@@ -9175,7 +9147,7 @@
+@@ -9943,7 +9915,7 @@
-.B \-X,  \-\-exclude
+.BI \-X,  \-\-exclude \ <PATTERN[+]>
 .
 exclude names matching the given patterns
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS largefiles
-.sp
+@@ -9952,10 +9924,10 @@
-track large binary files
-@@ -9182,10 +9154,10 @@
 .sp
 Large binary files tend to be not very compressible, not very
 diffable, and not at all mergeable. Such files are not handled
 -efficiently by Mercurial\(aqs storage format (revlog), which is based on
 +efficiently by Mercurial's storage format (revlog), which is based on
 -Mercurial\(aqs memory usage. The largefiles extension addresses these
 +Mercurial's memory usage. The largefiles extension addresses these
 problems by adding a centralized client\-server layer on top of
 Mercurial: largefiles live in a \fIcentral store\fP out on the network
 somewhere, and you only fetch the revisions that you need when you
-@@ -9197,18 +9169,18 @@
+@@ -9967,18 +9939,18 @@
 identified by the SHA\-1 hash of their contents, which is written to
 the standin. largefiles uses that revision ID to get/put largefile
 revisions from/to the central store. This saves both disk space and
 -bandwidth, since you don\(aqt need to retrieve all historical revisions
 +bandwidth, since you don't need to retrieve all historical revisions
 +$ hg commit \-m 'add randomdata as a largefile'
 +.ft
 .fi
 .sp
 When you push a changeset that adds/modifies largefiles to a remote
-@@ -9225,8 +9197,8 @@
+@@ -9995,8 +9967,8 @@
 copy to the latest pulled revision (and thereby downloading any new
 largefiles).
 .sp
 -If you want to pull largefiles you don\(aqt need for update yet, then
 -you can use pull with the \fI\-\-lfrev\fP option or the \%\fBhg lfpull\fP\: command.
 +If you want to pull largefiles you don't need for update yet, then
 +you can use pull with the \fI\-\-lfrev\fP option or the \fBhg lfpull\fP command.
 .sp
 If you know you are pulling from a non\-default location and want to
 download all the largefiles that correspond to the new changesets at
-@@ -9245,12 +9217,12 @@
+@@ -10015,12 +9987,12 @@
 If you already have large files tracked by Mercurial without the
 largefiles extension, you will need to convert your repository in
 order to benefit from largefiles. This is done with the
 -\%\fBhg lfconvert\fP\: command:
 +\fBhg lfconvert\fP command:
 -.ft P
 +.ft
 .fi
 .sp
 In repositories that already have largefiles in them, any new file
-@@ -9260,20 +9232,20 @@
+@@ -10030,20 +10002,20 @@
 \-\-lfsize option to the add command (also in megabytes):
 .sp
 .nf
 -.ft C
 +.ft
 -.ft C
 +.ft
 [largefiles]
 patterns =
 *.jpg
-@@ -9280,7 +9252,7 @@
+@@ -10050,7 +10022,7 @@
 re:.*\e.(png|bmp)$
 library.zip
 content/audio/*
 -.ft P
 +.ft
 .fi
 .sp
 Files that match one of these patterns will be added as largefiles
-@@ -9289,15 +9261,15 @@
+@@ -10059,7 +10031,7 @@
 The \fBlargefiles.minsize\fP and \fBlargefiles.patterns\fP config options
 will be ignored for any repositories not already containing a
 largefile. To add the first largefile to a repository, you must
 -explicitly do so with the \-\-large flag passed to the \%\fBhg add\fP\:
 +explicitly do so with the \-\-large flag passed to the \fBhg add\fP
 command.
 .SS Commands
 .SS lfconvert
+@@ -10067,9 +10039,9 @@
+convert a normal repository to a largefiles repository:
 .sp
 .nf
 -.ft C
 +.ft
 hg lfconvert SOURCE DEST [FILE ...]
 -.ft P
 +.ft
 .fi
 .sp
 Convert repository SOURCE to a new repository DEST, identical to
-@@ -9317,7 +9289,7 @@
+@@ -10089,7 +10061,7 @@
 this, the DEST repository can be used without largefiles at all.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-s,  \-\-size
+.BI \-s,  \-\-size \ <SIZE>
 .
-@@ -9326,31 +9298,31 @@
+@@ -10098,33 +10070,33 @@
 .B \-\-to\-normal
 .
 convert from a largefiles repo to a normal repo
 -.UNINDENT
 +.RE
 .SS lfpull
+.sp
+pull largefiles for the specified revisions from the specified source:
 .sp
 .nf
 -.ft C
 +.ft
 hg lfpull \-r REV... [\-e CMD] [\-\-remotecmd CMD] [SOURCE]
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -9357,14 +9329,14 @@
+@@ -10131,14 +10103,14 @@
 pull largefiles on the default branch:
 .sp
 .nf
 -.ft C
 +.ft
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-r,  \-\-rev
+.BI \-r,  \-\-rev \ <VALUE[+]>
 .
-@@ -9381,7 +9353,7 @@
+@@ -10155,7 +10127,7 @@
 .B \-\-insecure
 .
 do not verify server certificate (ignoring web.cacerts config)
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS mq
-.sp
+@@ -10169,10 +10141,10 @@
-manage a stack of patches
-@@ -9393,10 +9365,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):
 -.ft C
 +.ft
 create new patch                          qnew
 import existing patch                     qimport
-@@ -9406,7 +9378,7 @@
+@@ -10182,7 +10154,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
-@@ -9414,29 +9386,29 @@
+@@ -10190,29 +10162,29 @@
 files creations or deletions. This behaviour can be configured with:
 .sp
 .nf
 -.ft C
 +.ft
 -create other, independent patch queues with the \%\fBhg qqueue\fP\: command.
 +create other, independent patch queues with the \fBhg qqueue\fP command.
 .sp
 If the working directory contains uncommitted files, qpush, qpop and
 qgoto abort immediately. If \-f/\-\-force is used, the changes are
-@@ -9443,10 +9415,10 @@
+@@ -10219,10 +10191,10 @@
 discarded. Setting:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 make them behave as if \-\-keep\-changes were passed, and non\-conflicting
-@@ -9459,15 +9431,15 @@
+@@ -10237,15 +10209,15 @@
-.SS qapplied
+print the patches already applied:
 .sp
 .nf
 -.ft C
 +.ft
 hg qapplied [\-1] [\-s] [PATCH]
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-1,  \-\-last
 .
-@@ -9476,13 +9448,13 @@
+@@ -10254,15 +10226,15 @@
 .B \-s,  \-\-summary
 .
 print first line of patch header
 -.UNINDENT
 +.RE
 .SS qclone
 .sp
+clone main and patch repository at same time:
+.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
-@@ -9495,12 +9467,12 @@
+@@ -10275,12 +10247,12 @@
 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.
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-\-pull
 .
-@@ -9529,19 +9501,19 @@
+@@ -10309,21 +10281,21 @@
 .B \-\-insecure
 .
 do not verify server certificate (ignoring web.cacerts config)
 -.UNINDENT
 +.RE
 .SS qcommit
+.sp
+commit changes in the queue repository (DEPRECATED):
 .sp
 .nf
 -.ft C
 +.ft
 hg qcommit [OPTION]... [FILE]...
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-A,  \-\-addremove
 .
-@@ -9588,13 +9560,13 @@
+@@ -10372,23 +10344,23 @@
+.B \-S,  \-\-subrepos
+.
 recurse into subrepositories
+-.UNINDENT
++.RE
+.sp
+[+] marked option can be specified multiple times
+-.INDENT 0.0
+-.INDENT 3.5
++.RS 0
++.RS 3
 .sp
 aliases: qci
 -.UNINDENT
+-.UNINDENT
++.RE
 +.RE
 .SS qdelete
 .sp
+remove patches from queue:
+.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. Exact
-@@ -9602,10 +9574,10 @@
+@@ -10396,10 +10368,10 @@
 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.
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-k,  \-\-keep
 .
-@@ -9616,13 +9588,13 @@
+@@ -10408,23 +10380,23 @@
+.BI \-r,  \-\-rev \ <REV[+]>
+.
 stop managing a revision (DEPRECATED)
+-.UNINDENT
++.RE
+.sp
+[+] marked option can be specified multiple times
+-.INDENT 0.0
+-.INDENT 3.5
++.RS 0
++.RS 3
 .sp
 aliases: qremove qrm
 -.UNINDENT
+-.UNINDENT
++.RE
 +.RE
 .SS qdiff
 .sp
+diff of the current patch and subsequent modifications:
+.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
-@@ -9630,8 +9602,8 @@
+@@ -10432,8 +10404,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
-@@ -9638,7 +9610,7 @@
+@@ -10440,7 +10412,7 @@
 Returns 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-a,  \-\-text
 .
-@@ -9687,13 +9659,13 @@
+@@ -10489,7 +10461,7 @@
-.B \-X,  \-\-exclude
+.BI \-X,  \-\-exclude \ <PATTERN[+]>
 .
 exclude names matching the given patterns
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS qfinish
+@@ -10497,9 +10469,9 @@
+move applied patches into repository history:
 .sp
 .nf
 -.ft C
 +.ft
 hg qfinish [\-a] [REV]...
 -.ft P
 +.ft
 .fi
 .sp
 Finishes the specified revisions (corresponding to applied
-@@ -9712,18 +9684,18 @@
+@@ -10518,20 +10490,20 @@
 Returns 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 finish all applied changesets
 -.UNINDENT
 +.RE
 .SS qfold
 .sp
+fold the named patches into the current patch:
+.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
-@@ -9739,7 +9711,7 @@
+@@ -10547,7 +10519,7 @@
 Returns 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-e,  \-\-edit
 .
-@@ -9756,19 +9728,19 @@
+@@ -10564,21 +10536,21 @@
-.B \-l,  \-\-logfile
+.BI \-l,  \-\-logfile \ <FILE>
 .
 read commit message from file
 -.UNINDENT
 +.RE
 .SS qgoto
 .sp
+push or pop patches until named patch is at top of stack:
+.sp
 .nf
 -.ft C
 +.ft
 hg qgoto [OPTION]... PATCH
 -.ft P
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-\-keep\-changes
 .
-@@ -9781,19 +9753,19 @@
+@@ -10591,21 +10563,21 @@
 .B \-\-no\-backup
 .
 do not save backup copies of files
 -.UNINDENT
 +.RE
 .SS qguard
+.sp
+set or print guards for a patch:
 .sp
 .nf
 -.ft C
 +.ft
 hg qguard [\-l] [\-n] [PATCH] [\-\- [+GUARD]... [\-GUARD]...]
 +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.
-@@ -9800,21 +9772,21 @@
+@@ -10612,21 +10584,21 @@
 With arguments, set guards for the named patch.
 .IP Note
 .
 -Specifying negative guards now requires \(aq\-\-\(aq.
 +Specifying negative guards now requires '\-\-'.
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-l,  \-\-list
 .
-@@ -9823,13 +9795,13 @@
+@@ -10635,15 +10607,15 @@
 .B \-n,  \-\-none
 .
 drop all guards
 -.UNINDENT
 +.RE
 .SS qheader
 .sp
+print the header of the topmost or specified patch:
+.sp
 .nf
 -.ft C
 +.ft
 hg qheader [PATCH]
 -.ft P
 +.ft
 .fi
 .sp
 Returns 0 on success.
-@@ -9836,9 +9808,9 @@
+@@ -10652,9 +10624,9 @@
-.SS qimport
+import a patch or existing changeset:
 .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
-@@ -9859,7 +9831,7 @@
+@@ -10675,7 +10647,7 @@
 under mq control). With \-g/\-\-git, patches imported with \-\-rev will
 use the git diff format. See the diffs help topic for information
 on why this is important for preserving rename/copy information
 -and permission changes. Use \%\fBhg qfinish\fP\: to remove changesets
 +and permission changes. Use \fBhg qfinish\fP to remove changesets
 from mq control.
 .sp
 To import a patch from standard input, pass \- as the patch file.
-@@ -9869,15 +9841,15 @@
+@@ -10685,15 +10657,15 @@
 To import an existing patch while renaming it:
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-e,  \-\-existing
 .
-@@ -9902,13 +9874,13 @@
+@@ -10718,7 +10690,7 @@
 .B \-P,  \-\-push
 .
 qpush after importing
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS qinit
+@@ -10726,9 +10698,9 @@
+init a new queue repository (DEPRECATED):
 .sp
 .nf
 -.ft C
 +.ft
 hg qinit [\-c]
 -.ft P
 +.ft
 .fi
 .sp
 The queue repository is unversioned by default. If
-@@ -9917,22 +9889,22 @@
+@@ -10737,24 +10709,24 @@
 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.
 create queue repository
 -.UNINDENT
 +.RE
 .SS qnew
 .sp
+create a new patch:
+.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
-@@ -9948,7 +9920,7 @@
+@@ -10770,7 +10742,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
-@@ -9958,7 +9930,7 @@
+@@ -10780,7 +10752,7 @@
 Returns 0 on successful creation of a new patch.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-e,  \-\-edit
 .
-@@ -10003,30 +9975,30 @@
+@@ -10825,7 +10797,7 @@
-.B \-l,  \-\-logfile
+.BI \-l,  \-\-logfile \ <FILE>
 .
 read commit message from file
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS qnext
+@@ -10833,28 +10805,28 @@
+print the name of the next pushable patch:
 .sp
 .nf
 -.ft C
 +.ft
 hg qnext [\-s]
 print first line of patch header
 -.UNINDENT
 +.RE
 .SS qpop
 .sp
+pop the current patch off the stack:
+.sp
 .nf
 -.ft C
 +.ft
 hg qpop [\-a] [\-f] [PATCH | INDEX]
 -.ft P
 +.ft
 .fi
 .sp
 Without argument, pops off the top of the patch stack. If given a
-@@ -10041,7 +10013,7 @@
+@@ -10869,7 +10841,7 @@
 Return 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-a,  \-\-all
 .
-@@ -10062,30 +10034,30 @@
+@@ -10890,34 +10862,34 @@
 .B \-\-no\-backup
 .
 do not save backup copies of files
 -.UNINDENT
 +.RE
 .SS qprev
 .sp
+print the name of the preceding applied patch:
+.sp
 .nf
 -.ft C
 +.ft
 hg qprev [\-s]
 -.ft P
 print first line of patch header
 -.UNINDENT
 +.RE
 .SS qpush
 .sp
+push the next patch onto the stack:
+.sp
 .nf
 -.ft C
 +.ft
 hg qpush [\-f] [\-l] [\-a] [\-\-move] [PATCH | INDEX]
 -.ft P
 +.ft
 .fi
 .sp
 By default, abort if the working directory contains uncommitted
-@@ -10096,7 +10068,7 @@
+@@ -10928,7 +10900,7 @@
 Return 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-\-keep\-changes
 .
-@@ -10133,13 +10105,13 @@
+@@ -10965,15 +10937,15 @@
 .B \-\-no\-backup
 .
 do not save backup copies of files
 -.UNINDENT
 +.RE
 .SS qqueue
 .sp
+manage multiple patch queues:
+.sp
 .nf
 -.ft C
 +.ft
 hg qqueue [OPTION] [QUEUE]
 -.ft P
 +.ft
 .fi
 .sp
 Supports switching between different patch queues, as well as creating
-@@ -10161,7 +10133,7 @@
+@@ -10995,7 +10967,7 @@
 Returns 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-l,  \-\-list
 .
-@@ -10186,13 +10158,13 @@
+@@ -11020,15 +10992,15 @@
 .B \-\-purge
 .
 delete queue, and remove patch dir
 -.UNINDENT
 +.RE
 .SS qrefresh
 .sp
+update the current patch:
+.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
-@@ -10214,7 +10186,7 @@
+@@ -11050,7 +11022,7 @@
 Returns 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-e,  \-\-edit
 .
-@@ -10259,13 +10231,13 @@
+@@ -11095,7 +11067,7 @@
-.B \-l,  \-\-logfile
+.BI \-l,  \-\-logfile \ <FILE>
 .
 read commit message from file
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS qrename
+@@ -11103,9 +11075,9 @@
+rename a patch:
 .sp
 .nf
 -.ft C
 +.ft
 hg qrename PATCH1 [PATCH2]
 -.ft P
 +.ft
 .fi
 .sp
 With one argument, renames the current patch to PATCH1.
-@@ -10272,24 +10244,24 @@
+@@ -11112,26 +11084,26 @@
 With two arguments, renames PATCH1 to PATCH2.
 .sp
 Returns 0 on success.
 -.INDENT 0.0
 -.INDENT 3.5
 -.UNINDENT
 -.UNINDENT
 +.RE
 +.RE
 .SS qrestore
+.sp
+restore the queue state saved by a revision (DEPRECATED):
 .sp
 .nf
 -.ft C
 +.ft
 hg qrestore [\-d] [\-u] REV
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-d,  \-\-delete
 .
-@@ -10298,19 +10270,19 @@
+@@ -11140,21 +11112,21 @@
 .B \-u,  \-\-update
 .
 update queue working directory
 -.UNINDENT
 +.RE
 .SS qsave
+.sp
+save current queue state (DEPRECATED):
 .sp
 .nf
 -.ft C
 +.ft
 hg qsave [\-m TEXT] [\-l FILE] [\-c] [\-n NAME] [\-e] [\-f]
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-c,  \-\-copy
 .
-@@ -10335,16 +10307,16 @@
+@@ -11179,18 +11151,18 @@
-.B \-l,  \-\-logfile
+.BI \-l,  \-\-logfile \ <FILE>
 .
 read commit message from file
 -.UNINDENT
 +.RE
 .SS qselect
+.sp
+set or print guarded patches to push:
 .sp
 .nf
 -.ft C
 +.ft
 hg qselect [OPTION]... [GUARD]...
 -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
-@@ -10351,11 +10323,11 @@
+@@ -11197,11 +11169,11 @@
 match the current guard. For example:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 This activates the "stable" guard. mq will skip foo.patch (because
-@@ -10381,7 +10353,7 @@
+@@ -11227,7 +11199,7 @@
 Returns 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-n,  \-\-none
 .
-@@ -10398,19 +10370,19 @@
+@@ -11244,21 +11216,21 @@
 .B \-\-reapply
 .
 pop, then reapply patches
 -.UNINDENT
 +.RE
 .SS qseries
 .sp
+print the entire series file:
+.sp
 .nf
 -.ft C
 +.ft
 hg qseries [\-ms]
 -.ft P
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-m,  \-\-missing
 .
-@@ -10419,36 +10391,36 @@
+@@ -11267,40 +11239,40 @@
 .B \-s,  \-\-summary
 .
 print first line of patch header
 -.UNINDENT
 +.RE
 .SS qtop
 .sp
+print the name of the current patch:
+.sp
 .nf
 -.ft C
 +.ft
 hg qtop [\-s]
 -.ft P
 print first line of patch header
 -.UNINDENT
 +.RE
 .SS qunapplied
 .sp
+print the patches not yet applied:
+.sp
 .nf
 -.ft C
 +.ft
 hg qunapplied [\-1] [\-s] [PATCH]
 -.ft P
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-1,  \-\-first
 .
-@@ -10457,7 +10429,7 @@
+@@ -11309,7 +11281,7 @@
 .B \-s,  \-\-summary
 .
 print first line of patch header
 -.UNINDENT
 +.RE
 .SS notify
 .sp
 hooks for sending email push notifications
-@@ -10465,13 +10437,13 @@
+@@ -11317,13 +11289,13 @@
 This extension implements hooks to send email notifications when
 changesets are sent from or received by the local repository.
 .sp
 -First, enable the extension as explained in \%\fBhg help extensions\fP\:, and
 +First, enable the extension as explained in \fBhg help extensions\fP, and
 -.ft C
 +.ft
 [hooks]
 # one email for each incoming changeset
 incoming.notify = python:hgext.notify.hook
-@@ -10480,7 +10452,7 @@
+@@ -11332,7 +11304,7 @@
 # one email for all outgoing changesets
 outgoing.notify = python:hgext.notify.hook
 -.ft P
 +.ft
 .fi
 .sp
 This registers the hooks. To enable notification, subscribers must
-@@ -10489,7 +10461,7 @@
+@@ -11341,7 +11313,7 @@
 multiple recipients to a single repository:
 .sp
 .nf
 -.ft C
 +.ft
 [usersubs]
 # key is subscriber email, value is a comma\-separated list of repo patterns
 user@host = pattern
-@@ -10497,7 +10469,7 @@
+@@ -11349,7 +11321,7 @@
 [reposubs]
 # key is repo pattern, value is a comma\-separated list of subscriber emails
 pattern = user@host
 -.ft P
 +.ft
 .fi
 .sp
 A \fBpattern\fP is a \fBglob\fP matching the absolute path to a repository,
-@@ -10505,10 +10477,10 @@
+@@ -11357,10 +11329,10 @@
 present, is separated from the glob by a hash. Example:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 This sends to \fBqa\[email protected]\fP whenever a changeset on the \fBrelease\fP
-@@ -10519,10 +10491,10 @@
+@@ -11371,10 +11343,10 @@
 incorporated by reference:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Notifications will not be sent until the \fBnotify.test\fP value is set
-@@ -10529,7 +10501,7 @@
+@@ -11381,7 +11353,7 @@
 to \fBFalse\fP; see below.
 .sp
 Notifications content can be tweaked with the following configuration entries:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B notify.test
 .
-@@ -10538,8 +10510,8 @@
+@@ -11390,8 +11362,8 @@
 .B notify.sources
 .
 Space\-separated list of change sources. Notifications are activated only
 -when a changeset\(aqs source is in this list. Sources may be:
 -.INDENT 7.0
 +when a changeset's source is in this list. Sources may be:
 +.RS 7
 .TP
 .B \fBserve\fP
 .sp
-@@ -10560,7 +10532,7 @@
+@@ -11412,7 +11384,7 @@
 .B \fBbundle\fP
 .sp
 changesets sent via \fBhg unbundle\fP
 -.UNINDENT
 +.RE
 .sp
 Default: serve.
 .TP
-@@ -10603,7 +10575,7 @@
+@@ -11455,7 +11427,7 @@
 .TP
 .B notify.maxsubject
 .
 -Maximum number of characters in email\(aqs subject line. Default: 67.
 +Maximum number of characters in email's subject line. Default: 67.
 .TP
 .B notify.diffstat
 .
-@@ -10622,11 +10594,11 @@
+@@ -11474,11 +11446,11 @@
 If set, use the committer of the first changeset in a changegroup for
 the "From" field of the notification mail. If not set, take the user
 from the pushing repo.  Default: False.
 -.UNINDENT
 +.RE
 -.INDENT 0.0
 +.RS 0
 .TP
 .B email.from
 .
-@@ -10637,7 +10609,7 @@
+@@ -11489,7 +11461,7 @@
 .
 Root repository URL to combine with repository paths when making
 references. See also \fBnotify.strip\fP.
 -.UNINDENT
 +.RE
 .SS pager
 .sp
 browse command output with an external pager
-@@ -10645,10 +10617,10 @@
+@@ -11497,10 +11469,10 @@
 To set the pager that should be used, set the application variable:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 If no pager is set, the pager extensions uses the environment variable
-@@ -10658,10 +10630,10 @@
+@@ -11510,10 +11482,10 @@
 pager.ignore list:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 You can also enable the pager only for certain commands using
-@@ -10668,10 +10640,10 @@
+@@ -11520,10 +11492,10 @@
 pager.attend. Below is the default list of commands to be paged:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Setting pager.attend to an empty value will cause all commands to be
-@@ -10679,7 +10651,7 @@
+@@ -11536,13 +11508,13 @@
-.sp
+existing attend and ignore options and defaults:
-If pager.attend is present, pager.ignore will be ignored.
+.sp
+.nf
+-.ft C
++.ft
+[pager]
+attend\-cat = false
+-.ft P
++.ft
+.fi
 .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
-@@ -10695,7 +10667,7 @@
+@@ -11558,7 +11530,7 @@
 Each patch email has a Subject line of "[PATCH M of N] ...", using the
 first line of the changeset description as the subject text. The
 message contains two or three body parts:
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 .
 The changeset description.
-@@ -10704,8 +10676,8 @@
+@@ -11567,8 +11539,8 @@
 [Optional] The result of running diffstat on the patch.
 .IP \(bu 2
 .
 -The patch itself, as generated by \%\fBhg export\fP\:.
 -.UNINDENT
 +The patch itself, as generated by \fBhg export\fP.
 +.RE
 .sp
 Each message refers to the first in the series using the In\-Reply\-To
 and References headers, so they will show up as a sequence in threaded
-@@ -10715,7 +10687,7 @@
+@@ -11578,7 +11550,7 @@
 configuration file:
 .sp
 .nf
 -.ft C
 +.ft
 [email]
 from = My Name <my@email>
 to = recipient1, recipient2, ...
-@@ -10722,13 +10694,13 @@
+@@ -11585,13 +11557,13 @@
 cc = cc1, cc2, ...
 bcc = bcc1, bcc2, ...
 reply\-to = address1, address2, ...
 -.ft P
 +.ft
 -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
-@@ -10740,13 +10712,13 @@
+@@ -11605,13 +11577,13 @@
-.SS email
+send changesets by email:
 .sp
 .nf
 -.ft C
 +.ft
 hg email [OPTION]... [DEST]...
 -\%\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
-@@ -10757,7 +10729,7 @@
+@@ -11622,7 +11594,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 \-\-confirm options, you will be presented
 with a final summary of all messages and asked for confirmation before
-@@ -10797,7 +10769,7 @@
+@@ -11662,7 +11634,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
-@@ -10818,7 +10790,7 @@
+@@ -11683,7 +11655,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
-@@ -10825,7 +10797,7 @@
+@@ -11690,7 +11662,7 @@
 hgrc. See the [email] section in hgrc(5) for details.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-g,  \-\-git
 .
-@@ -10942,7 +10914,7 @@
+@@ -11807,7 +11779,7 @@
 .B \-\-insecure
 .
 do not verify server certificate (ignoring web.cacerts config)
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS progress
-.sp
+@@ -11822,7 +11794,7 @@
-show progress bars for some actions
-@@ -10955,7 +10927,7 @@
 The following settings are available:
 .sp
 .nf
 -.ft C
 +.ft
 [progress]
 delay = 3 # number of seconds (float) before showing the progress bar
 changedelay = 1 # changedelay: minimum delay before showing a new topic.
-@@ -10965,11 +10937,11 @@
+@@ -11832,11 +11804,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
 -.ft P
 +.ft
 .fi
 .sp
 Valid entries for the format field are topic, bar, number, unit,
-@@ -10984,9 +10956,9 @@
+@@ -11853,9 +11825,9 @@
-.SS purge
+removes files not tracked by Mercurial:
 .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
-@@ -10993,18 +10965,18 @@
+@@ -11862,18 +11834,18 @@
 and uncommitted changes in an otherwise\-clean source tree.
 .sp
-This means that purge will delete:
+This means that purge will delete the following by default:
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 .
 -Unknown files: files marked with "?" by \%\fBhg status\fP\:
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 .
 Modified and unmodified tracked files
-@@ -11013,8 +10985,8 @@
+@@ -11882,8 +11854,8 @@
 Ignored files (unless \-\-all is specified)
 .IP \(bu 2
 .
 -New files added to the repository (with \%\fBhg add\fP\:)
 -.UNINDENT
 +New files added to the repository (with \fBhg add\fP)
 +.RE
 .sp
-If directories are given on the command line, only files in these
+The \-\-files and \-\-dirs options can be used to direct purge to delete
-directories are considered.
+only files, only directories, or both. If neither option is given,
-@@ -11025,7 +10997,7 @@
+@@ -11898,7 +11870,7 @@
 option.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-a,  \-\-abort\-on\-err
 .
-@@ -11052,7 +11024,7 @@
+@@ -11931,15 +11903,15 @@
+.BI \-X,  \-\-exclude \ <PATTERN[+]>
+.
 exclude names matching the given patterns
+-.UNINDENT
++.RE
+.sp
+[+] marked option can be specified multiple times
+-.INDENT 0.0
+-.INDENT 3.5
++.RS 0
++.RS 3
 .sp
 aliases: clean
 -.UNINDENT
+-.UNINDENT
++.RE
 +.RE
 .SS rebase
 .sp
 command to move sets of revisions to a different ancestor
-@@ -11061,14 +11033,14 @@
+@@ -11948,7 +11920,7 @@
 repository.
 .sp
 For more information:
 -\%http://mercurial.selenic.com/wiki/RebaseExtension\:
 +http://mercurial.selenic.com/wiki/RebaseExtension
 .SS Commands
 .SS rebase
 .sp
+@@ -11955,9 +11927,9 @@
+move changeset (and descendants) to a different branch:
+.sp
 .nf
 -.ft C
 +.ft
 hg rebase [\-s REV | \-b REV] [\-d REV] [OPTION]
 -.ft P
 +.ft
 .fi
 .sp
 Rebase uses repeated merging to graft changesets from one part of
-@@ -11082,9 +11054,9 @@
+@@ -11971,9 +11943,9 @@
 pulling in your rebased changesets.
 .sp
 In its default configuration, Mercurial will prevent you from
 -rebasing published changes. See \%\fBhg help phases\fP\: for details.
 +rebasing published changes. See \fBhg help phases\fP for details.
 -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 current branch tip as the destination. (The
 destination changeset is not modified by rebasing, but new
 changesets are added as its descendants.)
-@@ -11116,7 +11088,7 @@
+@@ -12005,7 +11977,7 @@
 and source branch is that, unlike \fBmerge\fP, rebase will do
 nothing if you are at the branch tip 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
-@@ -11126,7 +11098,7 @@
+@@ -12012,7 +11984,7 @@
+continued with \-\-continue/\-c or aborted with \-\-abort/\-a.
+.sp
+Examples:
+-.INDENT 0.0
++.RS 0
+.IP \(bu 2
+.
+move "local changes" (current commit back to branching point)
+@@ -12019,9 +11991,9 @@
+to the current branch tip after a pull:
+.sp
+.nf
+-.ft C
++.ft
+hg rebase
+-.ft P
++.ft
+.fi
+.IP \(bu 2
+.
+@@ -12028,9 +12000,9 @@
+move a single changeset to the stable branch:
+.sp
+.nf
+-.ft C
++.ft
+hg rebase \-r 5f493448 \-d stable
+-.ft P
++.ft
+.fi
+.IP \(bu 2
+.
+@@ -12037,9 +12009,9 @@
+splice a commit and all its descendants onto another part of history:
+.sp
+.nf
+-.ft C
++.ft
+hg rebase \-\-source c0c3 \-\-dest 4cf9
+-.ft P
++.ft
+.fi
+.IP \(bu 2
+.
+@@ -12047,9 +12019,9 @@
+default branch:
+.sp
+.nf
+-.ft C
++.ft
+hg rebase \-\-base myfeature \-\-dest default
+-.ft P
++.ft
+.fi
+.IP \(bu 2
+.
+@@ -12056,9 +12028,9 @@
+collapse a sequence of changes into a single commit:
+.sp
+.nf
+-.ft C
++.ft
+hg rebase \-\-collapse \-r 1520:1525 \-d .
+-.ft P
++.ft
+.fi
+.IP \(bu 2
+.
+@@ -12065,17 +12037,17 @@
+move a named branch while preserving its name:
+.sp
+.nf
+-.ft C
++.ft
+hg rebase \-r "branch(featureX)" \-d 1.3 \-\-keepbranches
+-.ft P
++.ft
+.fi
+-.UNINDENT
++.RE
+.sp
+Returns 0 on success, 1 if nothing to rebase or there are
 unresolved conflicts.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-s,  \-\-source
+.BI \-s,  \-\-source \ <REV>
 .
-@@ -11191,7 +11163,7 @@
+@@ -12144,7 +12116,7 @@
-.B \-\-template
+.BI \-T,  \-\-template \ <TEMPLATE>
 .
 display with template
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS record
-.sp
+@@ -12156,12 +12128,12 @@
-commands to interactively select changes for commit/qrefresh
+interactively record a new patch:
-@@ -11199,25 +11171,25 @@
-.SS qrecord
 .sp
 .nf
 -.ft C
 +.ft
 hg qrecord [OPTION]... PATCH [FILE]...
 -See \%\fBhg help qnew\fP\: & \%\fBhg help record\fP\: for more information and
 +See \fBhg help qnew\fP & \fBhg help record\fP for more information and
 usage.
 .SS record
 .sp
+@@ -12168,15 +12140,15 @@
+interactively select changes to commit:
+.sp
 .nf
 -.ft C
 +.ft
 hg record [OPTION]... [FILE]...
 -.ft P
 -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
-@@ -11225,7 +11197,7 @@
+@@ -12184,7 +12156,7 @@
 possible:
 .sp
 .nf
 -.ft C
 +.ft
 y \- record this change
 n \- skip this change
 e \- edit this change manually
-@@ -11238,13 +11210,13 @@
+@@ -12197,13 +12169,13 @@
 q \- quit, recording no changes
 ? \- display help
 -.ft P
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-A,  \-\-addremove
 .
-@@ -11301,7 +11273,7 @@
+@@ -12264,7 +12236,7 @@
 .B \-B,  \-\-ignore\-blank\-lines
 .
 ignore changes whose lines are all blank
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS relink
-.sp
+@@ -12276,9 +12248,9 @@
-recreates hardlinks between repository clones
+recreate hardlinks between two repositories:
-@@ -11309,9 +11281,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
-@@ -11343,18 +11315,18 @@
+@@ -12310,18 +12282,18 @@
 lot of repositories to act like a scheme, for example:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Additionally there is support for some more complex schemas, for
-@@ -11361,10 +11333,10 @@
+@@ -12328,10 +12300,10 @@
 example used by Google Code:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 The syntax is taken from Mercurial templates, and you have unlimited
-@@ -11376,7 +11348,7 @@
+@@ -12343,7 +12315,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/
-@@ -11383,7 +11355,7 @@
+@@ -12350,7 +12322,7 @@
 bb+ssh = ssh://[email protected]/
 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
-@@ -11395,9 +11367,9 @@
+@@ -12364,9 +12336,9 @@
-.SS share
+create a new shared repository:
 .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
-@@ -11415,18 +11387,18 @@
+@@ -12384,20 +12356,20 @@
 .RE
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 do not create a working copy
 -.UNINDENT
 +.RE
 .SS unshare
 .sp
+convert a shared repository to a normal one:
+.sp
 .nf
 -.ft C
 +.ft
 hg unshare
 -.ft P
 +.ft
 .fi
 .sp
 Copy the store data to the repo and remove the sharedpath data.
-@@ -11440,7 +11412,7 @@
+@@ -12411,7 +12383,7 @@
 .sp
 Later on, the "hg unshelve" command restores the changes saved by "hg
 shelve". Changes can be restored even after updating to a different
 -parent, in which case Mercurial\(aqs merge machinery will resolve any
 +parent, in which case Mercurial's merge machinery will resolve any
 conflicts if necessary.
 .sp
 You can have more than one shelved change outstanding at a time; each
-@@ -11450,9 +11422,9 @@
+@@ -12423,9 +12395,9 @@
-.SS shelve
+save and set aside changes from the working directory:
 .sp
 .nf
 -.ft C
 +.ft
-hg shelve
+hg shelve [OPTION]... [FILE]...
 -.ft P
 +.ft
 .fi
 .sp
 Shelving takes files that "hg status" reports as not clean, saves
-@@ -11480,7 +11452,7 @@
+@@ -12453,7 +12425,7 @@
 all shelved changes, use \fB\-\-cleanup\fP.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-A,  \-\-addremove
 .
-@@ -11517,13 +11489,13 @@
+@@ -12502,7 +12474,7 @@
-.B \-\-stat
+.BI \-X,  \-\-exclude \ <PATTERN[+]>
 .
-output diffstat\-style summary of changes
+exclude names matching the given patterns
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS unshelve
+@@ -12510,9 +12482,9 @@
+restore a shelved change to the working directory:
 .sp
 .nf
 -.ft C
 +.ft
 hg unshelve [SHELVED]
 -.ft P
 +.ft
 .fi
 .sp
 This command accepts an optional name of a shelved change to
-@@ -11544,7 +11516,7 @@
+@@ -12533,7 +12505,7 @@
 does not delete the bundle.)
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-a,  \-\-abort
 .
-@@ -11557,7 +11529,7 @@
+@@ -12550,7 +12522,7 @@
-.B \-\-keep
+.BI \-\-date \ <DATE>
 .
-keep shelve after unshelving
+set date for temporary commits (DEPRECATED)
 -.UNINDENT
 +.RE
 .SS strip
 .sp
 strip changesets and their descendents from history
-@@ -11568,9 +11540,9 @@
+@@ -12563,9 +12535,9 @@
-.SS strip
+strip changesets and all their descendants from the repository:
 .sp
 .nf
 -.ft C
 +.ft
 hg strip [\-k] [\-f] [\-n] [\-B bookmark] [\-r] REV...
 -.ft P
 +.ft
 .fi
 .sp
 The strip command removes the specified changesets and all their
-@@ -11584,8 +11556,8 @@
+@@ -12579,8 +12551,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.
-@@ -11600,7 +11572,7 @@
+@@ -12595,7 +12567,7 @@
 Return 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-r,  \-\-rev
+.BI \-r,  \-\-rev \ <REV[+]>
 .
-@@ -11633,13 +11605,13 @@
+@@ -12624,7 +12596,7 @@
-.B \-B,  \-\-bookmark
+.BI \-B,  \-\-bookmark \ <VALUE>
 .
 remove revs only reachable from given bookmark
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS transplant
-.sp
+@@ -12632,7 +12604,7 @@
 command to transplant changesets from another branch
 .sp
 This extension allows you to transplant changes to another parent revision,
 -possibly in another repository. The transplant is done using \(aqdiff\(aq patches.
 +possibly in another repository. The transplant is done using 'diff' patches.
 .sp
 Transplanted patches are recorded in .hg/transplant/transplants, as a
 map from a changeset hash to its hash in the source repository.
-@@ -11647,9 +11619,9 @@
+@@ -12642,9 +12614,9 @@
-.SS transplant
+transplant changesets from another branch:
 .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
-@@ -11666,9 +11638,9 @@
+@@ -12661,9 +12633,9 @@
 of the form:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 You can rewrite the changelog message with the \-\-filter option.
-@@ -11684,17 +11656,17 @@
+@@ -12679,17 +12651,17 @@
 with \-\-branch will be transplanted.
 .sp
 Example:
 -.INDENT 0.0
 +.RS 0
 -.UNINDENT
 +.RE
 .sp
 You can optionally mark selected transplanted changesets as merge
 changesets. You will not be prompted to transplant any ancestors
-@@ -11702,17 +11674,17 @@
+@@ -12697,17 +12669,17 @@
 normally instead of transplanting them.
 .sp
 Merge changesets may be transplanted directly by specifying the
 -proper parent changeset by calling \%\fBhg transplant \-\-parent\fP\:.
 +proper parent changeset by calling \fBhg transplant \-\-parent\fP.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \-s,  \-\-source
+.BI \-s,  \-\-source \ <REPO>
 .
-@@ -11753,7 +11725,7 @@
+@@ -12748,7 +12720,7 @@
-.B \-\-filter
+.BI \-\-filter \ <CMD>
 .
 filter changesets through command
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS win32mbcs
-.sp
+@@ -12763,7 +12735,7 @@
-allow the use of MBCS paths with problematic encodings
-@@ -11766,7 +11738,7 @@
 operation.
 .sp
 This extension is useful for:
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 .
 Japanese Windows users using shift_jis encoding.
-@@ -11777,10 +11749,10 @@
+@@ -12774,10 +12746,10 @@
 .
 All users who use a repository with one of problematic encodings on
 case\-insensitive file system.
 -.UNINDENT
 +.RE
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 .
 Any user who use only ASCII chars in path.
-@@ -11787,10 +11759,10 @@
+@@ -12784,10 +12756,10 @@
 .IP \(bu 2
 .
 Any user who do not use any of problematic encodings.
 -.UNINDENT
 +.RE
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 .
 You should use single encoding in one repository.
-@@ -11800,16 +11772,16 @@
+@@ -12797,16 +12769,16 @@
 .IP \(bu 2
 .
 win32mbcs is not compatible with fixutf8 extension.
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .sp
 It is useful for the users who want to commit with UTF\-8 log message.
-@@ -11816,8 +11788,8 @@
+@@ -12813,8 +12785,8 @@
 .SS win32text
 .sp
-perform automatic newline conversion
+perform automatic newline conversion (DEPRECATED)
 -.INDENT 0.0
 -.INDENT 3.5
 +.RS 0
 +.RS 3
 .sp
 Deprecation: The win32text extension requires each user to configure
 the extension again and again for each clone since the configuration
-@@ -11826,13 +11798,13 @@
+@@ -12823,13 +12795,13 @@
 We have therefore made the \fBeol\fP as an alternative. The \fBeol\fP
 uses a version controlled file for its configuration and each clone
 will therefore use the right settings from the start.
 -.UNINDENT
 -.UNINDENT
 -.ft C
 +.ft
 [extensions]
 win32text =
 [encode]
-@@ -11842,17 +11814,17 @@
+@@ -12839,17 +12811,17 @@
 [decode]
 ** = cleverdecode:
 # or ** = macdecode:
 -.ft P
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 To do the same check on a server to prevent CRLF/CR from being
-@@ -11859,11 +11831,11 @@
+@@ -12856,11 +12828,11 @@
 pushed or pulled:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .SS zeroconf
 .sp
-@@ -11874,33 +11846,33 @@
+@@ -12871,33 +12843,33 @@
 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:
 -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.
 .TP
 .B \fB.hgignore\fP
-@@ -11907,13 +11879,13 @@
+@@ -12904,13 +12876,13 @@
 .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).
 -\%\fBhg help subrepos\fP\:.
 +\fBhg help subrepos\fP.
 .TP
 .B \fB.hgsubstate\fP
 .sp
-@@ -11928,7 +11900,7 @@
+@@ -12925,7 +12897,7 @@
 .TP
 .B \fB.hg/last\-message.txt\fP
 .sp
 -This file is used by \%\fBhg commit\fP\: to store a backup of the commit message
 +This file is used by \fBhg commit\fP to store a backup of the commit message
 in case the commit fails.
 .TP
 .B \fB.hg/localtags\fP
-@@ -11936,28 +11908,34 @@
+@@ -12933,28 +12905,34 @@
 This file can be used to define local tags which are not shared among
 repositories. The file format is the same as for \fB.hgtags\fP, but it is
 encoded using the local system encoding.
 -.UNINDENT
 +.TP
 .sp
 -Mailing list: \%http://selenic.com/mailman/listinfo/mercurial\:
 +Mailing list: http://selenic.com/mailman/listinfo/mercurial
 .SH COPYING
 .sp
-Copyright (C) 2005\-2013 Matt Mackall.
+Copyright (C) 2005\-2014 Matt Mackall.
---- mercurial-2.8.2/doc/hgignore.5	Wed Jan  1 19:46:48 2014
+--- mercurial-3.2.3/doc/hgignore.5.orig	Thu Dec 18 12:59:33 2014
-+++ mercurial-2.8.2/doc/hgignore.5	Tue Jan  7 15:28:43 2014
++++ mercurial-3.2.3/doc/hgignore.5	Thu Dec 18 18:23:25 2014
 @@ -3,33 +3,6 @@
 .TH HGIGNORE 5 "" "" "Mercurial Manual"
 .SH NAME
 hgignore \- syntax for Mercurial ignore files
 -.
 -\%\fBhg\fP(1)\:, \%\fBhgrc\fP(5)\:
 +\fBhg\fP(1), \fBhgrc\fP(5)
 .SH COPYING
 .sp
 This manual page is copyright 2006 Vadim Gelfer.
---- mercurial-2.8.2/doc/hgrc.5	Wed Jan  1 19:46:48 2014
+--- mercurial-3.2.3/doc/hgrc.5.orig	Thu Dec 18 12:59:33 2014
-+++ mercurial-2.8.2/doc/hgrc.5	Tue Jan  7 15:28:46 2014
++++ mercurial-3.2.3/doc/hgrc.5	Thu Dec 18 18:23:29 2014
 @@ -3,33 +3,6 @@
 .TH HGRC 5 "" "" "Mercurial Manual"
 .SH NAME
 hgrc \- configuration files for Mercurial
 -.
 -\fB%USERPROFILE%\emercurial.ini\fP or \fB$HOME/.hgrc\fP and local
 +the username setting is typically put into \fB$HOME/.hgrc\fP and local
 configuration is put into the per\-repository \fB<repo>/.hg/hgrc\fP file.
 .sp
 The names of these files depend on the system on which Mercurial is
-@@ -65,101 +37,50 @@
+@@ -64,8 +36,8 @@
+paths are given below, settings from earlier paths override later
 ones.
 .sp
-.nf
+-On Unix, the following files are consulted:
--(All) \fB<repo>/.hg/hgrc\fP
+-.INDENT 0.0
-+\fB<repo>/.hg/hgrc\fP
++The following files are consulted:
-.fi
++.RS 0
-.sp
+.IP \(bu 2
--.INDENT 0.0
+.
--.INDENT 3.5
+\fB<repo>/.hg/hgrc\fP (per\-repository)
-+.RS 0
+@@ -84,77 +56,21 @@
-+.RS 3
+.IP \(bu 2
-.sp
+.
-Per\-repository configuration options that only apply in a
+\fB/etc/mercurial/hgrc.d/*.rc\fP (per\-system)
-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
--Plan 9 and Unix, most of this file will be ignored if it doesn\(aqt
-+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 \fB[trusted]\fP section below for more details.
--.UNINDENT
--.UNINDENT
-+.RE
-+.RE
-.sp
-.nf
--(Plan 9) \fB$home/lib/hgrc\fP
--(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
-+.RS 0
-+.RS 3
-.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
-+Per\-user configuration file, 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
-+.RE
-+.RE
-.sp
-.nf
--(Plan 9) \fB/lib/mercurial/hgrc\fP
--(Plan 9) \fB/lib/mercurial/hgrc.d/*.rc\fP
--(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
--.INDENT 3.5
-+.RS 0
-+.RS 3
-.sp
-Per\-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. Options in these files
-override per\-installation options.
--.UNINDENT
 -.UNINDENT
 -.sp
--.nf
+-On Windows, the following files are consulted:
--(Plan 9) \fB<install\-root>/lib/mercurial/hgrc\fP
+-.INDENT 0.0
--(Plan 9) \fB<install\-root>/lib/mercurial/hgrc.d/*.rc\fP
+-.IP \(bu 2
--(Unix) \fB<install\-root>/etc/mercurial/hgrc\fP
+-.
--(Unix) \fB<install\-root>/etc/mercurial/hgrc.d/*.rc\fP
+-\fB<repo>/.hg/hgrc\fP (per\-repository)
--.fi
+-.IP \(bu 2
--.sp
+-.
--.INDENT 0.0
+-\fB%USERPROFILE%\e.hgrc\fP (per\-user)
--.INDENT 3.5
+-.IP \(bu 2
--.sp
+-.
--Per\-installation configuration files, searched for in the
+-\fB%USERPROFILE%\eMercurial.ini\fP (per\-user)
--directory where Mercurial is installed. \fB<install\-root>\fP is the
+-.IP \(bu 2
--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
+-\fB%HOME%\e.hgrc\fP (per\-user)
--in \fB/shared/tools/etc/mercurial/hgrc\fP. Options in these files apply
+-.IP \(bu 2
--to all Mercurial commands executed by any user in any directory.
+-.
--.UNINDENT
+-\fB%HOME%\eMercurial.ini\fP (per\-user)
--.UNINDENT
+-.IP \(bu 2
--.sp
+-.
--.nf
+-\fB<install\-dir>\eMercurial.ini\fP (per\-installation)
--(Windows) \fB<install\-dir>\eMercurial.ini\fP \fBor\fP
+-.IP \(bu 2
--(Windows) \fB<install\-dir>\ehgrc.d\e*.rc\fP \fBor\fP
+-.
--(Windows) \fBHKEY_LOCAL_MACHINE\eSOFTWARE\eMercurial\fP
+-\fB<install\-dir>\ehgrc.d\e*.rc\fP (per\-installation)
--.fi
+-.IP \(bu 2
--.sp
+-.
--.INDENT 0.0
+-\fBHKEY_LOCAL_MACHINE\eSOFTWARE\eMercurial\fP (per\-installation)
--.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.
--.UNINDENT
 -.UNINDENT
 -.IP Note
 -.
 -The registry key \fBHKEY_LOCAL_MACHINE\eSOFTWARE\eWow6432Node\eMercurial\fP
 -is used when running 32\-bit Python on 64\-bit Windows.
 .RE
-+.RE
+.sp
-.SH SYNTAX
+-On Plan9, the following files are consulted:
-.sp
+-.INDENT 0.0
-A configuration file consists of sections, led by a \fB[section]\fP header
+-.IP \(bu 2
-@@ -167,12 +88,12 @@
+-.
+-\fB<repo>/.hg/hgrc\fP (per\-repository)
+-.IP \(bu 2
+-.
+-\fB$home/lib/hgrc\fP (per\-user)
+-.IP \(bu 2
+-.
+-\fB<install\-root>/lib/mercurial/hgrc\fP (per\-installation)
+-.IP \(bu 2
+-.
+-\fB<install\-root>/lib/mercurial/hgrc.d/*.rc\fP (per\-installation)
+-.IP \(bu 2
+-.
+-\fB/lib/mercurial/hgrc\fP (per\-system)
+-.IP \(bu 2
+-.
+-\fB/lib/mercurial/hgrc.d/*.rc\fP (per\-system)
+-.UNINDENT
++Per\-repository configuration options 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.  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 \fB[trusted]\fP section below for more
++details.
+.sp
+-Per\-repository configuration options 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
+-Plan 9 and Unix, most of this file will be ignored if it doesn\(aqt
+-belong to a trusted user or to a trusted group. See the documentation
+-for the \fB[trusted]\fP section below for more details.
++Per\-user configuration file(s) are for the user running Mercurial.
++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.
+.sp
+-Per\-user configuration file(s) are 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.
+-.sp
+Per\-installation configuration files are 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
+@@ -181,12 +97,12 @@
 \fBconfiguration keys\fP):
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Each line contains one entry. If the lines that follow are indented,
-@@ -184,12 +105,12 @@
+@@ -198,12 +114,12 @@
 will use the value that was configured last. As an example:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 This would set the configuration key named \fBeggs\fP to \fBsmall\fP.
-@@ -199,7 +120,7 @@
+@@ -213,7 +129,7 @@
 example:
 .sp
 .nf
 -.ft C
 +.ft
 [foo]
 eggs=large
 ham=serrano
-@@ -214,7 +135,7 @@
+@@ -228,7 +144,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
-@@ -236,9 +157,9 @@
+@@ -250,9 +166,9 @@
 \fBfile\fP. This lets you do something like:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 to include a different configuration file on each computer you use.
-@@ -255,9 +176,9 @@
+@@ -269,9 +185,9 @@
 placed in double quotation marks:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Quotation marks can be escaped by prefixing them with a backslash. Only
-@@ -281,17 +202,17 @@
+@@ -295,17 +211,17 @@
 Alias definitions consist of lines of the form:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 creates a new command \fBlatest\fP that shows only the five most recent
-@@ -298,9 +219,9 @@
+@@ -312,9 +228,9 @@
 changesets. You can define subsequent aliases using earlier ones:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP Note
 .
-@@ -314,9 +235,9 @@
+@@ -328,9 +244,9 @@
 run arbitrary commands. As an example,
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 will let you do \fBhg echo foo\fP to have \fBfoo\fP printed in your
-@@ -323,9 +244,9 @@
+@@ -337,9 +253,9 @@
 terminal. A better example might be:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 which will make \fBhg purge\fP delete all unknown files in the
-@@ -354,7 +275,7 @@
+@@ -369,7 +285,7 @@
 Settings used when displaying file annotations. All values are
 Booleans and default to False. See \fBdiff\fP section for related
 options for the diff command.
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBignorews\fP
 .sp
-@@ -367,7 +288,7 @@
+@@ -382,7 +298,7 @@
 .B \fBignoreblanklines\fP
 .sp
 Ignore changes whose lines are all blank.
 -.UNINDENT
 +.RE
 .SS \fBauth\fP
 .sp
 Authentication credentials for HTTP authentication. This section
-@@ -378,9 +299,9 @@
+@@ -393,9 +309,9 @@
 Each line has the following format:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 where \fB<name>\fP is used to group arguments into authentication
-@@ -387,7 +308,7 @@
+@@ -402,7 +318,7 @@
 entries. Example:
 .sp
 .nf
 -.ft C
 +.ft
 foo.prefix = hg.intevation.org/mercurial
 foo.username = foo
 foo.password = bar
-@@ -397,11 +318,11 @@
+@@ -412,11 +328,11 @@
 bar.key = path/to/file.key
 bar.cert = path/to/file.cert
 bar.schemes = https
 -.ft P
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBprefix\fP
 .sp
-@@ -408,7 +329,7 @@
+@@ -423,7 +339,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
-@@ -440,11 +361,11 @@
+@@ -455,11 +371,11 @@
 .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
 -.UNINDENT
 +.RE
 .sp
 If no suitable authentication entry is found, the user is prompted
 for credentials as usual if required by the remote.
-@@ -470,7 +391,7 @@
+@@ -470,176 +386,176 @@
+.sp
+In addition to pre\-defined template keywords, commit log specific one
+below can be used for customization:
+-.INDENT 0.0
++.RS 0
+.TP
+.B \fBextramsg\fP
+.sp
+-String: Extra message (typically \(aqLeave message empty to abort
+-commit.\(aq). This may be changed by some commands or extensions.
+-.UNINDENT
++String: Extra message (typically 'Leave message empty to abort
++commit.'). This may be changed by some commands or extensions.
++.RE
+.sp
+For example, the template configuration below shows as same text as
+one shown by default:
+.sp
+.nf
+-.ft C
++.ft
+[committemplate]
+changeset = {desc}\en\en
+-    HG: Enter commit message.  Lines beginning with \(aqHG:\(aq are removed.
++    HG: Enter commit message.  Lines beginning with 'HG:' are removed.
+HG: {extramsg}
+HG: \-\-
+HG: user: {author}\en{ifeq(p2rev, "\-1", "",
+"HG: branch merge\en")
+-   }HG: branch \(aq{branch}\(aq\en{if(currentbookmark,
+-   "HG: bookmark \(aq{currentbookmark}\(aq\en")  }{subrepos %
++   }HG: branch '{branch}'\en{if(currentbookmark,
++   "HG: bookmark '{currentbookmark}'\en")  }{subrepos %
+"HG: subrepo {subrepo}\en"              }{file_adds %
+"HG: added {file}\en"                   }{file_mods %
+"HG: changed {file}\en"                 }{file_dels %
+"HG: removed {file}\en"                 }{if(files, "",
+"HG: no files changed\en")}
+-.ft P
++.ft
+.fi
+.IP Note
+.
+-For some problematic encodings (see \%\fBhg help win32mbcs\fP\: for
++For some problematic encodings (see \fBhg help win32mbcs\fP for
+detail), this customization should be configured carefully, to
+avoid showing broken characters.
+.sp
+For example, if multibyte character ending with backslash (0x5c) is
+-followed by ASCII character \(aqn\(aq in the customized template,
+-sequence of backslash and \(aqn\(aq is treated as line\-feed unexpectedly
++followed by ASCII character 'n' in the customized template,
++sequence of backslash and 'n' is treated as line\-feed unexpectedly
+(and multibyte character is broken, too).
+.RE
+.sp
+Customized template is used for commands below (\fB\-\-edit\fP may be
+required):
+-.INDENT 0.0
++.RS 0
+.IP \(bu 2
+.
+-\%\fBhg backout\fP\:
++\fBhg backout\fP
+.IP \(bu 2
+.
+-\%\fBhg commit\fP\:
++\fBhg commit\fP
+.IP \(bu 2
+.
+-\%\fBhg fetch\fP\: (for merge commit only)
++\fBhg fetch\fP (for merge commit only)
+.IP \(bu 2
+.
+-\%\fBhg graft\fP\:
++\fBhg graft\fP
+.IP \(bu 2
+.
+-\%\fBhg histedit\fP\:
++\fBhg histedit\fP
+.IP \(bu 2
+.
+-\%\fBhg import\fP\:
++\fBhg import\fP
+.IP \(bu 2
+.
+-\%\fBhg qfold\fP\:, \%\fBhg qnew\fP\: and \%\fBhg qrefresh\fP\:
++\fBhg qfold\fP, \fBhg qnew\fP and \fBhg qrefresh\fP
+.IP \(bu 2
+.
+-\%\fBhg rebase\fP\:
++\fBhg rebase\fP
+.IP \(bu 2
+.
+-\%\fBhg shelve\fP\:
++\fBhg shelve\fP
+.IP \(bu 2
+.
+-\%\fBhg sign\fP\:
++\fBhg sign\fP
+.IP \(bu 2
+.
+-\%\fBhg tag\fP\:
++\fBhg tag\fP
+.IP \(bu 2
+.
+-\%\fBhg transplant\fP\:
+-.UNINDENT
++\fBhg transplant\fP
++.RE
+.sp
+Configuring items below instead of \fBchangeset\fP allows showing
+customized message only for specific actions, or showing different
+messages for each action.
+-.INDENT 0.0
++.RS 0
+.IP \(bu 2
+.
+-\fBchangeset.backout\fP for \%\fBhg backout\fP\:
++\fBchangeset.backout\fP for \fBhg backout\fP
+.IP \(bu 2
+.
+-\fBchangeset.commit.amend.merge\fP for \%\fBhg commit \-\-amend\fP\: on merges
++\fBchangeset.commit.amend.merge\fP for \fBhg commit \-\-amend\fP on merges
+.IP \(bu 2
+.
+-\fBchangeset.commit.amend.normal\fP for \%\fBhg commit \-\-amend\fP\: on other
++\fBchangeset.commit.amend.normal\fP for \fBhg commit \-\-amend\fP on other
+.IP \(bu 2
+.
+-\fBchangeset.commit.normal.merge\fP for \%\fBhg commit\fP\: on merges
++\fBchangeset.commit.normal.merge\fP for \fBhg commit\fP on merges
+.IP \(bu 2
+.
+-\fBchangeset.commit.normal.normal\fP for \%\fBhg commit\fP\: on other
++\fBchangeset.commit.normal.normal\fP for \fBhg commit\fP on other
+.IP \(bu 2
+.
+-\fBchangeset.fetch\fP for \%\fBhg fetch\fP\: (impling merge commit)
++\fBchangeset.fetch\fP for \fBhg fetch\fP (impling merge commit)
+.IP \(bu 2
+.
+-\fBchangeset.gpg.sign\fP for \%\fBhg sign\fP\:
++\fBchangeset.gpg.sign\fP for \fBhg sign\fP
+.IP \(bu 2
+.
+-\fBchangeset.graft\fP for \%\fBhg graft\fP\:
++\fBchangeset.graft\fP for \fBhg graft\fP
+.IP \(bu 2
+.
+-\fBchangeset.histedit.edit\fP for \fBedit\fP of \%\fBhg histedit\fP\:
++\fBchangeset.histedit.edit\fP for \fBedit\fP of \fBhg histedit\fP
+.IP \(bu 2
+.
+-\fBchangeset.histedit.fold\fP for \fBfold\fP of \%\fBhg histedit\fP\:
++\fBchangeset.histedit.fold\fP for \fBfold\fP of \fBhg histedit\fP
+.IP \(bu 2
+.
+-\fBchangeset.histedit.mess\fP for \fBmess\fP of \%\fBhg histedit\fP\:
++\fBchangeset.histedit.mess\fP for \fBmess\fP of \fBhg histedit\fP
+.IP \(bu 2
+.
+-\fBchangeset.histedit.pick\fP for \fBpick\fP of \%\fBhg histedit\fP\:
++\fBchangeset.histedit.pick\fP for \fBpick\fP of \fBhg histedit\fP
+.IP \(bu 2
+.
+-\fBchangeset.import.bypass\fP for \%\fBhg import \-\-bypass\fP\:
++\fBchangeset.import.bypass\fP for \fBhg import \-\-bypass\fP
+.IP \(bu 2
+.
+-\fBchangeset.import.normal.merge\fP for \%\fBhg import\fP\: on merges
++\fBchangeset.import.normal.merge\fP for \fBhg import\fP on merges
+.IP \(bu 2
+.
+-\fBchangeset.import.normal.normal\fP for \%\fBhg import\fP\: on other
++\fBchangeset.import.normal.normal\fP for \fBhg import\fP on other
+.IP \(bu 2
+.
+-\fBchangeset.mq.qnew\fP for \%\fBhg qnew\fP\:
++\fBchangeset.mq.qnew\fP for \fBhg qnew\fP
+.IP \(bu 2
+.
+-\fBchangeset.mq.qfold\fP for \%\fBhg qfold\fP\:
++\fBchangeset.mq.qfold\fP for \fBhg qfold\fP
+.IP \(bu 2
+.
+-\fBchangeset.mq.qrefresh\fP for \%\fBhg qrefresh\fP\:
++\fBchangeset.mq.qrefresh\fP for \fBhg qrefresh\fP
+.IP \(bu 2
+.
+-\fBchangeset.rebase.collapse\fP for \%\fBhg rebase \-\-collapse\fP\:
++\fBchangeset.rebase.collapse\fP for \fBhg rebase \-\-collapse\fP
+.IP \(bu 2
+.
+-\fBchangeset.rebase.merge\fP for \%\fBhg rebase\fP\: on merges
++\fBchangeset.rebase.merge\fP for \fBhg rebase\fP on merges
+.IP \(bu 2
+.
+-\fBchangeset.rebase.normal\fP for \%\fBhg rebase\fP\: on other
++\fBchangeset.rebase.normal\fP for \fBhg rebase\fP on other
+.IP \(bu 2
+.
+-\fBchangeset.shelve.shelve\fP for \%\fBhg shelve\fP\:
++\fBchangeset.shelve.shelve\fP for \fBhg shelve\fP
+.IP \(bu 2
+.
+-\fBchangeset.tag.add\fP for \%\fBhg tag\fP\: without \fB\-\-remove\fP
++\fBchangeset.tag.add\fP for \fBhg tag\fP without \fB\-\-remove\fP
+.IP \(bu 2
+.
+-\fBchangeset.tag.remove\fP for \%\fBhg tag \-\-remove\fP\:
++\fBchangeset.tag.remove\fP for \fBhg tag \-\-remove\fP
+.IP \(bu 2
+.
+-\fBchangeset.transplant.merge\fP for \%\fBhg transplant\fP\: on merges
++\fBchangeset.transplant.merge\fP for \fBhg transplant\fP on merges
+.IP \(bu 2
+.
+-\fBchangeset.transplant.normal\fP for \%\fBhg transplant\fP\: on other
+-.UNINDENT
++\fBchangeset.transplant.normal\fP for \fBhg transplant\fP on other
++.RE
+.sp
+These dot\-separated lists of names are treated as hierarchical ones.
+For example, \fBchangeset.tag.remove\fP customizes the commit message
+-only for \%\fBhg tag \-\-remove\fP\:, but \fBchangeset.tag\fP customizes the
+-commit message for \%\fBhg tag\fP\: regardless of \fB\-\-remove\fP option.
++only for \fBhg tag \-\-remove\fP, but \fBchangeset.tag\fP customizes the
++commit message for \fBhg tag\fP regardless of \fB\-\-remove\fP option.
+.sp
+At the external editor invocation for committing, corresponding
+dot\-separated list of names without \fBchangeset.\fP prefix
+@@ -650,7 +566,7 @@
+below can be referred as \fB{listupfiles}\fP:
+.sp
+.nf
+-.ft C
++.ft
+[committemplate]
+listupfiles = {file_adds %
+"HG: added {file}\en"     }{file_mods %
+@@ -657,7 +573,7 @@
+"HG: changed {file}\en"   }{file_dels %
+"HG: removed {file}\en"   }{if(files, "",
+"HG: no files changed\en")}
+-.ft P
++.ft
+.fi
+.SS \fBdecode/encode\fP
+.sp
+@@ -681,7 +597,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
-@@ -478,9 +399,9 @@
+@@ -689,9 +605,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)
 -.ft P
 +.ft
 .fi
 .sp
 A \fBtempfile:\fP command is a template. The string \fBINFILE\fP is replaced
-@@ -488,12 +409,6 @@
+@@ -699,12 +615,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
 -.
 -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)
-@@ -500,20 +415,20 @@
+@@ -711,20 +621,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)
 -.ft P
 +.ft
 .fi
 .sp
 The actual commands, instead of their aliases, must be used when
-@@ -524,7 +439,7 @@
+@@ -735,7 +645,7 @@
 Settings used when displaying diffs. Everything except for \fBunified\fP
 is a Boolean and defaults to False. See \fBannotate\fP section for
 related options for the annotate command.
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBgit\fP
 .sp
-@@ -532,7 +447,7 @@
+@@ -747,7 +657,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
-@@ -553,11 +468,11 @@
+@@ -768,11 +678,11 @@
 .B \fBunified\fP
 .sp
 Number of lines of context to show.
 -.UNINDENT
 +.RE
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBfrom\fP
 .sp
-@@ -566,16 +481,16 @@
+@@ -781,16 +691,16 @@
 .TP
 .B \fBto\fP
 .sp
 -Optional. Comma\-separated list of recipients\(aq email addresses.
 +Optional. Comma\-separated list of recipients' email addresses.
 -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
-@@ -598,7 +513,7 @@
+@@ -813,7 +723,7 @@
 empty (explicit) list.
 .sp
 Order of outgoing email character sets:
 -.INDENT 7.0
 +.RS 7
 .IP 1. 3
 .
 \fBus\-ascii\fP: always first, regardless of settings
-@@ -614,13 +529,13 @@
+@@ -829,13 +739,13 @@
 .IP 5. 3
 .
 \fButf\-8\fP: always last, regardless of settings
 -.UNINDENT
 -.UNINDENT
 -.ft C
 +.ft
 [email]
 from = Joseph User <[email protected]>
 method = /usr/sbin/sendmail
-@@ -627,7 +542,7 @@
+@@ -842,7 +752,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
-@@ -634,7 +549,7 @@
+@@ -849,7 +759,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
-@@ -649,16 +564,16 @@
+@@ -864,16 +774,16 @@
 Example for \fB~/.hgrc\fP:
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBusestore\fP
 .sp
-@@ -686,7 +601,7 @@
+@@ -901,7 +811,7 @@
 Mac OS X and spaces on Windows. Enabled by default. Disabling this
 option ensures that the on\-disk format of newly created
 repositories will be compatible with Mercurial before version 1.7.
 -.UNINDENT
 +.RE
 .SS \fBgraph\fP
 .sp
 Web graph view configuration. This section let you change graph
-@@ -696,9 +611,9 @@
+@@ -911,9 +821,9 @@
 Each line has the following format:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 where \fB<branch>\fP is the name of the branch being
-@@ -705,17 +620,17 @@
+@@ -920,17 +830,17 @@
 customized. Example:
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBwidth\fP
 .sp
-@@ -724,7 +639,7 @@
+@@ -939,7 +849,7 @@
 .B \fBcolor\fP
 .sp
 Set branch edges color in hexadecimal RGB notation.
 -.UNINDENT
 +.RE
 .SS \fBhooks\fP
 .sp
 Commands or Python functions that get automatically executed by
-@@ -739,7 +654,7 @@
+@@ -954,7 +864,7 @@
 Example \fB.hg/hgrc\fP:
 .sp
 .nf
 -.ft C
 +.ft
 [hooks]
 # update working directory after adding changesets
 changegroup.update = hg update
-@@ -749,13 +664,13 @@
+@@ -964,13 +874,13 @@
 incoming.autobuild = /my/build/hook
 # force autobuild hook to run before other incoming hooks
 priority.incoming.autobuild = 1
 -.ft P
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBchangegroup\fP
 .sp
-@@ -799,7 +714,7 @@
+@@ -1014,7 +924,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
-@@ -899,7 +814,7 @@
+@@ -1114,7 +1024,7 @@
 new parent is in \fB$HG_PARENT1\fP. If merge, ID of second new parent is
 in \fB$HG_PARENT2\fP. If the update succeeded, \fB$HG_ERROR=0\fP. If the
 update failed (e.g. because conflicts not resolved), \fB$HG_ERROR=1\fP.
 -.UNINDENT
 +.RE
 .IP Note
 .
 It is generally better to use standard hooks rather than the
-@@ -908,21 +823,14 @@
+@@ -1123,21 +1033,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
 -.
 -.ft P
 +.ft
 .fi
 .sp
 Python hooks are run within the Mercurial process. Each hook is
-@@ -946,10 +854,10 @@
+@@ -1161,10 +1064,10 @@
 For example:
 .sp
 .nf
 -.ft C
 +.ft
 [hostfingerprints]
-hg.intevation.org = 44:ed:af:1f:97:11:b6:01:7a:48:45:fc:10:3c:b7:f9:d4:89:2a:9d
+hg.intevation.org = fa:1f:d9:48:f1:e7:74:30:38:8d:d8:58:b6:94:b8:58:28:7d:8b:d0
 -.ft P
 +.ft
 .fi
 .sp
 This feature is only supported when using Python 2.6 or later.
-@@ -957,7 +865,7 @@
+@@ -1172,7 +1075,7 @@
 .sp
 Used to access web\-based Mercurial repositories through a HTTP
 proxy.
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBhost\fP
 .sp
-@@ -981,7 +889,7 @@
+@@ -1196,7 +1099,7 @@
 .sp
 Optional. Always use the proxy, even for localhost and any entries
 in \fBhttp_proxy.no\fP. True or False. Default: False.
 -.UNINDENT
 +.RE
 .SS \fBmerge\-patterns\fP
 .sp
 This section specifies merge tools to associate with particular file
-@@ -992,11 +900,11 @@
+@@ -1207,23 +1110,23 @@
 Example:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .SS \fBmerge\-tools\fP
 .sp
-@@ -1006,7 +914,7 @@
+This section configures external merge tools to use for file\-level
+merges. This section has likely been preconfigured at install time.
+-Use \%\fBhg config merge\-tools\fP\: to check the existing configuration.
+-Also see \%\fBhg help merge\-tools\fP\: for more details.
++Use \fBhg config merge\-tools\fP to check the existing configuration.
++Also see \fBhg help merge\-tools\fP for more details.
+.sp
 Example \fB~/.hgrc\fP:
 .sp
 .nf
 -.ft C
 +.ft
 [merge\-tools]
 # Override stock tool location
 kdiff3.executable = ~/bin/kdiff3
-@@ -1017,13 +925,12 @@
+@@ -1237,13 +1140,12 @@
 # Define new tool
 myHtmlTool.args = \-m $local $other $base $output
 -myHtmlTool.regkey = Software\eFooSoftware\eHtmlMerge
 myHtmlTool.priority = 1
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBpriority\fP
 .sp
-@@ -1032,9 +939,7 @@
+@@ -1252,9 +1154,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.
 -Default: the tool name.
 +Either just the name of the executable or its pathname.  Default: the tool name.
 .TP
 .B \fBargs\fP
 .sp
-@@ -1063,7 +968,7 @@
+@@ -1276,7 +1176,7 @@
+\fBkeep\-merge3\fP. The \fBkeep\fP option will leave markers in the file if the
+premerge fails. The \fBkeep\-merge3\fP will do the same but include information
+about the base of the merge in the marker (see internal :merge3 in
+-\%\fBhg help merge\-tools\fP\:).
++\fBhg help merge\-tools\fP).
+Default: True
+.TP
+.B \fBbinary\fP
+@@ -1292,7 +1192,7 @@
 .B \fBcheck\fP
 .sp
 A list of merge success\-checking options:
 -.INDENT 7.0
 +.RS 7
 .TP
 .B \fBchanged\fP
 .sp
-@@ -1076,7 +981,7 @@
+@@ -1305,7 +1205,7 @@
 .B \fBprompt\fP
 .sp
 Always prompt for merge success, regardless of success reported by tool.
 -.UNINDENT
 +.RE
 .TP
 .B \fBfixeol\fP
 .sp
-@@ -1086,42 +991,16 @@
+@@ -1315,42 +1215,16 @@
 .B \fBgui\fP
 .sp
 This tool requires a graphical interface to run. Default: False
 -.TP
 -.B \fBregkey\fP
 -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
-@@ -1130,7 +1009,7 @@
+@@ -1359,7 +1233,7 @@
 on a per\-file basis. If target file does not exist or has no end
 of line, patch line endings are preserved.
 Default: strict.
 -.UNINDENT
 +.RE
 .SS \fBpaths\fP
 .sp
 Assigns symbolic names to repositories. The left side is the
-@@ -1137,7 +1016,7 @@
+@@ -1366,7 +1240,7 @@
 symbolic name, and the right gives the directory or URL that is the
 location of the repository. Default paths can be declared by setting
 the following entries.
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBdefault\fP
 .sp
-@@ -1149,30 +1028,30 @@
+@@ -1378,30 +1252,30 @@
 .sp
 Optional. Directory or URL to use when pushing if no destination
 is specified.
 -.UNINDENT
 +.RE
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBpublish\fP
 .sp
-@@ -1185,7 +1064,7 @@
+@@ -1426,7 +1300,7 @@
-.sp
+either aborted (if checksubrepos is set to "abort") or the higher phase is
-Phase of newly\-created commits.
+used for the parent repository commit (if set to "follow").
-Default: draft
+Default: "follow"
 -.UNINDENT
 +.RE
 .SS \fBprofiling\fP
 .sp
 Specifies profiling type, format, and file output. Two profilers are
-@@ -1192,21 +1071,21 @@
+@@ -1433,21 +1307,21 @@
 supported: an instrumenting profiler (named \fBls\fP), and a sampling
 profiler (named \fBstat\fP).
 .sp
 -In this section description, \(aqprofiling data\(aq stands for the raw data
 -collected during profiling, while \(aqprofiling report\(aq stands for a
 -Use Python\(aqs built\-in instrumenting profiler. This profiler
 +Use Python's built\-in instrumenting profiler. This profiler
 works on all platforms, but each line number it reports is the
 first line of a function. This restriction makes it difficult to
 identify the expensive parts of a non\-trivial function.
-@@ -1216,13 +1095,13 @@
+@@ -1457,13 +1331,13 @@
 Use a third\-party statistical profiler, statprof. This profiler
 currently runs only on Unix systems, and is most useful for
 profiling commands that run for longer than about 0.1 seconds.
 -.UNINDENT
 +.RE
 -.INDENT 7.0
 +.RS 7
 .TP
 .B \fBtext\fP
 .sp
-@@ -1235,7 +1114,7 @@
+@@ -1476,7 +1350,7 @@
 Format profiling data for kcachegrind use: when saving to a
 file, the generated file can directly be loaded into
 kcachegrind.
 -.UNINDENT
 +.RE
 .TP
 .B \fBfrequency\fP
 .sp
-@@ -1266,14 +1145,14 @@
+@@ -1507,14 +1381,14 @@
 This can help explain the difference between Total and Inline.
 Specific to the \fBls\fP instrumenting profiler.
 Default: 5.
 -.UNINDENT
 +.RE
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBuncompressed\fP
 .sp
-@@ -1298,11 +1177,11 @@
+@@ -1539,11 +1413,11 @@
 Whether to validate the completeness of pushed changesets by
 checking that all new file revisions specified in manifests are
 present. Default is False.
 -.UNINDENT
 +.RE
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBhost\fP
 .sp
-@@ -1327,7 +1206,7 @@
+@@ -1568,7 +1442,7 @@
 \fB[web] cacerts\fP also). For "strict", sending email is also
 aborted, if there is no configuration for mail server in
 \fB[hostfingerprints]\fP and \fB[web] cacerts\fP.  \-\-insecure for
 -\%\fBhg email\fP\: overwrites this as "loose". Default: "strict".
 +\fBhg email\fP overwrites this as "loose". Default: "strict".
 .TP
 .B \fBusername\fP
 .sp
-@@ -1342,9 +1221,9 @@
+@@ -1583,9 +1457,9 @@
 .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
 -.UNINDENT
 +.RE
 .SS \fBsubpaths\fP
 .sp
 Subrepository source URLs can go stale if a remote server changes name
-@@ -1352,9 +1231,9 @@
+@@ -1593,9 +1467,9 @@
 rewrite rules of the form:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 where \fBpattern\fP is a regular expression matching a subrepository
-@@ -1363,9 +1242,9 @@
+@@ -1604,9 +1478,9 @@
 \fBreplacements\fP. For instance:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 rewrites \fBhttp://server/foo\-hg/\fP into \fBhttp://hg.server/foo/\fP.
-@@ -1376,7 +1255,7 @@
+@@ -1617,7 +1491,7 @@
 .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
 +\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,
-@@ -1388,7 +1267,7 @@
+@@ -1629,7 +1503,7 @@
 group with name \fB*\fP. These settings must be placed in an
 \fIalready\-trusted file\fP to take effect, such as \fB$HOME/.hgrc\fP of the
 user or service running Mercurial.
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBusers\fP
 .sp
-@@ -1397,17 +1276,17 @@
+@@ -1638,17 +1512,17 @@
 .B \fBgroups\fP
 .sp
 Comma\-separated list of trusted groups.
 -.UNINDENT
 +.RE
 -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
-@@ -1435,7 +1314,7 @@
+@@ -1676,7 +1550,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
-@@ -1458,7 +1337,7 @@
+@@ -1699,7 +1573,7 @@
 .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 more information on merge tools see \fBhg help merge\-tools\fP.
 For configuring merge tools see the \fB[merge\-tools]\fP section.
 .TP
-.B \fBportablefilenames\fP
+.B \fBmergemarkers\fP
-@@ -1467,7 +1346,7 @@
+@@ -1706,7 +1580,7 @@
+.sp
+Sets the merge conflict marker label styling. The \fBdetailed\fP
+style uses the \fBmergemarkertemplate\fP setting to style the labels.
+-The \fBbasic\fP style just uses \(aqlocal\(aq and \(aqother\(aq as the marker label.
++The \fBbasic\fP style just uses 'local' and 'other' as the marker label.
+One of \fBbasic\fP or \fBdetailed\fP.
+Default is \fBbasic\fP.
+.TP
+@@ -1713,7 +1587,7 @@
+.B \fBmergemarkertemplate\fP
+.sp
+The template used to print the commit description next to each conflict
+-marker during merge conflicts. See \%\fBhg help templates\fP\: for the template
++marker during merge conflicts. See \fBhg help templates\fP for the template
+format.
+Defaults to showing the hash, tags, branches, bookmarks, author, and
+the first line of the commit description.
+@@ -1731,7 +1605,7 @@
 Default is \fBwarn\fP.
 If set to \fBwarn\fP (or \fBtrue\fP), a warning message is printed on POSIX
 platforms, if a file with a non\-portable filename is added (e.g. a file
 -with a name that can\(aqt be created on Windows because it contains reserved
 +with a name that can't be created on Windows because it contains reserved
 parts like \fBAUX\fP, reserved characters like \fB:\fP, or would cause a case
 collision with an existing file).
 If set to \fBignore\fP (or \fBfalse\fP), no warning is printed.
-@@ -1528,7 +1407,7 @@
+@@ -1792,7 +1666,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
 <[email protected]>\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
-@@ -1538,11 +1417,11 @@
+@@ -1802,11 +1676,11 @@
 .B \fBverbose\fP
 .sp
 Increase the amount of output printed. True or False. Default is False.
 -.UNINDENT
 +.RE
 -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
-@@ -1558,9 +1437,9 @@
+@@ -1822,9 +1696,9 @@
 command line:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Note that this will allow anybody to push anything to the server and
-@@ -1567,7 +1446,7 @@
+@@ -1831,7 +1705,7 @@
 that this should not be used for public servers.
 .sp
 The full set of options is:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBaccesslog\fP
 .sp
-@@ -1651,13 +1530,13 @@
+@@ -1915,13 +1789,13 @@
 To disable SSL verification temporarily, specify \fB\-\-insecure\fP from
 command line.
 .sp
 -You can use OpenSSL\(aqs CA certificate file if your platform has
 +You can use OpenSSL's CA certificate file if your platform has
 -.ft C
 +.ft
 \-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-
 \&... (certificate in base64 PEM encoding) ...
 \-\-\-\-\-END CERTIFICATE\-\-\-\-\-
-@@ -1664,7 +1543,7 @@
+@@ -1928,7 +1802,7 @@
 \-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-
 \&... (certificate in base64 PEM encoding) ...
 \-\-\-\-\-END CERTIFICATE\-\-\-\-\-
 -.ft P
 +.ft
 .fi
 .TP
 .B \fBcache\fP
-@@ -1725,7 +1604,7 @@
+@@ -1989,7 +1863,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
-@@ -1790,7 +1669,7 @@
+@@ -2054,7 +1928,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
-@@ -1816,7 +1695,7 @@
+@@ -2083,7 +1957,7 @@
-.B \fBtemplates\fP
+.sp
-.sp
+Where to find the HTML templates. The default path to the HTML templates
-Where to find the HTML templates. Default is install path.
+can be obtained from \fBhg debuginstall\fP.
 -.UNINDENT
 +.RE
 .SS \fBwebsub\fP
 .sp
 Web substitution filter definition. You can use this section to
-@@ -1838,9 +1717,9 @@
+@@ -2105,9 +1979,9 @@
 which in turn imitates the Unix sed replacement syntax:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 You can use any separator other than "/". The final "i" is optional
-@@ -1849,12 +1728,12 @@
+@@ -2116,12 +1990,12 @@
 Examples:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .SS \fBworker\fP
 .sp
-@@ -1861,7 +1740,7 @@
+@@ -2128,7 +2002,7 @@
 Parallel master/worker configuration. We currently perform working
 directory updates in parallel on Unix\-like systems, which greatly
 helps performance.
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBnumcpus\fP
 .sp
-@@ -1868,18 +1747,18 @@
+@@ -2135,18 +2009,18 @@
 Number of CPUs to use for parallel operations. Default is 4 or the
 number of CPUs on the system, whichever is larger. A zero or
 negative value is treated as \fBuse the default\fP.
 -.UNINDENT
 +.RE
 +\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\-2013 Matt Mackall.
+Mercurial is copyright 2005\-2014 Matt Mackall.
 Free use of this software is granted under the terms of the GNU General
 Public License version 2 or any later version.

branch	s11u2-sru
changeset 4090	12d330c594ac
parent 3045	0121e7323666
child 4321	38b0ccd2f460