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

equal deleted inserted replaced

-:40335bd603f6
+:20e6442c6cee
 after those changes are made.  Since we don't yet ship docutils, we have to
 create this patch offline and keep a copy of it in the repo.
 These changes are Solaris-specific and not appropriate for upstream.
---- mercurial-3.7.3/doc/hg.1	Tue Mar 29 09:54:51 2016
+--- mercurial-4.1/doc/hg.1	2017-02-01 08:19:54.000000000 -0800
-+++ mercurial-3.7.3/doc/hg.1	Tue Mar 29 10:26:31 2016
++++ mercurial-4.1/doc/hg.1	2017-02-03 11:20:06.570123444 -0800
 @@ -3,33 +3,6 @@
 .TH HG 1 "" "" "Mercurial Manual"
 .SH NAME
 hg \- Mercurial source code management system
 -.
 +.ft
 .fi
 -.UNINDENT
 +.RE
 .sp
--See \%\fBhg help revsets\fP\: for more about the \fIbisect()\fP keyword.
+-See \%\fBhg help revisions.bisect\fP\: for more about the \fIbisect()\fP predicate.
-+See \fBhg help revsets\fP for more about the \fIbisect()\fP keyword.
++See \fBhg help revisions.bisect\fP for more about the \fIbisect()\fP predicate.
 .sp
 Returns 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 clone a remote repository to a new directory named hg/:
 .sp
 .nf
 -.ft C
 +.ft
-hg clone http://selenic.com/hg
+hg clone https://www.mercurial\-scm.org/repo/hg/
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
 clone (and track) a particular named branch:
 .sp
 .nf
 -.ft C
 +.ft
-hg clone http://selenic.com/hg#stable
+hg clone https://www.mercurial\-scm.org/repo/hg/#stable
 -.ft P
 +.ft
 .fi
 -.UNINDENT
 +.RE
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-u,  \-\-untrusted
 .
-@@ -1574,15 +1547,15 @@
+@@ -1578,15 +1551,15 @@
-edit global config
+display with template (EXPERIMENTAL)
 .sp
 aliases: showconfig debugconfig
 -.UNINDENT
 +.RE
 .SS copy
 -.ft P
 +.ft
 .fi
 .sp
 Mark dest as having copies of source files. If dest is a
-@@ -1594,12 +1567,12 @@
+@@ -1598,12 +1571,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
 .
-@@ -1620,23 +1593,23 @@
+@@ -1624,23 +1597,23 @@
 .B \-n,  \-\-dry\-run
 .
 do not perform actions, just print output
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .sp
 Show differences between revisions for the specified files.
-@@ -1644,8 +1617,8 @@
+@@ -1648,8 +1621,8 @@
 Differences between files are shown using the unified diff format.
 .IP Note
 .
 -\%\fBhg diff\fP\: may generate unexpected results for merges, as it will
 -default to comparing against the working directory\(aqs first
 +\fBhg diff\fP may generate unexpected results for merges, as it will
 +default to comparing against the working directory's first
 parent changeset if no revisions are specified.
 .RE
 .sp
-@@ -1663,18 +1636,18 @@
+@@ -1667,18 +1640,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
 .
-@@ -1681,9 +1654,9 @@
+@@ -1685,9 +1658,9 @@
 compare two historical versions of a directory, with rename info:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -1690,9 +1663,9 @@
+@@ -1694,9 +1667,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
 .
-@@ -1699,9 +1672,9 @@
+@@ -1703,9 +1676,9 @@
 diff all newly\-added files that contain a keyword:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -1708,18 +1681,18 @@
+@@ -1712,18 +1685,18 @@
 compare a revision and its parents:
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .BI \-r,  \-\-rev \ <REV[+]>
 .
-@@ -1788,7 +1761,7 @@
+@@ -1792,7 +1765,7 @@
 .B \-S,  \-\-subrepos
 .
 recurse into subrepositories
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
 .SS export
-@@ -1796,9 +1769,9 @@
+@@ -1800,9 +1773,9 @@
 dump the header and diffs for one or more changesets:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Print the changeset header and diffs for one or more revisions.
-@@ -1809,7 +1782,7 @@
+@@ -1813,7 +1786,7 @@
 comment.
 .IP Note
 .
 -\%\fBhg export\fP\: may generate unexpected diff output for merge
 +\fBhg export\fP may generate unexpected diff output for merge
 changesets, as it will compare the merge changeset against its
 first parent only.
 .RE
-@@ -1816,7 +1789,7 @@
+@@ -1820,7 +1793,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
-@@ -1853,7 +1826,7 @@
+@@ -1857,7 +1830,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
-@@ -1860,13 +1833,13 @@
+@@ -1864,13 +1837,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
-@@ -1873,9 +1846,9 @@
+@@ -1877,9 +1850,9 @@
 branch:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -1883,9 +1856,9 @@
+@@ -1887,9 +1860,9 @@
 rename information:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -1893,16 +1866,16 @@
+@@ -1897,16 +1870,16 @@
 descriptive names:
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .BI \-o,  \-\-output \ <FORMAT>
 .
-@@ -1927,7 +1900,7 @@
+@@ -1931,7 +1904,7 @@
 .B \-\-nodates
 .
 omit dates from diff headers
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
 .SS files
-@@ -1935,9 +1908,9 @@
+@@ -1939,9 +1912,9 @@
 list tracked files:
 .sp
 .nf
 -.ft C
 +.ft
-hg files [OPTION]... [PATTERN]...
+hg files [OPTION]... [FILE]...
 -.ft P
 +.ft
 .fi
 .sp
 Print files under Mercurial control in the working directory or
-@@ -1948,15 +1921,15 @@
+@@ -1952,15 +1925,15 @@
-of all files under Mercurial control in the working directory.
+of all files under Mercurial control.
 .sp
 Examples:
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -1963,9 +1936,9 @@
+@@ -1967,9 +1940,9 @@
 shows sizes and flags for current revision:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -1972,9 +1945,9 @@
+@@ -1976,9 +1949,9 @@
 list all files named README:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -1981,9 +1954,9 @@
+@@ -1985,9 +1958,9 @@
 list all binary files:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -1990,9 +1963,9 @@
+@@ -1994,9 +1967,9 @@
 find files containing a regular expression:
 .sp
 .nf
 -.ft C
 -hg files "set:grep(\(aqbob\(aq)"
 +hg files "set:grep('bob')"
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -1999,19 +1972,19 @@
+@@ -2003,19 +1976,19 @@
 search tracked file contents with xargs and grep:
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .BI \-r,  \-\-rev \ <REV>
 .
-@@ -2036,7 +2009,7 @@
+@@ -2040,7 +2013,7 @@
 .B \-S,  \-\-subrepos
 .
 recurse into subrepositories
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
 .SS forget
-@@ -2044,9 +2017,9 @@
+@@ -2048,9 +2021,9 @@
 forget the specified files on the next commit:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Mark the specified files so they will no longer be tracked
-@@ -2056,20 +2029,20 @@
+@@ -2060,20 +2033,20 @@
 entire project history, and it does not delete them from the
 working directory.
 .sp
 -To delete the file from the working directory, see \%\fBhg remove\fP\:.
 +To delete the file from the working directory, see \fBhg remove\fP.
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -2076,16 +2049,16 @@
+@@ -2080,16 +2053,16 @@
 forget files that would be excluded by .hgignore:
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .BI \-I,  \-\-include \ <PATTERN[+]>
 .
-@@ -2094,7 +2067,7 @@
+@@ -2098,7 +2071,7 @@
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
 .
 exclude names matching the given patterns
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
 .SS graft
-@@ -2102,15 +2075,15 @@
+@@ -2106,15 +2079,15 @@
 copy changes from other branches onto the current branch:
 .sp
 .nf
 -.ft C
 +.ft
 +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
-@@ -2120,9 +2093,9 @@
+@@ -2124,9 +2097,9 @@
 of the form:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 If \-\-force is specified, revisions will be grafted even if they
-@@ -2140,16 +2113,16 @@
+@@ -2144,16 +2117,16 @@
 .RE
 .sp
 Examples:
 -.INDENT 0.0
 +.RS 0
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -2156,9 +2129,9 @@
+@@ -2160,9 +2133,9 @@
 graft a range of changesets with one exception, updating dates:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -2165,9 +2138,9 @@
+@@ -2169,9 +2142,9 @@
 continue a graft after resolving conflicts:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -2174,9 +2147,9 @@
+@@ -2178,9 +2151,9 @@
 show the source of a grafted changeset:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -2183,19 +2156,19 @@
+@@ -2187,18 +2160,18 @@
 show revisions sorted by date:
 .sp
 .nf
 -.ft C
--hg log \-r \(aqsort(all(), date)\(aq
++.ft
--.ft P
+hg log \-r "sort(all(), date)"
-+.ft
+-.ft P
-+hg log \-r 'sort(all(), date)'
++.ft
-+.ft
+.fi
-.fi
+-.UNINDENT
--.UNINDENT
++.RE
-+.RE
+.sp
-.sp
+-See \%\fBhg help revisions\fP\: for more about specifying revisions.
--See \%\fBhg help revisions\fP\: and \%\fBhg help revsets\fP\: for more about
++See \fBhg help revisions\fP for more about specifying revisions.
-+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
 .BI \-r,  \-\-rev \ <REV[+]>
 .
-@@ -2240,7 +2213,7 @@
+@@ -2243,7 +2216,7 @@
 .B \-n,  \-\-dry\-run
 .
 do not perform actions, just print output
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
 .SS grep
-@@ -2248,9 +2221,9 @@
+@@ -2251,9 +2224,9 @@
-search for a pattern in specified files and revisions:
+search revision history for a pattern in specified files:
 .sp
 .nf
 -.ft C
 +.ft
 hg grep [OPTION]... PATTERN [FILE]...
 -.ft P
 +.ft
 .fi
 .sp
-Search revisions of files for a regular expression.
+Search revision history for a regular expression in the specified
-@@ -2269,7 +2242,7 @@
+@@ -2268,14 +2241,14 @@
+PATTERN can be any Python (roughly Perl\-compatible) regular
+expression.
+.sp
+-If no FILEs are specified (and \-f/\-\-follow isn\(aqt set), all files in
+-the repository are searched, including those that don\(aqt exist in the
++If no FILEs are specified (and \-f/\-\-follow isn't set), all files in
++the repository are searched, including those that don't exist in the
+current branch or have been deleted in a prior changeset.
+.sp
 Returns 0 if a match is found, 1 otherwise.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-0,  \-\-print0
 .
-@@ -2318,7 +2291,7 @@
+@@ -2328,7 +2301,7 @@
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
 .
 exclude names matching the given patterns
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
 .SS heads
-@@ -2326,9 +2299,9 @@
+@@ -2336,9 +2309,9 @@
 show branch heads:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 With no arguments, show all open branch heads in the repository.
-@@ -2338,11 +2311,11 @@
+@@ -2348,11 +2321,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.
-@@ -2353,7 +2326,7 @@
+@@ -2363,7 +2336,7 @@
 Returns 0 if matching heads are found, 1 if not.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .BI \-r,  \-\-rev \ <STARTREV>
 .
-@@ -2378,15 +2351,15 @@
+@@ -2388,15 +2361,15 @@
 .BI \-T,  \-\-template \ <TEMPLATE>
 .
 display with template
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .sp
 With no arguments, print a list of commands with short help messages.
-@@ -2397,7 +2370,7 @@
+@@ -2407,7 +2380,7 @@
 Returns 0 if successful.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-e,  \-\-extension
 .
-@@ -2414,7 +2387,7 @@
+@@ -2424,7 +2397,7 @@
 .BI \-s,  \-\-system \ <VALUE[+]>
 .
 show help for specific platform(s)
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
 .SS identify
-@@ -2422,9 +2395,9 @@
+@@ -2432,9 +2405,9 @@
 identify the working directory or specified revision:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Print a summary identifying the repository state at REV using one or
-@@ -2439,15 +2412,15 @@
+@@ -2449,15 +2422,15 @@
 cause lookup to operate on that repository/bundle.
 .sp
 Examples:
 -.INDENT 0.0
 +.RS 0
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -2454,9 +2427,9 @@
+@@ -2464,9 +2437,9 @@
 find the revision corresponding to a tag:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -2463,19 +2436,19 @@
+@@ -2473,19 +2446,19 @@
 check the most recent revision of a remote repository:
 .sp
 .nf
 -.ft C
 +.ft
-hg id \-r tip http://selenic.com/hg/
+hg id \-r tip https://www.mercurial\-scm.org/repo/hg/
 -.ft P
 +.ft
 .fi
 -.UNINDENT
 +.RE
 -.INDENT 0.0
 +.RS 0
 .TP
 .BI \-r,  \-\-rev \ <REV>
 .
-@@ -2514,15 +2487,15 @@
+@@ -2524,15 +2497,15 @@
 do not verify server certificate (ignoring web.cacerts config)
 .sp
 aliases: id
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .sp
 Import a list of patches and commit them individually (unless
-@@ -2547,7 +2520,7 @@
+@@ -2557,7 +2530,7 @@
 text/plain body parts before first diff are added to the 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.
-@@ -2561,37 +2534,37 @@
+@@ -2567,42 +2540,42 @@
+resulting changeset has a different ID than the one recorded in
+the patch. This will guard against various ways that portable
+patch formats and mail systems might fail to transfer Mercurial
+-data or metadata. See \%\fBhg bundle\fP\: for lossless transmission.
++data or metadata. See \fBhg bundle\fP for lossless transmission.
+.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
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -2598,9 +2571,9 @@
+@@ -2609,9 +2582,9 @@
 import a changeset from an hgweb server:
 .sp
 .nf
 -.ft C
 +.ft
-hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
+hg import https://www.mercurial\-scm.org/repo/hg/rev/5ca8c111e9aa
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -2607,9 +2580,9 @@
+@@ -2618,9 +2591,9 @@
 import all the patches in an Unix\-style mbox:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -2617,35 +2590,35 @@
+@@ -2628,35 +2601,35 @@
 possible):
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .BI \-p,  \-\-strip \ <NUM>
 .
-@@ -2665,7 +2638,7 @@
+@@ -2676,7 +2649,7 @@
 .TP
 .B \-\-no\-commit
 .
 -don\(aqt commit, just update the working directory
 +don't commit, just update the working directory
 .TP
 .B \-\-bypass
 .
-@@ -2708,15 +2681,15 @@
+@@ -2719,15 +2692,15 @@
 guess renamed files by similarity (0<=s<=100)
 .sp
 aliases: patch
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .sp
 Show new changesets found in the specified path/URL or the default
-@@ -2730,17 +2703,17 @@
+@@ -2741,17 +2714,17 @@
 status is also displayed for each bookmark like below:
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBadded\fP
 .sp
-@@ -2757,7 +2730,7 @@
+@@ -2768,7 +2741,7 @@
 .B \fBchanged\fP
 .sp
 result depends on remote changesets
 -.UNINDENT
 +.RE
 .sp
 From the point of view of pulling behavior, bookmark
 existing only in the remote repository are treated as \fBadded\fP,
-@@ -2767,15 +2740,15 @@
+@@ -2778,15 +2751,15 @@
 changesets twice if the incoming is followed by a pull.
 .sp
 Examples:
 -.INDENT 0.0
 +.RS 0
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -2782,10 +2755,10 @@
+@@ -2793,10 +2766,10 @@
 show incoming changes excluding merges, store a bundle:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -2792,16 +2765,16 @@
+@@ -2803,16 +2776,16 @@
 briefly list changes inside a bundle:
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-f,  \-\-force
 .
-@@ -2874,23 +2847,23 @@
+@@ -2885,23 +2858,23 @@
 .B \-S,  \-\-subrepos
 .
 recurse into subrepositories
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .sp
 Initialize a new repository in the given directory. If the given
-@@ -2899,12 +2872,12 @@
+@@ -2910,12 +2883,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.
 -.INDENT 0.0
 +.RS 0
 .TP
 .BI \-e,  \-\-ssh \ <CMD>
 .
-@@ -2917,15 +2890,15 @@
+@@ -2928,15 +2901,15 @@
 .B \-\-insecure
 .
 do not verify server certificate (ignoring web.cacerts config)
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .sp
 Print files under Mercurial control in the working directory whose
-@@ -2943,12 +2916,12 @@
+@@ -2954,12 +2927,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.
 -.INDENT 0.0
 +.RS 0
 .TP
 .BI \-r,  \-\-rev \ <REV>
 .
-@@ -2969,7 +2942,7 @@
+@@ -2980,7 +2953,7 @@
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
 .
 exclude names matching the given patterns
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
 .SS log
-@@ -2977,9 +2950,9 @@
+@@ -2988,9 +2961,9 @@
 show revision history of entire repository or files:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Print the revision history of the specified files or the entire
-@@ -3001,12 +2974,12 @@
+@@ -3012,12 +2985,12 @@
 .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
 -\%\fBhg log \-\-patch\fP\: may generate unexpected diff output for merge
 +\fBhg log \-\-patch\fP may generate unexpected diff output for merge
 changesets, as it will only compare the merge changeset against
 its first parent. Also, only files different from BOTH parents
 will appear in files:.
-@@ -3013,21 +2986,21 @@
+@@ -3024,21 +2997,21 @@
 .RE
 .IP Note
 .
 -For performance reasons, \%\fBhg log FILE\fP\: may omit duplicate changes
 +For performance reasons, \fBhg log FILE\fP may omit duplicate changes
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -3034,9 +3007,9 @@
+@@ -3045,9 +3018,9 @@
 changesets ancestral to the working directory:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -3043,9 +3016,9 @@
+@@ -3054,9 +3027,9 @@
 last 10 commits on the current branch:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -3052,9 +3025,9 @@
+@@ -3063,9 +3036,9 @@
 changesets showing all modifications of a file, including removals:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -3061,9 +3034,9 @@
+@@ -3072,9 +3045,9 @@
 all changesets that touch a directory, with diffs, excluding merges:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -3070,9 +3043,9 @@
+@@ -3081,9 +3054,9 @@
 all revision numbers that match a keyword:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -3079,9 +3052,9 @@
+@@ -3090,9 +3063,9 @@
 the full hash identifier of the working directory parent:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -3088,9 +3061,9 @@
+@@ -3099,9 +3072,9 @@
 list available log templates:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -3097,9 +3070,9 @@
+@@ -3108,9 +3081,9 @@
 check if a given changeset is included in a tagged release:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -3106,9 +3079,9 @@
+@@ -3117,9 +3090,9 @@
 find all changesets by some user in a date range:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -3115,24 +3088,24 @@
+@@ -3126,24 +3099,24 @@
 summary of all changesets after the last tag:
 .sp
 .nf
 -.ft C
 +.ft
 +.RE
 .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
--See \%\fBhg help revisions\fP\: and \%\fBhg help revsets\fP\: for more about
+-See \%\fBhg help revisions\fP\: for more about specifying and ordering
-+See \fBhg help revisions\fP and \fBhg help revsets\fP for more about
++See \fBhg help revisions\fP for more about specifying and ordering
-specifying and ordering revisions.
+revisions.
 .sp
 -See \%\fBhg help templates\fP\: for more about pre\-packaged styles and
 +See \fBhg help templates\fP for more about pre\-packaged styles and
 specifying custom templates.
 .sp
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-f,  \-\-follow
 .
-@@ -3221,23 +3194,23 @@
+@@ -3232,23 +3205,23 @@
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
 .
 exclude names matching the given patterns
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .sp
 Print a list of version controlled files for the given revision.
-@@ -3253,7 +3226,7 @@
+@@ -3264,7 +3237,7 @@
 Returns 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .BI \-r,  \-\-rev \ <REV>
 .
-@@ -3266,15 +3239,15 @@
+@@ -3277,15 +3250,15 @@
 .BI \-T,  \-\-template \ <TEMPLATE>
 .
 display with template (EXPERIMENTAL)
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .sp
 The current working directory is updated with all changes made in
-@@ -3287,16 +3260,16 @@
+@@ -3298,16 +3271,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
-@@ -3303,7 +3276,7 @@
+@@ -3314,7 +3287,7 @@
 Returns 0 on success, 1 if there are unresolved files.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-f,  \-\-force
 .
-@@ -3320,15 +3293,15 @@
+@@ -3331,15 +3304,15 @@
 .BI \-t,  \-\-tool \ <VALUE>
 .
 specify merge tool
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .sp
 Show changesets not found in the specified destination repository
-@@ -3342,18 +3315,18 @@
+@@ -3353,18 +3326,18 @@
 status is also displayed for each bookmark like below:
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBadded\fP
 .sp
-@@ -3374,7 +3347,7 @@
+@@ -3385,7 +3358,7 @@
 .B \fBchanged\fP
 .sp
 push with \fB\-B\fP will update it
 -.UNINDENT
 +.RE
 .sp
 From the point of view of pushing behavior, bookmarks
 existing only in the remote repository are treated as
-@@ -3383,7 +3356,7 @@
+@@ -3394,7 +3367,7 @@
 Returns 0 if there are outgoing changes, 1 otherwise.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-f,  \-\-force
 .
-@@ -3452,26 +3425,26 @@
+@@ -3463,26 +3436,26 @@
 .B \-S,  \-\-subrepos
 .
 recurse into subrepositories
 -.UNINDENT
 +.RE
 -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
-@@ -3480,20 +3453,20 @@
+@@ -3491,20 +3464,20 @@
 This command is equivalent to:
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .BI \-r,  \-\-rev \ <REV>
 .
-@@ -3506,15 +3479,15 @@
+@@ -3517,15 +3490,15 @@
 .BI \-T,  \-\-template \ <TEMPLATE>
 .
 display with template
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .sp
 Show definition of symbolic path name NAME. If no name is given,
-@@ -3537,29 +3510,29 @@
+@@ -3548,29 +3521,29 @@
 .IP Note
 .
 \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.
 -.ft P
 +.ft
 .fi
 .sp
 With no argument, show the phase name of the current revision(s).
-@@ -3567,21 +3540,21 @@
+@@ -3578,21 +3551,21 @@
 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
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-p,  \-\-public
 .
-@@ -3602,7 +3575,7 @@
+@@ -3613,7 +3586,7 @@
 .BI \-r,  \-\-rev \ <REV[+]>
 .
 target revision
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
 .SS pull
-@@ -3610,9 +3583,9 @@
+@@ -3621,9 +3594,9 @@
 pull changes from the specified source:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Pull changes from a remote repository to a local one.
-@@ -3622,18 +3595,18 @@
+@@ -3633,21 +3606,21 @@
 \-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
 -If SOURCE is omitted, the \(aqdefault\(aq path will be used.
 -See \%\fBhg help urls\fP\: for more information.
 +If SOURCE is omitted, the 'default' path will be used.
 +See \fBhg help urls\fP for more information.
 .sp
+Specifying bookmark as \fB.\fP is equivalent to specifying the active
+-bookmark\(aqs name.
++bookmark's name.
+.sp
 Returns 0 on success, 1 if an update had unresolved files.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-u,  \-\-update
 .
-@@ -3666,7 +3639,7 @@
+@@ -3680,7 +3653,7 @@
 .B \-\-insecure
 .
 do not verify server certificate (ignoring web.cacerts config)
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
 .SS push
-@@ -3674,9 +3647,9 @@
+@@ -3688,9 +3661,9 @@
 push changes to the specified destination:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Push changesets from the local repository to the specified
-@@ -3707,13 +3680,13 @@
+@@ -3720,15 +3693,15 @@
+If \-B/\-\-bookmark is used, the specified bookmarked revision, its
 ancestors, and the bookmark will be pushed to the remote
-repository.
+repository. Specifying \fB.\fP is equivalent to specifying the active
+-bookmark\(aqs name.
++bookmark's name.
 .sp
 -Please see \%\fBhg help urls\fP\: for important details about \fBssh://\fP
 +Please see \fBhg help urls\fP for important details about \fBssh://\fP
 URLs. If DESTINATION is omitted, a default path will be used.
 .sp
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-f,  \-\-force
 .
-@@ -3746,7 +3719,7 @@
+@@ -3761,7 +3734,7 @@
 .B \-\-insecure
 .
 do not verify server certificate (ignoring web.cacerts config)
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
 .SS recover
-@@ -3754,9 +3727,9 @@
+@@ -3769,9 +3742,9 @@
 roll back an interrupted transaction:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Recover from an interrupted commit or pull.
-@@ -3771,16 +3744,16 @@
+@@ -3786,16 +3759,16 @@
 remove the specified files on the next commit:
 .sp
 .nf
 -.ft C
 +.ft
 +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
-@@ -3790,7 +3763,7 @@
+@@ -3805,7 +3778,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;
-@@ -3859,7 +3832,7 @@
+@@ -3874,7 +3847,7 @@
 .TE
 .IP Note
 .
 -\%\fBhg remove\fP\: never deletes files in Added [A] state from the
 +\fBhg remove\fP never deletes files in Added [A] state from the
 working directory, not even if \fB\-\-force\fP is specified.
 .RE
 .sp
-@@ -3866,7 +3839,7 @@
+@@ -3881,7 +3854,7 @@
 Returns 0 on success, 1 if any warnings encountered.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-A,  \-\-after
 .
-@@ -3887,23 +3860,23 @@
+@@ -3902,23 +3875,23 @@
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
 .
 exclude names matching the given patterns
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .sp
 Mark dest as copies of sources; mark sources for deletion. If dest
-@@ -3915,12 +3888,12 @@
+@@ -3930,12 +3903,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
 .
-@@ -3941,23 +3914,23 @@
+@@ -3956,23 +3929,23 @@
 .B \-n,  \-\-dry\-run
 .
 do not perform actions, just print output
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .sp
 Merges with unresolved conflicts are often the result of
-@@ -3964,15 +3937,15 @@
+@@ -3979,15 +3952,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
-@@ -3981,22 +3954,22 @@
+@@ -3996,22 +3969,22 @@
 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
 -conflicts. You must use \%\fBhg resolve \-m ...\fP\: before you can
 +conflicts. You must use \fBhg resolve \-m ...\fP before you can
 commit after a conflicting merge.
 .RE
 .sp
-@@ -4003,7 +3976,7 @@
+@@ -4018,7 +3991,7 @@
 Returns 0 on success, 1 if any files fail a resolve attempt.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-a,  \-\-all
 .
-@@ -4040,7 +4013,7 @@
+@@ -4055,7 +4028,7 @@
 .BI \-T,  \-\-template \ <TEMPLATE>
 .
 display with template (EXPERIMENTAL)
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
 .SS revert
-@@ -4048,15 +4021,15 @@
+@@ -4063,15 +4036,15 @@
 restore files to their checkout state:
 .sp
 .nf
 -.ft C
 +.ft
 -use \%\fBhg update \-\-clean .\fP\:.
 +use \fBhg update \-\-clean .\fP.
 .RE
 .sp
 With no revision specified, revert the specified files or directories
-@@ -4070,21 +4043,21 @@
+@@ -4085,7 +4058,7 @@
 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
 related method.
 .sp
 Modified files are saved with a .orig suffix before reverting.
-To disable these backups, use \-\-no\-backup.
+@@ -4094,15 +4067,15 @@
+repository by setting the \fBui.origbackuppath\fP configuration
+option.
 .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
 -See \%\fBhg help backout\fP\: for a way to reverse the effect of an
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-a,  \-\-all
 .
-@@ -4117,7 +4090,7 @@
+@@ -4135,7 +4108,7 @@
 .B \-n,  \-\-dry\-run
 .
 do not perform actions, just print output
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
 .SS rollback
-@@ -4125,12 +4098,12 @@
+@@ -4143,12 +4116,12 @@
 roll back the last transaction (DANGEROUS) (DEPRECATED):
 .sp
 .nf
 -.ft C
 +.ft
 -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
-@@ -4145,7 +4118,7 @@
+@@ -4163,7 +4136,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
-@@ -4161,10 +4134,10 @@
+@@ -4179,15 +4152,15 @@
 .IP \(bu 2
 .
 unbundle
 -.UNINDENT
 +.RE
 To avoid permanent data loss, rollback will refuse to rollback a
 -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
+The rollback command can be entirely disabled by setting the
+-\fBui.rollback\fP configuration setting to false. If you\(aqre here
+-because you want to use rollback and it\(aqs disabled, you can
++\fBui.rollback\fP configuration setting to false. If you're here
++because you want to use rollback and it's disabled, you can
+re\-enable the command by setting \fBui.rollback\fP to true.
+.sp
 This command is not intended for use on public repositories. Once
-@@ -4177,7 +4150,7 @@
+@@ -4200,7 +4173,7 @@
 Returns 0 on success, 1 if no rollback data is available.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-n,  \-\-dry\-run
 .
-@@ -4186,15 +4159,15 @@
+@@ -4209,15 +4182,15 @@
 .B \-f,  \-\-force
 .
 ignore safety measures
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .sp
 Print the root directory of the current repository.
-@@ -4205,9 +4178,9 @@
+@@ -4228,9 +4201,9 @@
 start stand\-alone webserver:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Start a local HTTP repository browser and pull server. You can use
-@@ -4232,7 +4205,7 @@
+@@ -4255,7 +4228,7 @@
 Returns 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .BI \-A,  \-\-accesslog \ <FILE>
 .
-@@ -4301,15 +4274,15 @@
+@@ -4291,7 +4264,7 @@
+.TP
+.BI \-\-web\-conf \ <FILE>
+.
+-name of the hgweb config file (see \(aqhg help hgweb\(aq)
++name of the hgweb config file (see 'hg help hgweb')
+.TP
+.BI \-\-webdir\-conf \ <FILE>
+.
+@@ -4324,7 +4297,7 @@
 .BI \-\-certificate \ <FILE>
 .
 SSL certificate file
 -.UNINDENT
 +.RE
+.sp
+[+] marked option can be specified multiple times
 .SS status
-.sp
+@@ -4332,9 +4305,9 @@
 show changed files in the working directory:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Show status of files in the repository. If names are given, only
-@@ -4323,7 +4296,7 @@
+@@ -4348,7 +4321,7 @@
 unless explicitly requested with \-u/\-\-unknown or \-i/\-\-ignored.
 .IP Note
 .
 -\%\fBhg status\fP\: may appear to disagree with diff if permissions have
 +\fBhg status\fP may appear to disagree with diff if permissions have
 changed or a merge has occurred. The standard diff format does
 not report permission changes and diff only reports changes
 relative to one merge parent.
-@@ -4337,7 +4310,7 @@
+@@ -4362,7 +4335,7 @@
 The codes used to show the status of files are:
 .sp
 .nf
 -.ft C
 +.ft
 M = modified
 A = added
 R = removed
-@@ -4346,11 +4319,11 @@
+@@ -4371,11 +4344,11 @@
 ? = not tracked
 I = ignored
 = origin of the previous file (with \-\-copies)
 -.ft P
 +.ft
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 .
 show changes in the working directory relative to a
-@@ -4357,19 +4330,19 @@
+@@ -4382,19 +4355,19 @@
 changeset:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -4376,9 +4349,9 @@
+@@ -4401,9 +4374,9 @@
 show all changes including copies in an existing changeset:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -4385,16 +4358,16 @@
+@@ -4410,16 +4383,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
 .
-@@ -4463,23 +4436,23 @@
+@@ -4488,23 +4461,23 @@
 .BI \-T,  \-\-template \ <TEMPLATE>
 .
 display with template (EXPERIMENTAL)
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .sp
 This generates a brief summary of the working directory state,
-@@ -4491,7 +4464,7 @@
+@@ -4516,7 +4489,7 @@
 Returns 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-\-remote
 .
-@@ -4498,15 +4471,15 @@
+@@ -4523,15 +4496,15 @@
 check for push and pull
 .sp
 aliases: sum
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .sp
 Name a particular revision using <name>.
-@@ -4527,11 +4500,11 @@
+@@ -4552,11 +4525,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.
-@@ -4539,7 +4512,7 @@
+@@ -4564,7 +4537,7 @@
 Returns 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-f,  \-\-force
 .
-@@ -4572,15 +4545,15 @@
+@@ -4597,15 +4570,15 @@
 .BI \-u,  \-\-user \ <USER>
 .
 record the specified user as committer
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .sp
 This lists both regular and local tags. When the \-v/\-\-verbose
-@@ -4590,20 +4563,20 @@
+@@ -4615,20 +4588,20 @@
 Returns 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 -.ft P
 +.ft
 .fi
 .sp
 The tip revision (usually just called the tip) is the changeset
-@@ -4615,12 +4588,12 @@
+@@ -4640,12 +4613,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
 .
-@@ -4637,15 +4610,15 @@
+@@ -4662,15 +4635,15 @@
 .BI \-T,  \-\-template \ <TEMPLATE>
 .
 display with template
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .sp
 Apply one or more compressed changegroup files generated by the
-@@ -4654,32 +4627,32 @@
+@@ -4679,32 +4652,32 @@
 Returns 0 on success, 1 if an update has unresolved files.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 -changeset (see \%\fBhg help parents\fP\:).
 +Update sets the working directory's parent revision to the specified
 +changeset (see \fBhg help parents\fP).
 .sp
 If the changeset is not a descendant or ancestor of the working
--directory\(aqs parent, the update is aborted. With the \-c/\-\-check
+-directory\(aqs parent and there are uncommitted changes, the update is
-+directory's parent, the update is aborted. With the \-c/\-\-check
++directory's parent and there are uncommitted changes, the update is
-option, the working directory is checked for uncommitted changes; if
+aborted. With the \-c/\-\-check option, the working directory is checked
-none are found, the working directory is updated to the specified
+for uncommitted changes; if none are found, the working directory is
-changeset.
+updated to the specified changeset.
-@@ -4686,12 +4659,12 @@
+@@ -4711,12 +4684,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
-@@ -4705,23 +4678,23 @@
+@@ -4730,23 +4703,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
 .
-@@ -4744,25 +4717,25 @@
+@@ -4769,25 +4742,25 @@
 specify merge tool
 .sp
 aliases: up checkout co
 -.UNINDENT
 +.RE
 -Please see \%https://mercurial\-scm.org/wiki/RepositoryCorruption\:
 +Please see https://mercurial\-scm.org/wiki/RepositoryCorruption
 for more information about recovery from corruption of the
 repository.
 .sp
-@@ -4772,9 +4745,9 @@
+@@ -4797,24 +4770,24 @@
 output version and copyright information:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 output version and copyright information
-@@ -4781,7 +4754,7 @@
+.sp
+Options:
+-.INDENT 0.0
++.RS 0
+.TP
+.BI \-T,  \-\-template \ <TEMPLATE>
+.
+display with template (EXPERIMENTAL)
+-.UNINDENT
++.RE
 .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.
-@@ -4788,10 +4761,10 @@
+@@ -4821,10 +4794,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)
-@@ -4840,14 +4813,14 @@
+@@ -4873,14 +4846,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
-@@ -4855,7 +4828,7 @@
+@@ -4888,7 +4861,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
-@@ -4868,16 +4841,16 @@
+@@ -4901,16 +4874,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
-@@ -4890,7 +4863,7 @@
+@@ -4923,7 +4896,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
-@@ -4898,26 +4871,26 @@
+@@ -4931,26 +4904,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
-@@ -4935,9 +4908,9 @@
+@@ -4968,9 +4941,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.
-@@ -4944,7 +4917,7 @@
+@@ -4977,7 +4950,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
-@@ -4966,19 +4939,19 @@
+@@ -4999,19 +4972,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.
-@@ -4990,11 +4963,11 @@
+@@ -5023,11 +4996,11 @@
 .
 This is a comma\-separated list of features to preserve when
 HGPLAIN is enabled. Currently the following values are supported:
 -.INDENT 7.0
 +.RS 7
 -Don\(aqt remove aliases.
 +Don't remove aliases.
 .TP
 .B \fBi18n\fP
 .sp
-@@ -5002,8 +4975,8 @@
+@@ -5035,16 +5008,16 @@
 .TP
 .B \fBrevsetalias\fP
 .sp
 -Don\(aqt remove revset aliases.
--.UNINDENT
 +Don't remove revset aliases.
+.TP
+.B \fBtemplatealias\fP
+.sp
+-Don\(aqt remove template aliases.
++Don't remove template aliases.
+.TP
+.B \fBprogress\fP
+.sp
+-Don\(aqt hide progress output.
+-.UNINDENT
++Don't hide progress output.
 +.RE
 .sp
 Setting HGPLAINEXCEPT to anything (even an empty string) will
 enable plain mode.
-@@ -5012,7 +4985,7 @@
+@@ -5053,7 +5026,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)
-@@ -5028,7 +5001,7 @@
+@@ -5069,7 +5042,7 @@
 .IP \(bu 2
 .
 LOGNAME (with \fB@hostname\fP appended)
 -.UNINDENT
 +.RE
 .sp
 (deprecated, use configuration file)
 .TP
-@@ -5051,13 +5024,13 @@
+@@ -5092,13 +5065,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
-@@ -5070,22 +5043,22 @@
+@@ -5111,22 +5084,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
-@@ -5099,19 +5072,19 @@
+@@ -5140,19 +5113,19 @@
 broader scope, prepend its path with !:
 .sp
 .nf
 -.ft C
 +.ft
 +.RS 3
 +.RS 0
 .TP
 .B acl
 .
-@@ -5244,9 +5217,9 @@
+@@ -5277,9 +5250,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
-@@ -5253,7 +5226,7 @@
+@@ -5286,7 +5259,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
-@@ -5264,18 +5237,18 @@
+@@ -5297,21 +5270,21 @@
 .sp
 Special characters can be used in quoted identifiers by escaping them,
 e.g., \fB\en\fP is interpreted as a newline. To prevent them from being
 -interpreted, strings can be prefixed with \fBr\fP, e.g. \fBr\(aq...\(aq\fP.
 +interpreted, strings can be prefixed with \fBr\fP, e.g. \fBr'...'\fP.
 .sp
+-See also \%\fBhg help patterns\fP\:.
++See also \fBhg help patterns\fP.
+.SS Operators
+.sp
 There is a single prefix operator:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBnot x\fP
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBx and y\fP
 .sp
-@@ -5289,14 +5262,14 @@
+@@ -5325,15 +5298,15 @@
 .B \fBx \- y\fP
 .sp
 Files in x but not in y.
 -.UNINDENT
 +.RE
+.SS Predicates
 .sp
 The following predicates are supported:
 -.INDENT 0.0
 +.RS 0
 .TP
 -File that is added according to \%\fBhg status\fP\:.
 +File that is added according to \fBhg status\fP.
 .TP
 .B \fBbinary()\fP
 .sp
-@@ -5304,7 +5277,7 @@
+@@ -5341,7 +5314,7 @@
 .TP
 .B \fBclean()\fP
 .sp
 -File that is clean according to \%\fBhg status\fP\:.
 +File that is clean according to \fBhg status\fP.
 .TP
 .B \fBcopied()\fP
 .sp
-@@ -5340,34 +5313,34 @@
+@@ -5377,47 +5350,47 @@
 .TP
 .B \fBignored()\fP
 .sp
 -File that is ignored according to \%\fBhg status\fP\:. These files will only be
 +File that is ignored according to \fBhg status\fP. These files will only be
 File size matches the given expression. Examples:
 -.INDENT 7.0
 +.RS 7
 .IP \(bu 2
 .
-1k (files from 1024 to 2047 bytes)
+-size(\(aq1k\(aq) \- files from 1024 to 2047 bytes
-@@ -5380,7 +5353,7 @@
++size('1k') \- files from 1024 to 2047 bytes
 .IP \(bu 2
 .
-4k \- 1MB (files from 4096 bytes to 1048576 bytes)
+-size(\(aq< 20k\(aq) \- files less than 20480 bytes
--.UNINDENT
++size('< 20k') \- files less than 20480 bytes
+.IP \(bu 2
+.
+-size(\(aq>= .5MB\(aq) \- files at least 524288 bytes
++size('>= .5MB') \- files at least 524288 bytes
+.IP \(bu 2
+.
+-size(\(aq4k \- 1MB\(aq) \- files from 4096 bytes to 1048576 bytes
+-.UNINDENT
++size('4k \- 1MB') \- files from 4096 bytes to 1048576 bytes
 +.RE
 .TP
 .B \fBsubrepo([pattern])\fP
 .sp
-@@ -5392,24 +5365,24 @@
+@@ -5429,25 +5402,25 @@
 .TP
 .B \fBunknown()\fP
 .sp
 -File that is unknown according to \%\fBhg status\fP\:. These files will only be
 +File that is unknown according to \fBhg status\fP. These files will only be
 .sp
 -File that is marked unresolved according to \%\fBhg resolve \-l\fP\:.
 -.UNINDENT
 +File that is marked unresolved according to \fBhg resolve \-l\fP.
 +.RE
+.SS Examples
 .sp
 Some sample queries:
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -5416,9 +5389,9 @@
+@@ -5454,9 +5427,9 @@
 Forget files that are in .hgignore but are already tracked:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -5425,9 +5398,9 @@
+@@ -5463,9 +5436,9 @@
 Find text files that contain a string:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -5434,9 +5407,9 @@
+@@ -5472,9 +5445,9 @@
 Find C files in a non\-standard encoding:
 .sp
 .nf
 -.ft C
 -hg files "set:**.c and not encoding(\(aqUTF\-8\(aq)"
 +hg files "set:**.c and not encoding('UTF\-8')"
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -5443,9 +5416,9 @@
+@@ -5481,9 +5454,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
 .
-@@ -5452,15 +5425,15 @@
+@@ -5490,13 +5463,13 @@
 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*)"
 +hg remove "set: 'listfile:foo.lst' and (**a* or **b*)"
 +.ft
 .fi
 -.UNINDENT
 +.RE
-.sp
--See also \%\fBhg help patterns\fP\:.
-+See also \fBhg help patterns\fP.
 .SH GLOSSARY
 -.INDENT 0.0
 +.RS 0
 .TP
 .B Ancestor
 .
-@@ -5468,7 +5441,7 @@
+@@ -5504,7 +5477,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
 .
-@@ -5475,7 +5448,7 @@
+@@ -5511,7 +5484,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,
-@@ -5487,9 +5460,9 @@
+@@ -5523,9 +5496,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
-@@ -5504,7 +5477,7 @@
+@@ -5540,7 +5513,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
 .
-@@ -5523,19 +5496,19 @@
+@@ -5559,19 +5532,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
 .
-@@ -5542,8 +5515,8 @@
+@@ -5578,8 +5551,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
-@@ -5556,7 +5529,7 @@
+@@ -5592,7 +5565,7 @@
 .TP
 .B Branch tip
 .
 -See \(aqTip, branch\(aq.
 +See 'Tip, branch'.
 .TP
 .B Branch, topological
 .
-@@ -5606,24 +5579,24 @@
+@@ -5642,24 +5615,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
 .
-@@ -5632,13 +5605,13 @@
+@@ -5668,13 +5641,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
 .
-@@ -5663,7 +5636,7 @@
+@@ -5699,7 +5672,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
-@@ -5673,7 +5646,7 @@
+@@ -5709,7 +5682,7 @@
 .TP
 .B Default branch
 .
 -See \(aqBranch, default\(aq.
 +See 'Branch, default'.
 .TP
 .B Descendant
 .
-@@ -5681,7 +5654,7 @@
+@@ -5717,7 +5690,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
 .
-@@ -5706,7 +5679,7 @@
+@@ -5742,7 +5715,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
-@@ -5714,7 +5687,7 @@
+@@ -5750,7 +5723,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
 .
-@@ -5722,13 +5695,13 @@
+@@ -5758,13 +5731,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.
-@@ -5740,9 +5713,9 @@
+@@ -5776,9 +5749,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.
-@@ -5771,11 +5744,11 @@
+@@ -5807,11 +5780,11 @@
 .TP
 .B Immutable history
 .
 -See \(aqHistory, immutable\(aq.
 +See 'History, immutable'.
 -See \(aqChangeset, merge\(aq.
 +See 'Changeset, merge'.
 .TP
 .B Manifest
 .
-@@ -5792,7 +5765,7 @@
+@@ -5828,7 +5801,7 @@
 .TP
 .B Named branch
 .
 -See \(aqBranch, named\(aq.
 +See 'Branch, named'.
 .TP
 .B Null changeset
 .
-@@ -5799,30 +5772,30 @@
+@@ -5835,30 +5808,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.
-@@ -5832,13 +5805,13 @@
+@@ -5868,13 +5841,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
 .
-@@ -5846,7 +5819,7 @@
+@@ -5882,7 +5855,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
 .
-@@ -5854,7 +5827,7 @@
+@@ -5890,7 +5863,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
 .
-@@ -5867,13 +5840,13 @@
+@@ -5903,13 +5876,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
 .
-@@ -5882,7 +5855,7 @@
+@@ -5918,7 +5891,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
 .
-@@ -5893,7 +5866,7 @@
+@@ -5929,7 +5902,7 @@
 .TP
 .B Rewriting history
 .
 -See \(aqHistory, rewriting\(aq.
 +See 'History, rewriting'.
 .TP
 .B Root
 .
-@@ -5903,13 +5876,13 @@
+@@ -5939,13 +5912,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
-@@ -5921,7 +5894,7 @@
+@@ -5957,7 +5930,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
-@@ -5929,22 +5902,22 @@
+@@ -5965,22 +5938,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
-@@ -5971,16 +5944,16 @@
+@@ -6007,16 +5980,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
-@@ -5995,13 +5968,13 @@
+@@ -6031,13 +6004,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
-@@ -6010,7 +5983,7 @@
+@@ -6046,7 +6019,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.
-@@ -6022,11 +5995,11 @@
+@@ -6058,11 +6031,11 @@
 .sp
 Subdirectories can have their own .hgignore settings by adding
 \fBsubinclude:path/to/subdir/.hgignore\fP to the root \fB.hgignore\fP. See
 -\%\fBhg help patterns\fP\: for details on \fBsubinclude:\fP and \fBinclude:\fP.
 +\fBhg help patterns\fP for details on \fBsubinclude:\fP and \fBinclude:\fP.
 -Please see \%\fBhg help patterns\fP\: for details.
 +Please see \fBhg help patterns\fP for details.
 .RE
 .SS Example
 .sp
-@@ -6033,7 +6006,7 @@
+@@ -6069,7 +6042,7 @@
 Here is an example ignore file.
 .sp
 .nf
 -.ft C
 +.ft
 # use glob syntax.
 syntax: glob
-@@ -6044,21 +6017,21 @@
+@@ -6080,21 +6053,21 @@
 # switch to regexp syntax.
 syntax: regexp
 ^\e.pc/
 -.ft P
 +.ft
 +.RS 3
 +.RS 0
 .IP \(bu 2
 .
 web
-@@ -6068,11 +6041,11 @@
+@@ -6104,11 +6077,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
-@@ -6087,7 +6060,7 @@
+@@ -6123,7 +6096,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
-@@ -6094,15 +6067,15 @@
+@@ -6130,15 +6103,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
-@@ -6116,7 +6089,7 @@
+@@ -6152,7 +6125,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.
-@@ -6139,7 +6112,7 @@
+@@ -6175,7 +6148,7 @@
 \fB/log?style=atom\fP. The hyphenated URL parameter is preferred.
 .sp
 Not all templates are available for all styles. Attempting to use
 -a style that doesn\(aqt have all templates defined may result in an error
 +a style that doesn't have all templates defined may result in an error
 rendering the page.
 .sp
 Many commands take a \fB{revision}\fP URL parameter. This defines the
-@@ -6146,7 +6119,7 @@
+@@ -6182,7 +6155,7 @@
 changeset to operate on. This is commonly specified as the short,
 12 digit hexadecimal abbreviation for the full 40 character unique
 revision identifier. However, any value described by
 -\%\fBhg help revisions\fP\: typically works.
 +\fBhg help revisions\fP typically works.
 .SS Commands and URLs
 .sp
 The following web commands and their URLs are available:
-@@ -6200,7 +6173,7 @@
+@@ -6236,7 +6209,7 @@
 .sp
 The argument for \fBrev\fP can be a single revision, a revision set,
 or a literal keyword to search for in changeset data (equivalent to
 -\%\fBhg log \-k\fP\:).
 +\fBhg log \-k\fP).
 .sp
 The \fBrevcount\fP query string argument defines the maximum numbers of
 changesets to render.
-@@ -6285,7 +6258,7 @@
+@@ -6321,7 +6294,7 @@
 .sp
 Render help documentation.
 .sp
 -This web command is roughly equivalent to \%\fBhg help\fP\:. If a \fBtopic\fP
 +This web command is roughly equivalent to \fBhg help\fP. If a \fBtopic\fP
 is defined, that help topic will be rendered. If not, an index of
 available help topics will be rendered.
 .sp
-@@ -6348,9 +6321,9 @@
+@@ -6384,9 +6357,9 @@
 .sp
 The \fBtags\fP template is rendered.
 .SH TECHNICAL IMPLEMENTATION TOPICS
 -.INDENT 0.0
 -.INDENT 3.5
 +.RS 3
 +.RS 0
 .TP
 .B bundles
 .
-@@ -6363,9 +6336,9 @@
+@@ -6407,9 +6380,9 @@
-.B revlogs
+.B wireprotocol
 .
-revision storage mechanism
+Wire Protocol
 -.UNINDENT
 -.UNINDENT
 -.UNINDENT
 +.RE
 +.RE
 +.RE
 .SH MERGE TOOLS
 .sp
 To merge files Mercurial uses merge tools.
-@@ -6375,8 +6348,8 @@
+@@ -6419,8 +6392,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
-@@ -6401,7 +6374,7 @@
+@@ -6445,7 +6418,7 @@
 .sp
 There are some internal merge tools which can be used. The internal
 merge tools are:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fB:dump\fP
 .sp
-@@ -6464,7 +6437,7 @@
+@@ -6508,7 +6481,7 @@
 Uses the internal non\-interactive simple merge algorithm for merging
 files. It will use both left and right sides for conflict regions.
 No markers are inserted.
 -.UNINDENT
 +.RE
 .sp
 Internal tools are always available and do not require a GUI but will by default
 not handle symlinks or binary files.
-@@ -6471,7 +6444,7 @@
+@@ -6515,7 +6488,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
-@@ -6508,11 +6481,11 @@
+@@ -6552,11 +6525,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
-@@ -6548,7 +6521,7 @@
+@@ -6577,7 +6550,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
-@@ -6573,8 +6546,8 @@
+@@ -6602,8 +6575,8 @@
 To read a set of patterns from a file, use \fBinclude:\fP or \fBsubinclude:\fP.
 \fBinclude:\fP will use all the patterns from the given file and treat them as if
 they had been passed in manually.  \fBsubinclude:\fP will only apply the patterns
 -against files that are under the subinclude file\(aqs directory. See \%\fBhg help
 -hgignore\fP\: for details on the format of these files.
 +against files that are under the subinclude file's directory. See \fBhg help
 +hgignore\fP for details on the format of these files.
 .sp
 All patterns, except for \fBglob:\fP specified in command line (not for
 \fB\-I\fP or \fB\-X\fP options), can match also against directories: files
-@@ -6583,17 +6556,17 @@
+@@ -6612,17 +6585,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
-@@ -6601,36 +6574,36 @@
+@@ -6630,36 +6603,36 @@
 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
 -.ft P
 +.ft
 .fi
 .SH WORKING WITH PHASES
 .SS What are phases?
-@@ -6640,9 +6613,9 @@
+@@ -6669,9 +6642,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
-@@ -6652,9 +6625,9 @@
+@@ -6681,9 +6654,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
-@@ -6668,17 +6641,17 @@
+@@ -6697,17 +6670,17 @@
 .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 P
 +.ft
 .fi
 .SS Phases and servers
 .sp
-@@ -6685,7 +6658,7 @@
+@@ -6714,7 +6687,7 @@
 Normally, all servers are \fBpublishing\fP by default. This means:
 .sp
 .nf
 -.ft C
 +.ft
 \- all draft changesets that are pulled or cloned appear in phase
 public on the client
-@@ -6693,7 +6666,7 @@
+@@ -6722,7 +6695,7 @@
 client and server
 \- secret changesets are neither pushed, pulled, or cloned
 -.ft P
 +.ft
 .fi
 .IP Note
 .
-@@ -6706,13 +6679,13 @@
+@@ -6735,13 +6708,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
-@@ -6726,17 +6699,17 @@
+@@ -6755,17 +6728,17 @@
 of the secret changeset may be communicated to the server.
 .RE
 .SS Examples
 -.INDENT 0.0
 -.INDENT 3.5
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -6743,9 +6716,9 @@
+@@ -6772,9 +6745,9 @@
 change all secret changesets to draft:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -6752,9 +6725,9 @@
+@@ -6781,9 +6754,9 @@
 forcibly move the current changeset and descendants from public to draft:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -6761,9 +6734,9 @@
+@@ -6790,9 +6763,9 @@
 show a list of changeset revision and phase:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -6770,15 +6743,15 @@
+@@ -6799,15 +6772,15 @@
 resynchronize draft changesets relative to a remote repository:
 .sp
 .nf
 -.ft C
 +.ft
 +.RE
 +.RE
 .sp
 -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
+.SH SPECIFYING REVISIONS
 .sp
-Mercurial supports several ways to specify individual revisions.
+Mercurial supports several ways to specify revisions.
-@@ -6824,18 +6797,18 @@
+@@ -6858,19 +6831,19 @@
 .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.
+.SS Operators
 .sp
 There is a single prefix operator:
 -.INDENT 0.0
 +.RS 0
 .TP
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBx::y\fP
 .sp
-@@ -6874,18 +6847,18 @@
+@@ -6926,25 +6899,25 @@
-.B \fBx~n\fP
+For example:
 .sp
-The nth first ancestor of x; \fBx~0\fP is x; \fBx~3\fP is \fBx^^^\fP.
+.nf
+-.ft C
++.ft
+[revsetalias]
+-issue(a1) = grep(r\(aq\ebissue[ :]?\(aq ## a1 ## r\(aq\eb|\ebbug\e(\(aq ## a1 ## r\(aq\e)\(aq)
++issue(a1) = grep(r'\ebissue[ :]?' ## a1 ## r'\eb|\ebbug\e(' ## a1 ## r'\e)')
+\(ga\(gaissue(1234)\(ga\(ga is equivalent to
+-\(ga\(gagrep(r\(aq\ebissue[ :]?1234\eb|\ebbug\e(1234\e)\(aq)\(ga\(ga
++\(ga\(gagrep(r'\ebissue[ :]?1234\eb|\ebbug\e(1234\e)')\(ga\(ga
+in this case. This matches against all of "issue 1234", "issue:1234",
+"issue1234" and "bug(1234)".
+-.ft P
++.ft
+.fi
 -.UNINDENT
 +.RE
 .sp
 There is a single postfix operator:
 -.INDENT 0.0
 .B \fBx^\fP
 .sp
 Equivalent to \fBx^1\fP, the first parent of each changeset in x.
 -.UNINDENT
 +.RE
+.SS Patterns
+.sp
+Where noted, predicates that perform string matching can accept a pattern
+@@ -6956,22 +6929,22 @@
+Matching is case\-sensitive, unless otherwise noted.  To perform a case\-
+insensitive match on a case\-sensitive predicate, use a regular expression,
+prefixed with \fB(?i)\fP.
+-.INDENT 0.0
+-.INDENT 3.5
++.RS 0
++.RS 3
+.sp
+For example:
+.sp
+.nf
+-.ft C
+-\(ga\(gatag(r\(aqre:(?i)release\(aq)\(ga\(ga matches "release" or "RELEASE" or "Release", etc
+-.ft P
++.ft
++\(ga\(gatag(r're:(?i)release')\(ga\(ga matches "release" or "RELEASE" or "Release", etc
++.ft
+.fi
+-.UNINDENT
+-.UNINDENT
++.RE
++.RE
+.SS Predicates
 .sp
 The following predicates are supported:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBadds(pattern)\fP
 .sp
-@@ -6918,7 +6891,7 @@
+@@ -7004,7 +6977,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
-@@ -6940,7 +6913,7 @@
+@@ -7026,13 +6999,13 @@
 .IP \(bu 2
 .
 \fBcurrent\fP            : the cset currently being bisected
 -.UNINDENT
 +.RE
 .TP
 .B \fBbookmark([name])\fP
 .sp
-@@ -6985,8 +6958,8 @@
+The named bookmark or all bookmarks.
+.sp
+-Pattern matching is supported for \fIname\fP. See \%\fBhg help revisions.patterns\fP\:.
++Pattern matching is supported for \fIname\fP. See \fBhg help revisions.patterns\fP.
+.TP
+.B \fBbranch(string or set)\fP
+.sp
+@@ -7040,7 +7013,7 @@
+changesets.
+.sp
+Pattern matching is supported for \fIstring\fP. See
+-\%\fBhg help revisions.patterns\fP\:.
++\fBhg help revisions.patterns\fP.
+.TP
+.B \fBbranchpoint()\fP
+.sp
+@@ -7068,8 +7041,8 @@
 .TP
 .B \fBcontains(pattern)\fP
 .sp
 -The revision\(aqs manifest contains a file matching pattern (but might not
 -modify it). See \%\fBhg help patterns\fP\: for information about file patterns.
 +The revision's manifest contains a file matching pattern (but might not
 +modify it). See \fBhg help patterns\fP for information about file patterns.
 .sp
 The pattern without explicit kind like \fBglob:\fP is expected to be
 relative to the current directory and match against a file exactly
-@@ -6999,7 +6972,7 @@
+@@ -7082,7 +7055,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
-@@ -7051,7 +7024,7 @@
+@@ -7089,7 +7062,7 @@
+Search commit message for string. The match is case\-insensitive.
+.sp
+Pattern matching is supported for \fIstring\fP. See
+-\%\fBhg help revisions.patterns\fP\:.
++\fBhg help revisions.patterns\fP.
+.TP
+.B \fBdescendants(set)\fP
+.sp
+@@ -7119,7 +7092,7 @@
+optional value.
+.sp
+Pattern matching is supported for \fIvalue\fP. See
+-\%\fBhg help revisions.patterns\fP\:.
++\fBhg help revisions.patterns\fP.
+.TP
+.B \fBfile(pattern)\fP
+.sp
+@@ -7136,7 +7109,7 @@
 .sp
 For performance reasons, visits only revisions mentioned in the file\-level
 filelog, rather than filtering through all changesets (much faster, but
 -doesn\(aqt include deletes or duplicate changes). For a slower, more accurate
 +doesn't include deletes or duplicate changes). For a slower, more accurate
 result, use \fBfile()\fP.
 .sp
 The pattern without explicit kind like \fBglob:\fP is expected to be
-@@ -7058,7 +7031,7 @@
+@@ -7143,7 +7116,7 @@
 relative to the current directory and match against a file exactly
 for efficiency.
 .sp
 -If some linkrev points to revisions filtered by the current repoview, we\(aqll
 +If some linkrev points to revisions filtered by the current repoview, we'll
 work around it to return a non\-filtered value.
 .TP
 .B \fBfirst(set, [n])\fP
-@@ -7067,13 +7040,13 @@
+@@ -7152,21 +7125,21 @@
 .TP
-.B \fBfollow([pattern])\fP
+.B \fBfollow([pattern[, startrev]])\fP
 .sp
 -An alias for \fB::.\fP (ancestors of the working directory\(aqs first parent).
 +An alias for \fB::.\fP (ancestors of the working directory's first parent).
 If pattern is specified, the histories of files matching given
-pattern is followed, including copies.
+pattern in the revision given by startrev are followed, including copies.
+.TP
+.B \fBfollowlines(file, fromline:toline[, startrev=.])\fP
+.sp
+-Changesets modifying \fIfile\fP in line range (\(aqfromline\(aq, \(aqtoline\(aq).
++Changesets modifying \fIfile\fP in line range ('fromline', 'toline').
+.sp
+-Line range corresponds to \(aqfile\(aq content at \(aqstartrev\(aq and should hence be
+-consistent with file size. If startrev is not specified, working directory\(aqs
++Line range corresponds to 'file' content at 'startrev' and should hence be
++consistent with file size. If startrev is not specified, working directory's
+parent is used.
 .TP
 .B \fBgrep(regex)\fP
 .sp
 -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
-@@ -7197,7 +7170,7 @@
+@@ -7252,7 +7225,7 @@
+The changesets in a given namespace.
+.sp
+Pattern matching is supported for \fInamespace\fP. See
+-\%\fBhg help revisions.patterns\fP\:.
++\fBhg help revisions.patterns\fP.
+.TP
+.B \fBobsolete()\fP
+.sp
+@@ -7292,7 +7265,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,
-@@ -7211,7 +7184,7 @@
+@@ -7306,7 +7279,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
-@@ -7244,7 +7217,7 @@
+@@ -7339,7 +7312,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,
-@@ -7260,7 +7233,7 @@
+@@ -7358,7 +7331,7 @@
 .IP \(bu 2
 .
-\fBdate\fP for the commit date
+\fBtopo\fP for a reverse topographical sort
 -.UNINDENT
 +.RE
-.TP
+.sp
-.B \fBsubrepo([pattern])\fP
+The \fBtopo\fP sort order cannot be combined with other sort keys. This sort
-.sp
+takes one optional argument, \fBtopo.firstbranch\fP, which takes a revset that
-@@ -7286,15 +7259,15 @@
+@@ -7374,7 +7347,7 @@
-If \fIstring\fP starts with \fIre:\fP, the remainder of the string is treated as
+The specified tag by name, or all tagged revisions if no name is given.
-a regular expression. To match a user that actually contains \fIre:\fP, use
+.sp
-the prefix \fIliteral:\fP.
+Pattern matching is supported for \fIname\fP. See
--.UNINDENT
+-\%\fBhg help revisions.patterns\fP\:.
-+.RE
++\fBhg help revisions.patterns\fP.
+.TP
+.B \fBunstable()\fP
+.sp
+@@ -7385,8 +7358,8 @@
+User name contains string. The match is case\-insensitive.
+.sp
+Pattern matching is supported for \fIstring\fP. See
+-\%\fBhg help revisions.patterns\fP\:.
+-.UNINDENT
++\fBhg help revisions.patterns\fP.
++.RE
+.SS Aliases
 .sp
 New predicates (known as "aliases") can be defined, using any combination of
+@@ -7393,9 +7366,9 @@
 existing predicates or other aliases. An alias definition looks like:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 in the \fBrevsetalias\fP section of a Mercurial configuration file. Arguments
-@@ -7304,12 +7277,12 @@
+@@ -7405,12 +7378,12 @@
 For example,
 .sp
 .nf
 -.ft C
 +.ft
 [revsetalias]
 h = heads()
-d($1) = sort($1, date)
+d(s) = sort(s, date)
-rs($1, $2) = reverse(sort($1, $2))
+rs(s, k) = reverse(sort(s, k))
 -.ft P
 +.ft
 .fi
 .sp
 defines three aliases, \fBh\fP, \fBd\fP, and \fBrs\fP. \fBrs(0:tip, author)\fP is
-@@ -7319,13 +7292,13 @@
+@@ -7417,10 +7390,10 @@
-one string. For example:
+exactly equivalent to \fBreverse(sort(0:tip, author))\fP.
-.sp
+.SS Equivalents
-.nf
--.ft C
-+.ft
-[revsetalias]
--issue($1) = grep(r\(aq\ebissue[ :]?\(aq ## $1 ## r\(aq\eb|\ebbug\e(\(aq ## $1 ## r\(aq\e)\(aq)
--.ft P
-+issue($1) = grep(r'\ebissue[ :]?' ## $1 ## r'\eb|\ebbug\e(' ## $1 ## r'\e)')
-+.ft
-.fi
-.sp
--\fBissue(1234)\fP is equivalent to \fBgrep(r\(aq\ebissue[ :]?1234\eb|\ebbug\e(1234\e)\(aq)\fP
-+\fBissue(1234)\fP is equivalent to \fBgrep(r'\ebissue[ :]?1234\eb|\ebbug\e(1234\e)')\fP
-in this case. This matches against all of "issue 1234", "issue:1234",
-"issue1234" and "bug(1234)".
-.sp
-@@ -7332,10 +7305,10 @@
-All other prefix, infix and postfix operators have lower priority than
-\fB##\fP. For example, \fB$1 ## $2~2\fP is equivalent to \fB($1 ## $2)~2\fP.
 .sp
 -Command line equivalents for \%\fBhg log\fP\::
 +Command line equivalents for \fBhg log\fP:
 .sp
 .nf
 -.ft C
 +.ft
 \-f    \->  ::.
 \-d x  \->  date(x)
 \-k x  \->  keyword(x)
-@@ -7344,19 +7317,19 @@
+@@ -7429,20 +7402,20 @@
 \-b x  \->  branch(x)
 \-P x  \->  !::x
 \-l x  \->  limit(expr, x)
 -.ft P
 +.ft
 .fi
+.SS Examples
 .sp
 Some sample queries:
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -7363,9 +7336,9 @@
+@@ -7449,9 +7422,9 @@
 Changesets on the default branch since tag 1.5 (excluding merges):
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -7372,9 +7345,9 @@
+@@ -7458,9 +7431,9 @@
 Open branch heads:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -7382,9 +7355,9 @@
+@@ -7468,9 +7441,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
 .
-@@ -7391,9 +7364,9 @@
+@@ -7477,9 +7450,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
 .
-@@ -7401,11 +7374,11 @@
+@@ -7487,9 +7460,9 @@
 release:
 .sp
 .nf
 -.ft C
 +.ft
 hg log \-r "(keyword(bug) or keyword(issue)) and not ancestors(tag())"
 -.ft P
 +.ft
 .fi
+.IP \(bu 2
+.
+@@ -7497,9 +7470,9 @@
+bookmark (this works because the last revision of the revset is used):
+.sp
+.nf
+-.ft C
++.ft
+hg update :@
+-.ft P
++.ft
+.fi
+.IP \(bu 2
+.
+@@ -7507,11 +7480,11 @@
+last revisions of the revset are used):
+.sp
+.nf
+-.ft C
++.ft
+hg diff \-r 1.3::1.5
+-.ft P
++.ft
+.fi
 -.UNINDENT
 +.RE
 .SH USING MERCURIAL FROM SCRIPTS AND AUTOMATION
 .sp
 It is common for machines (as opposed to humans) to consume Mercurial.
-@@ -7415,7 +7388,7 @@
+@@ -7521,7 +7494,7 @@
 .sp
 Machines have a choice of several methods to interface with Mercurial.
 These include:
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 .
 Executing the \fBhg\fP process
-@@ -7425,21 +7398,21 @@
+@@ -7531,21 +7504,21 @@
 .IP \(bu 2
 .
 Calling out to a command server
 -.UNINDENT
 +.RE
 .sp
 -\%\fBhg serve\fP\: can also start a "command server." Clients can connect
 +\fBhg serve\fP can also start a "command server." Clients can connect
 to this server and issue Mercurial commands over a special protocol.
 For more details on the command server, including links to client
--libraries, see \%https://mercurial.selenic.com/wiki/CommandServer\:.
+-libraries, see \%https://www.mercurial\-scm.org/wiki/CommandServer\:.
-+libraries, see https://mercurial.selenic.com/wiki/CommandServer.
++libraries, see https://www.mercurial\-scm.org/wiki/CommandServer.
 .sp
 -\%\fBhg serve\fP\: based interfaces (the hgweb and command servers) have the
 +\fBhg serve\fP based interfaces (the hgweb and command servers) have the
 advantage over simple \fBhg\fP process invocations in that they are
 likely more efficient. This is because there is significant overhead
 to spawn new Python processes.
-@@ -7451,14 +7424,14 @@
+@@ -7557,14 +7530,14 @@
 .RE
 .SS Environment Variables
 .sp
 -As documented in \%\fBhg help environment\fP\:, various environment variables
 +As documented in \fBhg help environment\fP, various environment variables
 -If not set, Mercurial\(aqs output could be influenced by configuration
 +If not set, Mercurial's output could be influenced by configuration
 settings that impact its encoding, verbose mode, localization, etc.
 .sp
 It is highly recommended for machines to set this variable when
-@@ -7479,7 +7452,7 @@
+@@ -7585,7 +7558,7 @@
 .B HGRCPATH
 .
 If not set, Mercurial will inherit config options from config files
 -using the process described in \%\fBhg help config\fP\:. This includes
 +using the process described in \fBhg help config\fP. This includes
 inheriting user or system\-wide config files.
 .sp
 When utmost control over the Mercurial configuration is desired, the
-@@ -7490,7 +7463,7 @@
+@@ -7596,7 +7569,7 @@
 consequences, as the user and system config files often define things
 like the username and extensions that may be required to interface
 with a repository.
 -.UNINDENT
 +.RE
 .SS Consuming Command Output
 .sp
 It is common for machines to need to parse the output of Mercurial
-@@ -7514,7 +7487,7 @@
+@@ -7620,7 +7593,7 @@
 .SS Using Templates to Control Output
 .sp
 Many \fBhg\fP commands support templatized output via the
 -\fB\-T/\-\-template\fP argument. For more, see \%\fBhg help templates\fP\:.
 +\fB\-T/\-\-template\fP argument. For more, see \fBhg help templates\fP.
 .sp
 Templates are useful for explicitly controlling output so that
 you get exactly the data you want formatted how you want it. For
-@@ -7552,13 +7525,13 @@
+@@ -7658,13 +7631,13 @@
 .sp
 Commands often have varying output verbosity, even when machine
 readable styles are being used (e.g. \fB\-T json\fP). Adding
 -\fB\-v/\-\-verbose\fP and \fB\-\-debug\fP to the command\(aqs arguments can
 +\fB\-v/\-\-verbose\fP and \fB\-\-debug\fP to the command's arguments can
 -.INDENT 0.0
 +.RS 0
 .TP
 .B revsets
 .
-@@ -7566,7 +7539,7 @@
+@@ -7672,7 +7645,7 @@
 of revisions. Think of it as SQL for Mercurial repositories. Revsets
 are useful for querying repositories for specific data.
 .sp
 -See \%\fBhg help revsets\fP\: for more.
 +See \fBhg help revsets\fP for more.
 .TP
 .B share extension
 .
-@@ -7580,8 +7553,8 @@
+@@ -7686,8 +7659,8 @@
 network. This is especially true for continuous integration (CI)
 environments.
 .sp
 -See \%\fBhg help \-e share\fP\: for more.
 -.UNINDENT
 +See \fBhg help \-e share\fP for more.
 +.RE
 .SH SUBREPOSITORIES
 .sp
 Subrepositories let you nest external repositories or projects into a
-@@ -7592,7 +7565,7 @@
+@@ -7698,7 +7671,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
-@@ -7605,18 +7578,18 @@
+@@ -7711,18 +7684,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
-@@ -7639,7 +7612,7 @@
+@@ -7745,7 +7718,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
-@@ -7647,7 +7620,7 @@
+@@ -7753,7 +7726,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
-@@ -7664,7 +7637,7 @@
+@@ -7770,7 +7743,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
 .
-@@ -7699,7 +7672,7 @@
+@@ -7805,7 +7778,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.  The \-\-addremove
 option also honors the \-S/\-\-subrepos option.  However, Git and
-@@ -7739,7 +7712,7 @@
+@@ -7845,7 +7818,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.
-@@ -7774,7 +7747,7 @@
+@@ -7880,7 +7853,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,
-@@ -7792,12 +7765,12 @@
+@@ -7898,12 +7871,12 @@
 outgoing, incoming, tip, parents, and heads.
 .sp
 Some built\-in styles are packaged with Mercurial. These can be listed
 -with \%\fBhg log \-\-template list\fP\:. Example usage:
 +with \fBhg log \-\-template list\fP. Example usage:
 -.ft P
 +.ft
 .fi
 .sp
 A template is a piece of text, with markup to invoke variable
-@@ -7804,16 +7777,16 @@
+@@ -7910,10 +7883,10 @@
 expansion:
 .sp
 .nf
 -.ft C
 +.ft
 $ hg log \-r1 \-\-template "{node}\en"
 b56ce7b07c52de7d5fd79fb89701ea538af65746
 -.ft P
 +.ft
 .fi
-.sp
+.SS Keywords
+.sp
+@@ -7920,7 +7893,7 @@
 Strings in curly braces are called keywords. The availability of
 keywords depends on the exact context of the templater. These
 keywords are usually available for templating a log\-like command:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B activebookmark
 .
-@@ -7831,7 +7804,7 @@
+@@ -7938,7 +7911,7 @@
 .B bookmarks
 .
 List of strings. Any bookmarks associated with the
 -changeset. Also sets \(aqactive\(aq, the name of the active bookmark.
 +changeset. Also sets 'active', the name of the active bookmark.
 .TP
 .B branch
 .
-@@ -7861,7 +7834,7 @@
+@@ -7968,7 +7941,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
-@@ -7917,24 +7890,24 @@
+@@ -8024,24 +7997,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
-@@ -7962,24 +7935,24 @@
+@@ -8073,25 +8046,25 @@
-.B tags
+.B termwidth
 .
-List of strings. Any tags associated with the changeset.
+Integer. The width of the current terminal.
 -.UNINDENT
 +.RE
 .sp
 The "date" keyword does not produce human\-readable output. If you
 want to use a date in your output, you can use a filter to process
 $ hg tip \-\-template "{date|isodate}\en"
 2008\-08\-21 18:22 +0000
 -.ft P
 +.ft
 .fi
+.SS Filters
 .sp
 List of filters:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B addbreaks
 .
-@@ -8062,7 +8035,7 @@
+@@ -8174,7 +8147,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
 .
-@@ -8138,17 +8111,17 @@
+@@ -8254,7 +8227,7 @@
-.
+.B utf8
-Any text. Returns a short representation of a user name or email
+.
-address.
+Any text. Converts from the local character encoding to UTF\-8.
 -.UNINDENT
 +.RE
 .sp
 Note that a filter is nothing more than a function call, i.e.
 \fBexpr|filter\fP is equivalent to \fBfilter(expr)\fP.
+@@ -8261,11 +8234,11 @@
+.SS Functions
 .sp
 In addition to filters, there are some basic built\-in functions:
 -.INDENT 0.0
 +.RS 0
 .TP
 -Format a date. See \%\fBhg help dates\fP\: for formatting
 +Format a date. See \fBhg help dates\fP for formatting
 strings. The default is a Unix date format, including the timezone:
 "Mon Sep 04 15:13:13 2006 0700".
 .TP
-@@ -8210,7 +8183,7 @@
+@@ -8277,7 +8250,7 @@
-Converts a date to the specified timezone.
+.B files(pattern)
-The default is local date.
+.
-.TP
+All files of the current changeset matching the pattern. See
--.B pad(text, width[, fillchar=\(aq \(aq[, right=False]])
+-\%\fBhg help patterns\fP\:.
-+.B pad(text, width[, fillchar=' '[, right=False]])
++\fBhg help patterns\fP.
+.TP
+.B fill(text[, width[, initialident[, hangindent]]])
+.
+@@ -8336,7 +8309,7 @@
+.
+Calculate a mod b such that a / b + a mod b == a
+.TP
+-.B pad(text, width[, fillchar=\(aq \(aq[, left=False]])
++.B pad(text, width[, fillchar=' '[, left=False]])
 .
 Pad text with a
 fill character.
-@@ -8218,7 +8191,7 @@
+@@ -8349,7 +8322,7 @@
 .B revset(query[, formatargs...])
 .
 Execute a revision set query. See
 -\%\fBhg help revset\fP\:.
 +\fBhg help revset\fP.
 .TP
 .B rstdoc(text, style)
 .
-@@ -8247,30 +8220,30 @@
+@@ -8382,18 +8355,18 @@
 .B word(number, text[, separator])
 .
 Return the nth word from a string.
 -.UNINDENT
 +.RE
-.sp
+.SS Operators
+.sp
+We provide a limited set of infix arithmetic operations on integers:
+.sp
+.nf
+-.ft C
++.ft
++ for addition
+\- for subtraction
+* for multiplication
+/ for floor division (division rounded to integer nearest \-infinity)
+-.ft P
++.ft
+.fi
+.sp
+Division fulfils the law x = x / y + mod(x, y).
+@@ -8401,14 +8374,14 @@
 Also, for any expression that returns a list, there is a list operator:
 .sp
 .nf
 -.ft C
 +.ft
 .sp
 As seen in the above example, \fB{template}\fP is interpreted as a template.
 To prevent it from being interpreted, you can use an escape character \fB\e{\fP
 -or a raw string prefix, \fBr\(aq...\(aq\fP.
 +or a raw string prefix, \fBr'...'\fP.
+.SS Aliases
+.sp
+New keywords and functions can be defined in the \fBtemplatealias\fP section of
+@@ -8415,9 +8388,9 @@
+a Mercurial configuration file:
+.sp
+.nf
+-.ft C
++.ft
+<alias> = <definition>
+-.ft P
++.ft
+.fi
+.sp
+Arguments of the form \fIa1\fP, \fIa2\fP, etc. are substituted from the alias into
+@@ -8426,48 +8399,48 @@
+For example,
+.sp
+.nf
+-.ft C
++.ft
+[templatealias]
+r = rev
+rn = "{r}:{node|short}"
+-leftpad(s, w) = pad(s, w, \(aq \(aq, True)
+-.ft P
++leftpad(s, w) = pad(s, w, ' ', True)
++.ft
+.fi
+.sp
+defines two symbol aliases, \fBr\fP and \fBrn\fP, and a function alias
+\fBleftpad()\fP.
+.sp
+-It\(aqs also possible to specify complete template strings, using the
++It's also possible to specify complete template strings, using the
+\fBtemplates\fP section. The syntax used is the general template string syntax.
+.sp
+For example,
+.sp
+.nf
+-.ft C
++.ft
+[templates]
+nodedate = "{node|short}: {date(date, "%Y\-%m\-%d")}\en"
+-.ft P
++.ft
+.fi
+.sp
+defines a template, \fBnodedate\fP, which can be called like:
+.sp
+.nf
+-.ft C
++.ft
+$ hg log \-r . \-Tnodedate
+-.ft P
++.ft
+.fi
+.SS Examples
 .sp
 Some sample command line templates:
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 +$ hg log \-r 0 \-\-template "files:\en{files % '  {file}\en'}"
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -8277,9 +8250,9 @@
+@@ -8474,9 +8447,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
 .
-@@ -8286,9 +8259,9 @@
+@@ -8483,9 +8456,9 @@
+Join the list of files ending with ".py" with a ", ":
+.sp
+.nf
+-.ft C
+-$ hg log \-r 0 \-\-template "pythonfiles: {join(files(\(aq**.py\(aq), \(aq, \(aq)}\en"
+-.ft P
++.ft
++$ hg log \-r 0 \-\-template "pythonfiles: {join(files('**.py'), ', ')}\en"
++.ft
+.fi
+.IP \(bu 2
+.
+@@ -8492,9 +8465,9 @@
+Separate non\-empty arguments by a " ":
+.sp
+.nf
+-.ft C
+-$ hg log \-r 0 \-\-template "{separate(\(aq \(aq, node, bookmarks, tags}\en"
+-.ft P
++.ft
++$ hg log \-r 0 \-\-template "{separate(' ', node, bookmarks, tags}\en"
++.ft
+.fi
+.IP \(bu 2
+.
+@@ -8501,9 +8474,9 @@
 Modify each line of a commit description:
 .sp
 .nf
 -.ft C
 -$ hg log \-\-template "{splitlines(desc) % \(aq**** {line}\en\(aq}"
 +$ hg log \-\-template "{splitlines(desc) % '**** {line}\en'}"
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -8295,9 +8268,9 @@
+@@ -8510,9 +8483,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
 .
-@@ -8304,9 +8277,9 @@
+@@ -8519,9 +8492,9 @@
 Display date in UTC:
 .sp
 .nf
 -.ft C
 -$ hg log \-r 0 \-\-template "{localdate(date, \(aqUTC\(aq)|date}\en"
 +$ hg log \-r 0 \-\-template "{localdate(date, 'UTC')|date}\en"
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -8313,9 +8286,9 @@
+@@ -8528,9 +8501,9 @@
 Output the description set to a fill\-width of 30:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -8322,10 +8295,10 @@
+@@ -8537,10 +8510,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
 .
-@@ -8332,9 +8305,9 @@
+@@ -8547,9 +8520,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
 .
-@@ -8341,9 +8314,9 @@
+@@ -8556,9 +8529,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
 .
-@@ -8350,27 +8323,27 @@
+@@ -8565,27 +8538,27 @@
 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"
 +$ hg log \-\-template "{bookmarks % '{bookmark}{ifeq(bookmark, active, '*')} '}\en"
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -8377,18 +8350,18 @@
+@@ -8592,18 +8565,18 @@
 Find the previous release candidate tag, the distance and changes since the tag:
 .sp
 .nf
 -.ft C
 -$ hg log \-r . \-\-template "{latesttag(\(aqre:^.*\-rc$\(aq) % \(aq{tag}, {changes}, {distance}\(aq}\en"
 +$ hg log \-\-template "{ifcontains(rev, revset('.'), '@')}\en"
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -8395,9 +8368,9 @@
+@@ -8610,9 +8583,9 @@
 Show details of parent revisions:
 .sp
 .nf
 -.ft C
 -$ hg log \-\-template "{revset(\(aqparents(%d)\(aq, rev) % \(aq{desc|firstline}\en\(aq}"
 +$ hg log \-\-template "{revset('parents(%d)', rev) % '{desc|firstline}\en'}"
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -8404,9 +8377,9 @@
+@@ -8619,9 +8592,9 @@
 Show only commit descriptions that start with "template":
 .sp
 .nf
 -.ft C
 -$ hg log \-\-template "{startswith(\(aqtemplate\(aq, firstline(desc))}\en"
 +$ hg log \-\-template "{startswith('template', firstline(desc))}\en"
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -8413,34 +8386,34 @@
+@@ -8628,34 +8601,34 @@
 Print the first word of each line of a commit message:
 .sp
 .nf
 -.ft C
 +.ft
 -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
-@@ -8448,7 +8421,7 @@
+@@ -8663,7 +8636,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
-@@ -8455,63 +8428,63 @@
+@@ -8670,63 +8643,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.
-@@ -8535,7 +8508,7 @@
+@@ -8750,7 +8723,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)
-@@ -8548,7 +8521,7 @@
+@@ -8763,7 +8736,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
-@@ -8556,7 +8529,7 @@
+@@ -8771,7 +8744,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
-@@ -8563,10 +8536,10 @@
+@@ -8778,10 +8751,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
-@@ -8573,7 +8546,7 @@
+@@ -8788,7 +8761,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.
-@@ -8595,7 +8568,7 @@
+@@ -8810,7 +8783,7 @@
 .SS Example Configuration
 .sp
 .nf
 -.ft C
 +.ft
 [hooks]
 # Use this if you want to check access restrictions at commit time
-@@ -8671,12 +8644,12 @@
+@@ -8886,12 +8859,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
-@@ -8688,18 +8661,18 @@
+@@ -8903,18 +8876,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:
-@@ -8708,10 +8681,10 @@
+@@ -8923,10 +8896,10 @@
 # Empty
 [acl.deny]
 -# 3) only \(aqgollum\(aq can change the file below;
 -# \(aqgollum\(aq and anyone else can still change any other file.
 +# 'gollum' and anyone else can still change any other file.
 /misty/mountains/cave/ring = !gollum
 -.ft P
 +.ft
 .fi
-.SS blackbox
+.SS automv
 .sp
-@@ -8722,7 +8695,7 @@
+@@ -8948,7 +8921,7 @@
 Examples:
 .sp
 .nf
 -.ft C
 +.ft
 [blackbox]
 track = *
+# dirty is *EXPENSIVE* (slow);
-@@ -8737,7 +8710,7 @@
+@@ -8968,7 +8941,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
-@@ -8745,20 +8718,20 @@
+@@ -8976,20 +8949,20 @@
 view the recent repository events:
 .sp
 .nf
 -.ft C
 +.ft
 -.UNINDENT
 +.RE
 .SS bugzilla
 .sp
 hooks for integrating with the Bugzilla bug tracker
-@@ -8771,7 +8744,7 @@
+@@ -9002,7 +8975,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.
-@@ -8783,7 +8756,7 @@
+@@ -9014,7 +8987,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
-@@ -8811,12 +8784,12 @@
+@@ -9042,12 +9015,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
-@@ -8839,7 +8812,7 @@
+@@ -9070,7 +9043,7 @@
 .sp
 MySQL access, Bugzilla 2.16 and up to but not
 including 2.18.
 -.UNINDENT
 +.RE
 .TP
 .B bugzilla.regexp
 .
-@@ -8884,7 +8857,7 @@
+@@ -9115,7 +9088,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
-@@ -8901,7 +8874,7 @@
+@@ -9132,7 +9105,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
-@@ -8918,10 +8891,10 @@
+@@ -9149,10 +9122,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
 .
-@@ -8930,13 +8903,13 @@
+@@ -9161,13 +9134,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.
-@@ -8943,7 +8916,7 @@
+@@ -9174,7 +9147,7 @@
 Contains entries of the form \fBcommitter = Bugzilla user\fP.
 .sp
 XMLRPC access mode configuration:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B bugzilla.bzurl
 .
-@@ -8958,22 +8931,22 @@
+@@ -9189,22 +9162,22 @@
 .B bugzilla.password
 .
 The password for Bugzilla login.
 -.UNINDENT
 +.RE
 -.INDENT 0.0
 +.RS 0
 .TP
 .B bugzilla.host
 .
-@@ -9013,12 +8986,12 @@
+@@ -9244,12 +9217,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 =
-@@ -9025,7 +8998,7 @@
+@@ -9256,7 +9229,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:
-@@ -9037,7 +9010,7 @@
+@@ -9268,7 +9241,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
-@@ -9050,7 +9023,7 @@
+@@ -9281,7 +9254,7 @@
 [web]
 baseurl=http://my\-project.org/hg
 -.ft P
 +.ft
 .fi
 .sp
 XMLRPC+email example configuration. This uses the Bugzilla at
-@@ -9062,7 +9035,7 @@
+@@ -9293,7 +9266,7 @@
 \fBbugzilla@my\-project.org\fP.
 .sp
 .nf
 -.ft C
 +.ft
 [bugzilla]
 bzurl=http://my\-project.org/bugzilla
 user=bugmail@my\-project.org
-@@ -9079,7 +9052,7 @@
+@@ -9310,7 +9283,7 @@
 [usermap]
 [email protected][email protected]
 -.ft P
 +.ft
 .fi
 .sp
 MySQL example configuration. This has a local Bugzilla 3.2 installation
-@@ -9090,7 +9063,7 @@
+@@ -9321,7 +9294,7 @@
 with a web interface at \fBhttp://my\-project.org/hg\fP.
 .sp
 .nf
 -.ft C
 +.ft
 [bugzilla]
 host=localhost
 password=XYZZY
-@@ -9107,18 +9080,18 @@
+@@ -9338,18 +9311,18 @@
 [usermap]
 [email protected][email protected]
 -.ft P
 +.ft
 -.ft P
 +.ft
 .fi
 .SS censor
 .sp
-@@ -9132,14 +9105,14 @@
+@@ -9363,14 +9336,14 @@
 Typical uses for censor are due to security or legal requirements, including:
 .sp
 .nf
 -.ft C
 +.ft
 -Censored nodes can interrupt mercurial\(aqs typical operation whenever the excised
 +Censored nodes can interrupt mercurial's typical operation whenever the excised
 data needs to be materialized. Some commands, like \fBhg cat\fP/\fBhg revert\fP,
 simply fail when asked to produce censored data. Others, like \fBhg verify\fP and
 \fBhg update\fP, must be capable of tolerating censored data to continue to
-@@ -9149,13 +9122,13 @@
+@@ -9380,13 +9353,13 @@
 .SS censor
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .BI \-r,  \-\-rev \ <REV>
 .
-@@ -9164,42 +9137,42 @@
+@@ -9395,13 +9368,13 @@
 .BI \-t,  \-\-tombstone \ <TEXT>
 .
 replacement tombstone data
--.UNINDENT
-+.RE
-.SS chgserver
-.sp
-command server extension for cHg (EXPERIMENTAL)
--.INDENT 0.0
-+.RS 0
-.TP
--.B \(aqS\(aq channel (read/write)
-+.B \&'S' channel (read/write)
-.
-propagate ui.system() request to client
-.TP
--.B \(aqattachio\(aq command
-+.B \&'attachio' command
-.
--attach client\(aqs stdio passed by sendmsg()
-+attach client's stdio passed by sendmsg()
-.TP
--.B \(aqchdir\(aq command
-+.B \&'chdir' command
-.
-change current directory
-.TP
--.B \(aqgetpager\(aq command
-+.B \&'getpager' command
-.
-checks if pager is enabled and which pager should be executed
-.TP
--.B \(aqsetenv\(aq command
-+.B \&'setenv' command
-.
-replace os.environ completely
-.TP
--.B \(aqSIGHUP\(aq signal
-+.B \&'SIGHUP' signal
-.
-reload configuration files
 -.UNINDENT
 +.RE
 .SS children
 .sp
 command to display child changesets (DEPRECATED)
 +This extension is deprecated. You should use \fBhg log \-r
 +"children(REV)"\fP instead.
 .SS Commands
 .SS children
 .sp
-@@ -9206,30 +9179,30 @@
+@@ -9408,30 +9381,30 @@
 show the children of the given or working directory revision:
 .sp
 .nf
 -.ft C
 +.ft
 -Please use \%\fBhg log\fP\: instead:
 +Please use \fBhg log\fP instead:
 .sp
 .nf
 -.ft C
--hg children => hg log \-r \(aqchildren()\(aq
++.ft
--hg children \-r REV => hg log \-r \(aqchildren(REV)\(aq
+hg children => hg log \-r "children()"
--.ft P
+hg children \-r REV => hg log \-r "children(REV)"
-+.ft
+-.ft P
-+hg children => hg log \-r 'children()'
-+hg children \-r REV => hg log \-r 'children(REV)'
 +.ft
 .fi
 .sp
 -See \%\fBhg help log\fP\: and \%\fBhg help revsets.children\fP\:.
 +See \fBhg help log\fP and \fBhg help revsets.children\fP.
 -.INDENT 0.0
 +.RS 0
 .TP
 .BI \-r,  \-\-rev \ <REV>
 .
-@@ -9242,7 +9215,7 @@
+@@ -9444,7 +9417,7 @@
 .BI \-T,  \-\-template \ <TEMPLATE>
 .
 display with template
 -.UNINDENT
 +.RE
 .SS churn
 .sp
 command to display statistics about repository history
-@@ -9252,9 +9225,9 @@
+@@ -9454,9 +9427,9 @@
 histogram of changes to the repository:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 This command will display a histogram representing the number
-@@ -9270,7 +9243,7 @@
+@@ -9472,7 +9445,7 @@
 Examples:
 .sp
 .nf
 -.ft C
 +.ft
 # display count of changed lines for every committer
 hg churn \-t "{author|email}"
-@@ -9282,7 +9255,7 @@
+@@ -9484,7 +9457,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
-@@ -9289,9 +9262,9 @@
+@@ -9491,9 +9464,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
-@@ -9299,7 +9272,7 @@
+@@ -9501,7 +9474,7 @@
 Aliases will be split from the rightmost "=".
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .BI \-r,  \-\-rev \ <REV[+]>
 .
-@@ -9344,7 +9317,7 @@
+@@ -9546,7 +9519,7 @@
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
 .
 exclude names matching the given patterns
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
 .SS clonebundles
-@@ -9357,7 +9330,7 @@
+@@ -9559,7 +9532,7 @@
 resources on the server.
 .sp
 Cloning can be a CPU and I/O intensive operation on servers. Traditionally,
 -the server, in response to a client\(aqs request to clone, dynamically generates
 +the server, in response to a client's request to clone, dynamically generates
 a bundle containing the entire repository content and sends it to the client.
 There is no caching on the server and the server will have to redundantly
 generate the same outgoing bundle in response to each clone request. For
-@@ -9365,8 +9338,8 @@
+@@ -9567,8 +9540,8 @@
 clones can make scaling the server challenging and costly.
 .sp
 This extension provides server operators the ability to offload potentially
 -expensive clone load to an external service. Here\(aqs how it works.
 -.INDENT 0.0
 +expensive clone load to an external service. Here's how it works.
 +.RS 0
 .IP 1. 3
 .
 A server operator establishes a mechanism for making bundle files available
-@@ -9393,10 +9366,10 @@
+@@ -9595,10 +9568,10 @@
 .IP 7. 3
 .
 The client reconnects to the original server and performs the equivalent
 -of \%\fBhg pull\fP\: to retrieve all repository data not in the bundle. (The
 +of \fBhg pull\fP to retrieve all repository data not in the bundle. (The
 -.UNINDENT
 +.RE
 .sp
 Instead of the server generating full repository bundles for every clone
 request, it generates full bundles once and they are subsequently reused to
-@@ -9406,7 +9379,7 @@
+@@ -9608,7 +9581,7 @@
 clones to less than 1% of original.
 .sp
 To work, this extension requires the following of server operators:
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 .
 Generating bundle files of repository content (typically periodically,
-@@ -9420,23 +9393,23 @@
+@@ -9622,23 +9595,23 @@
 .
 A process for keeping the bundles manifest in sync with available bundle
 files.
 -.UNINDENT
 +.RE
 -However, \fIstreaming clone bundles\fP don\(aqt have this guarantee. \fBServer
 +However, \fIstreaming clone bundles\fP don't have this guarantee. \fBServer
 operators need to be aware that newer versions of Mercurial may produce
 streaming clone bundles incompatible with older Mercurial versions.\fP
 .sp
-@@ -9449,12 +9422,12 @@
+@@ -9651,12 +9624,12 @@
 ) delimited list of entries.
 .sp
 Each line in this file defines an available bundle. Lines have the format:
 -.INDENT 0.0
 -.INDENT 3.5
 +.RE
 +.RE
 .sp
 That is, a URL followed by an optional, space\-delimited list of key=value
 pairs describing additional properties of this bundle. Both keys and values
-@@ -9467,7 +9440,7 @@
+@@ -9669,7 +9642,7 @@
 data center closest to them.
 .sp
 The following reserved keys are currently defined:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B BUNDLESPEC
 .
-@@ -9474,21 +9447,21 @@
+@@ -9676,21 +9649,21 @@
 A "bundle specification" string that describes the type of the bundle.
 .sp
 These are string values that are accepted by the "\-\-type" argument of
 -\%\fBhg bundle\fP\:.
 +\fBhg bundle\fP.
 -The actual value doesn\(aqt impact client behavior beyond filtering:
 +The actual value doesn't impact client behavior beyond filtering:
 clients will still sniff the bundle type from the header of downloaded
 files.
 .sp
-@@ -9510,10 +9483,10 @@
+@@ -9712,10 +9685,10 @@
 with the clonebundles facility.
 .sp
 Value should be "true".
 -.UNINDENT
 +.RE
 -will filter entries from the manifest that they don\(aqt support. The remaining
 +will filter entries from the manifest that they don't support. The remaining
 entries are optionally sorted by client preferences
 (\fBexperimental.clonebundleprefers\fP config option). The client then attempts
 to fetch the bundle at the first URL in the remaining list.
-@@ -9523,7 +9496,7 @@
+@@ -9725,7 +9698,7 @@
 for this is that if a server is using clone bundles, it is probably doing so
 because the feature is necessary to help it scale. In other words, there
 is an assumption that clone load will be offloaded to another service and
 -that the Mercurial server isn\(aqt responsible for serving this clone load.
 +that the Mercurial server isn't responsible for serving this clone load.
 If that other service experiences issues and clients start mass falling back to
 the original Mercurial server, the added clone load could overwhelm the server
 due to unexpected load and effectively take it offline. Not having clients
-@@ -9556,10 +9529,10 @@
+@@ -9758,10 +9731,10 @@
 available, then effects are rendered with the ECMA\-48 SGR control
 function (aka ANSI escape codes).
 .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
 +\&'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
+@@ -9770,19 +9743,19 @@
+configuration:
+.sp
+.nf
+-.ft C
++.ft
+[color]
+terminfo.dim = \eE[2m
+-.ft P
++.ft
+.fi
+.sp
+-where \(aqE\(aq is substituted with an escape character.
++where 'E' is substituted with an escape character.
 .SS Labels
-@@ -9566,8 +9539,8 @@
 .sp
 Text receives color effects depending on the labels that it has. Many
 default Mercurial commands emit labelled text. You can also define
 -your own labels in templates using the label function, see \%\fBhg help
 -templates\fP\:. A single portion of text may have more than one label. In
 +your own labels in templates using the label function, see \fBhg help
 +templates\fP. A single portion of text may have more than one label. In
 that case, effects given to the last label will override any other
 effects. This includes the special "none" effect, which nullifies
 other effects.
-@@ -9575,18 +9548,18 @@
+@@ -9790,18 +9763,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
 -.ft C
 +.ft
 [color]
 status.modified = blue bold underline red_background
 status.added = green bold
-@@ -9595,7 +9568,7 @@
+@@ -9810,7 +9783,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
-@@ -9640,7 +9613,7 @@
+@@ -9855,7 +9828,7 @@
 shelve.name = blue bold
 histedit.remaining = red bold
 -.ft P
 +.ft
 .fi
 .SS Custom colors
 .sp
-@@ -9649,18 +9622,18 @@
+@@ -9864,18 +9837,18 @@
 for your terminal type, assuming terminfo mode.  For instance:
 .sp
 .nf
 -.ft C
 +.ft
 -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
-@@ -9668,19 +9641,19 @@
+@@ -9883,19 +9856,19 @@
 terminfo mode, for example), set the following configuration option:
 .sp
 .nf
 -.ft C
 +.ft
 -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).
-@@ -9691,11 +9664,11 @@
+@@ -9906,11 +9879,11 @@
 the pager is active:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 If \fBpagermode\fP is not defined, the \fBmode\fP will be used.
-@@ -9709,13 +9682,13 @@
+@@ -9924,13 +9897,13 @@
 convert a foreign SCM repository to a Mercurial one.:
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 .
 Mercurial [hg]
-@@ -9743,10 +9716,10 @@
+@@ -9958,10 +9931,10 @@
 .IP \(bu 2
 .
 Perforce [p4]
 -.UNINDENT
 +.RE
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 .
 Mercurial [hg]
-@@ -9753,7 +9726,7 @@
+@@ -9968,7 +9941,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
-@@ -9761,12 +9734,12 @@
+@@ -9976,12 +9949,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
 .
-@@ -9791,21 +9764,21 @@
+@@ -10006,21 +9979,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
-@@ -9814,9 +9787,9 @@
+@@ -10029,9 +10002,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.
-@@ -9826,13 +9799,13 @@
+@@ -10041,13 +10014,13 @@
 directives:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Comment lines start with \fB#\fP. A specified path matches if it
-@@ -9865,9 +9838,9 @@
+@@ -10080,9 +10053,9 @@
 comma\-separated values:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 The key is the revision ID in the source
-@@ -9887,9 +9860,9 @@
+@@ -10102,9 +10075,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
-@@ -9901,7 +9874,7 @@
+@@ -10116,7 +10089,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
 .
-@@ -9923,7 +9896,7 @@
+@@ -10138,7 +10111,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
-@@ -9937,7 +9910,7 @@
+@@ -10152,7 +10125,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
 .
-@@ -9988,7 +9961,7 @@
+@@ -10203,7 +10176,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
-@@ -10008,7 +9981,7 @@
+@@ -10223,7 +10196,7 @@
 detection.
 .sp
 The following options can be set with \fB\-\-config\fP:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B convert.svn.branches
 .
-@@ -10030,28 +10003,28 @@
+@@ -10245,28 +10218,28 @@
 use local time (as determined by the TZ
 environment variable) for changeset date/times. The default
 is False (use UTC).
 -.UNINDENT
 +.RE
 -.INDENT 0.0
 +.RS 0
 .TP
 .B convert.git.similarity
 .
-@@ -10059,7 +10032,7 @@
+@@ -10274,7 +10247,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
-@@ -10073,13 +10046,13 @@
+@@ -10337,7 +10310,7 @@
 .
 remote refs are converted as bookmarks with
 \fBconvert.git.remoteprefix\fP as a prefix followed by a /. The default
 -is \(aqremote\(aq.
 +is 'remote'.
 .TP
-.B convert.git.skipsubmodules
+.B convert.git.saverev
+.
+@@ -10348,7 +10321,7 @@
 .
 does not convert root level .gitmodules files
 or files with 160000 mode indicating a submodule. Default is False.
 -.UNINDENT
 +.RE
 .SS Perforce Source
 .sp
 The Perforce (P4) importer can be given a p4 depot path or a
-@@ -10090,7 +10063,7 @@
+@@ -10359,7 +10332,7 @@
 target may be named \fB...\-hg\fP.
 .sp
 The following options can be set with \fB\-\-config\fP:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B convert.p4.encoding
 .
-@@ -10102,7 +10075,7 @@
+@@ -10371,7 +10344,7 @@
 .
 specify initial Perforce revision (a
 Perforce changelist number).
 -.UNINDENT
 +.RE
 .SS Mercurial Destination
 .sp
 The Mercurial destination will recognize Mercurial subrepositories in the
-@@ -10114,7 +10087,7 @@
+@@ -10383,7 +10356,7 @@
 An example showing how to convert a repository with subrepositories:
 .sp
 .nf
 -.ft C
 +.ft
 # so convert knows the type when it sees a non empty destination
 $ hg init converted
-@@ -10121,11 +10094,11 @@
+@@ -10390,11 +10363,11 @@
 $ hg convert orig/sub1 converted/sub1
 $ hg convert orig/sub2 converted/sub2
 $ hg convert orig converted
 -.ft P
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .B convert.hg.clonebranches
 .
-@@ -10144,22 +10117,22 @@
+@@ -10413,22 +10386,22 @@
 .TP
 .B convert.hg.sourcename
 .
 -records the given string as a \(aqconvert_source\(aq extra
 +records the given string as a 'convert_source' extra
 -.INDENT 0.0
 +.RS 0
 .TP
 .BI \-\-authors \ <FILE>
 .
-@@ -10212,7 +10185,7 @@
+@@ -10481,7 +10454,7 @@
 .B \-\-closesort
 .
 try to reorder closed revisions
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
 .SS eol
-@@ -10226,7 +10199,7 @@
+@@ -10495,7 +10468,7 @@
 .sp
 The extension reads its configuration from a versioned \fB.hgeol\fP
 configuration file found in the root of the working directory. 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
-@@ -10239,9 +10212,9 @@
+@@ -10508,9 +10481,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 behavior; it is only needed if you need to override a later,
 more general pattern.
 .sp
-@@ -10258,7 +10231,7 @@
+@@ -10527,7 +10500,7 @@
 Example versioned \fB.hgeol\fP file:
 .sp
 .nf
 -.ft C
 +.ft
 [patterns]
 **.py = native
 **.vcproj = CRLF
-@@ -10268,7 +10241,7 @@
+@@ -10537,7 +10510,7 @@
 [repository]
 native = LF
 -.ft P
 +.ft
 .fi
 .IP Note
 .
-@@ -10280,12 +10253,12 @@
+@@ -10549,12 +10522,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
 .
-@@ -10299,7 +10272,7 @@
+@@ -10568,7 +10541,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
-@@ -10315,7 +10288,7 @@
+@@ -10584,7 +10557,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
-@@ -10328,12 +10301,12 @@
+@@ -10597,12 +10570,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
-@@ -10349,20 +10322,20 @@
+@@ -10618,20 +10591,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]
-@@ -10369,17 +10342,17 @@
+@@ -10638,17 +10611,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
-@@ -10388,9 +10361,9 @@
+@@ -10657,9 +10630,9 @@
 use external program to diff repository (or selected files):
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Show differences between revisions for the specified files, using
-@@ -10409,7 +10382,7 @@
+@@ -10678,7 +10651,7 @@
 to its parent.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .BI \-p,  \-\-program \ <CMD>
 .
-@@ -10442,7 +10415,7 @@
+@@ -10711,7 +10684,7 @@
 .B \-S,  \-\-subrepos
 .
 recurse into subrepositories
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
 .SS factotum
-@@ -10458,9 +10431,9 @@
+@@ -10727,9 +10700,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
-@@ -10470,12 +10443,12 @@
+@@ -10739,12 +10712,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
-@@ -10490,9 +10463,9 @@
+@@ -10759,9 +10732,9 @@
 pull changes from a remote repository, merge new changes if needed.:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 This finds all changes from the repository at the specified path
-@@ -10507,12 +10480,12 @@
+@@ -10776,12 +10749,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.
 -.INDENT 0.0
 +.RS 0
 .TP
 .BI \-r,  \-\-rev \ <REV[+]>
 .
-@@ -10557,7 +10530,7 @@
+@@ -10826,7 +10799,7 @@
 .B \-\-insecure
 .
 do not verify server certificate (ignoring web.cacerts config)
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
-.SS gpg
+.SS fsmonitor
-@@ -10569,9 +10542,9 @@
+@@ -10841,16 +10814,16 @@
+system, with fsmonitor it takes about 0.3 seconds.
+.sp
+fsmonitor requires no configuration \-\- it will tell Watchman about your
+-repository as necessary. You\(aqll need to install Watchman from
+-\%https://facebook.github.io/watchman/\: and make sure it is in your PATH.
++repository as necessary. You'll need to install Watchman from
++https://facebook.github.io/watchman/ and make sure it is in your PATH.
+.sp
+The following configuration options exist:
+.sp
+.nf
+-.ft C
++.ft
+[fsmonitor]
+mode = {off, on, paranoid}
+-.ft P
++.ft
+.fi
+.sp
+When \fImode = off\fP, fsmonitor will disable itself (similar to not loading the
+@@ -10859,10 +10832,10 @@
+and ensure that the results are consistent.
+.sp
+.nf
+-.ft C
++.ft
+[fsmonitor]
+timeout = (float)
+-.ft P
++.ft
+.fi
+.sp
+A value, in seconds, that determines how long fsmonitor will wait for Watchman
+@@ -10869,19 +10842,19 @@
+to return results. Defaults to \fI2.0\fP.
+.sp
+.nf
+-.ft C
++.ft
+[fsmonitor]
+blacklistusers = (list of userids)
+-.ft P
++.ft
+.fi
+.sp
+A list of usernames for which fsmonitor will disable itself altogether.
+.sp
+.nf
+-.ft C
++.ft
+[fsmonitor]
+walk_on_invalidate = (boolean)
+-.ft P
++.ft
+.fi
+.sp
+Whether or not to walk the whole repo ourselves when our cached state has been
+@@ -10903,9 +10876,9 @@
 verify all the signatures there may be for a particular revision:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 verify all the signatures there may be for a particular revision
-@@ -10580,9 +10553,9 @@
+@@ -10914,9 +10887,9 @@
 add a signature for the current or given revision:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 If no revision is given, the parent of the working directory is used,
-@@ -10591,10 +10564,10 @@
+@@ -10925,10 +10898,10 @@
 The \fBgpg.cmd\fP config setting can be used to specify the command
 to run. A default key can be specified with \fBgpg.key\fP.
 .sp
 -See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
 +See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-l,  \-\-local
 .
-@@ -10627,15 +10600,15 @@
+@@ -10961,15 +10934,15 @@
 .BI \-u,  \-\-user \ <USER>
 .
 record the specified user as committer
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .sp
 list signed changesets
-@@ -10644,7 +10617,7 @@
+@@ -10978,7 +10951,7 @@
 command to view revision graphs from a shell (DEPRECATED)
 .sp
 The functionality of this extension has been include in core Mercurial
 -since version 2.3. Please use \%\fBhg log \-G ...\fP\: instead.
 +since version 2.3. Please use \fBhg log \-G ...\fP instead.
 .sp
 This extension adds a \-\-graph option to the incoming, outgoing and log
 commands. When this options is given, an ASCII representation of the
-@@ -10655,9 +10628,9 @@
+@@ -10989,9 +10962,9 @@
 show revision history alongside an ASCII revision graph:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Print a revision history alongside a revision graph drawn with
-@@ -10666,10 +10639,10 @@
+@@ -11000,10 +10973,10 @@
 Nodes printed as an @ character are parents of the working
 directory.
 .sp
 -This is an alias to \%\fBhg log \-G\fP\:.
 +This is an alias to \fBhg log \-G\fP.
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-f,  \-\-follow
 .
-@@ -10758,7 +10731,7 @@
+@@ -11092,7 +11065,7 @@
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
 .
 exclude names matching the given patterns
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
-.SS hgcia
-@@ -10769,7 +10742,7 @@
-configure it, set the following options in your hgrc:
-.sp
-.nf
--.ft C
-+.ft
-[cia]
-# your registered CIA user name
-user = foo
-@@ -10801,7 +10774,7 @@
-[web]
-# If you want hyperlinks (optional)
-baseurl = http://server/path/to/repo
--.ft P
-+.ft
-.fi
 .SS hgk
-.sp
+@@ -11105,19 +11078,18 @@
-@@ -10813,19 +10786,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.
-@@ -10832,10 +10804,10 @@
+@@ -11124,10 +11096,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
-@@ -10846,36 +10818,36 @@
+@@ -11138,36 +11110,36 @@
 start interactive history viewer:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 \fBhighlightonlymatchfilename\fP will only highlight files if their type could
-@@ -10890,7 +10862,7 @@
+@@ -11182,7 +11154,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
 |
-@@ -10902,7 +10874,7 @@
+@@ -11194,7 +11166,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
-@@ -10909,7 +10881,7 @@
+@@ -11201,7 +11173,7 @@
 file open in your editor:
 .sp
 .nf
 -.ft C
 +.ft
 pick c561b4e977df Add beta
 pick 030b686bedc4 Add gamma
 pick 7c2fd3b9020c Add delta
-@@ -10922,11 +10894,11 @@
+@@ -11214,11 +11186,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
 -.ft P
 +.ft
 .fi
 .sp
 In this file, lines beginning with \fB#\fP are ignored. You must specify a rule
-@@ -10935,7 +10907,7 @@
+@@ -11227,7 +11199,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
-@@ -10948,11 +10920,11 @@
+@@ -11240,11 +11212,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
 -.ft P
 +.ft
 .fi
 .sp
 At which point you close the editor and \fBhistedit\fP starts working. When you
-@@ -10960,21 +10932,21 @@
+@@ -11252,21 +11224,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.
 |
-@@ -10983,12 +10955,12 @@
+@@ -11275,12 +11247,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.
-@@ -10995,20 +10967,20 @@
+@@ -11287,20 +11259,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
-@@ -11018,7 +10990,7 @@
+@@ -11310,7 +11282,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
 |
-@@ -11039,7 +11011,7 @@
+@@ -11331,7 +11303,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
-@@ -11053,10 +11025,10 @@
+@@ -11345,10 +11317,10 @@
 configuration file:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 \fBhg histedit\fP attempts to automatically choose an appropriate base
-@@ -11064,10 +11036,10 @@
+@@ -11356,10 +11328,10 @@
 revset in your configuration file:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 By default each edited revision needs to be present in histedit commands.
-@@ -11075,10 +11047,10 @@
+@@ -11367,10 +11339,10 @@
 the drop to be implicit for missing commits by adding:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .SS Commands
 .SS histedit
-@@ -11086,15 +11058,15 @@
+@@ -11378,15 +11350,15 @@
 interactively edit changeset history:
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 .
 \fIpick\fP to [re]order a changeset
-@@ -11109,14 +11081,14 @@
+@@ -11401,14 +11373,14 @@
 \fIfold\fP to combine it with the preceding changeset
 .IP \(bu 2
 .
 -\fIroll\fP like fold, but discarding this commit\(aqs description
 +\fIroll\fP like fold, but discarding this commit's description
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 .
 Specify ANCESTOR directly
-@@ -11123,7 +11095,7 @@
+@@ -11415,7 +11387,7 @@
 .IP \(bu 2
 .
 Use \-\-outgoing \-\- it will be the first linear changeset not
--included in destination. (See \%\fBhg help config.default\-push\fP\:)
+-included in destination. (See \%\fBhg help config.paths.default\-push\fP\:)
-+included in destination. (See \fBhg help config.default\-push\fP)
++included in destination. (See \fBhg help config.paths.default\-push\fP)
 .IP \(bu 2
 .
 Otherwise, the value from the "histedit.defaultrev" config option
-@@ -11131,7 +11103,7 @@
+@@ -11423,7 +11395,7 @@
 specified. The first revision returned by the revset is used. By
 default, this selects the editable history that is unique to the
 ancestry of the working directory.
 -.UNINDENT
 +.RE
 .sp
 If you use \-\-outgoing, this command will abort if there are ambiguous
 outgoing revisions. For example, if there are multiple branches
-@@ -11139,13 +11111,13 @@
+@@ -11431,13 +11403,13 @@
 .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
 +.RS 3
 +.RS 0
 .IP \(bu 2
 .
 A number of changes have been made.
-@@ -11154,9 +11126,9 @@
+@@ -11446,9 +11418,9 @@
 Start history editing from revision 3:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 An editor opens, containing the list of revisions,
-@@ -11163,11 +11135,11 @@
+@@ -11455,11 +11427,11 @@
 with specific actions specified:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Additional information about the possible actions
-@@ -11175,14 +11147,14 @@
+@@ -11467,14 +11439,14 @@
 .sp
 To remove revision 3 from the history,
 its action (at the beginning of the relevant line)
 -is changed to \(aqdrop\(aq:
 +is changed to 'drop':
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -11192,9 +11164,9 @@
+@@ -11484,9 +11456,9 @@
 Start history editing from revision 2:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 An editor opens, containing the list of revisions,
-@@ -11201,11 +11173,11 @@
+@@ -11493,11 +11465,11 @@
 with specific actions specified:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 To swap revision 2 and 4, its lines are swapped
-@@ -11212,15 +11184,15 @@
+@@ -11504,15 +11476,15 @@
 in the editor:
 .sp
 .nf
 -.ft C
 +.ft
 +.RE
 +.RE
 .sp
 Returns 0 on success, 1 if user intervention is required (not only
 for intentional "edit" command, but also for resolving unexpected
-@@ -11227,7 +11199,7 @@
+@@ -11519,7 +11491,7 @@
 conflicts).
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .BI \-\-commands \ <FILE>
 .
-@@ -11243,7 +11215,7 @@
+@@ -11535,7 +11507,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
 .
-@@ -11260,7 +11232,7 @@
+@@ -11552,7 +11524,7 @@
 .BI \-r,  \-\-rev \ <REV[+]>
 .
 first revision to be edited
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
+.SS journal
+@@ -11567,9 +11539,9 @@
+show the previous position of bookmarks and the working copy:
+.sp
+.nf
+-.ft C
++.ft
+hg journal [OPTION]... [BOOKMARKNAME]
+-.ft P
++.ft
+.fi
+.sp
+The journal is used to see the previous commits that bookmarks and the
+@@ -11577,7 +11549,7 @@
+copy.  Passing a bookmark name will show all the previous positions of
+that bookmark. Use the \-\-all switch to show previous locations for all
+bookmarks and the working copy; each line will then include the bookmark
+-name, or \(aq.\(aq for the working copy, as well.
++name, or '.' for the working copy, as well.
+.sp
+If \fIname\fP starts with \fIre:\fP, the remainder of the name is treated as
+a regular expression. To match a name that actually starts with \fIre:\fP,
+@@ -11594,7 +11566,7 @@
+\fIhg journal \-T json\fP can be used to produce machine readable output.
+.sp
+Options:
+-.INDENT 0.0
++.RS 0
+.TP
+.B \-\-all
+.
+@@ -11627,7 +11599,7 @@
+.BI \-T,  \-\-template \ <TEMPLATE>
+.
+display with template
+-.UNINDENT
++.RE
 .SS keyword
-@@ -11283,7 +11255,7 @@
+.sp
+expand keywords in tracked files
+@@ -11648,7 +11620,7 @@
 Example:
 .sp
 .nf
 -.ft C
 +.ft
 [keyword]
 # expand keywords in every python file except those matching "x*"
 **.py =
-@@ -11292,7 +11264,7 @@
+@@ -11657,7 +11629,7 @@
 [keywordset]
 # prefer svn\- over cvs\-like default keywordmaps
 svn = True
 -.ft P
 +.ft
 .fi
 .IP Note
 .
-@@ -11301,11 +11273,11 @@
+@@ -11666,11 +11638,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
-@@ -11318,20 +11290,20 @@
+@@ -11683,20 +11655,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
-@@ -11339,9 +11311,9 @@
+@@ -11704,9 +11676,9 @@
 print [keywordmaps] configuration and an expansion example:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Show current, custom, or default keyword template maps and their
-@@ -11352,10 +11324,10 @@
+@@ -11717,10 +11689,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
 .
-@@ -11364,15 +11336,15 @@
+@@ -11729,15 +11701,15 @@
 .BI \-f,  \-\-rcfile \ <FILE>
 .
 read maps from rcfile
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .sp
 Run after (re)enabling keyword expansion.
-@@ -11380,7 +11352,7 @@
+@@ -11745,7 +11717,7 @@
 kwexpand refuses to run if given files contain local changes.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .BI \-I,  \-\-include \ <PATTERN[+]>
 .
-@@ -11389,7 +11361,7 @@
+@@ -11754,7 +11726,7 @@
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
 .
 exclude names matching the given patterns
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
 .SS kwfiles
-@@ -11397,9 +11369,9 @@
+@@ -11762,9 +11734,9 @@
 show files configured for keyword expansion:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 List which files in the working directory are matched by the
-@@ -11409,7 +11381,7 @@
+@@ -11774,7 +11746,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
-@@ -11416,16 +11388,16 @@
+@@ -11781,16 +11753,16 @@
 of files are:
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-A,  \-\-all
 .
-@@ -11446,7 +11418,7 @@
+@@ -11811,7 +11783,7 @@
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
 .
 exclude names matching the given patterns
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
 .SS kwshrink
-@@ -11454,9 +11426,9 @@
+@@ -11819,9 +11791,9 @@
 revert expanded keywords in the working directory:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Must be run before changing/disabling active keywords.
-@@ -11464,7 +11436,7 @@
+@@ -11829,7 +11801,7 @@
 kwshrink refuses to run if given files contain local changes.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .BI \-I,  \-\-include \ <PATTERN[+]>
 .
-@@ -11473,7 +11445,7 @@
+@@ -11838,7 +11810,7 @@
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
 .
 exclude names matching the given patterns
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
 .SS largefiles
-@@ -11482,10 +11454,10 @@
+@@ -11847,10 +11819,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
-@@ -11497,18 +11469,18 @@
+@@ -11862,18 +11834,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
 .nf
 -.ft C
 +.ft
 $ dd if=/dev/urandom of=randomdata count=2000
 $ hg add \-\-large randomdata
--$ hg commit \-m \(aqadd randomdata as a largefile\(aq
+$ hg commit \-m "add randomdata as a largefile"
 -.ft P
-+$ hg commit \-m 'add randomdata as a largefile'
 +.ft
 .fi
 .sp
 When you push a changeset that adds/modifies largefiles to a remote
-@@ -11525,8 +11497,8 @@
+@@ -11890,8 +11862,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
-@@ -11545,12 +11517,12 @@
+@@ -11910,12 +11882,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
-@@ -11560,20 +11532,20 @@
+@@ -11925,20 +11897,20 @@
 \-\-lfsize option to the add command (also in megabytes):
 .sp
 .nf
 -.ft C
 +.ft
 -.ft C
 +.ft
 [largefiles]
 patterns =
 *.jpg
-@@ -11580,7 +11552,7 @@
+@@ -11945,7 +11917,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
-@@ -11589,7 +11561,7 @@
+@@ -11954,7 +11926,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
-@@ -11597,9 +11569,9 @@
+@@ -11962,9 +11934,9 @@
 convert a normal repository to a largefiles repository:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Convert repository SOURCE to a new repository DEST, identical to
-@@ -11619,7 +11591,7 @@
+@@ -11984,7 +11956,7 @@
 this, the DEST repository can be used without largefiles at all.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .BI \-s,  \-\-size \ <SIZE>
 .
-@@ -11628,33 +11600,33 @@
+@@ -11993,33 +11965,33 @@
 .B \-\-to\-normal
 .
 convert from a largefiles repo to a normal repo
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -11661,14 +11633,14 @@
+@@ -12026,14 +11998,14 @@
 pull largefiles on the default branch:
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .BI \-r,  \-\-rev \ <VALUE[+]>
 .
-@@ -11685,7 +11657,7 @@
+@@ -12050,7 +12022,7 @@
 .B \-\-insecure
 .
 do not verify server certificate (ignoring web.cacerts config)
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
-.SS mq
+.SS logtoprocess
-@@ -11699,10 +11671,10 @@
+@@ -12066,7 +12038,7 @@
+prefixed with \fIOPT_\fP). The original event name is passed in the \fIEVENT\fP
+environment variable, and the process ID of mercurial is given in \fIHGPID\fP.
+.sp
+-So given a call \fIui.log(\(aqfoo\(aq, \(aqbar\(aq, \(aqbaz\(aq, spam=\(aqeggs\(aq), a script configured
++So given a call \fIui.log('foo', 'bar', 'baz', spam='eggs'), a script configured
+for the \(gafoo\fP event can expect an environment with \fIMSG1=bar\fP, \fIMSG2=baz\fP, and
+\fIOPT_SPAM=eggs\fP.
+.sp
+@@ -12074,10 +12046,10 @@
+For example:
+.sp
+.nf
+-.ft C
++.ft
+[logtoprocess]
+commandexception = echo "$MSG2$MSG3" > /var/log/mercurial_exceptions.log
+-.ft P
++.ft
+.fi
+.sp
+would log the warning message and traceback of any failed command dispatch.
+@@ -12095,10 +12067,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
-@@ -11712,7 +11684,7 @@
+@@ -12108,7 +12080,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
-@@ -11720,29 +11692,29 @@
+@@ -12116,29 +12088,29 @@
 files creations or deletions. This behavior 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
-@@ -11749,10 +11721,10 @@
+@@ -12145,10 +12117,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
-@@ -11767,15 +11739,15 @@
+@@ -12163,15 +12135,15 @@
 print the patches already applied:
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-1,  \-\-last
 .
-@@ -11784,15 +11756,15 @@
+@@ -12180,15 +12152,15 @@
 .B \-s,  \-\-summary
 .
 print first line of patch header
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .sp
 If source is local, destination will have no patches applied. If
-@@ -11805,12 +11777,12 @@
+@@ -12201,12 +12173,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
 .
-@@ -11839,21 +11811,21 @@
+@@ -12235,21 +12207,21 @@
 .B \-\-insecure
 .
 do not verify server certificate (ignoring web.cacerts config)
 -.UNINDENT
 +.RE
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-A,  \-\-addremove
 .
-@@ -11906,23 +11878,23 @@
+@@ -12302,23 +12274,23 @@
 .B \-S,  \-\-subrepos
 .
 recurse into subrepositories
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .sp
 The patches must not be applied, and at least one patch is required. Exact
-@@ -11930,10 +11902,10 @@
+@@ -12326,10 +12298,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
 .
-@@ -11942,23 +11914,23 @@
+@@ -12338,23 +12310,23 @@
 .BI \-r,  \-\-rev \ <REV[+]>
 .
 stop managing a revision (DEPRECATED)
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .sp
 Shows a diff which includes the current patch as well as any
-@@ -11966,8 +11938,8 @@
+@@ -12362,8 +12334,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
-@@ -11974,7 +11946,7 @@
+@@ -12370,7 +12342,7 @@
 Returns 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-a,  \-\-text
 .
-@@ -12031,7 +12003,7 @@
+@@ -12427,7 +12399,7 @@
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
 .
 exclude names matching the given patterns
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
 .SS qfinish
-@@ -12039,9 +12011,9 @@
+@@ -12435,9 +12407,9 @@
 move applied patches into repository history:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Finishes the specified revisions (corresponding to applied
-@@ -12060,20 +12032,20 @@
+@@ -12456,20 +12428,20 @@
 Returns 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 -.ft P
 +.ft
 .fi
 .sp
 Patches must not yet be applied. Each patch will be successively
-@@ -12089,7 +12061,7 @@
+@@ -12485,7 +12457,7 @@
 Returns 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-e,  \-\-edit
 .
-@@ -12106,21 +12078,21 @@
+@@ -12502,21 +12474,21 @@
 .BI \-l,  \-\-logfile \ <FILE>
 .
 read commit message from file
 -.UNINDENT
 +.RE
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-\-keep\-changes
 .
-@@ -12133,21 +12105,21 @@
+@@ -12529,21 +12501,21 @@
 .B \-\-no\-backup
 .
 do not save backup copies of files
 -.UNINDENT
 +.RE
 +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.
-@@ -12154,21 +12126,21 @@
+@@ -12550,21 +12522,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
 .
-@@ -12177,15 +12149,15 @@
+@@ -12573,15 +12545,15 @@
 .B \-n,  \-\-none
 .
 drop all guards
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .sp
 Returns 0 on success.
-@@ -12194,9 +12166,9 @@
+@@ -12590,9 +12562,9 @@
 import a patch or existing changeset:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 The patch is inserted into the series after the last applied
-@@ -12217,7 +12189,7 @@
+@@ -12613,7 +12585,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.
-@@ -12227,15 +12199,15 @@
+@@ -12623,15 +12595,15 @@
 To import an existing patch while renaming it:
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-e,  \-\-existing
 .
-@@ -12260,7 +12232,7 @@
+@@ -12656,7 +12628,7 @@
 .B \-P,  \-\-push
 .
 qpush after importing
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
 .SS qinit
-@@ -12268,9 +12240,9 @@
+@@ -12664,9 +12636,9 @@
 init a new queue repository (DEPRECATED):
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 The queue repository is unversioned by default. If
-@@ -12279,24 +12251,24 @@
+@@ -12675,24 +12647,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.
 -.ft P
 +.ft
 .fi
 .sp
 qnew creates a new patch on top of the currently\-applied patch (if
-@@ -12312,7 +12284,7 @@
+@@ -12708,7 +12680,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
-@@ -12322,7 +12294,7 @@
+@@ -12718,7 +12690,7 @@
 Returns 0 on successful creation of a new patch.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-e,  \-\-edit
 .
-@@ -12367,7 +12339,7 @@
+@@ -12763,7 +12735,7 @@
 .BI \-l,  \-\-logfile \ <FILE>
 .
 read commit message from file
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
 .SS qnext
-@@ -12375,28 +12347,28 @@
+@@ -12771,28 +12743,28 @@
 print the name of the next pushable patch:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Without argument, pops off the top of the patch stack. If given a
-@@ -12411,7 +12383,7 @@
+@@ -12807,7 +12779,7 @@
 Return 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-a,  \-\-all
 .
-@@ -12432,34 +12404,34 @@
+@@ -12828,34 +12800,34 @@
 .B \-\-no\-backup
 .
 do not save backup copies of files
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .sp
 By default, abort if the working directory contains uncommitted
-@@ -12470,7 +12442,7 @@
+@@ -12866,7 +12838,7 @@
 Return 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-\-keep\-changes
 .
-@@ -12507,15 +12479,15 @@
+@@ -12903,15 +12875,15 @@
 .B \-\-no\-backup
 .
 do not save backup copies of files
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .sp
 Supports switching between different patch queues, as well as creating
-@@ -12537,7 +12509,7 @@
+@@ -12933,7 +12905,7 @@
 Returns 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-l,  \-\-list
 .
-@@ -12562,15 +12534,15 @@
+@@ -12958,15 +12930,15 @@
 .B \-\-purge
 .
 delete queue, and remove patch dir
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .sp
 If any file patterns are provided, the refreshed patch will
-@@ -12592,7 +12564,7 @@
+@@ -12988,7 +12960,7 @@
 Returns 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-e,  \-\-edit
 .
-@@ -12637,7 +12609,7 @@
+@@ -13033,7 +13005,7 @@
 .BI \-l,  \-\-logfile \ <FILE>
 .
 read commit message from file
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
 .SS qrename
-@@ -12645,9 +12617,9 @@
+@@ -13041,9 +13013,9 @@
 rename a patch:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 With one argument, renames the current patch to PATCH1.
-@@ -12654,26 +12626,26 @@
+@@ -13050,26 +13022,26 @@
 With two arguments, renames PATCH1 to PATCH2.
 .sp
 Returns 0 on success.
 -.INDENT 0.0
 -.INDENT 3.5
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-d,  \-\-delete
 .
-@@ -12682,21 +12654,21 @@
+@@ -13078,21 +13050,21 @@
 .B \-u,  \-\-update
 .
 update queue working directory
 -.UNINDENT
 +.RE
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-c,  \-\-copy
 .
-@@ -12721,18 +12693,18 @@
+@@ -13117,18 +13089,18 @@
 .BI \-l,  \-\-logfile \ <FILE>
 .
 read commit message from file
 -.UNINDENT
 +.RE
 -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
-@@ -12739,11 +12711,11 @@
+@@ -13135,11 +13107,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
-@@ -12769,7 +12741,7 @@
+@@ -13165,7 +13137,7 @@
 Returns 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-n,  \-\-none
 .
-@@ -12786,21 +12758,21 @@
+@@ -13182,21 +13154,21 @@
 .B \-\-reapply
 .
 pop, then reapply patches
 -.UNINDENT
 +.RE
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-m,  \-\-missing
 .
-@@ -12809,40 +12781,40 @@
+@@ -13205,40 +13177,40 @@
 .B \-s,  \-\-summary
 .
 print first line of patch header
 -.UNINDENT
 +.RE
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-1,  \-\-first
 .
-@@ -12851,7 +12823,7 @@
+@@ -13247,7 +13219,7 @@
 .B \-s,  \-\-summary
 .
 print first line of patch header
 -.UNINDENT
 +.RE
 .SS notify
 .sp
 hooks for sending email push notifications
-@@ -12859,13 +12831,13 @@
+@@ -13255,13 +13227,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
-@@ -12874,7 +12846,7 @@
+@@ -13270,7 +13242,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
-@@ -12883,7 +12855,7 @@
+@@ -13279,7 +13251,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
-@@ -12891,7 +12863,7 @@
+@@ -13287,7 +13259,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,
-@@ -12899,10 +12871,10 @@
+@@ -13295,10 +13267,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
-@@ -12913,10 +12885,10 @@
+@@ -13309,10 +13281,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
-@@ -12923,7 +12895,7 @@
+@@ -13319,7 +13291,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
 .
-@@ -12932,8 +12904,8 @@
+@@ -13328,8 +13300,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
-@@ -12954,7 +12926,7 @@
+@@ -13350,7 +13322,7 @@
 .B \fBbundle\fP
 .sp
 changesets sent via \fBhg unbundle\fP
 -.UNINDENT
 +.RE
 .sp
 Default: serve.
 .TP
-@@ -12997,7 +12969,7 @@
+@@ -13393,7 +13365,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
 .
-@@ -13016,11 +12988,11 @@
+@@ -13412,11 +13384,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
 .
-@@ -13031,7 +13003,7 @@
+@@ -13427,7 +13399,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
-@@ -13039,10 +13011,10 @@
+@@ -13435,10 +13407,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
-@@ -13052,10 +13024,10 @@
+@@ -13448,10 +13420,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
-@@ -13062,10 +13034,10 @@
+@@ -13458,10 +13430,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
-@@ -13078,13 +13050,13 @@
+@@ -13474,13 +13446,13 @@
 existing attend and ignore options and defaults:
 .sp
 .nf
 -.ft C
 +.ft
 -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
 To control whether the pager is used at all for an individual command,
-@@ -13091,12 +13063,12 @@
+@@ -13487,12 +13459,12 @@
 you can use \-\-pager=<value>:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .SS patchbomb
 .sp
-@@ -13108,7 +13080,7 @@
+@@ -13504,7 +13476,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.
-@@ -13117,8 +13089,8 @@
+@@ -13513,8 +13485,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
-@@ -13128,7 +13100,7 @@
+@@ -13524,7 +13496,7 @@
 configuration file:
 .sp
 .nf
 -.ft C
 +.ft
 [email]
 from = My Name <my@email>
 to = recipient1, recipient2, ...
-@@ -13135,13 +13107,13 @@
+@@ -13531,13 +13503,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
-@@ -13150,15 +13122,15 @@
+@@ -13546,15 +13518,15 @@
 directly from the commandline. See the [email] and [smtp] sections in
 hgrc(5) for details.
 .sp
 -By default, \%\fBhg email\fP\: will prompt for a \fBTo\fP or \fBCC\fP header if
 +By default, \fBhg email\fP will prompt for a \fBTo\fP or \fBCC\fP header if
 -.ft P
 +.ft
 .fi
 .sp
 You can control the default inclusion of an introduction message with the
-@@ -13166,12 +13138,12 @@
+@@ -13562,12 +13534,12 @@
 overwritten by command line flags like \-\-intro and \-\-desc:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 You can set patchbomb to always ask for confirmation by setting
-@@ -13182,13 +13154,13 @@
+@@ -13578,13 +13550,13 @@
 send changesets by email:
 .sp
 .nf
 -.ft C
 +.ft
 -\%\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
-@@ -13199,7 +13171,7 @@
+@@ -13595,7 +13567,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
-@@ -13219,7 +13191,7 @@
+@@ -13615,7 +13587,7 @@
 With \-b/\-\-bundle, changesets are selected as for \-\-outgoing, but a
 single email containing a binary Mercurial bundle as an attachment
 will be sent. Use the \fBpatchbomb.bundletype\fP config option to
 -control the bundle type as with \%\fBhg bundle \-\-type\fP\:.
 +control the bundle type as with \fBhg bundle \-\-type\fP.
 .sp
 With \-m/\-\-mbox, instead of previewing each patchbomb message in a
 pager or sending the messages directly, it will create a UNIX
-@@ -13238,12 +13210,12 @@
+@@ -13634,12 +13606,12 @@
 introductory message in \fB.hg/last\-email.txt\fP.
 .sp
 The default behavior of this command can be customized through
 -configuration. (See \%\fBhg help patchbomb\fP\: for details)
 +configuration. (See \fBhg help patchbomb\fP for details)
 -.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
-@@ -13264,7 +13236,7 @@
+@@ -13660,7 +13632,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
-@@ -13271,7 +13243,7 @@
+@@ -13667,7 +13639,7 @@
 hgrc. See the [email] section in hgrc(5) for details.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-g,  \-\-git
 .
-@@ -13388,7 +13360,7 @@
+@@ -13784,7 +13756,7 @@
 .B \-\-insecure
 .
 do not verify server certificate (ignoring web.cacerts config)
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
 .SS purge
-@@ -13400,9 +13372,9 @@
+@@ -13796,9 +13768,9 @@
 removes files not tracked by Mercurial:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Delete files not known to Mercurial. This is useful to test local
-@@ -13409,18 +13381,18 @@
+@@ -13805,18 +13777,18 @@
 and uncommitted changes in an otherwise\-clean source tree.
 .sp
 This means that purge will delete the following by default:
 -.INDENT 0.0
 +.RS 0
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 .
 Modified and unmodified tracked files
-@@ -13429,8 +13401,8 @@
+@@ -13825,8 +13797,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
 The \-\-files and \-\-dirs options can be used to direct purge to delete
 only files, only directories, or both. If neither option is given,
-@@ -13445,7 +13417,7 @@
+@@ -13841,7 +13813,7 @@
 option.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-a,  \-\-abort\-on\-err
 .
-@@ -13478,15 +13450,15 @@
+@@ -13874,15 +13846,15 @@
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
 .
 exclude names matching the given patterns
 -.UNINDENT
 +.RE
 +.RE
 +.RE
 .SS rebase
 .sp
 command to move sets of revisions to a different ancestor
-@@ -13495,7 +13467,7 @@
+@@ -13891,7 +13863,7 @@
 repository.
 .sp
 For more information:
 -\%https://mercurial\-scm.org/wiki/RebaseExtension\:
 +https://mercurial\-scm.org/wiki/RebaseExtension
 .SS Commands
 .SS rebase
 .sp
-@@ -13502,9 +13474,9 @@
+@@ -13898,9 +13870,9 @@
 move changeset (and descendants) to a different branch:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Rebase uses repeated merging to graft changesets from one part of
-@@ -13512,18 +13484,18 @@
+@@ -13908,11 +13880,11 @@
 useful for linearizing \fIlocal\fP changes relative to a master
 development tree.
 .sp
 -Published commits cannot be rebased (see \%\fBhg help phases\fP\:).
 -To copy commits, see \%\fBhg help graft\fP\:.
 +Published commits cannot be rebased (see \fBhg help phases\fP).
 +To copy commits, see \fBhg help graft\fP.
 .sp
--If you don\(aqt specify a destination changeset (\fB\-d/\-\-dest\fP),
+-If you don\(aqt specify a destination changeset (\fB\-d/\-\-dest\fP), rebase
-+If you don't specify a destination changeset (\fB\-d/\-\-dest\fP),
+-will use the same logic as \%\fBhg merge\fP\: to pick a destination.  if
-rebase uses the current branch tip as the destination. (The
++If you don't specify a destination changeset (\fB\-d/\-\-dest\fP), rebase
-destination changeset is not modified by rebasing, but new
++will use the same logic as \fBhg merge\fP to pick a destination.  if
-changesets are added as its descendants.)
+the current branch contains exactly one other head, the other head
+is merged with by default.  Otherwise, an explicit revision with
+which to merge with must be provided.  (destination changeset is not
+@@ -13920,9 +13892,9 @@
+descendants.)
 .sp
 Here are the ways to select changesets:
 -.INDENT 0.0
 -.INDENT 3.5
 -.INDENT 0.0
 +.RS 3
 +.RS 0
 .IP 1. 3
 .
 Explicitly select them using \fB\-\-rev\fP.
-@@ -13539,9 +13511,9 @@
+@@ -13938,9 +13910,9 @@
 .
 If you do not specify any of \fB\-\-rev\fP, \fBsource\fP, or \fB\-\-base\fP,
 rebase will use \fB\-\-base .\fP as above.
 -.UNINDENT
 -.UNINDENT
 +.RE
 +.RE
 .sp
 Rebase will destroy original changesets unless you use \fB\-\-keep\fP.
 It will also move your bookmarks (even if you do).
-@@ -13557,7 +13529,7 @@
+@@ -13953,7 +13925,7 @@
+and/or destination.
+.sp
+If you need to use a tool to automate merge/conflict decisions, you
+-can specify one with \fB\-\-tool\fP, see \%\fBhg help merge\-tools\fP\:.
++can specify one with \fB\-\-tool\fP, see \fBhg help merge\-tools\fP.
+As a caveat: the tool will not be used to mediate when a file was
+deleted, there is no hook presently available for this.
+.sp
+@@ -13961,7 +13933,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)
-@@ -13564,9 +13536,9 @@
+@@ -13968,9 +13940,9 @@
 to the current branch tip after a pull:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -13573,9 +13545,9 @@
+@@ -13977,9 +13949,9 @@
 move a single changeset to the stable branch:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -13582,9 +13554,9 @@
+@@ -13986,9 +13958,9 @@
 splice a commit and all its descendants onto another part of history:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -13592,9 +13564,9 @@
+@@ -13996,9 +13968,9 @@
 default branch:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -13601,9 +13573,9 @@
+@@ -14005,9 +13977,9 @@
 collapse a sequence of changes into a single commit:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .IP \(bu 2
 .
-@@ -13610,17 +13582,17 @@
+@@ -14014,17 +13986,17 @@
 move a named branch while preserving its name:
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .BI \-s,  \-\-source \ <REV>
 .
-@@ -13689,7 +13661,7 @@
+@@ -14093,7 +14065,7 @@
 .BI \-T,  \-\-template \ <TEMPLATE>
 .
 display with template
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
 .SS record
-@@ -13701,12 +13673,12 @@
+@@ -14101,7 +14073,7 @@
+commands to interactively select changes for commit/qrefresh (DEPRECATED)
+.sp
+The feature provided by this extension has been moved into core Mercurial as
+-\%\fBhg commit \-\-interactive\fP\:.
++\fBhg commit \-\-interactive\fP.
+.SS Commands
+.SS qrecord
+.sp
+@@ -14108,12 +14080,12 @@
 interactively record a new patch:
 .sp
 .nf
 -.ft C
 +.ft
 -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
-@@ -13713,15 +13685,15 @@
+@@ -14120,15 +14092,15 @@
 interactively select changes to commit:
 .sp
 .nf
 -.ft C
 +.ft
 -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
-@@ -13729,7 +13701,7 @@
+@@ -14136,7 +14108,7 @@
 possible:
 .sp
 .nf
 -.ft C
 +.ft
 y \- record this change
 n \- skip this change
 e \- edit this change manually
-@@ -13742,13 +13714,13 @@
+@@ -14149,13 +14121,13 @@
 q \- quit, recording no changes
 ? \- display help
 -.ft P
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-A,  \-\-addremove
 .
-@@ -13809,7 +13781,7 @@
+@@ -14216,7 +14188,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
-@@ -13821,9 +13793,9 @@
+@@ -14228,9 +14200,9 @@
 recreate hardlinks between two repositories:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 When repositories are cloned locally, their data files will be
-@@ -13855,18 +13827,18 @@
+@@ -14262,18 +14234,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
-@@ -13873,10 +13845,10 @@
+@@ -14280,10 +14252,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
-@@ -13888,7 +13860,7 @@
+@@ -14295,7 +14267,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/
-@@ -13895,7 +13867,7 @@
+@@ -14302,7 +14274,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
-@@ -13905,19 +13877,19 @@
+@@ -14313,19 +14285,19 @@
 share a common history between several working directories
 .SS Automatic Pooled Storage for Clones
 .sp
 -When this extension is active, \%\fBhg clone\fP\: can be configured to
 +When this extension is active, \fBhg clone\fP can be configured to
 -defined, \%\fBhg clone\fP\: will automatically use shared repository
 +defined, \fBhg clone\fP will automatically use shared repository
 storage instead of creating a store inside each clone.
 .TP
 .B \fBshare.poolnaming\fP
-@@ -13929,13 +13901,13 @@
+@@ -14337,13 +14309,13 @@
 root/initial changeset is identical. In this mode, the local shared
 repository is an aggregate of all encountered remote repositories.
 .sp
 -"remote" means the name is derived from the source repository\(aqs
 +"remote" means the name is derived from the source repository's
 -.UNINDENT
 +.RE
 .SS Commands
 .SS share
 .sp
-@@ -13942,9 +13914,9 @@
+@@ -14350,9 +14322,9 @@
 create a new shared repository:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Initialize a new repository and working directory that shares its
-@@ -13962,7 +13934,7 @@
+@@ -14370,7 +14342,7 @@
 .RE
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-U,  \-\-noupdate
 .
-@@ -13971,15 +13943,15 @@
+@@ -14379,15 +14351,15 @@
 .B \-B,  \-\-bookmarks
 .
 also share bookmarks
 -.UNINDENT
 +.RE
 -.ft P
 +.ft
 .fi
 .sp
 Copy the store data to the repo and remove the sharedpath data.
-@@ -13993,7 +13965,7 @@
+@@ -14401,7 +14373,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
-@@ -14005,9 +13977,9 @@
+@@ -14413,9 +14385,9 @@
 save and set aside changes from the working directory:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Shelving takes files that "hg status" reports as not clean, saves
-@@ -14035,7 +14007,7 @@
+@@ -14449,7 +14421,7 @@
 all shelved changes, use \fB\-\-cleanup\fP.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-A,  \-\-addremove
 .
-@@ -14092,7 +14064,7 @@
+@@ -14506,7 +14478,7 @@
 .BI \-X,  \-\-exclude \ <PATTERN[+]>
 .
 exclude names matching the given patterns
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
 .SS unshelve
-@@ -14100,9 +14072,9 @@
+@@ -14514,9 +14486,9 @@
 restore a shelved change to the working directory:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 This command accepts an optional name of a shelved change to
-@@ -14133,7 +14105,7 @@
+@@ -14551,7 +14523,7 @@
 prevents from deciding exact order of them, for safety.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \-a,  \-\-abort
 .
-@@ -14154,7 +14126,7 @@
+@@ -14572,7 +14544,7 @@
 .BI \-\-date \ <DATE>
 .
 set date for temporary commits (DEPRECATED)
 -.UNINDENT
 +.RE
 .SS strip
 .sp
 strip changesets and their descendants from history
-@@ -14167,9 +14139,9 @@
+@@ -14585,9 +14557,9 @@
 strip changesets and all their descendants from the repository:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 The strip command removes the specified changesets and all their
-@@ -14183,8 +14155,8 @@
+@@ -14601,8 +14573,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.
-@@ -14199,7 +14171,7 @@
+@@ -14617,7 +14589,7 @@
 Return 0 on success.
 .sp
 Options:
 -.INDENT 0.0
 +.RS 0
 .TP
 .BI \-r,  \-\-rev \ <REV[+]>
 .
-@@ -14228,7 +14200,7 @@
+@@ -14646,7 +14618,7 @@
 .BI \-B,  \-\-bookmark \ <VALUE[+]>
 .
 remove revs only reachable from given bookmark
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
 .SS transplant
-@@ -14236,7 +14208,7 @@
+@@ -14654,7 +14626,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.
-@@ -14246,9 +14218,9 @@
+@@ -14664,9 +14636,9 @@
 transplant changesets from another branch:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 Selected changesets will be applied on top of the current working
-@@ -14265,9 +14237,9 @@
+@@ -14683,9 +14655,9 @@
 of the form:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .sp
 You can rewrite the changelog message with the \-\-filter option.
-@@ -14283,17 +14255,17 @@
+@@ -14701,17 +14673,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
-@@ -14301,17 +14273,17 @@
+@@ -14719,17 +14691,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.
 -.INDENT 0.0
 +.RS 0
 .TP
 .BI \-s,  \-\-source \ <REPO>
 .
-@@ -14352,7 +14324,7 @@
+@@ -14770,7 +14742,7 @@
 .BI \-\-filter \ <CMD>
 .
 filter changesets through command
 -.UNINDENT
 +.RE
 .sp
 [+] marked option can be specified multiple times
 .SS win32mbcs
-@@ -14367,7 +14339,7 @@
+@@ -14785,7 +14757,7 @@
 operation.
 .sp
 This extension is useful for:
 -.INDENT 0.0
 +.RS 0
 .IP \(bu 2
 .
 Japanese Windows users using shift_jis encoding.
-@@ -14378,10 +14350,10 @@
+@@ -14796,10 +14768,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.
-@@ -14388,10 +14360,10 @@
+@@ -14806,10 +14778,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.
-@@ -14401,16 +14373,16 @@
+@@ -14819,16 +14791,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.
-@@ -14417,8 +14389,8 @@
+@@ -14835,8 +14807,8 @@
 .SS win32text
 .sp
 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
-@@ -14427,13 +14399,13 @@
+@@ -14845,13 +14817,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]
-@@ -14443,17 +14415,17 @@
+@@ -14861,17 +14833,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
-@@ -14460,11 +14432,11 @@
+@@ -14878,11 +14850,11 @@
 pushed or pulled:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .SS zeroconf
 .sp
-@@ -14475,33 +14447,33 @@
+@@ -14893,33 +14865,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
-@@ -14508,13 +14480,13 @@
+@@ -14926,13 +14898,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
-@@ -14529,7 +14501,7 @@
+@@ -14947,7 +14919,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
-@@ -14537,28 +14509,34 @@
+@@ -14955,28 +14927,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
 .SH RESOURCES
 .sp
 -Main Web Site: \%https://mercurial\-scm.org/\:
 +Main Web Site: https://mercurial\-scm.org/
 .sp
--Source code repository: \%http://selenic.com/hg\:
+-Source code repository: \%https://www.mercurial\-scm.org/repo/hg\:
-+Source code repository: http://selenic.com/hg
++Source code repository: https://www.mercurial\-scm.org/repo/hg
 .sp
--Mailing list: \%http://selenic.com/mailman/listinfo/mercurial\:
+-Mailing list: \%https://www.mercurial\-scm.org/mailman/listinfo/mercurial/\:
-+Mailing list: http://selenic.com/mailman/listinfo/mercurial
++Mailing list: https://www.mercurial\-scm.org/mailman/listinfo/mercurial/
 .SH COPYING
 .sp
 Copyright (C) 2005\-2016 Matt Mackall.
---- mercurial-3.7.3/doc/hgignore.5.~1~	Tue Mar 29 09:54:51 2016
+--- mercurial-4.1/doc/hgignore.5	2017-02-01 08:19:55.000000000 -0800
-+++ mercurial-3.7.3/doc/hgignore.5	Tue Mar 29 10:26:27 2016
++++ mercurial-4.1/doc/hgignore.5	2017-02-03 11:20:03.473564965 -0800
 @@ -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-3.7.3/doc/hgrc.5.~1~	Tue Mar 29 09:54:48 2016
+--- mercurial-4.1/doc/hgrc.5	2017-02-01 08:19:56.000000000 -0800
-+++ mercurial-3.7.3/doc/hgrc.5	Tue Mar 29 10:26:32 2016
++++ mercurial-4.1/doc/hgrc.5	2017-02-03 11:20:07.405927763 -0800
 @@ -3,33 +3,6 @@
 .TH HGRC 5 "" "" "Mercurial Manual"
 .SH NAME
 hgrc \- configuration files for Mercurial
 -.
 -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
-@@ -496,195 +399,195 @@
+@@ -496,70 +399,70 @@
 .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
 "HG: removed {file}\en"                 }{if(files, "",
 "HG: no files changed\en")}
 -.ft P
 +.ft
 .fi
+-.INDENT 0.0
++.RS 0
+.TP
+.B \fBdiff()\fP
+.sp
+-String: show the diff (see \%\fBhg help templates\fP\: for detail)
+-.UNINDENT
++String: show the diff (see \fBhg help templates\fP for detail)
++.RE
+.sp
+Sometimes it is helpful to show the diff of the changeset in the editor without
+-having to prefix \(aqHG: \(aq to each line so that highlighting works correctly. For
++having to prefix 'HG: ' to each line so that highlighting works correctly. For
+this, Mercurial provides a special string which will ignore everything below
+it:
+.sp
+.nf
+-.ft C
++.ft
+HG: \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- >8 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+-.ft P
++.ft
+.fi
+.sp
+For example, the template configuration below will show the diff below the
+@@ -566,158 +469,158 @@
+extra message:
+.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: \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- >8 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+HG: Do not touch the line above.
+HG: Everything below will be removed.
+{diff()}
+-.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
 +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
 When the external editor is invoked for a commit, the corresponding
 dot\-separated list of names without the \fBchangeset.\fP prefix
-@@ -696,7 +599,7 @@
+@@ -729,7 +632,7 @@
 below can be referred as \fB{listupfiles}\fP:
 .sp
 .nf
 -.ft C
 +.ft
 [committemplate]
 listupfiles = {file_adds %
 "HG: added {file}\en"     }{file_mods %
-@@ -703,7 +606,7 @@
+@@ -736,7 +639,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
-@@ -727,7 +630,7 @@
+@@ -760,7 +663,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
-@@ -735,9 +638,9 @@
+@@ -768,9 +671,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
-@@ -745,12 +648,6 @@
+@@ -778,12 +681,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)
-@@ -757,20 +654,20 @@
+@@ -790,20 +687,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
-@@ -779,9 +676,9 @@
+@@ -812,9 +709,9 @@
 .SS \fBdiff\fP
 .sp
 Settings used when displaying diffs. Everything except for \fBunified\fP
 -is a Boolean and defaults to False. See \%\fBhg help config.annotate\fP\:
 +is a Boolean and defaults to False. See \fBhg help config.annotate\fP
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBgit\fP
 .sp
-@@ -793,11 +690,11 @@
+@@ -826,11 +723,11 @@
 .TP
 .B \fBnodates\fP
 .sp
 -Don\(aqt include dates in diff headers.
 +Don't include dates in diff headers.
 -Omit \(aqa/\(aq and \(aqb/\(aq prefixes from filenames. Ignored in plain mode.
 +Omit 'a/' and 'b/' prefixes from filenames. Ignored in plain mode.
 .TP
 .B \fBshowfunc\fP
 .sp
-@@ -818,11 +715,11 @@
+@@ -851,11 +748,11 @@
 .B \fBunified\fP
 .sp
 Number of lines of context to show.
 -.UNINDENT
 +.RE
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBfrom\fP
 .sp
-@@ -831,16 +728,16 @@
+@@ -864,16 +761,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
-@@ -860,10 +757,10 @@
+@@ -893,10 +790,10 @@
 first character set to which conversion from local encoding
 (\fB$HGENCODING\fP, \fBui.fallbackencoding\fP) succeeds. If correct
 conversion fails, the text in question is sent as is.
 -(default: \(aq\(aq)
 +(default: '')
 -.INDENT 7.0
 +.RS 7
 .IP 1. 3
 .
 \fBus\-ascii\fP: always first, regardless of settings
-@@ -879,13 +776,13 @@
+@@ -912,13 +809,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
-@@ -892,7 +789,7 @@
+@@ -925,7 +822,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
-@@ -899,7 +796,7 @@
+@@ -932,7 +829,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
-@@ -914,16 +811,16 @@
+@@ -947,16 +844,16 @@
 Example for \fB~/.hgrc\fP:
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBusegeneraldelta\fP
 .sp
-@@ -968,7 +865,7 @@
+@@ -1001,7 +898,7 @@
 Repositories with this on\-disk format require Mercurial version 0.9.4.
 .sp
 Enabled by default.
 -.UNINDENT
 +.RE
 .SS \fBgraph\fP
 .sp
 Web graph view configuration. This section let you change graph
-@@ -978,9 +875,9 @@
+@@ -1011,9 +908,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
-@@ -987,17 +884,17 @@
+@@ -1020,17 +917,17 @@
 customized. Example:
 .sp
 .nf
 -.ft C
 +.ft
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBwidth\fP
 .sp
-@@ -1006,7 +903,7 @@
+@@ -1039,7 +936,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
-@@ -1020,7 +917,7 @@
+@@ -1053,7 +950,7 @@
 Example \fB.hg/hgrc\fP:
 .sp
 .nf
 -.ft C
 +.ft
 [hooks]
 # update working directory after adding changesets
 changegroup.update = hg update
-@@ -1030,13 +927,13 @@
+@@ -1063,13 +960,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
-@@ -1060,7 +957,7 @@
+@@ -1093,7 +990,7 @@
 .sp
 Run after sending changes from local repository to another. ID of
 first changeset sent is in \fB$HG_NODE\fP. Source of operation is in
--\fB$HG_SOURCE\fP; Also see \%\fBhg help config.preoutgoing\fP\: hook.
+-\fB$HG_SOURCE\fP; Also see \%\fBhg help config.hooks.preoutgoing\fP\: hook.
-+\fB$HG_SOURCE\fP; Also see \fBhg help config.preoutgoing\fP hook.
++\fB$HG_SOURCE\fP; Also see \fBhg help config.hooks.preoutgoing\fP hook.
 .TP
 .B \fBpost\-<command>\fP
 .sp
-@@ -1080,7 +977,7 @@
+@@ -1123,7 +1020,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
-@@ -1152,12 +1049,12 @@
+@@ -1195,12 +1092,12 @@
 .sp
 Run after any repository transaction has been committed. At this
 point, the transaction can no longer be rolled back. The hook will run
--after the lock is released. See \%\fBhg help config.pretxnclose\fP\: docs for
+-after the lock is released. See \%\fBhg help config.hooks.pretxnclose\fP\: docs for
-+after the lock is released. See \fBhg help config.pretxnclose\fP docs for
++after the lock is released. See \fBhg help config.hooks.pretxnclose\fP docs for
 details about available variables.
 .TP
 .B \fBtxnabort\fP
 .sp
--Run when a transaction is aborted. See \%\fBhg help config.pretxnclose\fP\:
+-Run when a transaction is aborted. See \%\fBhg help config.hooks.pretxnclose\fP\:
-+Run when a transaction is aborted. See \fBhg help config.pretxnclose\fP
++Run when a transaction is aborted. See \fBhg help config.hooks.pretxnclose\fP
 docs for details about available variables.
 .TP
 .B \fBpretxnchangegroup\fP
-@@ -1211,7 +1108,7 @@
+@@ -1254,7 +1151,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
-@@ -1220,21 +1117,14 @@
+@@ -1263,21 +1160,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
-@@ -1258,11 +1148,11 @@
+@@ -1291,7 +1181,7 @@
+is treated as a failure.
+.SS \fBhostfingerprints\fP
+.sp
+-(Deprecated. Use \fB[hostsecurity]\fP\(aqs \fBfingerprints\fP options instead.)
++(Deprecated. Use \fB[hostsecurity]\fP\&'s \fBfingerprints\fP options instead.)
+.sp
+Fingerprints of the certificates of known HTTPS servers.
+.sp
+@@ -1309,11 +1199,11 @@
 For example:
 .sp
 .nf
 -.ft C
 +.ft
 hg.intevation.de = fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33
 hg.intevation.org = fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33
 -.ft P
 +.ft
 .fi
-.sp
+.SS \fBhostsecurity\fP
-This feature is only supported when using Python 2.6 or later.
+.sp
-@@ -1270,7 +1160,7 @@
+@@ -1321,7 +1211,7 @@
+other machines.
+.sp
+The following options control default behavior for all hosts.
+-.INDENT 0.0
++.RS 0
+.TP
+.B \fBciphers\fP
+.sp
+@@ -1328,7 +1218,7 @@
+Defines the cryptographic ciphers to use for connections.
+.sp
+Value must be a valid OpenSSL Cipher List Format as documented at
+-\%https://www.openssl.org/docs/manmaster/apps/ciphers.html#CIPHER\-LIST\-FORMAT\:.
++https://www.openssl.org/docs/manmaster/apps/ciphers.html#CIPHER\-LIST\-FORMAT.
+.sp
+This setting is for advanced users only. Setting to incorrect values
+can significantly lower connection security or decrease performance.
+@@ -1352,7 +1242,7 @@
+\fBtls1.1\fP. \fBtls1.0\fP can still be used to allow TLS 1.0. However, this
+weakens security and should only be used as a feature of last resort if
+a server does not support TLS 1.1+.
+-.UNINDENT
++.RE
+.sp
+Options in the \fB[hostsecurity]\fP section can have the form
+\fBhostname\fP:\fBsetting\fP. This allows multiple settings to be defined on a
+@@ -1359,7 +1249,7 @@
+per\-host basis.
+.sp
+The following per\-host settings can be defined.
+-.INDENT 0.0
++.RS 0
+.TP
+.B \fBciphers\fP
+.sp
+@@ -1397,7 +1287,7 @@
+verify the server certificate. Environment variables and \fB~user\fP
+constructs are expanded in the filename.
+.sp
+-The server certificate or the certificate\(aqs certificate authority (CA)
++The server certificate or the certificate's certificate authority (CA)
+must match a certificate from this file or certificate verification
+will fail and connections to the server will be refused.
+.sp
+@@ -1411,7 +1301,7 @@
+The format of the file is as follows:
+.sp
+.nf
+-.ft C
++.ft
+\-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-
+\&... (certificate in base64 PEM encoding) ...
+\-\-\-\-\-END CERTIFICATE\-\-\-\-\-
+@@ -1418,19 +1308,19 @@
+\-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-
+\&... (certificate in base64 PEM encoding) ...
+\-\-\-\-\-END CERTIFICATE\-\-\-\-\-
+-.ft P
++.ft
+.fi
+-.UNINDENT
++.RE
+.sp
+For example:
+.sp
+.nf
+-.ft C
++.ft
+[hostsecurity]
+hg.example.com:fingerprints = sha256:c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2
+hg2.example.com:fingerprints = sha1:914f1aff87249c09b6859b88b1906d30756491ca, sha1:fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33
+foo.example.com:verifycertsfile = /etc/ssl/trusted\-ca\-certs.pem
+-.ft P
++.ft
+.fi
+.sp
+To change the default minimum protocol version to TLS 1.2 but to allow TLS 1.1
+@@ -1437,17 +1327,17 @@
+when connecting to \fBhg.example.com\fP:
+.sp
+.nf
+-.ft C
++.ft
+[hostsecurity]
+minimumprotocol = tls1.2
+hg.example.com:minimumprotocol = tls1.1
+-.ft P
++.ft
+.fi
+.SS \fBhttp_proxy\fP
 .sp
 Used to access web\-based Mercurial repositories through a HTTP
 proxy.
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBhost\fP
 .sp
-@@ -1294,7 +1184,7 @@
+@@ -1471,11 +1361,11 @@
 .sp
 Optional. Always use the proxy, even for localhost and any entries
 in \fBhttp_proxy.no\fP. (default: False)
 -.UNINDENT
 +.RE
+.SS \fBmerge\fP
+.sp
+This section specifies behavior during merges and updates.
+-.INDENT 0.0
++.RS 0
+.TP
+.B \fBcheckignored\fP
+.sp
+@@ -1483,16 +1373,16 @@
+file in the changeset being merged or updated to, and has different
+contents. Options are \fBabort\fP, \fBwarn\fP and \fBignore\fP. With \fBabort\fP,
+abort on such files. With \fBwarn\fP, warn on such files and back them up as
+-\fB.orig\fP. With \fBignore\fP, don\(aqt print a warning and back them up as
+-\fB.orig\fP. (default: \fBabort\fP)
++\fB\&.orig\fP. With \fBignore\fP, don't print a warning and back them up as
++\fB\&.orig\fP. (default: \fBabort\fP)
+.TP
+.B \fBcheckunknown\fP
+.sp
+-Controls behavior when an unknown file that isn\(aqt ignored has the same name
++Controls behavior when an unknown file that isn't ignored has the same name
+as a tracked file in the changeset being merged or updated to, and has
+different contents. Similar to \fBmerge.checkignored\fP, except for files that
+are not ignored. (default: \fBabort\fP)
+-.UNINDENT
++.RE
 .SS \fBmerge\-patterns\fP
 .sp
 This section specifies merge tools to associate with particular file
-@@ -1305,23 +1195,23 @@
+@@ -1503,23 +1393,23 @@
 Example:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft C
 +.ft
 [merge\-tools]
 # Override stock tool location
 kdiff3.executable = ~/bin/kdiff3
-@@ -1338,13 +1228,12 @@
+@@ -1536,13 +1426,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
-@@ -1355,9 +1244,6 @@
+@@ -1553,9 +1442,6 @@
 .sp
 Either just the name of the executable or its pathname.
 .sp
 -On Windows, the path can use environment variables with ${ProgramFiles}
 -syntax.
 -.sp
 (default: the tool name)
 .TP
 .B \fBargs\fP
-@@ -1380,7 +1266,7 @@
+@@ -1578,7 +1464,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
-@@ -1395,7 +1281,7 @@
+@@ -1593,7 +1479,7 @@
 .B \fBcheck\fP
 .sp
 A list of merge success\-checking options:
 -.INDENT 7.0
 +.RS 7
 .TP
 .B \fBchanged\fP
 .sp
-@@ -1408,7 +1294,7 @@
+@@ -1606,7 +1492,7 @@
 .B \fBprompt\fP
 .sp
 Always prompt for merge success, regardless of success reported by tool.
 -.UNINDENT
 +.RE
 .TP
 .B \fBfixeol\fP
 .sp
-@@ -1418,44 +1304,16 @@
+@@ -1616,44 +1502,16 @@
 .B \fBgui\fP
 .sp
 This tool requires a graphical interface to run. (default: False)
 -.UNINDENT
 -.INDENT 0.0
 -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
-@@ -1467,11 +1325,11 @@
+@@ -1665,11 +1523,11 @@
 .TP
 .B \fBfuzz\fP
 .sp
 -The number of lines of \(aqfuzz\(aq to allow when applying patches. This
 +The number of lines of 'fuzz' to allow when applying patches. This
 -.UNINDENT
 +.RE
 .SS \fBpaths\fP
 .sp
 Assigns symbolic names and behavior to repositories.
-@@ -1480,57 +1338,57 @@
+@@ -1678,70 +1536,70 @@
 location of the repository. Example:
 .sp
 .nf
 -.ft C
 +.ft
 .TP
 .B \fBpushurl\fP
 .sp
 The URL to use for push operations. If not defined, the location
 -defined by the path\(aqs main entry is used.
--.UNINDENT
 +defined by the path's main entry is used.
+.TP
+.B \fBpushrev\fP
+.sp
+A revset defining which revisions to push by default.
+.sp
+-When \%\fBhg push\fP\: is executed without a \fB\-r\fP argument, the revset
++When \fBhg push\fP is executed without a \fB\-r\fP argument, the revset
+defined by this sub\-option is evaluated to determine what to push.
+.sp
+-For example, a value of \fB.\fP will push the working directory\(aqs
++For example, a value of \fB.\fP will push the working directory's
+revision by default.
+.sp
+Revsets specifying bookmarks will not result in the bookmark being
+pushed.
+-.UNINDENT
 +.RE
 .sp
 The following special named paths exist:
 -.INDENT 0.0
 +.RS 0
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBpublish\fP
 .sp
-@@ -1555,7 +1413,7 @@
+@@ -1766,7 +1624,7 @@
 either aborted (if checksubrepos is set to "abort") or the higher phase is
 used for the parent repository commit (if set to "follow").
 (default: follow)
 -.UNINDENT
 +.RE
 .SS \fBprofiling\fP
 .sp
 Specifies profiling type, format, and file output. Two profilers are
-@@ -1562,21 +1420,21 @@
+@@ -1773,11 +1631,11 @@
 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
 statistical text report generated from the profiling data. The
 profiling is done using lsprof.
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \fBtype\fP
+.B \fBenabled\fP
+.sp
+@@ -1790,11 +1648,11 @@
 .sp
 The type of profiler to use.
-(default: ls)
+(default: stat)
 -.INDENT 7.0
 +.RS 7
 .TP
 .B \fBls\fP
 .sp
 -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.
-@@ -1586,13 +1444,13 @@
+@@ -1804,13 +1662,13 @@
-Use a third\-party statistical profiler, statprof. This profiler
+Use a statistical profiler, statprof. This profiler is most
-currently runs only on Unix systems, and is most useful for
+useful for profiling commands that run for longer than about 0.1
-profiling commands that run for longer than about 0.1 seconds.
+seconds.
 -.UNINDENT
 +.RE
 .TP
 .B \fBformat\fP
 .sp
 -.INDENT 7.0
 +.RS 7
 .TP
 .B \fBtext\fP
 .sp
-@@ -1605,7 +1463,7 @@
+@@ -1823,13 +1681,13 @@
 Format profiling data for kcachegrind use: when saving to a
 file, the generated file can directly be loaded into
 kcachegrind.
 -.UNINDENT
 +.RE
 .TP
+.B \fBstatformat\fP
+.sp
+Profiling format for the \fBstat\fP profiler.
+(default: hotpath)
+-.INDENT 7.0
++.RS 7
+.TP
+.B \fBhotpath\fP
+.sp
+@@ -1847,7 +1705,7 @@
+.B \fBjson\fP
+.sp
+Render profiling data as JSON.
+-.UNINDENT
++.RE
+.TP
 .B \fBfrequency\fP
 .sp
-@@ -1636,13 +1494,13 @@
+@@ -1878,13 +1736,13 @@
 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 \fBdelay\fP
 .sp
-@@ -1676,31 +1534,31 @@
+@@ -1918,31 +1776,31 @@
 .TP
 .B \fBclear\-complete\fP
 .sp
 -Clear the progress bar after it\(aqs done. (default: True)
 +Clear the progress bar after it's done. (default: True)
 .sp
 Controls generic server settings.
 -.INDENT 0.0
 +.RS 0
 .TP
-.B \fBuncompressed\fP
+.B \fBcompressionengines\fP
 .sp
-@@ -1765,11 +1623,11 @@
+@@ -1951,10 +1809,10 @@
-consider setting this option because converting \fIgeneraldelta\fP
+.sp
-repositories to the exchange format required by the bundle1 data
+The order of compression engines determines their priority, the first
-format can consume a lot of CPU.
+having the highest priority. If a compression engine is not listed
+-here, it won\(aqt be advertised to clients.
++here, it won't be advertised to clients.
+.sp
+If not set (the default), built\-in defaults are used. Run
+-\%\fBhg debuginstall\fP\: to list available compression engines and their
++\fBhg debuginstall\fP to list available compression engines and their
+default wire protocol priority.
+.sp
+Older Mercurial clients only support zlib compression and this setting
+@@ -2052,11 +1910,11 @@
+This option only impacts the HTTP server.
+.sp
+See also \fBserver.zliblevel\fP.
 -.UNINDENT
 +.RE
 .SS \fBsmtp\fP
 .sp
 Configuration for extensions that need to send email messages.
 -.INDENT 0.0
 +.RS 0
 .TP
 .B \fBhost\fP
 .sp
-@@ -1794,7 +1652,7 @@
+@@ -2087,7 +1945,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
-@@ -1811,7 +1669,7 @@
 .sp
 Optional. The hostname that the sender can use to identify
 itself to the MTA.
 -.UNINDENT
 +.RE
 .SS \fBsubpaths\fP
 .sp
 Subrepository source URLs can go stale if a remote server changes name
-@@ -1819,9 +1677,9 @@
+@@ -2095,9 +1953,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
-@@ -1830,9 +1688,9 @@
+@@ -2106,9 +1964,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.
-@@ -1843,7 +1701,7 @@
+@@ -2115,19 +1973,19 @@
+.sp
+Relative subrepository paths are first made absolute, and the
+rewrite rules are then applied on the full (absolute) path. If \fBpattern\fP
+-doesn\(aqt match the full path, an attempt is made to apply it on the
++doesn't match the full path, an attempt is made to apply it on the
+relative path alone. The rules are applied in definition order.
+.SS \fBtemplatealias\fP
+.sp
+-Alias definitions for templates. See \%\fBhg help templates\fP\: for details.
++Alias definitions for templates. See \fBhg help templates\fP for details.
+.SS \fBtemplates\fP
+.sp
+Use the \fB[templates]\fP section to define template strings.
+-See \%\fBhg help templates\fP\: for details.
++See \fBhg help templates\fP for details.
 .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,
-@@ -1855,7 +1713,7 @@
+@@ -2139,7 +1997,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
-@@ -1864,17 +1722,17 @@
+@@ -2148,17 +2006,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: True)
 .TP
 .B \fBaskusername\fP
-@@ -1889,7 +1747,7 @@
+@@ -2173,7 +2031,7 @@
 .sp
 Whether the "clone bundles" feature is enabled.
 .sp
 -When enabled, \%\fBhg clone\fP\: may download and apply a server\-advertised
 +When enabled, \fBhg clone\fP may download and apply a server\-advertised
 bundle file from a URL instead of using the normal exchange mechanism.
 .sp
 This can likely result in faster and more reliable clones.
-@@ -1907,7 +1765,7 @@
+@@ -2191,7 +2049,7 @@
 clone, this would add significant and unexpected load to the server
 since the server is expecting clone operations to be offloaded to
 pre\-generated bundles. Failing fast (the default behavior) ensures
 -clients don\(aqt overwhelm the server when "clone bundle" application
 +clients don't overwhelm the server when "clone bundle" application
 fails.
 .sp
 (default: False)
-@@ -1922,17 +1780,17 @@
+@@ -2206,17 +2064,17 @@
 bundle over another.
 .sp
 The following keys are defined by Mercurial:
 -.INDENT 7.0
 +.RS 7
 -.UNINDENT
 +.RE
 .sp
 Server operators may define custom keys.
 .sp
-@@ -1958,7 +1816,7 @@
+@@ -2242,7 +2100,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: ISO\-8859\-1)
 .TP
 .B \fBgraphnodetemplate\fP
-@@ -1986,7 +1844,7 @@
+@@ -2266,12 +2124,12 @@
+.B \fBinterface\fP
+.sp
+Select the default interface for interactive features (default: text).
+-Possible values are \(aqtext\(aq and \(aqcurses\(aq.
++Possible values are 'text' and 'curses'.
+.TP
+.B \fBinterface.chunkselector\fP
+.sp
+-Select the interface for change recording (e.g. \%\fBhg commit \-i\fP\:).
+-Possible values are \(aqtext\(aq and \(aqcurses\(aq.
++Select the interface for change recording (e.g. \fBhg commit \-i\fP).
++Possible values are 'text' and 'curses'.
+This config overrides the interface specified by ui.interface.
+.TP
+.B \fBlogtemplate\fP
+@@ -2281,7 +2139,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 \fBmergemarkers\fP
-@@ -1993,7 +1851,7 @@
+@@ -2288,7 +2146,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: \fBbasic\fP)
 .TP
-@@ -2000,7 +1858,7 @@
+@@ -2295,7 +2153,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.
 .sp
 Defaults to showing the hash, tags, branches, bookmarks, author, and
-@@ -2037,12 +1895,12 @@
+@@ -2332,12 +2190,12 @@
 .sp
 Check for portable filenames. Can be \fBwarn\fP, \fBignore\fP or \fBabort\fP.
 (default: \fBwarn\fP)
 -.INDENT 7.0
 +.RS 7
 -filename is added (e.g. a file with a name that can\(aqt be created on
 +filename is added (e.g. a file 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).
-@@ -2049,7 +1907,7 @@
+@@ -2344,7 +2202,7 @@
 .TP
 .B \fBignore\fP
 .sp
 -Don\(aqt print a warning.
 +Don't print a warning.
 .TP
 .B \fBabort\fP
 .sp
-@@ -2062,9 +1920,7 @@
+@@ -2357,9 +2215,7 @@
 .B \fBfalse\fP
 .sp
 Alias for \fBignore\fP.
 -.UNINDENT
 -.sp
 -On Windows, this configuration option is ignored and the command aborted.
 +.RE
 .TP
 .B \fBquiet\fP
 .sp
-@@ -2128,7 +1984,7 @@
+@@ -2431,7 +2287,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. Environment variables in the
 username are expanded.
 .sp
-@@ -2140,11 +1996,11 @@
+@@ -2443,11 +2299,11 @@
 .B \fBverbose\fP
 .sp
 Increase the amount of output printed. (default: 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
-@@ -2160,9 +2016,9 @@
+@@ -2463,9 +2319,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
-@@ -2169,7 +2025,7 @@
+@@ -2472,7 +2328,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
-@@ -2254,13 +2110,13 @@
+@@ -2552,13 +2408,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\-\-\-\-\-
-@@ -2267,7 +2123,7 @@
+@@ -2565,7 +2421,7 @@
 \-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-
 \&... (certificate in base64 PEM encoding) ...
 \-\-\-\-\-END CERTIFICATE\-\-\-\-\-
 -.ft P
 +.ft
 .fi
 .TP
 .B \fBcache\fP
-@@ -2276,7 +2132,7 @@
+@@ -2574,7 +2430,7 @@
 .TP
 .B \fBcertificate\fP
 .sp
 -Certificate to use when running \%\fBhg serve\fP\:.
 +Certificate to use when running \fBhg serve\fP.
 .TP
 .B \fBcollapse\fP
 .sp
-@@ -2333,7 +2189,7 @@
+@@ -2646,7 +2502,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: "unknown")
 .TP
 .B \fBencoding\fP
-@@ -2398,7 +2254,7 @@
+@@ -2720,7 +2576,7 @@
 .TP
 .B \fBprefix\fP
 .sp
 -Prefix path to serve from. (default: \(aq\(aq (server root))
 +Prefix path to serve from. (default: '' (server root))
 .TP
 .B \fBpush_ssl\fP
 .sp
-@@ -2437,7 +2293,7 @@
+@@ -2759,7 +2615,7 @@
 .sp
 Where to find the HTML templates. The default path to the HTML templates
 can be obtained from \fBhg debuginstall\fP.
 -.UNINDENT
 +.RE
 .SS \fBwebsub\fP
 .sp
 Web substitution filter definition. You can use this section to
-@@ -2459,9 +2315,9 @@
+@@ -2781,9 +2637,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
-@@ -2470,12 +2326,12 @@
+@@ -2792,12 +2648,12 @@
 Examples:
 .sp
 .nf
 -.ft C
 +.ft
 -.ft P
 +.ft
 .fi
 .SS \fBworker\fP
 .sp
-@@ -2482,7 +2338,7 @@
+@@ -2804,7 +2660,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
-@@ -2493,7 +2349,7 @@
+@@ -2815,7 +2671,7 @@
 .B \fBbackgroundclose\fP
 .sp
 Whether to enable closing file handles on background threads during certain
 -operations. Some platforms aren\(aqt very efficient at closing file
 +operations. Some platforms aren't very efficient at closing file
 handles that have been written or appended to. By performing file closing
 on background threads, file write rate can increase substantially.
 (default: true on Windows, false elsewhere)
-@@ -2501,7 +2357,7 @@
+@@ -2823,7 +2679,7 @@
 .B \fBbackgroundcloseminfilecount\fP
 .sp
 Minimum number of files required to trigger background file closing.
 -Operations not writing this many files won\(aqt start background close
 +Operations not writing this many files won't start background close
 threads.
 (default: 2048)
 .TP
-@@ -2517,18 +2373,18 @@
+@@ -2839,18 +2695,18 @@
 Number of threads to process background file closes. Only relevant if
 \fBbackgroundclose\fP is enabled.
 (default: 4)
 -.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\-2016 Matt Mackall.
+Mercurial is copyright 2005\-2017 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	s11u3-sru
changeset 7937	20e6442c6cee
parent 5721	153e2c170241