# HG changeset patch
# User Danek Duvall <danek.duvall@oracle.com>
# Date 1456180162 28800
# Node ID 5e30cd0645e7cf73772b9c3dca6a62ffe285a2e1
# Parent  c8882ac2a393fbccb162d993dc7ac9e1e1608c86
21549200 mercurial 3.7.1
21368629 hg diff is not interruptible

diff -r c8882ac2a393 -r 5e30cd0645e7 components/mercurial/Makefile
--- a/components/mercurial/Makefile	Mon Feb 22 10:26:36 2016 -0800
+++ b/components/mercurial/Makefile	Mon Feb 22 14:29:22 2016 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -28,17 +28,17 @@
 PATH=/usr/bin:/usr/gnu/bin:/usr/sbin
 
 COMPONENT_NAME=		mercurial
-COMPONENT_VERSION=	3.4
+COMPONENT_VERSION=	3.7.1
 COMPONENT_PROJECT_URL=	http://mercurial.selenic.com/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:ff1da0545cdd46ebcf473176d55937a22bb55fff51cdff9d4c2f900fc80baf10
+    sha256:96d37d1f444a032295e190318b3166e9d05abb55916d2b3adb618a8f16c5cfed
 COMPONENT_ARCHIVE_URL=	http://www.selenic.com/mercurial/release/$(COMPONENT_ARCHIVE)
 COMPONENT_SIG_URL=	$(COMPONENT_ARCHIVE_URL).asc
 COMPONENT_BUGDB=	utility/hg
 
-TPNO=			22534
+TPNO=			26646
 
 # Mercurial does not yet support Python 3.
 PYTHON_VERSIONS = $(PYTHON2_VERSIONS)
@@ -58,13 +58,21 @@
 # tests which try to check all the code in the userland gate.  And finally,
 # test the bits from the proto area, rather than rebuilding.  Given the way the
 # test suite works, the hg executable must be named "hg".
+TEST_BLACKLIST = \
+	test-check-code.t \
+	test-check-config.t \
+	test-hghave.t \
+	test-module-imports.t \
+	test-run-tests.t
 COMPONENT_PRE_TEST_ACTION = \
 	(cd $(BUILD_DIR); rm -f sh; ln -s /bin/bash sh; \
-	echo "test-check-code-hg.t\ntest-module-imports.t" > blacklist); \
+	printf "%s\n" $(TEST_BLACKLIST) > blacklist); \
 	(cd $(PROTOUSRBINDIR); rm -f hg; ln -s hg-$(PYTHON_VERSION) hg)
 
 COMPONENT_TEST_DIR =	$(COMPONENT_SRC)/tests
-COMPONENT_TEST_ENV =	PYTHONPATH=$(PROTO_DIR)/$(PYTHON_LIB) TERM=dumb
+COMPONENT_TEST_ENV =	PYTHONPATH=$(PROTO_DIR)/$(PYTHON_LIB)
+COMPONENT_TEST_ENV +=	TERM=dumb
+COMPONENT_TEST_ENV +=	HGTEST_JOBS=$(or $(HGTEST_JOBS),1)
 COMPONENT_TEST_ARGS =	./run-tests.py \
 			--shell $(BUILD_DIR)/sh \
 			--with-hg $(PROTOUSRBINDIR)/hg \
@@ -78,7 +86,12 @@
 # patched with the older manpages.patch or against a fresh tarball.  Eventually
 # we'll have docutils in the CBE and we'll be able to regenerate the manpages
 # as part of the build, rather than patching them.
-patches/manpages.patch:
+#
+# Only build this target if it doesn't already exist, since this recipe is just
+# for the component maintainer's benefit.
+patches/manpages.patch: $(SOURCE_DIR)/.unpacked \
+    $(SOURCE_DIR)/.patched-rst.patch $(SOURCE_DIR)/.patched-hgmanpage.patch
+	if [[ -f $@ ]]; then exit 0; fi; \
 	if [[ -f $(COMPONENT_SRC)/doc/hg.1.~1~ ]]; then \
 		cd $(COMPONENT_SRC)/doc; gmake man || true; cd ../..; \
 		for f in hg.1 hgignore.5 hgrc.5; do \
diff -r c8882ac2a393 -r 5e30cd0645e7 components/mercurial/mercurial-GENFRAG.p5m
--- a/components/mercurial/mercurial-GENFRAG.p5m	Mon Feb 22 10:26:36 2016 -0800
+++ b/components/mercurial/mercurial-GENFRAG.p5m	Mon Feb 22 14:29:22 2016 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
@@ -34,9 +34,9 @@
 
 file path=usr/demo/mercurial/bash_completion
 file path=usr/demo/mercurial/casesmash.py
-file path=usr/demo/mercurial/check-code.py mode=555
 file path=usr/demo/mercurial/debugcmdserver.py mode=555
 file path=usr/demo/mercurial/debugshell.py
+file path=usr/demo/mercurial/dirstatenonnormalcheck.py
 file path=usr/demo/mercurial/dumprevlog mode=555
 file path=usr/demo/mercurial/editmerge mode=555
 file path=usr/demo/mercurial/hg-ssh mode=555
@@ -53,6 +53,7 @@
 file path=usr/demo/mercurial/perf.py
 file path=usr/demo/mercurial/pylintrc
 file path=usr/demo/mercurial/python-hook-examples.py
+file path=usr/demo/mercurial/showstack.py
 file path=usr/demo/mercurial/simplemerge mode=555
 file path=usr/demo/mercurial/synthrepo.py
 file path=usr/demo/mercurial/tcsh_completion
diff -r c8882ac2a393 -r 5e30cd0645e7 components/mercurial/mercurial-PYVER.p5m
--- a/components/mercurial/mercurial-PYVER.p5m	Mon Feb 22 10:26:36 2016 -0800
+++ b/components/mercurial/mercurial-PYVER.p5m	Mon Feb 22 14:29:22 2016 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -46,8 +46,10 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/blackbox.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/bugzilla.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/censor.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/chgserver.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/children.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/churn.py
+file path=usr/lib/python$(PYVER)/vendor-packages/hgext/clonebundles.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/color.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/convert/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/convert/bzr.py
@@ -91,7 +93,6 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/notify.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/pager.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/patchbomb.py
-file path=usr/lib/python$(PYVER)/vendor-packages/hgext/progress.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/purge.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/rebase.py
 file path=usr/lib/python$(PYVER)/vendor-packages/hgext/record.py
@@ -130,10 +131,12 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/dagutil.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/default.d/mergetools.rc
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/demandimport.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/destutil.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/diffhelpers.so
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/dirstate.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/discovery.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/dispatch.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/dummycert.pem
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/encoding.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/error.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/exchange.py
@@ -159,12 +162,16 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/hgignore.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/hgrc.5.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/hgweb.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/internals/bundles.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/internals/changegroups.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/internals/revlogs.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/merge-tools.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/multirevs.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/patterns.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/phases.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/revisions.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/revsets.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/scripting.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/subrepos.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/templates.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/help/urls.txt
@@ -186,7 +193,6 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/httpconnection.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/httppeer.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/i18n.py
-file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/ignore.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/keepalive.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/da/LC_MESSAGES/hg.mo
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/locale/de/LC_MESSAGES/hg.mo
@@ -222,9 +228,11 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/peer.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/phases.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/posix.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/progress.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/pushkey.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/pvec.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/py3kcompat.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/registrar.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/repair.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/repoview.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/revlog.py
@@ -241,6 +249,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/sslutil.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/statichttprepo.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/store.py
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/streamclone.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/strutil.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/subrepo.py
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/tagmerge.py
@@ -293,6 +302,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/map-cmdline.compact
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/map-cmdline.default
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/map-cmdline.phases
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/map-cmdline.status
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/map-cmdline.xml
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/bookmarks.tmpl
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/monoblue/branches.tmpl
@@ -398,7 +408,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/hgicon.png
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/hglogo.png
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/mercurial.js
-file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/style-coal.css
+file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/style-extra-coal.css
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/style-gitweb.css
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/style-monoblue.css
 file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/templates/static/style-paper.css
diff -r c8882ac2a393 -r 5e30cd0645e7 components/mercurial/patches/demandimport.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/mercurial/patches/demandimport.patch	Mon Feb 22 14:29:22 2016 -0800
@@ -0,0 +1,34 @@
+Mercurial's demandload system is incompatible with sqlalchemy.
+
+This was reported upstream as
+
+    https://bz.mercurial-scm.org/show_bug.cgi?id=5085
+
+and is available in the upstream repository in changesets c25e3fd38ff1 and
+9ff7261cc0f5.
+
+diff --git a/mercurial/demandimport.py b/mercurial/demandimport.py
+--- a/mercurial/demandimport.py
++++ b/mercurial/demandimport.py
+@@ -174,7 +174,12 @@ def _demandimport(name, globals=None, lo
+             """
+             symbol = getattr(mod, attr, nothing)
+             if symbol is nothing:
+-                symbol = _demandmod(attr, mod.__dict__, locals, level=1)
++                mn = '%s.%s' % (mod.__name__, attr)
++                if mn in ignore:
++                    importfunc = _origimport
++                else:
++                    importfunc = _demandmod
++                symbol = importfunc(attr, mod.__dict__, locals, level=1)
+                 setattr(mod, attr, symbol)
+ 
+             # Record the importing module references this symbol so we can
+@@ -250,6 +255,7 @@ ignore = [
+     '_sre', # issue4920
+     'rfc822',
+     'mimetools',
++    'sqlalchemy.events', # has import-time side effects (issue5085)
+     # setuptools 8 expects this module to explode early when not on windows
+     'distutils.msvc9compiler'
+     ]
diff -r c8882ac2a393 -r 5e30cd0645e7 components/mercurial/patches/extdiff.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/mercurial/patches/extdiff.patch	Mon Feb 22 14:29:22 2016 -0800
@@ -0,0 +1,19 @@
+Use GNU diff instead of Solaris diff.
+
+Solaris diff doesn't understand the -N option, which is part of the default
+option set.
+
+This is a very Solaris-specific patch, and should not be passed upstream.
+
+diff --git a/hgext/extdiff.py b/hgext/extdiff.py
+--- a/hgext/extdiff.py
++++ b/hgext/extdiff.py
+@@ -282,7 +282,7 @@ def extdiff(ui, repo, *pats, **opts):
+     program = opts.get('program')
+     option = opts.get('option')
+     if not program:
+-        program = 'diff'
++        program = 'gdiff'
+         option = option or ['-Npru']
+     cmdline = ' '.join(map(util.shellquote, [program] + option))
+     return dodiff(ui, repo, cmdline, pats, opts)
diff -r c8882ac2a393 -r 5e30cd0645e7 components/mercurial/patches/issue4646.patch
--- a/components/mercurial/patches/issue4646.patch	Mon Feb 22 10:26:36 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-# HG changeset patch
-# User Gregory Szorc <gregory.szorc@gmail.com>
-# Date 1430931130 25200
-#      Wed May 06 09:52:10 2015 -0700
-# Branch stable
-# Node ID 44b054c3a46eac63d5fed06ffb8fffc38d5668f6
-# Parent  41cd8171e58f991373dcd0b4897dc1e5978d42dd
-extensions: clear aftercallbacks after execution (issue4646)
-
-It was reported that enabling pager without color could cause a hang.
-Inserting print statements revealed that the callbacks in
-extensions._aftercallbacks were being invoked twice.
-
-extensions.loadall can be called multiple times. If entries in
-extensions._aftercallbacks linger between calls, this could result
-in double execution of the callbacks. This can lead to unwanted
-behavior.
-
-The reproduce steps in the bug seem to only occur when the output of
-a command is less than the size of the current screen. This is not
-something that can easily be tested. I verified the test case works
-with this patch and that pager and color interaction continues to
-work. Since we have no existing automated tests for pager, this sadly
-appears to be the best testing I can do.
-
-diff --git a/mercurial/extensions.py b/mercurial/extensions.py
---- a/mercurial/extensions.py
-+++ b/mercurial/extensions.py
-@@ -133,8 +133,12 @@ def loadall(ui):
- 
-         for fn in _aftercallbacks[shortname]:
-             fn(loaded=False)
- 
-+    # loadall() is called multiple times and lingering _aftercallbacks
-+    # entries could result in double execution. See issue4646.
-+    _aftercallbacks.clear()
-+
- def afterloaded(extension, callback):
-     '''Run the specified function after a named extension is loaded.
- 
-     If the named extension is already loaded, the callback will be called
-_______________________________________________
-Mercurial-devel mailing list
-Mercurial-devel@selenic.com
-http://selenic.com/mailman/listinfo/mercurial-devel
diff -r c8882ac2a393 -r 5e30cd0645e7 components/mercurial/patches/manpages.patch
--- a/components/mercurial/patches/manpages.patch	Mon Feb 22 10:26:36 2016 -0800
+++ b/components/mercurial/patches/manpages.patch	Mon Feb 22 14:29:22 2016 -0800
@@ -1,5 +1,14 @@
---- mercurial-3.4/doc/hg.1.orig	Fri May  1 14:49:19 2015
-+++ mercurial-3.4/doc/hg.1	Mon May  4 14:57:31 2015
+This patch is autogenerated by a rule in the userland Makefile for
+mercurial.  We already patch a handful of help files (via rst.patch), and
+change the rst plugin to emit manpages intelligible to Solaris nroff (via
+hgmanpage.patch), but docutils is required to actually rebuild the manpages
+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.1/doc/hg.1.orig	Wed Feb  3 14:00:04 2016
++++ mercurial-3.7.1/doc/hg.1	Thu Feb  4 10:13:50 2016
 @@ -3,33 +3,6 @@
  .TH HG 1 "" "" "Mercurial Manual"
  .SH NAME
@@ -91,16 +100,26 @@
  .fi
  .sp
  Schedule files to be version controlled and added to the
-@@ -144,15 +117,15 @@
+@@ -144,22 +117,22 @@
  repository.
  .sp
  The files will be added to the repository at the next commit. To
 -undo an add before that, see \%\fBhg forget\fP\:.
 +undo an add before that, see \fBhg forget\fP.
  .sp
- If no names are given, add all files to the repository.
- .sp
- An example showing how new (unknown) files are added
+ If no names are given, add all files to the repository (except
+ files matching \fB.hgignore\fP).
+ .sp
+ Examples:
+-.INDENT 0.0
+-.INDENT 3.5
+-.INDENT 0.0
++.RS 0
++.RS 3
++.RS 0
+ .IP \(bu 2
+ .
+ New (unknown) files are added
 -automatically by \%\fBhg add\fP\::
 +automatically by \fBhg add\fP:
  .sp
@@ -110,13 +129,37 @@
  $ ls
  foo.c
  $ hg status
-@@ -161,13 +134,13 @@
+@@ -168,7 +141,7 @@
  adding foo.c
  $ hg status
  A foo.c
 -.ft P
 +.ft
  .fi
+ .IP \(bu 2
+ .
+@@ -175,7 +148,7 @@
+ Specific files to be added can be specified:
+ .sp
+ .nf
+-.ft C
++.ft
+ $ ls
+ bar.c  foo.c
+ $ hg status
+@@ -185,16 +158,16 @@
+ $ hg status
+ A bar.c
+ ? foo.c
+-.ft P
++.ft
+ .fi
+-.UNINDENT
+-.UNINDENT
+-.UNINDENT
++.RE
++.RE
++.RE
  .sp
  Returns 0 if all files are successfully added.
  .sp
@@ -126,7 +169,7 @@
  .TP
  .BI \-I,  \-\-include \ <PATTERN[+]>
  .
-@@ -184,7 +157,7 @@
+@@ -211,7 +184,7 @@
  .B \-n,  \-\-dry\-run
  .
  do not perform actions, just print output
@@ -135,7 +178,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS addremove
-@@ -192,9 +165,9 @@
+@@ -219,9 +192,9 @@
  add all new files, delete all missing files:
  .sp
  .nf
@@ -147,16 +190,7 @@
  .fi
  .sp
  Add all new files and remove all missing files from the
-@@ -201,7 +174,7 @@
- repository.
- .sp
- New files are ignored if they match any of the patterns in
--\fB.hgignore\fP. As with add, these changes take effect at the next
-+\fB\&.hgignore\fP. As with add, these changes take effect at the next
- commit.
- .sp
- Use the \-s/\-\-similarity option to detect renamed files. This
-@@ -209,7 +182,7 @@
+@@ -236,23 +209,23 @@
  be identical) as its parameter. With a parameter greater than 0,
  this compares every removed file with every added file and records
  those similar enough as renames. Detecting renamed files this way
@@ -165,7 +199,60 @@
  used to check which files were identified as moved or renamed. If
  not specified, \-s/\-\-similarity defaults to 100 and only renames of
  identical files are detected.
-@@ -217,7 +190,7 @@
+ .sp
+ Examples:
+-.INDENT 0.0
+-.INDENT 3.5
+-.INDENT 0.0
++.RS 0
++.RS 3
++.RS 0
+ .IP \(bu 2
+ .
+ A number of files (bar.c and foo.c) are new,
+-while foobar.c has been removed (without using \%\fBhg remove\fP\:)
++while foobar.c has been removed (without using \fBhg remove\fP)
+ from the repository:
+ .sp
+ .nf
+-.ft C
++.ft
+ $ ls
+ bar.c foo.c
+ $ hg status
+@@ -267,15 +240,15 @@
+ A bar.c
+ A foo.c
+ R foobar.c
+-.ft P
++.ft
+ .fi
+ .IP \(bu 2
+ .
+-A file foobar.c was moved to foo.c without using \%\fBhg rename\fP\:.
++A file foobar.c was moved to foo.c without using \fBhg rename\fP.
+ Afterwards, it was edited slightly:
+ .sp
+ .nf
+-.ft C
++.ft
+ $ ls
+ foo.c
+ $ hg status
+@@ -289,16 +262,16 @@
+ A foo.c
+   foobar.c
+ R foobar.c
+-.ft P
++.ft
+ .fi
+-.UNINDENT
+-.UNINDENT
+-.UNINDENT
++.RE
++.RE
++.RE
+ .sp
  Returns 0 if all files are successfully added.
  .sp
  Options:
@@ -174,7 +261,7 @@
  .TP
  .BI \-s,  \-\-similarity \ <SIMILARITY>
  .
-@@ -238,7 +211,7 @@
+@@ -319,7 +292,7 @@
  .B \-n,  \-\-dry\-run
  .
  do not perform actions, just print output
@@ -183,7 +270,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS annotate
-@@ -246,9 +219,9 @@
+@@ -327,9 +300,9 @@
  show changeset information by line for each file:
  .sp
  .nf
@@ -195,7 +282,7 @@
  .fi
  .sp
  List changes in files, showing the revision id responsible for
-@@ -265,7 +238,7 @@
+@@ -349,7 +322,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -204,7 +291,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
-@@ -277,7 +250,7 @@
+@@ -361,7 +334,7 @@
  .TP
  .B \-\-no\-follow
  .
@@ -213,10 +300,10 @@
  .TP
  .B \-a,  \-\-text
  .
-@@ -330,23 +303,23 @@
+@@ -414,23 +387,23 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
- display with template (DEPRECATED)
+ display with template (EXPERIMENTAL)
 -.UNINDENT
 +.RE
  .sp
@@ -244,8 +331,8 @@
  .fi
  .sp
  By default, the revision used is the parent of the working
-@@ -356,15 +329,15 @@
- extension (or override using \-t/\-\-type).
+@@ -440,15 +413,15 @@
+ extension (to override, use \-t/\-\-type).
  .sp
  Examples:
 -.INDENT 0.0
@@ -263,7 +350,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -371,14 +344,14 @@
+@@ -455,14 +428,14 @@
  create a tarball excluding .hg files:
  .sp
  .nf
@@ -282,7 +369,7 @@
  .TP
  .B \fBfiles\fP
  .sp
-@@ -403,10 +376,10 @@
+@@ -487,10 +460,10 @@
  .B \fBzip\fP
  .sp
  zip archive, compressed using deflate
@@ -295,7 +382,7 @@
  .sp
  Each member added to an archive file has a directory prefix
  prepended. Use \-p/\-\-prefix to specify a format string for the
-@@ -416,7 +389,7 @@
+@@ -500,7 +473,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -304,7 +391,7 @@
  .TP
  .B \-\-no\-decode
  .
-@@ -445,7 +418,7 @@
+@@ -529,7 +502,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -313,7 +400,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS backout
-@@ -453,9 +426,9 @@
+@@ -537,9 +510,9 @@
  reverse effect of earlier changeset:
  .sp
  .nf
@@ -325,7 +412,62 @@
  .fi
  .sp
  Prepare a new changeset with the effect of REV undone in the
-@@ -476,17 +449,17 @@
+@@ -550,12 +523,12 @@
+ is committed automatically (unless \-\-no\-commit is specified).
+ .IP Note
+ .
+-\%\fBhg backout\fP\: cannot be used to fix either an unwanted or
++\fBhg backout\fP cannot be used to fix either an unwanted or
+ incorrect merge.
+ .RE
+ .sp
+ Examples:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
+ Reverse the effect of the parent of the working directory.
+@@ -562,9 +535,9 @@
+ This backout will be committed immediately:
+ .sp
+ .nf
+-.ft C
++.ft
+ hg backout \-r .
+-.ft P
++.ft
+ .fi
+ .IP \(bu 2
+ .
+@@ -571,9 +544,9 @@
+ Reverse the effect of previous bad revision 23:
+ .sp
+ .nf
+-.ft C
++.ft
+ hg backout \-r 23
+-.ft P
++.ft
+ .fi
+ .IP \(bu 2
+ .
+@@ -581,12 +554,12 @@
+ leave changes uncommitted:
+ .sp
+ .nf
+-.ft C
++.ft
+ hg backout \-r 23 \-\-no\-commit
+ hg commit \-m "Backout revision 23"
+-.ft P
++.ft
+ .fi
+-.UNINDENT
++.RE
+ .sp
+ By default, the pending changeset will have one parent,
+ maintaining a linear history. With \-\-merge, the pending
+@@ -594,13 +567,13 @@
  working directory and a new child of REV that simply undoes REV.
  .sp
  Before version 1.7, the behavior without \-\-merge was equivalent
@@ -337,7 +479,12 @@
 -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 revert\fP\: for a way to restore files to the state
++See \fBhg help revert\fP for a way to restore files to the state
+ of another revision.
+ .sp
  Returns 0 on success, 1 if nothing to backout or there are unresolved
+@@ -607,7 +580,7 @@
  files.
  .sp
  Options:
@@ -346,7 +493,7 @@
  .TP
  .B \-\-merge
  .
-@@ -535,7 +508,7 @@
+@@ -660,7 +633,7 @@
  .BI \-u,  \-\-user \ <USER>
  .
  record the specified user as committer
@@ -355,7 +502,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS bisect
-@@ -543,9 +516,9 @@
+@@ -668,9 +641,9 @@
  subdivision search of changesets:
  .sp
  .nf
@@ -367,7 +514,7 @@
  .fi
  .sp
  This command helps to find changesets which introduce problems. To
-@@ -569,16 +542,16 @@
+@@ -694,16 +667,16 @@
  is bad.
  .sp
  Some examples:
@@ -387,7 +534,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -586,10 +559,10 @@
+@@ -711,10 +684,10 @@
  bad:
  .sp
  .nf
@@ -400,7 +547,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -597,10 +570,10 @@
+@@ -722,10 +695,10 @@
  that revision is not usable because of another issue):
  .sp
  .nf
@@ -413,7 +560,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -607,9 +580,9 @@
+@@ -732,9 +705,9 @@
  skip all revisions that do not touch directories \fBfoo\fP or \fBbar\fP:
  .sp
  .nf
@@ -426,7 +573,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -616,22 +589,22 @@
+@@ -741,22 +714,22 @@
  forget the current bisection:
  .sp
  .nf
@@ -454,7 +601,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -639,9 +612,9 @@
+@@ -764,9 +737,9 @@
  bisection:
  .sp
  .nf
@@ -466,7 +613,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -649,9 +622,9 @@
+@@ -774,9 +747,9 @@
  if running with \-U/\-\-noupdate):
  .sp
  .nf
@@ -478,7 +625,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -658,9 +631,9 @@
+@@ -783,9 +756,9 @@
  see all changesets that took part in the current bisection:
  .sp
  .nf
@@ -490,7 +637,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -667,18 +640,18 @@
+@@ -792,18 +765,18 @@
  you can even get a nice graph:
  .sp
  .nf
@@ -514,7 +661,7 @@
  .TP
  .B \-r,  \-\-reset
  .
-@@ -707,15 +680,15 @@
+@@ -832,15 +805,15 @@
  .B \-U,  \-\-noupdate
  .
  do not update to target
@@ -533,7 +680,7 @@
  .fi
  .sp
  Bookmarks are labels on changesets to help track lines of development.
-@@ -722,30 +695,30 @@
+@@ -847,30 +820,30 @@
  Bookmarks are unversioned and can be moved, renamed and deleted.
  Deleting or moving a bookmark has no effect on the associated changesets.
  .sp
@@ -574,7 +721,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -752,9 +725,9 @@
+@@ -877,9 +850,9 @@
  create an inactive bookmark as a place marker:
  .sp
  .nf
@@ -586,7 +733,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -761,23 +734,23 @@
+@@ -886,9 +859,9 @@
  create an inactive bookmark on another changeset:
  .sp
  .nf
@@ -598,6 +745,18 @@
  .fi
  .IP \(bu 2
  .
+@@ -895,23 +868,23 @@
+ rename bookmark turkey to dinner:
+ .sp
+ .nf
+-.ft C
++.ft
+ hg book \-m turkey dinner
+-.ft P
++.ft
+ .fi
+ .IP \(bu 2
+ .
 -move the \(aq@\(aq bookmark from another branch:
 +move the '@' bookmark from another branch:
  .sp
@@ -617,8 +776,8 @@
  .TP
  .B \-f,  \-\-force
  .
-@@ -804,20 +777,20 @@
- display with template (DEPRECATED)
+@@ -938,20 +911,20 @@
+ display with template (EXPERIMENTAL)
  .sp
  aliases: bookmark
 -.UNINDENT
@@ -643,7 +802,7 @@
  information about named branches and bookmarks.
  .RE
  .sp
-@@ -824,7 +797,7 @@
+@@ -958,7 +931,7 @@
  With no argument, show the current branch name. With one argument,
  set the working directory branch name (the branch will not exist
  in the repository until the next commit). Standard practice
@@ -652,15 +811,18 @@
  branch.
  .sp
  Unless \-f/\-\-force is specified, branch will not let you set a
-@@ -834,13 +807,13 @@
+@@ -968,8 +941,8 @@
  the parent of the working directory, negating a previous branch
  change.
  .sp
 -Use the command \%\fBhg update\fP\: to switch to an existing branch. Use
--\%\fBhg commit \-\-close\-branch\fP\: to mark this branch as closed.
+-\%\fBhg commit \-\-close\-branch\fP\: to mark this branch head as closed.
 +Use the command \fBhg update\fP to switch to an existing branch. Use
-+\fBhg commit \-\-close\-branch\fP to mark this branch as closed.
- .sp
++\fBhg commit \-\-close\-branch\fP to mark this branch head as closed.
+ When all heads of a branch are closed, the branch will be
+ considered closed.
+ .sp
+@@ -976,7 +949,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -669,7 +831,7 @@
  .TP
  .B \-f,  \-\-force
  .
-@@ -849,27 +822,27 @@
+@@ -985,27 +958,27 @@
  .B \-C,  \-\-clean
  .
  reset branch name to parent branch name
@@ -704,10 +866,10 @@
  .TP
  .B \-a,  \-\-active
  .
-@@ -882,15 +855,15 @@
+@@ -1018,15 +991,15 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
- display with template (DEPRECATED)
+ display with template (EXPERIMENTAL)
 -.UNINDENT
 +.RE
  .SS bundle
@@ -722,8 +884,8 @@
 +.ft
  .fi
  .sp
- Generate a compressed changegroup file collecting changesets not
-@@ -916,7 +889,7 @@
+ Generate a changegroup file collecting changesets to be added
+@@ -1055,7 +1028,7 @@
  Returns 0 on success, 1 if no changes found.
  .sp
  Options:
@@ -732,7 +894,7 @@
  .TP
  .B \-f,  \-\-force
  .
-@@ -953,7 +926,7 @@
+@@ -1092,7 +1065,7 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -741,7 +903,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS cat
-@@ -961,9 +934,9 @@
+@@ -1100,9 +1073,9 @@
  output the current or given revision of files:
  .sp
  .nf
@@ -753,7 +915,7 @@
  .fi
  .sp
  Print the specified files as they were at the given revision. If
-@@ -971,7 +944,7 @@
+@@ -1110,7 +1083,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 as follows:
@@ -762,7 +924,7 @@
  .TP
  .B \fB%%\fP
  .sp
-@@ -983,7 +956,7 @@
+@@ -1122,7 +1095,7 @@
  .TP
  .B \fB%d\fP
  .sp
@@ -771,7 +933,7 @@
  .TP
  .B \fB%p\fP
  .sp
-@@ -1008,12 +981,12 @@
+@@ -1147,12 +1120,12 @@
  .B \fB%b\fP
  .sp
  basename of the exporting repository
@@ -786,7 +948,7 @@
  .TP
  .BI \-o,  \-\-output \ <FORMAT>
  .
-@@ -1034,7 +1007,7 @@
+@@ -1173,7 +1146,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -795,7 +957,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS clone
-@@ -1042,9 +1015,9 @@
+@@ -1181,9 +1154,9 @@
  make a copy of an existing repository:
  .sp
  .nf
@@ -807,7 +969,7 @@
  .fi
  .sp
  Create a copy of an existing repository in a new directory.
-@@ -1052,22 +1025,22 @@
+@@ -1191,14 +1164,14 @@
  If no destination directory name is specified, it defaults to the
  basename of the source.
  .sp
@@ -821,21 +983,21 @@
 -\fB.hg/hgrc\fP will be created on the remote side.
 +\fB\&.hg/hgrc\fP will be created on the remote side.
  .sp
+-If the source repository has a bookmark called \(aq@\(aq set, that
++If the source repository has a bookmark called '@' set, that
+ revision will be checked out in the new repository by default.
+ .sp
+ To check out a particular version, use \-u/\-\-update, or
+@@ -1207,7 +1180,7 @@
  To pull only a subset of changesets, specify one or more revisions
  identifiers with \-r/\-\-rev or branches with \-b/\-\-branch. The
  resulting clone will contain only the specified changesets and
 -their ancestors. These options (or \(aqclone src#rev dest\(aq) imply
 +their ancestors. These options (or 'clone src#rev dest') imply
- \-\-pull, even for local source repositories. Note that specifying a
- tag will include the tagged changeset but not the changeset
- containing the tag.
- .sp
--If the source repository has a bookmark called \(aq@\(aq set, that
-+If the source repository has a bookmark called '@' set, that
- revision will be checked out in the new repository by default.
- .sp
- To check out a particular version, use \-u/\-\-update, or
-@@ -1084,9 +1057,9 @@
+ \-\-pull, even for local source repositories.
+ .IP Note
+ .
+@@ -1226,9 +1199,9 @@
  directory using full hardlinks with
  .sp
  .nf
@@ -847,7 +1009,7 @@
  .fi
  .sp
  This is the fastest way to clone, but it is not always safe. The
-@@ -1098,7 +1071,7 @@
+@@ -1240,7 +1213,7 @@
  .sp
  Mercurial will update the working directory to the first applicable
  revision from this list:
@@ -856,7 +1018,7 @@
  .IP a. 3
  .
  null if \-U or the source repository has no changesets
-@@ -1105,7 +1078,7 @@
+@@ -1247,7 +1220,7 @@
  .IP b. 3
  .
  if \-u . and the source repository is local, the first parent of
@@ -865,7 +1027,7 @@
  .IP c. 3
  .
  the changeset specified with \-u (if a branch name, this means the
-@@ -1121,7 +1094,7 @@
+@@ -1263,7 +1236,7 @@
  the tipmost head specified with the url#branch source syntax
  .IP g. 3
  .
@@ -874,13 +1036,22 @@
  .IP h. 3
  .
  the tipmost head of the default branch
-@@ -1128,18 +1101,18 @@
+@@ -1270,7 +1243,7 @@
  .IP i. 3
  .
  tip
 -.UNINDENT
 +.RE
  .sp
+ When cloning from servers that support it, Mercurial may fetch
+ pre\-generated data from a server\-advertised URL. When this is done,
+@@ -1278,18 +1251,18 @@
+ once for the bundle fetched from the URL and another for any additional
+ data not fetched from this URL. In addition, if an error occurs, the
+ repository may be rolled back to a partial clone. This behavior may
+-change in future releases. See \%\fBhg help \-e clonebundles\fP\: for more.
++change in future releases. See \fBhg help \-e clonebundles\fP for more.
+ .sp
  Examples:
 -.INDENT 0.0
 +.RS 0
@@ -897,7 +1068,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1146,9 +1119,9 @@
+@@ -1296,9 +1269,9 @@
  create a lightweight local clone:
  .sp
  .nf
@@ -909,7 +1080,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1155,9 +1128,9 @@
+@@ -1305,9 +1278,9 @@
  clone from an absolute path on an ssh server (note double\-slash):
  .sp
  .nf
@@ -921,7 +1092,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1165,9 +1138,9 @@
+@@ -1315,9 +1288,9 @@
  specified version:
  .sp
  .nf
@@ -933,7 +1104,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1174,9 +1147,9 @@
+@@ -1324,9 +1297,9 @@
  create a repository without changesets after a particular revision:
  .sp
  .nf
@@ -945,7 +1116,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1183,18 +1156,18 @@
+@@ -1333,18 +1306,18 @@
  clone (and track) a particular named branch:
  .sp
  .nf
@@ -969,7 +1140,7 @@
  .TP
  .B \-U,  \-\-noupdate
  .
-@@ -1231,7 +1204,7 @@
+@@ -1381,7 +1354,7 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -978,7 +1149,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS commit
-@@ -1239,16 +1212,16 @@
+@@ -1389,16 +1362,16 @@
  commit the specified files or all outstanding changes:
  .sp
  .nf
@@ -999,13 +1170,17 @@
  will be committed.
  .sp
  If you are committing the result of a merge, do not provide any
-@@ -1257,28 +1230,28 @@
+@@ -1407,7 +1380,7 @@
  If no commit message is specified, Mercurial starts your
  configured editor where you can enter a message. In case your
  commit fails, you will find a backup of your message in
 -\fB.hg/last\-message.txt\fP.
 +\fB\&.hg/last\-message.txt\fP.
  .sp
+ The \-\-close\-branch flag can be used to mark the current branch
+ head closed. When all heads of a branch are closed, the branch
+@@ -1415,32 +1388,32 @@
+ .sp
  The \-\-amend flag can be used to amend the parent of the
  working directory with a new commit that contains the changes
 -in the parent in addition to those currently reported by \%\fBhg status\fP\:,
@@ -1029,13 +1204,54 @@
  .sp
  Returns 0 on success, 1 if nothing changed.
  .sp
+ Examples:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
+ commit all files ending in .py:
+ .sp
+ .nf
+-.ft C
++.ft
+ hg commit \-\-include "set:**.py"
+-.ft P
++.ft
+ .fi
+ .IP \(bu 2
+ .
+@@ -1447,9 +1420,9 @@
+ commit all non\-binary files:
+ .sp
+ .nf
+-.ft C
++.ft
+ hg commit \-\-exclude "set:binary()"
+-.ft P
++.ft
+ .fi
+ .IP \(bu 2
+ .
+@@ -1456,14 +1429,14 @@
+ amend the current commit and set the date to now:
+ .sp
+ .nf
+-.ft C
++.ft
+ hg commit \-\-amend \-\-date now
+-.ft P
++.ft
+ .fi
+-.UNINDENT
++.RE
+ .sp
  Options:
 -.INDENT 0.0
 +.RS 0
  .TP
  .B \-A,  \-\-addremove
  .
-@@ -1331,23 +1304,23 @@
+@@ -1516,23 +1489,23 @@
  .B \-S,  \-\-subrepos
  .
  recurse into subrepositories
@@ -1066,7 +1282,7 @@
  .fi
  .sp
  With no arguments, print names and values of all config items.
-@@ -1365,12 +1338,12 @@
+@@ -1550,12 +1523,12 @@
  With \-\-debug, the source (filename and line number) is printed
  for each config item.
  .sp
@@ -1081,7 +1297,7 @@
  .TP
  .B \-u,  \-\-untrusted
  .
-@@ -1389,15 +1362,15 @@
+@@ -1574,15 +1547,15 @@
  edit global config
  .sp
  aliases: showconfig debugconfig
@@ -1100,7 +1316,7 @@
  .fi
  .sp
  Mark dest as having copies of source files. If dest is a
-@@ -1409,12 +1382,12 @@
+@@ -1594,12 +1567,12 @@
  operation is recorded, but no copying is performed.
  .sp
  This command takes effect with the next commit. To undo a copy
@@ -1115,7 +1331,7 @@
  .TP
  .B \-A,  \-\-after
  .
-@@ -1435,23 +1408,23 @@
+@@ -1620,23 +1593,23 @@
  .B \-n,  \-\-dry\-run
  .
  do not perform actions, just print output
@@ -1146,16 +1362,18 @@
  .fi
  .sp
  Show differences between revisions for the specified files.
-@@ -1460,7 +1433,7 @@
+@@ -1644,8 +1617,8 @@
+ Differences between files are shown using the unified diff format.
  .IP Note
  .
- diff may generate unexpected results for merges, as it will
+-\%\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
-@@ -1478,18 +1451,18 @@
+@@ -1663,18 +1636,18 @@
  anyway, probably with undesirable results.
  .sp
  Use the \-g/\-\-git option to generate diffs in the git extended diff
@@ -1178,7 +1396,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1496,9 +1469,9 @@
+@@ -1681,9 +1654,9 @@
  compare two historical versions of a directory, with rename info:
  .sp
  .nf
@@ -1190,7 +1408,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1505,9 +1478,9 @@
+@@ -1690,9 +1663,9 @@
  get change stats relative to the last change on some date:
  .sp
  .nf
@@ -1203,7 +1421,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1514,9 +1487,9 @@
+@@ -1699,9 +1672,9 @@
  diff all newly\-added files that contain a keyword:
  .sp
  .nf
@@ -1215,7 +1433,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1523,18 +1496,18 @@
+@@ -1708,18 +1681,18 @@
  compare a revision and its parents:
  .sp
  .nf
@@ -1238,7 +1456,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV[+]>
  .
-@@ -1603,7 +1576,7 @@
+@@ -1788,7 +1761,7 @@
  .B \-S,  \-\-subrepos
  .
  recurse into subrepositories
@@ -1247,7 +1465,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS export
-@@ -1611,9 +1584,9 @@
+@@ -1796,9 +1769,9 @@
  dump the header and diffs for one or more changesets:
  .sp
  .nf
@@ -1259,7 +1477,16 @@
  .fi
  .sp
  Print the changeset header and diffs for one or more revisions.
-@@ -1631,7 +1604,7 @@
+@@ -1809,7 +1782,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 @@
  .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:
@@ -1268,7 +1495,7 @@
  .TP
  .B \fB%%\fP
  .sp
-@@ -1668,7 +1641,7 @@
+@@ -1853,7 +1826,7 @@
  .B \fB%r\fP
  .sp
  zero\-padded changeset revision number
@@ -1277,7 +1504,7 @@
  .sp
  Without the \-a/\-\-text option, export will avoid generating diffs
  of files it detects as binary. With \-a, export will generate a
-@@ -1675,13 +1648,13 @@
+@@ -1860,13 +1833,13 @@
  diff anyway, probably with undesirable results.
  .sp
  Use the \-g/\-\-git option to generate diffs in the git extended diff
@@ -1293,7 +1520,7 @@
  .IP \(bu 2
  .
  use export and import to transplant a bugfix to the current
-@@ -1688,9 +1661,9 @@
+@@ -1873,9 +1846,9 @@
  branch:
  .sp
  .nf
@@ -1305,7 +1532,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1698,9 +1671,9 @@
+@@ -1883,9 +1856,9 @@
  rename information:
  .sp
  .nf
@@ -1317,7 +1544,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1708,16 +1681,16 @@
+@@ -1893,16 +1866,16 @@
  descriptive names:
  .sp
  .nf
@@ -1338,7 +1565,7 @@
  .TP
  .BI \-o,  \-\-output \ <FORMAT>
  .
-@@ -1742,7 +1715,7 @@
+@@ -1927,7 +1900,7 @@
  .B \-\-nodates
  .
  omit dates from diff headers
@@ -1347,7 +1574,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS files
-@@ -1750,9 +1723,9 @@
+@@ -1935,9 +1908,9 @@
  list tracked files:
  .sp
  .nf
@@ -1359,7 +1586,7 @@
  .fi
  .sp
  Print files under Mercurial control in the working directory or
-@@ -1763,15 +1736,15 @@
+@@ -1948,15 +1921,15 @@
  of all files under Mercurial control in the working directory.
  .sp
  Examples:
@@ -1378,7 +1605,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1778,9 +1751,9 @@
+@@ -1963,9 +1936,9 @@
  shows sizes and flags for current revision:
  .sp
  .nf
@@ -1390,7 +1617,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1787,9 +1760,9 @@
+@@ -1972,9 +1945,9 @@
  list all files named README:
  .sp
  .nf
@@ -1402,7 +1629,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1796,9 +1769,9 @@
+@@ -1981,9 +1954,9 @@
  list all binary files:
  .sp
  .nf
@@ -1414,7 +1641,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1805,9 +1778,9 @@
+@@ -1990,9 +1963,9 @@
  find files containing a regular expression:
  .sp
  .nf
@@ -1427,7 +1654,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1814,19 +1787,19 @@
+@@ -1999,19 +1972,19 @@
  search tracked file contents with xargs and grep:
  .sp
  .nf
@@ -1452,7 +1679,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
-@@ -1851,7 +1824,7 @@
+@@ -2036,7 +2009,7 @@
  .B \-S,  \-\-subrepos
  .
  recurse into subrepositories
@@ -1461,7 +1688,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS forget
-@@ -1859,9 +1832,9 @@
+@@ -2044,9 +2017,9 @@
  forget the specified files on the next commit:
  .sp
  .nf
@@ -1473,10 +1700,13 @@
  .fi
  .sp
  Mark the specified files so they will no longer be tracked
-@@ -1871,18 +1844,18 @@
+@@ -2056,20 +2029,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.
+ .sp
 -To undo a forget before the next commit, see \%\fBhg add\fP\:.
 +To undo a forget before the next commit, see \fBhg add\fP.
  .sp
@@ -1496,7 +1726,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1889,16 +1862,16 @@
+@@ -2076,16 +2049,16 @@
  forget files that would be excluded by .hgignore:
  .sp
  .nf
@@ -1517,7 +1747,7 @@
  .TP
  .BI \-I,  \-\-include \ <PATTERN[+]>
  .
-@@ -1907,7 +1880,7 @@
+@@ -2094,7 +2067,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -1526,13 +1756,13 @@
  .sp
  [+] marked option can be specified multiple times
  .SS graft
-@@ -1915,15 +1888,15 @@
+@@ -2102,15 +2075,15 @@
  copy changes from other branches onto the current branch:
  .sp
  .nf
 -.ft C
 +.ft
- hg graft [OPTION]... [\-r] REV...
+ hg graft [OPTION]... [\-r REV]... REV...
 -.ft P
 +.ft
  .fi
@@ -1547,7 +1777,7 @@
  description from the source changesets.
  .sp
  Changesets that are ancestors of the current revision, that have
-@@ -1933,9 +1906,9 @@
+@@ -2120,9 +2093,9 @@
  of the form:
  .sp
  .nf
@@ -1559,7 +1789,7 @@
  .fi
  .sp
  If \-\-force is specified, revisions will be grafted even if they
-@@ -1953,16 +1926,16 @@
+@@ -2140,16 +2113,16 @@
  .RE
  .sp
  Examples:
@@ -1579,7 +1809,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1969,9 +1942,9 @@
+@@ -2156,9 +2129,9 @@
  graft a range of changesets with one exception, updating dates:
  .sp
  .nf
@@ -1591,7 +1821,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1978,9 +1951,9 @@
+@@ -2165,9 +2138,9 @@
  continue a graft after resolving conflicts:
  .sp
  .nf
@@ -1603,7 +1833,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -1987,19 +1960,19 @@
+@@ -2174,9 +2147,9 @@
  show the source of a grafted changeset:
  .sp
  .nf
@@ -1613,6 +1843,19 @@
 -.ft P
 +.ft
  .fi
+ .IP \(bu 2
+ .
+@@ -2183,19 +2156,19 @@
+ show revisions sorted by date:
+ .sp
+ .nf
+-.ft C
+-hg log \-r \(aqsort(all(), date)\(aq
+-.ft P
++.ft
++hg log \-r 'sort(all(), date)'
++.ft
+ .fi
 -.UNINDENT
 +.RE
  .sp
@@ -1628,7 +1871,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV[+]>
  .
-@@ -2044,7 +2017,7 @@
+@@ -2240,7 +2213,7 @@
  .B \-n,  \-\-dry\-run
  .
  do not perform actions, just print output
@@ -1637,7 +1880,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS grep
-@@ -2052,9 +2025,9 @@
+@@ -2248,9 +2221,9 @@
  search for a pattern in specified files and revisions:
  .sp
  .nf
@@ -1649,7 +1892,7 @@
  .fi
  .sp
  Search revisions of files for a regular expression.
-@@ -2073,7 +2046,7 @@
+@@ -2269,7 +2242,7 @@
  Returns 0 if a match is found, 1 otherwise.
  .sp
  Options:
@@ -1658,7 +1901,7 @@
  .TP
  .B \-0,  \-\-print0
  .
-@@ -2122,7 +2095,7 @@
+@@ -2318,7 +2291,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -1667,7 +1910,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS heads
-@@ -2130,9 +2103,9 @@
+@@ -2326,9 +2299,9 @@
  show branch heads:
  .sp
  .nf
@@ -1679,7 +1922,7 @@
  .fi
  .sp
  With no arguments, show all open branch heads in the repository.
-@@ -2142,11 +2115,11 @@
+@@ -2338,11 +2311,11 @@
  .sp
  If one or more REVs are given, only open branch heads on the
  branches associated with the specified changesets are shown. This
@@ -1693,7 +1936,7 @@
  .sp
  If STARTREV is specified, only those heads that are descendants of
  STARTREV will be displayed.
-@@ -2157,7 +2130,7 @@
+@@ -2353,7 +2326,7 @@
  Returns 0 if matching heads are found, 1 if not.
  .sp
  Options:
@@ -1702,7 +1945,7 @@
  .TP
  .BI \-r,  \-\-rev \ <STARTREV>
  .
-@@ -2182,15 +2155,15 @@
+@@ -2378,15 +2351,15 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template
@@ -1715,13 +1958,13 @@
  .nf
 -.ft C
 +.ft
- hg help [\-ec] [TOPIC]
+ hg help [\-ecks] [TOPIC]
 -.ft P
 +.ft
  .fi
  .sp
  With no arguments, print a list of commands with short help messages.
-@@ -2201,7 +2174,7 @@
+@@ -2397,7 +2370,7 @@
  Returns 0 if successful.
  .sp
  Options:
@@ -1730,14 +1973,16 @@
  .TP
  .B \-e,  \-\-extension
  .
-@@ -2214,15 +2187,15 @@
- .BI \-k,  \-\-keyword \ <VALUE>
- .
- show topics matching keyword
--.UNINDENT
-+.RE
+@@ -2414,7 +2387,7 @@
+ .BI \-s,  \-\-system \ <VALUE[+]>
+ .
+ show help for specific platform(s)
+-.UNINDENT
++.RE
+ .sp
+ [+] marked option can be specified multiple times
  .SS identify
- .sp
+@@ -2422,9 +2395,9 @@
  identify the working directory or specified revision:
  .sp
  .nf
@@ -1749,7 +1994,7 @@
  .fi
  .sp
  Print a summary identifying the repository state at REV using one or
-@@ -2237,15 +2210,15 @@
+@@ -2439,15 +2412,15 @@
  cause lookup to operate on that repository/bundle.
  .sp
  Examples:
@@ -1768,7 +2013,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2252,9 +2225,9 @@
+@@ -2454,9 +2427,9 @@
  find the revision corresponding to a tag:
  .sp
  .nf
@@ -1780,7 +2025,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2261,16 +2234,16 @@
+@@ -2463,19 +2436,19 @@
  check the most recent revision of a remote repository:
  .sp
  .nf
@@ -1793,6 +2038,10 @@
 -.UNINDENT
 +.RE
  .sp
+-See \%\fBhg log\fP\: for generating more information about specific revisions,
++See \fBhg log\fP for generating more information about specific revisions,
+ including full hash identifiers.
+ .sp
  Returns 0 if successful.
  .sp
  Options:
@@ -1801,7 +2050,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
-@@ -2309,15 +2282,15 @@
+@@ -2514,15 +2487,15 @@
  do not verify server certificate (ignoring web.cacerts config)
  .sp
  aliases: id
@@ -1820,8 +2069,8 @@
  .fi
  .sp
  Import a list of patches and commit them individually (unless
-@@ -2333,7 +2306,7 @@
- text/plain body parts before first diff are added to commit
+@@ -2547,7 +2520,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
@@ -1829,13 +2078,7 @@
  description from patch override values from message headers and
  body. Values given on command line with \-m/\-\-message and \-u/\-\-user
  override these.
-@@ -2350,32 +2323,32 @@
- revision.
- .sp
- With \-s/\-\-similarity, hg will attempt to discover renames and
--copies in the patch in the same way as \%\fBhg addremove\fP\:.
-+copies in the patch in the same way as \fBhg addremove\fP.
- .sp
+@@ -2561,37 +2534,37 @@
  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
@@ -1843,13 +2086,25 @@
 +by hand before \fBhg commit \-\-amend\fP is run to update the created
  changeset. This flag exists to let people import patches that
  partially apply without losing the associated metadata (author,
- date, description, ...). Note that when none of the hunk applies
--cleanly, \%\fBhg import \-\-partial\fP\: will create an empty changeset,
-+cleanly, \fBhg import \-\-partial\fP will create an empty changeset,
- importing only the patch metadata.
- .sp
- To read a patch from standard input, use "\-" as the patch name. If
- a URL is specified, the patch will be downloaded from it.
+ date, description, ...).
+ .IP Note
+ .
+-When no hunks apply cleanly, \%\fBhg import \-\-partial\fP\: will create
++When no hunks apply cleanly, \fBhg import \-\-partial\fP will create
+ an empty changeset, importing only the patch metadata.
+ .RE
+ .sp
+ With \-s/\-\-similarity, hg will attempt to discover renames and
+-copies in the patch in the same way as \%\fBhg addremove\fP\:.
++copies in the patch in the same way as \fBhg addremove\fP.
+ .sp
+ It is possible to use external patch programs to perform the patch
+ by setting the \fBui.patch\fP configuration option. For the default
+ internal tool, the fuzz can also be configured via \fBpatch.fuzz\fP.
+-See \%\fBhg help config\fP\: for more information about configuration
++See \fBhg help config\fP for more information about configuration
+ files and how to use these options.
+ .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
@@ -1869,7 +2124,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2382,9 +2355,9 @@
+@@ -2598,9 +2571,9 @@
  import a changeset from an hgweb server:
  .sp
  .nf
@@ -1881,7 +2136,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2391,9 +2364,9 @@
+@@ -2607,9 +2580,9 @@
  import all the patches in an Unix\-style mbox:
  .sp
  .nf
@@ -1893,7 +2148,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2401,16 +2374,16 @@
+@@ -2617,35 +2590,35 @@
  possible):
  .sp
  .nf
@@ -1903,7 +2158,34 @@
 -.ft P
 +.ft
  .fi
--.UNINDENT
+ .IP \(bu 2
+ .
+ use an external tool to apply a patch which is too fuzzy for
+ the default internal tool.
+-.INDENT 2.0
+-.INDENT 3.5
++.RS 2
++.RS 3
+ .sp
+ hg import \-\-config ui.patch="patch \-\-merge" fuzzy.patch
+-.UNINDENT
+-.UNINDENT
++.RE
++.RE
+ .IP \(bu 2
+ .
+ change the default fuzzing from 2 to a less strict 7
+-.INDENT 2.0
+-.INDENT 3.5
++.RS 2
++.RS 3
+ .sp
+ hg import \-\-config ui.fuzz=7 fuzz.patch
+-.UNINDENT
+-.UNINDENT
+-.UNINDENT
++.RE
++.RE
 +.RE
  .sp
  Returns 0 on success, 1 on partial success (see \-\-partial).
@@ -1914,7 +2196,7 @@
  .TP
  .BI \-p,  \-\-strip \ <NUM>
  .
-@@ -2430,7 +2403,7 @@
+@@ -2665,7 +2638,7 @@
  .TP
  .B \-\-no\-commit
  .
@@ -1923,7 +2205,7 @@
  .TP
  .B \-\-bypass
  .
-@@ -2473,15 +2446,15 @@
+@@ -2708,15 +2681,15 @@
  guess renamed files by similarity (0<=s<=100)
  .sp
  aliases: patch
@@ -1942,7 +2224,7 @@
  .fi
  .sp
  Show new changesets found in the specified path/URL or the default
-@@ -2495,17 +2468,17 @@
+@@ -2730,17 +2703,17 @@
  status is also displayed for each bookmark like below:
  .sp
  .nf
@@ -1963,7 +2245,7 @@
  .TP
  .B \fBadded\fP
  .sp
-@@ -2522,7 +2495,7 @@
+@@ -2757,7 +2730,7 @@
  .B \fBchanged\fP
  .sp
  result depends on remote changesets
@@ -1972,7 +2254,7 @@
  .sp
  From the point of view of pulling behavior, bookmark
  existing only in the remote repository are treated as \fBadded\fP,
-@@ -2532,15 +2505,15 @@
+@@ -2767,15 +2740,15 @@
  changesets twice if the incoming is followed by a pull.
  .sp
  Examples:
@@ -1991,7 +2273,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2547,10 +2520,10 @@
+@@ -2782,10 +2755,10 @@
  show incoming changes excluding merges, store a bundle:
  .sp
  .nf
@@ -2004,7 +2286,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2557,16 +2530,16 @@
+@@ -2792,16 +2765,16 @@
  briefly list changes inside a bundle:
  .sp
  .nf
@@ -2025,7 +2307,7 @@
  .TP
  .B \-f,  \-\-force
  .
-@@ -2639,23 +2612,23 @@
+@@ -2874,23 +2847,23 @@
  .B \-S,  \-\-subrepos
  .
  recurse into subrepositories
@@ -2056,7 +2338,7 @@
  .fi
  .sp
  Initialize a new repository in the given directory. If the given
-@@ -2664,12 +2637,12 @@
+@@ -2899,12 +2872,12 @@
  If no directory is given, the current directory is used.
  .sp
  It is possible to specify an \fBssh://\fP URL as the destination.
@@ -2071,7 +2353,7 @@
  .TP
  .BI \-e,  \-\-ssh \ <CMD>
  .
-@@ -2682,15 +2655,15 @@
+@@ -2917,15 +2890,15 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -2090,7 +2372,7 @@
  .fi
  .sp
  Print files under Mercurial control in the working directory whose
-@@ -2708,12 +2681,12 @@
+@@ -2943,12 +2916,12 @@
  will avoid the problem of "xargs" treating single filenames that
  contain whitespace as multiple filenames.
  .sp
@@ -2105,7 +2387,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
-@@ -2734,7 +2707,7 @@
+@@ -2969,7 +2942,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -2114,7 +2396,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS log
-@@ -2742,9 +2715,9 @@
+@@ -2977,9 +2950,9 @@
  show revision history of entire repository or files:
  .sp
  .nf
@@ -2126,7 +2408,7 @@
  .fi
  .sp
  Print the revision history of the specified files or the entire
-@@ -2766,9 +2739,9 @@
+@@ -3001,12 +2974,12 @@
  .sp
  With \-\-graph the revisions are shown as an ASCII art DAG with the most
  recent changeset at the top.
@@ -2138,8 +2420,19 @@
 +parent of the 'o' merge on the same line.
  .IP Note
  .
- log \-p/\-\-patch may generate unexpected diff output for merge
-@@ -2784,15 +2757,15 @@
+-\%\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 @@
+ .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
+ made on branches and will not show removals or mode changes. To
+ see all such changes, use the \-\-removed switch.
  .RE
  .sp
  Some examples:
@@ -2158,7 +2451,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2799,9 +2772,9 @@
+@@ -3034,9 +3007,9 @@
  changesets ancestral to the working directory:
  .sp
  .nf
@@ -2170,7 +2463,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2808,9 +2781,9 @@
+@@ -3043,9 +3016,9 @@
  last 10 commits on the current branch:
  .sp
  .nf
@@ -2182,7 +2475,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2817,9 +2790,9 @@
+@@ -3052,9 +3025,9 @@
  changesets showing all modifications of a file, including removals:
  .sp
  .nf
@@ -2194,7 +2487,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2826,9 +2799,9 @@
+@@ -3061,9 +3034,9 @@
  all changesets that touch a directory, with diffs, excluding merges:
  .sp
  .nf
@@ -2206,7 +2499,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2835,9 +2808,9 @@
+@@ -3070,9 +3043,9 @@
  all revision numbers that match a keyword:
  .sp
  .nf
@@ -2218,7 +2511,19 @@
  .fi
  .IP \(bu 2
  .
-@@ -2844,9 +2817,9 @@
+@@ -3079,9 +3052,9 @@
+ the full hash identifier of the working directory parent:
+ .sp
+ .nf
+-.ft C
++.ft
+ hg log \-r . \-\-template "{node}\en"
+-.ft P
++.ft
+ .fi
+ .IP \(bu 2
+ .
+@@ -3088,9 +3061,9 @@
  list available log templates:
  .sp
  .nf
@@ -2230,7 +2535,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2853,9 +2826,9 @@
+@@ -3097,9 +3070,9 @@
  check if a given changeset is included in a tagged release:
  .sp
  .nf
@@ -2242,7 +2547,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2862,9 +2835,9 @@
+@@ -3106,9 +3079,9 @@
  find all changesets by some user in a date range:
  .sp
  .nf
@@ -2254,7 +2559,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -2871,24 +2844,24 @@
+@@ -3115,24 +3088,24 @@
  summary of all changesets after the last tag:
  .sp
  .nf
@@ -2272,7 +2577,7 @@
  .sp
 -See \%\fBhg help revisions\fP\: and \%\fBhg help revsets\fP\: for more about
 +See \fBhg help revisions\fP and \fBhg help revsets\fP for more about
- specifying revisions.
+ specifying and ordering 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
@@ -2286,7 +2591,7 @@
  .TP
  .B \-f,  \-\-follow
  .
-@@ -2977,23 +2950,23 @@
+@@ -3221,23 +3194,23 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -2317,7 +2622,7 @@
  .fi
  .sp
  Print a list of version controlled files for the given revision.
-@@ -3009,7 +2982,7 @@
+@@ -3253,7 +3226,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -2326,10 +2631,10 @@
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
-@@ -3022,15 +2995,15 @@
+@@ -3266,15 +3239,15 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
- display with template (DEPRECATED)
+ display with template (EXPERIMENTAL)
 -.UNINDENT
 +.RE
  .SS merge
@@ -2345,7 +2650,7 @@
  .fi
  .sp
  The current working directory is updated with all changes made in
-@@ -3043,16 +3016,16 @@
+@@ -3287,16 +3260,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
@@ -2358,15 +2663,15 @@
  head, the other head is merged with by default. Otherwise, an
  explicit revision with which to merge with must be provided.
  .sp
--\%\fBhg resolve\fP\: must be used to resolve unresolved files.
-+\fBhg resolve\fP must be used to resolve unresolved files.
+-See \%\fBhg help resolve\fP\: for information on handling file conflicts.
++See \fBhg help resolve\fP for information on handling file conflicts.
  .sp
 -To undo an uncommitted merge, use \%\fBhg update \-\-clean .\fP\: which
 +To undo an uncommitted merge, use \fBhg update \-\-clean .\fP which
  will check out a clean copy of the original merge parent, losing
  all changes.
  .sp
-@@ -3059,7 +3032,7 @@
+@@ -3303,7 +3276,7 @@
  Returns 0 on success, 1 if there are unresolved files.
  .sp
  Options:
@@ -2375,7 +2680,7 @@
  .TP
  .B \-f,  \-\-force
  .
-@@ -3076,15 +3049,15 @@
+@@ -3320,15 +3293,15 @@
  .BI \-t,  \-\-tool \ <VALUE>
  .
  specify merge tool
@@ -2394,7 +2699,7 @@
  .fi
  .sp
  Show changesets not found in the specified destination repository
-@@ -3098,18 +3071,18 @@
+@@ -3342,18 +3315,18 @@
  status is also displayed for each bookmark like below:
  .sp
  .nf
@@ -2416,7 +2721,7 @@
  .TP
  .B \fBadded\fP
  .sp
-@@ -3130,7 +3103,7 @@
+@@ -3374,7 +3347,7 @@
  .B \fBchanged\fP
  .sp
  push with \fB\-B\fP will update it
@@ -2425,7 +2730,7 @@
  .sp
  From the point of view of pushing behavior, bookmarks
  existing only in the remote repository are treated as
-@@ -3139,7 +3112,7 @@
+@@ -3383,7 +3356,7 @@
  Returns 0 if there are outgoing changes, 1 otherwise.
  .sp
  Options:
@@ -2434,7 +2739,7 @@
  .TP
  .B \-f,  \-\-force
  .
-@@ -3208,37 +3181,37 @@
+@@ -3452,26 +3425,26 @@
  .B \-S,  \-\-subrepos
  .
  recurse into subrepositories
@@ -2469,7 +2774,19 @@
  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
- argument to \-\-rev if given) is printed.
+@@ -3480,20 +3453,20 @@
+ This command is equivalent to:
+ .sp
+ .nf
+-.ft C
++.ft
+ hg log \-r "p1()+p2()" or
+ hg log \-r "p1(REV)+p2(REV)" or
+ hg log \-r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
+ hg log \-r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
+-.ft P
++.ft
+ .fi
  .sp
 -See \%\fBhg summary\fP\: and \%\fBhg help revsets\fP\: for related information.
 +See \fBhg summary\fP and \fBhg help revsets\fP for related information.
@@ -2482,7 +2799,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
-@@ -3251,15 +3224,15 @@
+@@ -3506,15 +3479,15 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template
@@ -2501,33 +2818,44 @@
  .fi
  .sp
  Show definition of symbolic path name NAME. If no name is given,
-@@ -3280,10 +3253,10 @@
- as the fallback for both.  When cloning a repository, the clone
- source is written as \fBdefault\fP in \fB.hg/hgrc\fP.  Note that
+@@ -3537,29 +3510,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.
-+\fBhg incoming\fP) and outbound (e.g. \fBhg outgoing\fP, \fBhg email\fP and
-+\fBhg bundle\fP) operations.
+-\%\fBhg incoming\fP\:) and outbound (e.g. \%\fBhg outgoing\fP\:, \%\fBhg email\fP\:
+-and \%\fBhg bundle\fP\:) operations.
++\fBhg incoming\fP) and outbound (e.g. \fBhg outgoing\fP, \fBhg email\fP
++and \fBhg bundle\fP) operations.
+ .RE
  .sp
 -See \%\fBhg help urls\fP\: for more information.
 +See \fBhg help urls\fP for more information.
  .sp
  Returns 0 on success.
+ .sp
+ Options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .BI \-T,  \-\-template \ <TEMPLATE>
+ .
+ display with template (EXPERIMENTAL)
+-.UNINDENT
++.RE
  .SS phase
-@@ -3291,9 +3264,9 @@
+ .sp
  set or show the current phase name:
  .sp
  .nf
 -.ft C
 +.ft
- hg phase [\-p|\-d|\-s] [\-f] [\-r] REV...
--.ft P
-+.ft
- .fi
- .sp
- With no argument, show the phase name of specified revisions.
-@@ -3301,13 +3274,13 @@
+ hg phase [\-p|\-d|\-s] [\-f] [\-r] [REV...]
+-.ft P
++.ft
+ .fi
+ .sp
+ With no argument, show the phase name of the current revision(s).
+@@ -3567,21 +3540,21 @@
  With one of \-p/\-\-public, \-d/\-\-draft or \-s/\-\-secret, change the
  phase value of the specified revisions.
  .sp
@@ -2543,9 +2871,10 @@
 +.ft
  .fi
  .sp
- Returns 0 on success, 1 if no phases were changed or some could not
-@@ -3314,7 +3287,7 @@
- be changed.
+ Returns 0 on success, 1 if some phases could not be changed.
+ .sp
+-(For more information about the phases concept, see \%\fBhg help phases\fP\:.)
++(For more information about the phases concept, see \fBhg help phases\fP.)
  .sp
  Options:
 -.INDENT 0.0
@@ -2553,7 +2882,7 @@
  .TP
  .B \-p,  \-\-public
  .
-@@ -3335,7 +3308,7 @@
+@@ -3602,7 +3575,7 @@
  .BI \-r,  \-\-rev \ <REV[+]>
  .
  target revision
@@ -2562,7 +2891,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS pull
-@@ -3343,9 +3316,9 @@
+@@ -3610,9 +3583,9 @@
  pull changes from the specified source:
  .sp
  .nf
@@ -2574,7 +2903,7 @@
  .fi
  .sp
  Pull changes from a remote repository to a local one.
-@@ -3355,18 +3328,18 @@
+@@ -3622,18 +3595,18 @@
  \-R is specified). By default, this does not update the copy of the
  project in the working directory.
  .sp
@@ -2599,7 +2928,7 @@
  .TP
  .B \-u,  \-\-update
  .
-@@ -3399,7 +3372,7 @@
+@@ -3666,7 +3639,7 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -2608,7 +2937,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS push
-@@ -3407,9 +3380,9 @@
+@@ -3674,9 +3647,9 @@
  push changes to the specified destination:
  .sp
  .nf
@@ -2620,7 +2949,7 @@
  .fi
  .sp
  Push changesets from the local repository to the specified
-@@ -3440,13 +3413,13 @@
+@@ -3707,13 +3680,13 @@
  ancestors, and the bookmark will be pushed to the remote
  repository.
  .sp
@@ -2636,7 +2965,7 @@
  .TP
  .B \-f,  \-\-force
  .
-@@ -3479,7 +3452,7 @@
+@@ -3746,7 +3719,7 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -2645,7 +2974,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS recover
-@@ -3487,9 +3460,9 @@
+@@ -3754,9 +3727,9 @@
  roll back an interrupted transaction:
  .sp
  .nf
@@ -2657,7 +2986,7 @@
  .fi
  .sp
  Recover from an interrupted commit or pull.
-@@ -3504,16 +3477,16 @@
+@@ -3771,16 +3744,16 @@
  remove the specified files on the next commit:
  .sp
  .nf
@@ -2678,7 +3007,7 @@
  .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
-@@ -3523,7 +3496,7 @@
+@@ -3790,7 +3763,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 [!]
@@ -2687,7 +3016,16 @@
  (from branch) and Delete (from disk):
  .TS
  center;
-@@ -3597,7 +3570,7 @@
+@@ -3859,7 +3832,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 @@
  Returns 0 on success, 1 if any warnings encountered.
  .sp
  Options:
@@ -2696,7 +3034,7 @@
  .TP
  .B \-A,  \-\-after
  .
-@@ -3618,23 +3591,23 @@
+@@ -3887,23 +3860,23 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -2727,7 +3065,7 @@
  .fi
  .sp
  Mark dest as copies of sources; mark sources for deletion. If dest
-@@ -3646,12 +3619,12 @@
+@@ -3915,12 +3888,12 @@
  operation is recorded, but no copying is performed.
  .sp
  This command takes effect at the next commit. To undo a rename
@@ -2742,7 +3080,7 @@
  .TP
  .B \-A,  \-\-after
  .
-@@ -3672,23 +3645,23 @@
+@@ -3941,23 +3914,23 @@
  .B \-n,  \-\-dry\-run
  .
  do not perform actions, just print output
@@ -2773,7 +3111,7 @@
  .fi
  .sp
  Merges with unresolved conflicts are often the result of
-@@ -3695,15 +3668,15 @@
+@@ -3964,15 +3937,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
@@ -2794,7 +3132,7 @@
  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
-@@ -3712,27 +3685,27 @@
+@@ -3981,22 +3954,22 @@
  contents are saved with a \fB.orig\fP suffix.
  .IP \(bu 2
  .
@@ -2814,12 +3152,15 @@
  In the printed list, \fBU\fP = unresolved and \fBR\fP = resolved.
 -.UNINDENT
 +.RE
- .sp
- Note that Mercurial will not let you commit files with unresolved
--merge conflicts. You must use \%\fBhg resolve \-m ...\fP\: before you can
-+merge conflicts. You must use \fBhg resolve \-m ...\fP before you can
+ .IP Note
+ .
+ Mercurial will not let you commit files with unresolved merge
+-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.
- .sp
+ .RE
+ .sp
+@@ -4003,7 +3976,7 @@
  Returns 0 on success, 1 if any files fail a resolve attempt.
  .sp
  Options:
@@ -2828,16 +3169,16 @@
  .TP
  .B \-a,  \-\-all
  .
-@@ -3769,7 +3742,7 @@
+@@ -4040,7 +4013,7 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
- display with template (DEPRECATED)
+ display with template (EXPERIMENTAL)
 -.UNINDENT
 +.RE
  .sp
  [+] marked option can be specified multiple times
  .SS revert
-@@ -3777,15 +3750,15 @@
+@@ -4048,15 +4021,15 @@
  restore files to their checkout state:
  .sp
  .nf
@@ -2857,7 +3198,7 @@
  .RE
  .sp
  With no revision specified, revert the specified files or directories
-@@ -3799,18 +3772,18 @@
+@@ -4070,21 +4043,21 @@
  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
@@ -2871,6 +3212,10 @@
 -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
++See \fBhg help backout\fP for a way to reverse the effect of an
+ earlier changeset.
+ .sp
  Returns 0 on success.
  .sp
  Options:
@@ -2879,7 +3224,7 @@
  .TP
  .B \-a,  \-\-all
  .
-@@ -3843,7 +3816,7 @@
+@@ -4117,7 +4090,7 @@
  .B \-n,  \-\-dry\-run
  .
  do not perform actions, just print output
@@ -2888,7 +3233,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS rollback
-@@ -3851,12 +3824,12 @@
+@@ -4125,12 +4098,12 @@
  roll back the last transaction (DANGEROUS) (DEPRECATED):
  .sp
  .nf
@@ -2904,7 +3249,7 @@
  mistakes in the last commit.
  .sp
  This command should be used with care. There is only one level of
-@@ -3871,7 +3844,7 @@
+@@ -4145,7 +4118,7 @@
  .sp
  For example, the following commands are transactional, and their
  effects can be rolled back:
@@ -2913,7 +3258,7 @@
  .IP \(bu 2
  .
  commit
-@@ -3887,10 +3860,10 @@
+@@ -4161,10 +4134,10 @@
  .IP \(bu 2
  .
  unbundle
@@ -2926,7 +3271,7 @@
  override this protection.
  .sp
  This command is not intended for use on public repositories. Once
-@@ -3903,7 +3876,7 @@
+@@ -4177,7 +4150,7 @@
  Returns 0 on success, 1 if no rollback data is available.
  .sp
  Options:
@@ -2935,7 +3280,7 @@
  .TP
  .B \-n,  \-\-dry\-run
  .
-@@ -3912,15 +3885,15 @@
+@@ -4186,15 +4159,15 @@
  .B \-f,  \-\-force
  .
  ignore safety measures
@@ -2954,7 +3299,7 @@
  .fi
  .sp
  Print the root directory of the current repository.
-@@ -3931,9 +3904,9 @@
+@@ -4205,9 +4178,9 @@
  start stand\-alone webserver:
  .sp
  .nf
@@ -2966,7 +3311,7 @@
  .fi
  .sp
  Start a local HTTP repository browser and pull server. You can use
-@@ -3958,7 +3931,7 @@
+@@ -4232,7 +4205,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -2975,7 +3320,7 @@
  .TP
  .BI \-A,  \-\-accesslog \ <FILE>
  .
-@@ -4027,15 +4000,15 @@
+@@ -4301,15 +4274,15 @@
  .BI \-\-certificate \ <FILE>
  .
  SSL certificate file
@@ -2994,7 +3339,16 @@
  .fi
  .sp
  Show status of files in the repository. If names are given, only
-@@ -4063,7 +4036,7 @@
+@@ -4323,7 +4296,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 @@
  The codes used to show the status of files are:
  .sp
  .nf
@@ -3003,7 +3357,7 @@
  M = modified
  A = added
  R = removed
-@@ -4072,11 +4045,11 @@
+@@ -4346,11 +4319,11 @@
  ? = not tracked
  I = ignored
    = origin of the previous file (with \-\-copies)
@@ -3017,7 +3371,7 @@
  .IP \(bu 2
  .
  show changes in the working directory relative to a
-@@ -4083,19 +4056,19 @@
+@@ -4357,19 +4330,19 @@
  changeset:
  .sp
  .nf
@@ -3042,7 +3396,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -4102,9 +4075,9 @@
+@@ -4376,9 +4349,9 @@
  show all changes including copies in an existing changeset:
  .sp
  .nf
@@ -3054,7 +3408,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -4111,16 +4084,16 @@
+@@ -4385,16 +4358,16 @@
  get a NUL separated list of added files, suitable for xargs:
  .sp
  .nf
@@ -3075,10 +3429,10 @@
  .TP
  .B \-A,  \-\-all
  .
-@@ -4189,23 +4162,23 @@
+@@ -4463,23 +4436,23 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
- display with template (DEPRECATED)
+ display with template (EXPERIMENTAL)
 -.UNINDENT
 +.RE
  .sp
@@ -3106,7 +3460,7 @@
  .fi
  .sp
  This generates a brief summary of the working directory state,
-@@ -4217,7 +4190,7 @@
+@@ -4491,7 +4464,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -3115,7 +3469,7 @@
  .TP
  .B \-\-remote
  .
-@@ -4224,15 +4197,15 @@
+@@ -4498,15 +4471,15 @@
  check for push and pull
  .sp
  aliases: sum
@@ -3134,7 +3488,7 @@
  .fi
  .sp
  Name a particular revision using <name>.
-@@ -4253,11 +4226,11 @@
+@@ -4527,11 +4500,11 @@
  repositories).
  .sp
  Tag commits are usually made at the head of a branch. If the parent
@@ -3148,7 +3502,7 @@
  .sp
  Since tag names have priority over branch names during revision
  lookup, using an existing branch name as a tag name is discouraged.
-@@ -4265,7 +4238,7 @@
+@@ -4539,7 +4512,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -3157,7 +3511,7 @@
  .TP
  .B \-f,  \-\-force
  .
-@@ -4298,15 +4271,15 @@
+@@ -4572,15 +4545,15 @@
  .BI \-u,  \-\-user \ <USER>
  .
  record the specified user as committer
@@ -3176,7 +3530,7 @@
  .fi
  .sp
  This lists both regular and local tags. When the \-v/\-\-verbose
-@@ -4315,20 +4288,20 @@
+@@ -4590,20 +4563,20 @@
  Returns 0 on success.
  .sp
  Options:
@@ -3185,7 +3539,7 @@
  .TP
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
- display with template (DEPRECATED)
+ display with template (EXPERIMENTAL)
 -.UNINDENT
 +.RE
  .SS tip
@@ -3201,7 +3555,7 @@
  .fi
  .sp
  The tip revision (usually just called the tip) is the changeset
-@@ -4340,12 +4313,12 @@
+@@ -4615,12 +4588,12 @@
  that repository becomes the current tip. The "tip" tag is special
  and cannot be renamed or assigned to a different changeset.
  .sp
@@ -3216,7 +3570,7 @@
  .TP
  .B \-p,  \-\-patch
  .
-@@ -4362,15 +4335,15 @@
+@@ -4637,15 +4610,15 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template
@@ -3235,7 +3589,7 @@
  .fi
  .sp
  Apply one or more compressed changegroup files generated by the
-@@ -4379,32 +4352,32 @@
+@@ -4654,32 +4627,32 @@
  Returns 0 on success, 1 if an update has unresolved files.
  .sp
  Options:
@@ -3262,9 +3616,9 @@
 -Update the repository\(aqs working directory to the specified
 +Update the repository's working directory to the specified
  changeset. If no changeset is specified, update to the tip of the
--current named branch and move the current bookmark (see \%\fBhg help
+-current named branch and move the active bookmark (see \%\fBhg help
 -bookmarks\fP\:).
-+current named branch and move the current bookmark (see \fBhg help
++current named branch and move the active bookmark (see \fBhg help
 +bookmarks\fP).
  .sp
 -Update sets the working directory\(aqs parent revision to the specified
@@ -3278,7 +3632,7 @@
  option, the working directory is checked for uncommitted changes; if
  none are found, the working directory is updated to the specified
  changeset.
-@@ -4411,12 +4384,12 @@
+@@ -4686,12 +4659,12 @@
  .sp
  The following rules apply when the working directory contains
  uncommitted changes:
@@ -3293,7 +3647,7 @@
  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
-@@ -4430,23 +4403,23 @@
+@@ -4705,23 +4678,23 @@
  .
  With the \-C/\-\-clean option, uncommitted changes are discarded and
  the working directory is updated to the requested changeset.
@@ -3323,7 +3677,7 @@
  .TP
  .B \-C,  \-\-clean
  .
-@@ -4469,25 +4442,25 @@
+@@ -4744,25 +4717,25 @@
  specify merge tool
  .sp
  aliases: up checkout co
@@ -3349,12 +3703,12 @@
  the changelog, manifest, and tracked files, as well as the
  integrity of their crosslinks and indices.
  .sp
--Please see \%http://mercurial.selenic.com/wiki/RepositoryCorruption\:
-+Please see http://mercurial.selenic.com/wiki/RepositoryCorruption
+-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
-@@ -4497,9 +4470,9 @@
+@@ -4772,9 +4745,9 @@
  output version and copyright information:
  .sp
  .nf
@@ -3366,7 +3720,7 @@
  .fi
  .sp
  output version and copyright information
-@@ -4506,7 +4479,7 @@
+@@ -4781,7 +4754,7 @@
  .SH DATE FORMATS
  .sp
  Some commands allow the user to specify a date, e.g.:
@@ -3375,7 +3729,7 @@
  .IP \(bu 2
  .
  backout, commit, import, tag: Specify the commit date.
-@@ -4513,10 +4486,10 @@
+@@ -4788,10 +4761,10 @@
  .IP \(bu 2
  .
  log, revert, update: Select revision(s) by date.
@@ -3388,7 +3742,7 @@
  .IP \(bu 2
  .
  \fBWed Dec 6 13:18:29 2006\fP (local timezone assumed)
-@@ -4565,14 +4538,14 @@
+@@ -4840,14 +4813,14 @@
  .IP \(bu 2
  .
  \fBnow\fP \- right now
@@ -3407,7 +3761,7 @@
  .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
-@@ -4580,7 +4553,7 @@
+@@ -4855,7 +4828,7 @@
  (negative if the timezone is east of UTC).
  .sp
  The log command also accepts date ranges:
@@ -3416,7 +3770,7 @@
  .IP \(bu 2
  .
  \fB<DATE\fP \- at or before a given date/time
-@@ -4593,16 +4566,16 @@
+@@ -4868,16 +4841,16 @@
  .IP \(bu 2
  .
  \fB\-DAYS\fP \- within a given number of days of today
@@ -3436,7 +3790,7 @@
  .IP \(bu 2
  .
  executable status and other permission bits
-@@ -4615,7 +4588,7 @@
+@@ -4890,7 +4863,7 @@
  .IP \(bu 2
  .
  creation or deletion of empty files
@@ -3445,7 +3799,7 @@
  .sp
  Mercurial also supports the extended diff format from the git VCS
  which addresses these limitations. The git diff format is not produced
-@@ -4623,26 +4596,26 @@
+@@ -4898,26 +4871,26 @@
  format.
  .sp
  This means that when generating diffs from a Mercurial repository
@@ -3479,7 +3833,7 @@
  Windows) is searched.
  .TP
  .B HGEDITOR
-@@ -4660,9 +4633,9 @@
+@@ -4935,9 +4908,9 @@
  .TP
  .B HGENCODINGMODE
  .
@@ -3491,7 +3845,7 @@
  settings include "replace", which replaces unknown characters, and
  "ignore", which drops them. This setting can be overridden with
  the \-\-encodingmode command\-line option.
-@@ -4669,7 +4642,7 @@
+@@ -4944,7 +4917,7 @@
  .TP
  .B HGENCODINGAMBIGUOUS
  .
@@ -3500,7 +3854,7 @@
  "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
-@@ -4691,19 +4664,19 @@
+@@ -4966,19 +4939,19 @@
  the .hg/hgrc from the current repository is read.
  .sp
  For each element in HGRCPATH:
@@ -3524,7 +3878,32 @@
  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.
-@@ -4724,7 +4697,7 @@
+@@ -4990,11 +4963,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
+ .TP
+ .B \fBalias\fP
+ .sp
+-Don\(aqt remove aliases.
++Don't remove aliases.
+ .TP
+ .B \fBi18n\fP
+ .sp
+@@ -5002,8 +4975,8 @@
+ .TP
+ .B \fBrevsetalias\fP
+ .sp
+-Don\(aqt remove revset aliases.
+-.UNINDENT
++Don't remove revset aliases.
++.RE
+ .sp
+ Setting HGPLAINEXCEPT to anything (even an empty string) will
+ enable plain mode.
+@@ -5012,7 +4985,7 @@
  .
  This is the string used as the author of a commit. If not set,
  available values will be considered in this order:
@@ -3533,7 +3912,7 @@
  .IP \(bu 2
  .
  HGUSER (deprecated)
-@@ -4740,7 +4713,7 @@
+@@ -5028,7 +5001,7 @@
  .IP \(bu 2
  .
  LOGNAME (with \fB@hostname\fP appended)
@@ -3542,7 +3921,7 @@
  .sp
  (deprecated, use configuration file)
  .TP
-@@ -4763,13 +4736,13 @@
+@@ -5051,13 +5024,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
@@ -3558,7 +3937,7 @@
  .SH USING ADDITIONAL FEATURES
  .sp
  Mercurial has the ability to add new features through the use of
-@@ -4782,22 +4755,22 @@
+@@ -5070,22 +5043,22 @@
  like this:
  .sp
  .nf
@@ -3586,7 +3965,7 @@
  .sp
  Extensions are not loaded by default for a variety of reasons:
  they can increase startup overhead; they may be meant for advanced
-@@ -4811,19 +4784,19 @@
+@@ -5099,19 +5072,19 @@
  broader scope, prepend its path with !:
  .sp
  .nf
@@ -3611,7 +3990,7 @@
  .TP
  .B acl
  .
-@@ -4956,9 +4929,9 @@
+@@ -5244,9 +5217,9 @@
  .B zeroconf
  .
  discover and advertise repositories on the local network
@@ -3624,7 +4003,7 @@
  .SH SPECIFYING FILE SETS
  .sp
  Mercurial supports a functional language for selecting a set of
-@@ -4965,7 +4938,7 @@
+@@ -5253,7 +5226,7 @@
  files.
  .sp
  Like other file patterns, this pattern type is indicated by a prefix,
@@ -3633,7 +4012,7 @@
  by infix operators. Parenthesis can be used for grouping.
  .sp
  Identifiers such as filenames or patterns must be quoted with single
-@@ -4976,18 +4949,18 @@
+@@ -5264,18 +5237,18 @@
  .sp
  Special characters can be used in quoted identifiers by escaping them,
  e.g., \fB\en\fP is interpreted as a newline. To prevent them from being
@@ -3656,7 +4035,7 @@
  .TP
  .B \fBx and y\fP
  .sp
-@@ -5001,10 +4974,10 @@
+@@ -5289,14 +5262,14 @@
  .B \fBx \- y\fP
  .sp
  Files in x but not in y.
@@ -3669,7 +4048,37 @@
  .TP
  .B \fBadded()\fP
  .sp
-@@ -5061,7 +5034,7 @@
+-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 @@
+ .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 @@
+ .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
+ considered if this predicate is used.
+ .TP
+ .B \fBmissing()\fP
+ .sp
+-File that is missing according to \%\fBhg status\fP\:.
++File that is missing according to \fBhg status\fP.
+ .TP
+ .B \fBmodified()\fP
+ .sp
+-File that is modified according to \%\fBhg status\fP\:.
++File that is modified according to \fBhg status\fP.
  .TP
  .B \fBportable()\fP
  .sp
@@ -3678,7 +4087,15 @@
  collisions.)
  .TP
  .B \fBremoved()\fP
-@@ -5075,7 +5048,7 @@
+ .sp
+-File that is removed according to \%\fBhg status\fP\:.
++File that is removed according to \fBhg status\fP.
+ .TP
+ .B \fBresolved()\fP
+ .sp
+-File that is marked resolved according to \%\fBhg resolve \-l\fP\:.
++File that is marked resolved according to \fBhg resolve \-l\fP.
+ .TP
  .B \fBsize(expression)\fP
  .sp
  File size matches the given expression. Examples:
@@ -3687,7 +4104,7 @@
  .IP \(bu 2
  .
  1k (files from 1024 to 2047 bytes)
-@@ -5088,7 +5061,7 @@
+@@ -5380,7 +5353,7 @@
  .IP \(bu 2
  .
  4k \- 1MB (files from 4096 bytes to 1048576 bytes)
@@ -3696,11 +4113,19 @@
  .TP
  .B \fBsubrepo([pattern])\fP
  .sp
-@@ -5106,18 +5079,18 @@
+@@ -5392,24 +5365,24 @@
+ .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
+ considered if this predicate is used.
+ .TP
  .B \fBunresolved()\fP
  .sp
- File that is marked unresolved according to the resolve state.
--.UNINDENT
+-File that is marked unresolved according to \%\fBhg resolve \-l\fP\:.
+-.UNINDENT
++File that is marked unresolved according to \fBhg resolve \-l\fP.
 +.RE
  .sp
  Some sample queries:
@@ -3719,7 +4144,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -5124,9 +5097,9 @@
+@@ -5416,9 +5389,9 @@
  Forget files that are in .hgignore but are already tracked:
  .sp
  .nf
@@ -3731,7 +4156,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -5133,9 +5106,9 @@
+@@ -5425,9 +5398,9 @@
  Find text files that contain a string:
  .sp
  .nf
@@ -3743,7 +4168,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -5142,9 +5115,9 @@
+@@ -5434,9 +5407,9 @@
  Find C files in a non\-standard encoding:
  .sp
  .nf
@@ -3756,7 +4181,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -5151,9 +5124,9 @@
+@@ -5443,9 +5416,9 @@
  Revert copies of large binary files:
  .sp
  .nf
@@ -3769,7 +4194,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -5160,15 +5133,15 @@
+@@ -5452,15 +5425,15 @@
  Remove files listed in foo.lst that contain the letter a or b:
  .sp
  .nf
@@ -3791,7 +4216,7 @@
  .TP
  .B Ancestor
  .
-@@ -5176,7 +5149,7 @@
+@@ -5468,7 +5441,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
@@ -3800,7 +4225,7 @@
  .TP
  .B Bookmark
  .
-@@ -5183,7 +5156,7 @@
+@@ -5475,7 +5448,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
@@ -3809,7 +4234,7 @@
  when you make a commit.
  .sp
  Bookmarks can be renamed, copied and deleted. Bookmarks are local,
-@@ -5195,9 +5168,9 @@
+@@ -5487,9 +5460,9 @@
  .
  (Noun) A child changeset that has been created from a parent that
  is not a head. These are known as topological branches, see
@@ -3821,16 +4246,16 @@
  .sp
  Branches may be created when changes are pulled from or pushed to
  a remote repository, since new heads may be created by these
-@@ -5212,7 +5185,7 @@
+@@ -5504,7 +5477,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".
+-Example: "I\(aqm going to branch at X."
++Example: "I'm going to branch at X."
  .TP
  .B Branch, anonymous
  .
-@@ -5231,19 +5204,19 @@
+@@ -5523,19 +5496,19 @@
  .TP
  .B Branch head
  .
@@ -3855,7 +4280,7 @@
  .TP
  .B Branch, named
  .
-@@ -5250,8 +5223,8 @@
+@@ -5542,8 +5515,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
@@ -3866,7 +4291,7 @@
  branches.
  .sp
  Named branches can be thought of as a kind of namespace, dividing
-@@ -5264,7 +5237,7 @@
+@@ -5556,7 +5529,7 @@
  .TP
  .B Branch tip
  .
@@ -3875,7 +4300,7 @@
  .TP
  .B Branch, topological
  .
-@@ -5314,24 +5287,24 @@
+@@ -5606,24 +5579,24 @@
  revision. This use should probably be avoided where possible, as
  changeset is much more appropriate than checkout in this context.
  .sp
@@ -3896,8 +4321,8 @@
  .TP
  .B Close changeset
  .
--See \(aqHead, closed branch\(aq
-+See 'Head, closed branch'
+-See \(aqHead, closed branch\(aq.
++See 'Head, closed branch'.
  .TP
  .B Closed branch
  .
@@ -3906,15 +4331,15 @@
  .TP
  .B Clone
  .
-@@ -5340,13 +5313,13 @@
- .sp
- Example: "Is your clone up to date?".
+@@ -5632,13 +5605,13 @@
+ .sp
+ Example: "Is your clone up to date?"
  .sp
 -(Verb) The process of creating a clone, using \%\fBhg clone\fP\:.
 +(Verb) The process of creating a clone, using \fBhg clone\fP.
  .sp
--Example: "I\(aqm going to clone the repository".
-+Example: "I'm going to clone the repository".
+-Example: "I\(aqm going to clone the repository."
++Example: "I'm going to clone the repository."
  .TP
  .B Closed branch head
  .
@@ -3923,7 +4348,7 @@
  .TP
  .B Commit
  .
-@@ -5371,7 +5344,7 @@
+@@ -5663,7 +5636,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
@@ -3932,7 +4357,7 @@
  Mercurial, the DAG is limited by the requirement for children to
  have at most two parents.
  .TP
-@@ -5381,7 +5354,7 @@
+@@ -5673,7 +5646,7 @@
  .TP
  .B Default branch
  .
@@ -3941,7 +4366,7 @@
  .TP
  .B Descendant
  .
-@@ -5389,7 +5362,7 @@
+@@ -5681,7 +5654,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
@@ -3950,7 +4375,7 @@
  .TP
  .B Diff
  .
-@@ -5414,7 +5387,7 @@
+@@ -5706,7 +5679,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
@@ -3959,7 +4384,7 @@
  to the files introduced manually or by a merge. The repository
  metadata exists in the .hg directory inside the working directory.
  .TP
-@@ -5422,7 +5395,7 @@
+@@ -5714,7 +5687,7 @@
  .
  Changesets in the draft phase have not been shared with publishing
  repositories and may thus be safely changed by history\-modifying
@@ -3968,7 +4393,7 @@
  .TP
  .B Experimental
  .
-@@ -5430,13 +5403,13 @@
+@@ -5722,13 +5695,13 @@
  .TP
  .B Graph
  .
@@ -3986,7 +4411,7 @@
  .sp
  Heads are where development generally takes place and are the
  usual targets for update and merge operations.
-@@ -5448,9 +5421,9 @@
+@@ -5740,9 +5713,9 @@
  .B Head, closed branch
  .
  A changeset that marks a head as no longer interesting. The closed
@@ -3998,7 +4423,7 @@
  .sp
  Closed heads can be re\-opened by committing new changeset as the
  child of the changeset that marks a head as closed.
-@@ -5479,11 +5452,11 @@
+@@ -5771,11 +5744,11 @@
  .TP
  .B Immutable history
  .
@@ -4012,7 +4437,7 @@
  .TP
  .B Manifest
  .
-@@ -5500,7 +5473,7 @@
+@@ -5792,7 +5765,7 @@
  .TP
  .B Named branch
  .
@@ -4021,7 +4446,7 @@
  .TP
  .B Null changeset
  .
-@@ -5507,30 +5480,30 @@
+@@ -5799,30 +5772,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
@@ -4060,7 +4485,7 @@
  .sp
  (Verb) The process of using a patch file to transform one
  changeset into another.
-@@ -5540,13 +5513,13 @@
+@@ -5832,13 +5805,13 @@
  .B Phase
  .
  A per\-changeset state tracking how the changeset has been or
@@ -4077,7 +4502,7 @@
  .TP
  .B Pull
  .
-@@ -5554,7 +5527,7 @@
+@@ -5846,7 +5819,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
@@ -4086,7 +4511,7 @@
  .TP
  .B Push
  .
-@@ -5562,7 +5535,7 @@
+@@ -5854,7 +5827,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
@@ -4095,7 +4520,7 @@
  .TP
  .B Repository
  .
-@@ -5575,13 +5548,13 @@
+@@ -5867,13 +5840,13 @@
  .TP
  .B Repository head
  .
@@ -4112,7 +4537,7 @@
  .TP
  .B Revision number
  .
-@@ -5590,7 +5563,7 @@
+@@ -5882,7 +5855,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
@@ -4121,7 +4546,7 @@
  .TP
  .B Revlog
  .
-@@ -5601,7 +5574,7 @@
+@@ -5893,7 +5866,7 @@
  .TP
  .B Rewriting history
  .
@@ -4130,7 +4555,7 @@
  .TP
  .B Root
  .
-@@ -5611,13 +5584,13 @@
+@@ -5903,13 +5876,13 @@
  .B Secret
  .
  Changesets in the secret phase may not be shared via push, pull,
@@ -4146,7 +4571,7 @@
  will thus automatically be shared with other using push and pull.
  .TP
  .B Tip
-@@ -5629,7 +5602,7 @@
+@@ -5921,7 +5894,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
@@ -4155,19 +4580,19 @@
  numbers may be different in different repository clones, the
  branch tip may be different in different cloned repositories.
  .TP
-@@ -5637,22 +5610,22 @@
+@@ -5929,22 +5902,22 @@
  .
  (Noun) Another synonym of changeset.
  .sp
--Example: "I\(aqve pushed an update".
-+Example: "I've pushed an update".
+-Example: "I\(aqve pushed an update."
++Example: "I've pushed an update."
  .sp
  (Verb) This term is usually used to describe updating the state of
  the working directory to that of a specific changeset. See
 -\%\fBhg help update\fP\:.
 +\fBhg help update\fP.
  .sp
- Example: "You should update".
+ Example: "You should update."
  .TP
  .B Working directory
  .
@@ -4183,7 +4608,7 @@
  .SH SYNTAX FOR MERCURIAL IGNORE FILES
  .SS Synopsis
  .sp
-@@ -5679,16 +5652,16 @@
+@@ -5971,16 +5944,16 @@
  .sp
  In addition, a Mercurial configuration file can reference a set of
  per\-user or global ignore files. See the \fBignore\fP configuration
@@ -4204,7 +4629,7 @@
  in .hgignore.
  .SS Syntax
  .sp
-@@ -5703,13 +5676,13 @@
+@@ -5995,13 +5968,13 @@
  To change the syntax used, use a line of the following form:
  .sp
  .nf
@@ -4221,7 +4646,7 @@
  .TP
  .B \fBregexp\fP
  .sp
-@@ -5718,7 +5691,7 @@
+@@ -6010,7 +5983,7 @@
  .B \fBglob\fP
  .sp
  Shell\-style glob.
@@ -4230,7 +4655,12 @@
  .sp
  The chosen syntax stays in effect when parsing all patterns that
  follow, until another syntax is selected.
-@@ -5730,7 +5703,7 @@
+@@ -6022,11 +5995,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.
  .IP Note
  .
  Patterns specified in other than \fB.hgignore\fP are always rooted.
@@ -4239,7 +4669,7 @@
  .RE
  .SS Example
  .sp
-@@ -5737,7 +5710,7 @@
+@@ -6033,7 +6006,7 @@
  Here is an example ignore file.
  .sp
  .nf
@@ -4248,7 +4678,7 @@
  # use glob syntax.
  syntax: glob
  
-@@ -5748,21 +5721,21 @@
+@@ -6044,21 +6017,21 @@
  # switch to regexp syntax.
  syntax: regexp
  ^\e.pc/
@@ -4276,7 +4706,7 @@
  .IP \(bu 2
  .
  web
-@@ -5772,11 +5745,11 @@
+@@ -6068,11 +6041,11 @@
  .IP \(bu 2
  .
  collections
@@ -4292,7 +4722,7 @@
  .sp
  The \fBpaths\fP section maps URL paths to paths of repositories in the
  filesystem. hgweb will not expose the filesystem directly \- only
-@@ -5791,7 +5764,7 @@
+@@ -6087,7 +6060,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
@@ -4301,7 +4731,7 @@
  With \fB**\fP it will also search inside repository working directories
  and possibly find subrepositories.
  .sp
-@@ -5798,15 +5771,15 @@
+@@ -6094,15 +6067,15 @@
  In this example:
  .sp
  .nf
@@ -4320,7 +4750,7 @@
  .IP \(bu 2
  .
  The first two entries make two repositories in different directories
-@@ -5820,7 +5793,7 @@
+@@ -6116,7 +6089,7 @@
  .
  The fourth entry will publish both \fBhttp://server/user/bob/quux/\fP
  and \fBhttp://server/user/bob/quux/testsubrepo/\fP
@@ -4329,7 +4759,7 @@
  .sp
  The \fBcollections\fP section is deprecated and has been superseded by
  \fBpaths\fP.
-@@ -5843,7 +5816,7 @@
+@@ -6139,7 +6112,7 @@
  \fB/log?style=atom\fP. The hyphenated URL parameter is preferred.
  .sp
  Not all templates are available for all styles. Attempting to use
@@ -4338,16 +4768,16 @@
  rendering the page.
  .sp
  Many commands take a \fB{revision}\fP URL parameter. This defines the
-@@ -5850,7 +5823,7 @@
+@@ -6146,7 +6119,7 @@
  changeset to operate on. This is commonly specified as the short,
- 12 digit hexidecimal abbreviation for the full 40 character unique
+ 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:
-@@ -5904,7 +5877,7 @@
+@@ -6200,7 +6173,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
@@ -4356,7 +4786,7 @@
  .sp
  The \fBrevcount\fP query string argument defines the maximum numbers of
  changesets to render.
-@@ -5989,7 +5962,7 @@
+@@ -6285,7 +6258,7 @@
  .sp
  Render help documentation.
  .sp
@@ -4365,7 +4795,33 @@
  is defined, that help topic will be rendered. If not, an index of
  available help topics will be rendered.
  .sp
-@@ -6060,8 +6033,8 @@
+@@ -6348,9 +6321,9 @@
+ .sp
+ The \fBtags\fP template is rendered.
+ .SH TECHNICAL IMPLEMENTATION TOPICS
+-.INDENT 0.0
+-.INDENT 3.5
+-.INDENT 0.0
++.RS 0
++.RS 3
++.RS 0
+ .TP
+ .B bundles
+ .
+@@ -6363,9 +6336,9 @@
+ .B revlogs
+ .
+ revision storage mechanism
+-.UNINDENT
+-.UNINDENT
+-.UNINDENT
++.RE
++.RE
++.RE
+ .SH MERGE TOOLS
+ .sp
+ To merge files Mercurial uses merge tools.
+@@ -6375,8 +6348,8 @@
  ancestor of the two file versions, so they can determine the changes
  made on both branches.
  .sp
@@ -4376,7 +4832,7 @@
  .sp
  Usually, the merge tool tries to automatically reconcile the files by
  combining all non\-overlapping changes that occurred separately in
-@@ -6086,7 +6059,7 @@
+@@ -6401,7 +6374,7 @@
  .sp
  There are some internal merge tools which can be used. The internal
  merge tools are:
@@ -4385,16 +4841,16 @@
  .TP
  .B \fB:dump\fP
  .sp
-@@ -6133,7 +6106,7 @@
- .B \fB:tagmerge\fP
- .sp
- Uses the internal tag merge algorithm (experimental).
+@@ -6464,7 +6437,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.
-@@ -6140,7 +6113,7 @@
+@@ -6471,7 +6444,7 @@
  .SS Choosing a merge tool
  .sp
  Mercurial uses these rules when deciding which merge tool to use:
@@ -4403,7 +4859,7 @@
  .IP 1. 3
  .
  If a tool has been specified with the \-\-tool option to merge or resolve, it
-@@ -6177,11 +6150,11 @@
+@@ -6508,11 +6481,11 @@
  .IP 8. 3
  .
  The merge of the file fails and must be resolved before commit.
@@ -4417,7 +4873,7 @@
  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
-@@ -6217,7 +6190,7 @@
+@@ -6548,7 +6521,7 @@
  .IP Note
  .
  Patterns specified in \fB.hgignore\fP are not rooted.
@@ -4426,7 +4882,18 @@
  .RE
  .sp
  To use a plain path name without any pattern matching, start it with
-@@ -6246,17 +6219,17 @@
+@@ -6573,8 +6546,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 @@
  Plain examples:
  .sp
  .nf
@@ -4447,7 +4914,7 @@
  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
-@@ -6264,27 +6237,27 @@
+@@ -6601,36 +6574,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.
@@ -4478,10 +4945,21 @@
  .sp
 -See also \%\fBhg help filesets\fP\:.
 +See also \fBhg help filesets\fP.
+ .sp
+ Include examples:
+ .sp
+ .nf
+-.ft C
++.ft
+ include:path/to/mypatternfile    reads patterns to be applied to all paths
+ subinclude:path/to/subignorefile reads patterns specifically for paths in the
+                                  subdirectory
+-.ft P
++.ft
+ .fi
  .SH WORKING WITH PHASES
  .SS What are phases?
- .sp
-@@ -6293,9 +6266,9 @@
+@@ -6640,9 +6613,9 @@
  (for instance, with the mq or rebase extensions).
  .sp
  Each changeset in a repository is in one of the following phases:
@@ -4494,7 +4972,7 @@
  .IP \(bu 2
  .
  public : changeset is visible on a public server
-@@ -6305,9 +6278,9 @@
+@@ -6652,9 +6625,9 @@
  .IP \(bu 2
  .
  secret : changeset should not be pushed, pulled, or cloned
@@ -4507,7 +4985,7 @@
  .sp
  These phases are ordered (public < draft < secret) and no changeset
  can be in a lower phase than its ancestors. For instance, if a
-@@ -6321,14 +6294,14 @@
+@@ -6668,17 +6641,17 @@
  .sp
  Once changesets become public, extensions like mq and rebase will
  refuse to operate on them to prevent creating duplicate changesets.
@@ -4515,8 +4993,21 @@
 -if needed. See \%\fBhg help \-v phase\fP\: for examples.
 +Phases can also be manually manipulated with the \fBhg phase\fP command
 +if needed. See \fBhg help \-v phase\fP for examples.
+ .sp
+ To make yours commits secret by default, put this in your
+ configuration file:
+ .sp
+ .nf
+-.ft C
++.ft
+ [phases]
+ new\-commit = secret
+-.ft P
++.ft
+ .fi
  .SS Phases and servers
  .sp
+@@ -6685,7 +6658,7 @@
  Normally, all servers are \fBpublishing\fP by default. This means:
  .sp
  .nf
@@ -4525,7 +5016,7 @@
  \- all draft changesets that are pulled or cloned appear in phase
  public on the client
  
-@@ -6336,7 +6309,7 @@
+@@ -6693,7 +6666,7 @@
  client and server
  
  \- secret changesets are neither pushed, pulled, or cloned
@@ -4534,7 +5025,7 @@
  .fi
  .IP Note
  .
-@@ -6349,13 +6322,13 @@
+@@ -6706,13 +6679,13 @@
  repository to disable publishing in its configuration file:
  .sp
  .nf
@@ -4551,7 +5042,7 @@
  .IP Note
  .
  Servers running older versions of Mercurial are treated as
-@@ -6369,17 +6342,17 @@
+@@ -6726,17 +6699,17 @@
  of the secret changeset may be communicated to the server.
  .RE
  .SS Examples
@@ -4574,7 +5065,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -6386,9 +6359,9 @@
+@@ -6743,9 +6716,9 @@
  change all secret changesets to draft:
  .sp
  .nf
@@ -4586,7 +5077,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -6395,9 +6368,9 @@
+@@ -6752,9 +6725,9 @@
  forcibly move the current changeset and descendants from public to draft:
  .sp
  .nf
@@ -4598,7 +5089,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -6404,9 +6377,9 @@
+@@ -6761,9 +6734,9 @@
  show a list of changeset revision and phase:
  .sp
  .nf
@@ -4610,7 +5101,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -6413,15 +6386,15 @@
+@@ -6770,15 +6743,15 @@
  resynchronize draft changesets relative to a remote repository:
  .sp
  .nf
@@ -4632,7 +5123,7 @@
  .SH SPECIFYING SINGLE REVISIONS
  .sp
  Mercurial supports several ways to specify individual revisions.
-@@ -6467,18 +6440,18 @@
+@@ -6824,18 +6797,18 @@
  .sp
  Special characters can be used in quoted identifiers by escaping them,
  e.g., \fB\en\fP is interpreted as a newline. To prevent them from being
@@ -4655,7 +5146,7 @@
  .TP
  .B \fBx::y\fP
  .sp
-@@ -6517,18 +6490,18 @@
+@@ -6874,18 +6847,18 @@
  .B \fBx~n\fP
  .sp
  The nth first ancestor of x; \fBx~0\fP is x; \fBx~3\fP is \fBx^^^\fP.
@@ -4678,7 +5169,7 @@
  .TP
  .B \fBadds(pattern)\fP
  .sp
-@@ -6561,7 +6534,7 @@
+@@ -6918,7 +6891,7 @@
  .B \fBbisect(string)\fP
  .sp
  Changesets marked in the specified bisect status:
@@ -4687,7 +5178,7 @@
  .IP \(bu 2
  .
  \fBgood\fP, \fBbad\fP, \fBskip\fP: csets explicitly marked as good/bad/skip
-@@ -6583,7 +6556,7 @@
+@@ -6940,7 +6913,7 @@
  .IP \(bu 2
  .
  \fBcurrent\fP            : the cset currently being bisected
@@ -4696,7 +5187,7 @@
  .TP
  .B \fBbookmark([name])\fP
  .sp
-@@ -6628,8 +6601,8 @@
+@@ -6985,8 +6958,8 @@
  .TP
  .B \fBcontains(pattern)\fP
  .sp
@@ -4707,7 +5198,7 @@
  .sp
  The pattern without explicit kind like \fBglob:\fP is expected to be
  relative to the current directory and match against a file exactly
-@@ -6642,7 +6615,7 @@
+@@ -6999,7 +6972,7 @@
  .TP
  .B \fBdate(interval)\fP
  .sp
@@ -4716,7 +5207,7 @@
  .TP
  .B \fBdesc(string)\fP
  .sp
-@@ -6694,7 +6667,7 @@
+@@ -7051,7 +7024,7 @@
  .sp
  For performance reasons, visits only revisions mentioned in the file\-level
  filelog, rather than filtering through all changesets (much faster, but
@@ -4725,7 +5216,7 @@
  result, use \fBfile()\fP.
  .sp
  The pattern without explicit kind like \fBglob:\fP is expected to be
-@@ -6701,7 +6674,7 @@
+@@ -7058,7 +7031,7 @@
  relative to the current directory and match against a file exactly
  for efficiency.
  .sp
@@ -4734,14 +5225,14 @@
  work around it to return a non\-filtered value.
  .TP
  .B \fBfirst(set, [n])\fP
-@@ -6710,13 +6683,13 @@
- .TP
- .B \fBfollow([file])\fP
+@@ -7067,13 +7040,13 @@
+ .TP
+ .B \fBfollow([pattern])\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 a filename is specified, the history of the given file is followed,
- including copies.
+ If pattern is specified, the histories of files matching given
+ pattern is followed, including copies.
  .TP
  .B \fBgrep(regex)\fP
  .sp
@@ -4750,7 +5241,7 @@
  to ensure special escape characters are handled correctly. Unlike
  \fBkeyword(string)\fP, the match is case\-sensitive.
  .TP
-@@ -6840,7 +6813,7 @@
+@@ -7197,7 +7170,7 @@
  .TP
  .B \fBpresent(set)\fP
  .sp
@@ -4759,7 +5250,7 @@
  all revisions in set.
  .sp
  If any of specified revisions is not present in the local repository,
-@@ -6854,7 +6827,7 @@
+@@ -7211,7 +7184,7 @@
  .B \fBremote([id [,path]])\fP
  .sp
  Local revision that corresponds to the given identifier in a
@@ -4768,7 +5259,7 @@
  synonym for the current local branch.
  .TP
  .B \fBremoves(pattern)\fP
-@@ -6887,7 +6860,7 @@
+@@ -7244,7 +7217,7 @@
  as \fB\-key\fP to sort in descending order.
  .sp
  The keys can be:
@@ -4777,7 +5268,7 @@
  .IP \(bu 2
  .
  \fBrev\fP for the revision number,
-@@ -6903,7 +6876,7 @@
+@@ -7260,7 +7233,7 @@
  .IP \(bu 2
  .
  \fBdate\fP for the commit date
@@ -4786,7 +5277,7 @@
  .TP
  .B \fBsubrepo([pattern])\fP
  .sp
-@@ -6929,15 +6902,15 @@
+@@ -7286,15 +7259,15 @@
  If \fIstring\fP starts with \fIre:\fP, the remainder of the string is treated as
  a regular expression. To match a user that actually contains \fIre:\fP, use
  the prefix \fIliteral:\fP.
@@ -4805,7 +5296,7 @@
  .fi
  .sp
  in the \fBrevsetalias\fP section of a Mercurial configuration file. Arguments
-@@ -6947,12 +6920,12 @@
+@@ -7304,12 +7277,12 @@
  For example,
  .sp
  .nf
@@ -4820,7 +5311,7 @@
  .fi
  .sp
  defines three aliases, \fBh\fP, \fBd\fP, and \fBrs\fP. \fBrs(0:tip, author)\fP is
-@@ -6962,13 +6935,13 @@
+@@ -7319,13 +7292,13 @@
  one string. For example:
  .sp
  .nf
@@ -4838,7 +5329,7 @@
  in this case. This matches against all of "issue 1234", "issue:1234",
  "issue1234" and "bug(1234)".
  .sp
-@@ -6975,10 +6948,10 @@
+@@ -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
@@ -4851,7 +5342,7 @@
  \-f    \->  ::.
  \-d x  \->  date(x)
  \-k x  \->  keyword(x)
-@@ -6987,19 +6960,19 @@
+@@ -7344,19 +7317,19 @@
  \-b x  \->  branch(x)
  \-P x  \->  !::x
  \-l x  \->  limit(expr, x)
@@ -4875,7 +5366,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -7006,9 +6979,9 @@
+@@ -7363,9 +7336,9 @@
  Changesets on the default branch since tag 1.5 (excluding merges):
  .sp
  .nf
@@ -4887,7 +5378,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -7015,9 +6988,9 @@
+@@ -7372,9 +7345,9 @@
  Open branch heads:
  .sp
  .nf
@@ -4899,7 +5390,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -7025,9 +6998,9 @@
+@@ -7382,9 +7355,9 @@
  \fBhgext/*\fP:
  .sp
  .nf
@@ -4912,7 +5403,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -7034,9 +7007,9 @@
+@@ -7391,9 +7364,9 @@
  Changesets committed in May 2008, sorted by user:
  .sp
  .nf
@@ -4925,7 +5416,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -7044,11 +7017,11 @@
+@@ -7401,11 +7374,11 @@
  release:
  .sp
  .nf
@@ -4937,10 +5428,128 @@
  .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 @@
+ .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 @@
+ .IP \(bu 2
+ .
+ Calling out to a command server
+-.UNINDENT
++.RE
+ .sp
+ Executing \fBhg\fP processes is very similar to how humans interact with
+ Mercurial in the shell. It should already be familiar to you.
+ .sp
+-\%\fBhg serve\fP\: can be used to start a server. By default, this will start
++\fBhg serve\fP can be used to start a server. By default, this will start
+ a "hgweb" HTTP server. This HTTP server has support for machine\-readable
+-output, such as JSON. For more, see \%\fBhg help hgweb\fP\:.
++output, such as JSON. For more, see \fBhg help hgweb\fP.
+ .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://mercurial.selenic.com/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 @@
+ .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
+ influence the operation of Mercurial. The following are particularly
+ relevant for machines consuming Mercurial:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B HGPLAIN
+ .
+-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 @@
+ .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 @@
+ 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 @@
+ .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 @@
+ .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
+ increase the amount of data exposed by Mercurial.
+ .sp
+ An alternate way to get the data you need is by explicitly specifying
+ a template.
+ .SS Other Topics
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B revsets
+ .
+@@ -7566,7 +7539,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 @@
+ 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
-@@ -7059,7 +7032,7 @@
+@@ -7592,7 +7565,7 @@
  subrepositories.
  .sp
  Subrepositories are made of three components:
@@ -4949,7 +5558,7 @@
  .IP 1. 3
  .
  Nested repository checkouts. They can appear anywhere in the
-@@ -7072,18 +7045,18 @@
+@@ -7605,18 +7578,18 @@
  subrepositories are referenced like:
  .sp
  .nf
@@ -4972,7 +5581,7 @@
  .fi
  .sp
  where \fBpath/to/nested\fP is the checkout location relatively to the
-@@ -7106,7 +7079,7 @@
+@@ -7639,7 +7612,7 @@
  .
  The \fB.hgsubstate\fP file should not be edited manually.
  .RE
@@ -4981,7 +5590,7 @@
  .SS Adding a Subrepository
  .sp
  If \fB.hgsub\fP does not exist, create it and add it to the parent
-@@ -7114,7 +7087,7 @@
+@@ -7647,7 +7620,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
@@ -4990,7 +5599,7 @@
  .SS Synchronizing a Subrepository
  .sp
  Subrepos do not automatically track the latest changeset of their
-@@ -7131,7 +7104,7 @@
+@@ -7664,7 +7637,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
@@ -4999,7 +5608,7 @@
  .TP
  .B add
  .
-@@ -7166,7 +7139,7 @@
+@@ -7699,7 +7672,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
@@ -5008,7 +5617,7 @@
  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
-@@ -7204,7 +7177,7 @@
+@@ -7739,7 +7712,7 @@
  .B pull
  .
  pull is not recursive since it is not clear what to pull prior
@@ -5017,7 +5626,7 @@
  subrepositories changes referenced by the parent repository pulled
  changesets is expensive at best, impossible in the Subversion
  case.
-@@ -7239,7 +7212,7 @@
+@@ -7774,7 +7747,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.
@@ -5026,7 +5635,7 @@
  .SS Remapping Subrepositories Sources
  .sp
  A subrepository source location may change during a project life,
-@@ -7257,12 +7230,12 @@
+@@ -7792,12 +7765,12 @@
  outgoing, incoming, tip, parents, and heads.
  .sp
  Some built\-in styles are packaged with Mercurial. These can be listed
@@ -5042,7 +5651,7 @@
  .fi
  .sp
  A template is a piece of text, with markup to invoke variable
-@@ -7269,16 +7242,16 @@
+@@ -7804,16 +7777,16 @@
  expansion:
  .sp
  .nf
@@ -5060,9 +5669,18 @@
 -.INDENT 0.0
 +.RS 0
  .TP
- .B author
- .
-@@ -7322,7 +7295,7 @@
+ .B activebookmark
+ .
+@@ -7831,7 +7804,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 @@
  .TP
  .B extras
  .
@@ -5071,7 +5689,7 @@
  field of this changeset.
  .TP
  .B file_adds
-@@ -7368,24 +7341,24 @@
+@@ -7917,24 +7890,24 @@
  .TP
  .B p1node
  .
@@ -5100,7 +5718,7 @@
  second parent, or \-1 if the changeset has no second parent.
  .TP
  .B parents
-@@ -7413,24 +7386,24 @@
+@@ -7962,24 +7935,24 @@
  .B tags
  .
  List of strings. Any tags associated with the changeset.
@@ -5130,7 +5748,7 @@
  .TP
  .B addbreaks
  .
-@@ -7522,7 +7495,7 @@
+@@ -8062,7 +8035,7 @@
  .TP
  .B nonempty
  .
@@ -5139,7 +5757,7 @@
  .TP
  .B obfuscate
  .
-@@ -7596,17 +7569,17 @@
+@@ -8138,17 +8111,17 @@
  .
  Any text. Returns a short representation of a user name or email
  address.
@@ -5157,19 +5775,19 @@
  .
 -Format a date. See \%\fBhg help dates\fP\: for formatting
 +Format a date. See \fBhg help dates\fP for formatting
- strings.
- .TP
- .B diff([includepattern [, excludepattern]])
-@@ -7650,7 +7623,7 @@
- a label applied can result in additional post\-processing, such as
- automatic colorization.
+ strings. The default is a Unix date format, including the timezone:
+ "Mon Sep 04 15:13:13 2006 0700".
+ .TP
+@@ -8210,7 +8183,7 @@
+ Converts a date to the specified timezone.
+ The default is local date.
  .TP
 -.B pad(text, width[, fillchar=\(aq \(aq[, right=False]])
 +.B pad(text, width[, fillchar=' '[, right=False]])
  .
  Pad text with a
  fill character.
-@@ -7658,7 +7631,7 @@
+@@ -8218,7 +8191,7 @@
  .B revset(query[, formatargs...])
  .
  Execute a revision set query. See
@@ -5178,7 +5796,7 @@
  .TP
  .B rstdoc(text, style)
  .
-@@ -7686,25 +7659,25 @@
+@@ -8247,29 +8220,29 @@
  .B word(number, text[, separator])
  .
  Return the nth word from a string.
@@ -5194,6 +5812,11 @@
 -.UNINDENT
 +.RE
  .sp
+ As seen in the above example, "{template}" is interpreted as a template.
+ To prevent it from being interpreted, you can use an escape character "{"
+-or a raw string prefix, "r\(aq...\(aq".
++or a raw string prefix, "r'...'".
+ .sp
  Some sample command line templates:
 -.INDENT 0.0
 +.RS 0
@@ -5211,7 +5834,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -7711,9 +7684,9 @@
+@@ -8276,9 +8249,9 @@
  Join the list of files with a ", ":
  .sp
  .nf
@@ -5224,7 +5847,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -7720,9 +7693,9 @@
+@@ -8285,9 +8258,9 @@
  Modify each line of a commit description:
  .sp
  .nf
@@ -5237,7 +5860,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -7729,9 +7702,9 @@
+@@ -8294,9 +8267,9 @@
  Format date:
  .sp
  .nf
@@ -5250,20 +5873,32 @@
  .fi
  .IP \(bu 2
  .
-@@ -7738,9 +7711,9 @@
+@@ -8303,9 +8276,9 @@
+ Display date in UTC:
+ .sp
+ .nf
+-.ft C
+-$ hg log \-r 0 \-\-template "{localdate(date, \(aqUTC\(aq)|date}\en"
+-.ft P
++.ft
++$ hg log \-r 0 \-\-template "{localdate(date, 'UTC')|date}\en"
++.ft
+ .fi
+ .IP \(bu 2
+ .
+@@ -8312,9 +8285,9 @@
  Output the description set to a fill\-width of 30:
  .sp
  .nf
 -.ft C
--$ hg log \-r 0 \-\-template "{fill(desc, \(aq30\(aq)}"
--.ft P
-+.ft
-+$ hg log \-r 0 \-\-template "{fill(desc, '30')}"
-+.ft
- .fi
- .IP \(bu 2
- .
-@@ -7747,10 +7720,10 @@
++.ft
+ $ hg log \-r 0 \-\-template "{fill(desc, 30)}"
+-.ft P
++.ft
+ .fi
+ .IP \(bu 2
+ .
+@@ -8321,10 +8294,10 @@
  Use a conditional to test for the default branch:
  .sp
  .nf
@@ -5278,7 +5913,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -7757,9 +7730,9 @@
+@@ -8331,9 +8304,9 @@
  Append a newline if not empty:
  .sp
  .nf
@@ -5291,7 +5926,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -7766,9 +7739,9 @@
+@@ -8340,9 +8313,9 @@
  Label the output for use with the color extension:
  .sp
  .nf
@@ -5304,7 +5939,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -7775,36 +7748,36 @@
+@@ -8349,27 +8322,27 @@
  Invert the firstline filter, i.e. everything but the first line:
  .sp
  .nf
@@ -5330,15 +5965,28 @@
  .fi
  .IP \(bu 2
  .
--Mark the current bookmark with \(aq*\(aq:
-+Mark the current bookmark with '*':
- .sp
- .nf
--.ft C
--$ hg log \-\-template "{bookmarks % \(aq{bookmark}{ifeq(bookmark, current, \e"*\e")} \(aq}\en"
--.ft P
-+.ft
-+$ hg log \-\-template "{bookmarks % '{bookmark}{ifeq(bookmark, current, \e"*\e")} '}\en"
+-Mark the active bookmark with \(aq*\(aq:
++Mark the active bookmark with '*':
+ .sp
+ .nf
+-.ft C
+-$ hg log \-\-template "{bookmarks % \(aq{bookmark}{ifeq(bookmark, active, \(aq*\(aq)} \(aq}\en"
+-.ft P
++.ft
++$ hg log \-\-template "{bookmarks % '{bookmark}{ifeq(bookmark, active, '*')} '}\en"
++.ft
+ .fi
+ .IP \(bu 2
+ .
+@@ -8376,18 +8349,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"
+-.ft P
++.ft
++$ hg log \-r . \-\-template "{latesttag('re:^.*\-rc$') % '{tag}, {changes}, {distance}'}\en"
 +.ft
  .fi
  .IP \(bu 2
@@ -5356,25 +6004,39 @@
  .fi
  .IP \(bu 2
  .
-@@ -7811,9 +7784,9 @@
+@@ -8394,9 +8367,9 @@
+ Show details of parent revisions:
+ .sp
+ .nf
+-.ft C
+-$ hg log \-\-template "{revset(\(aqparents(%d)\(aq, rev) % \(aq{desc|firstline}\en\(aq}"
+-.ft P
++.ft
++$ hg log \-\-template "{revset('parents(%d)', rev) % '{desc|firstline}\en'}"
++.ft
+ .fi
+ .IP \(bu 2
+ .
+@@ -8403,9 +8376,9 @@
  Show only commit descriptions that start with "template":
  .sp
  .nf
 -.ft C
-+.ft
- $ hg log \-\-template "{startswith(\e"template\e", firstline(desc))}\en"
--.ft P
-+.ft
- .fi
- .IP \(bu 2
- .
-@@ -7820,34 +7793,34 @@
+-$ hg log \-\-template "{startswith(\(aqtemplate\(aq, firstline(desc))}\en"
+-.ft P
++.ft
++$ hg log \-\-template "{startswith('template', firstline(desc))}\en"
++.ft
+ .fi
+ .IP \(bu 2
+ .
+@@ -8412,34 +8385,34 @@
  Print the first word of each line of a commit message:
  .sp
  .nf
 -.ft C
 +.ft
- $ hg log \-\-template "{word(\e"0\e", desc)}\en"
+ $ hg log \-\-template "{word(0, desc)}\en"
 -.ft P
 +.ft
  .fi
@@ -5413,7 +6075,7 @@
  possible if the feature is explicitly enabled on the remote Mercurial
  server.
  .sp
-@@ -7855,7 +7828,7 @@
+@@ -8447,7 +8420,7 @@
  web.cacerts.
  .sp
  Some notes about using SSH with Mercurial:
@@ -5422,7 +6084,7 @@
  .IP \(bu 2
  .
  SSH requires an accessible shell account on the destination machine
-@@ -7862,63 +7835,63 @@
+@@ -8454,63 +8427,63 @@
  and a copy of hg in the remote path or specified with as remotecmd.
  .IP \(bu 2
  .
@@ -5502,7 +6164,7 @@
  .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.
-@@ -7942,7 +7915,7 @@
+@@ -8534,7 +8507,7 @@
  distinguish them.
  .sp
  The order in which access checks are performed is:
@@ -5511,7 +6173,7 @@
  .IP 1. 3
  .
  Deny  list for branches (section \fBacl.deny.branches\fP)
-@@ -7955,7 +7928,7 @@
+@@ -8547,7 +8520,7 @@
  .IP 4. 3
  .
  Allow list for paths    (section \fBacl.allow\fP)
@@ -5520,7 +6182,7 @@
  .sp
  The allow and deny sections take key\-value pairs.
  .SS Branch\-based Access Control
-@@ -7963,7 +7936,7 @@
+@@ -8555,7 +8528,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:
@@ -5529,7 +6191,7 @@
  .IP \(bu 2
  .
  a branch name, or
-@@ -7970,10 +7943,10 @@
+@@ -8562,10 +8535,10 @@
  .IP \(bu 2
  .
  an asterisk, to match any branch;
@@ -5542,7 +6204,7 @@
  .IP \(bu 2
  .
  a comma\-separated list containing users and groups, or
-@@ -7980,7 +7953,7 @@
+@@ -8572,7 +8545,7 @@
  .IP \(bu 2
  .
  an asterisk, to match anyone;
@@ -5551,7 +6213,7 @@
  .sp
  You can add the "!" prefix to a user or group name to invert the sense
  of the match.
-@@ -8002,7 +7975,7 @@
+@@ -8594,7 +8567,7 @@
  .SS Example Configuration
  .sp
  .nf
@@ -5560,7 +6222,7 @@
  [hooks]
  
  # Use this if you want to check access restrictions at commit time
-@@ -8078,12 +8051,12 @@
+@@ -8670,12 +8643,12 @@
  src/main/resources/** = *
  
  \&.hgtags = release_engineer
@@ -5576,7 +6238,7 @@
  be created.
  .sp
  The "!" prefix allows you to prevent anyone except a given user or group to
-@@ -8095,18 +8068,18 @@
+@@ -8687,18 +8660,18 @@
  3) Deny access to a file to anyone but user "gollum"
  .sp
  .nf
@@ -5600,7 +6262,7 @@
  lake = !@hobbit
  
  # You can also deny access based on file paths:
-@@ -8115,10 +8088,10 @@
+@@ -8707,10 +8680,10 @@
  # Empty
  
  [acl.deny]
@@ -5614,7 +6276,7 @@
  .fi
  .SS blackbox
  .sp
-@@ -8129,7 +8102,7 @@
+@@ -8721,7 +8694,7 @@
  Examples:
  .sp
  .nf
@@ -5623,7 +6285,7 @@
  [blackbox]
  track = *
  
-@@ -8144,7 +8117,7 @@
+@@ -8736,7 +8709,7 @@
  maxsize = 1.5 MB
  # rotate up to N log files when the current one gets too big
  maxfiles = 3
@@ -5632,7 +6294,7 @@
  .fi
  .SS Commands
  .SS blackbox
-@@ -8152,20 +8125,20 @@
+@@ -8744,20 +8717,20 @@
  view the recent repository events:
  .sp
  .nf
@@ -5657,7 +6319,7 @@
  .SS bugzilla
  .sp
  hooks for integrating with the Bugzilla bug tracker
-@@ -8178,7 +8151,7 @@
+@@ -8770,7 +8743,7 @@
  hours spent working on the bug. Bugs can also be marked fixed.
  .sp
  Three basic modes of access to Bugzilla are provided:
@@ -5666,7 +6328,7 @@
  .IP 1. 3
  .
  Access via the Bugzilla XMLRPC interface. Requires Bugzilla 3.4 or later.
-@@ -8190,7 +8163,7 @@
+@@ -8782,7 +8755,7 @@
  .
  Writing directly to the Bugzilla database. Only Bugzilla installations
  using MySQL are supported. Requires Python MySQLdb.
@@ -5675,7 +6337,7 @@
  .sp
  Writing directly to the database is susceptible to schema changes, and
  relies on a Bugzilla contrib script to send out bug change
-@@ -8218,12 +8191,12 @@
+@@ -8810,12 +8783,12 @@
  works on all supported Bugzilla versions.
  .sp
  Configuration items common to all access modes:
@@ -5690,7 +6352,7 @@
  .TP
  .B \fBxmlrpc\fP
  .sp
-@@ -8246,7 +8219,7 @@
+@@ -8838,7 +8811,7 @@
  .sp
  MySQL access, Bugzilla 2.16 and up to but not
  including 2.18.
@@ -5699,7 +6361,7 @@
  .TP
  .B bugzilla.regexp
  .
-@@ -8291,7 +8264,7 @@
+@@ -8883,7 +8856,7 @@
  Template to use when formatting comments. Overrides style if
  specified. In addition to the usual Mercurial keywords, the
  extension specifies:
@@ -5708,7 +6370,7 @@
  .TP
  .B \fB{bug}\fP
  .sp
-@@ -8308,7 +8281,7 @@
+@@ -8900,7 +8873,7 @@
  .B \fB{hgweb}\fP
  .sp
  Base URL for browsing Mercurial repositories.
@@ -5717,7 +6379,7 @@
  .sp
  Default \fBchangeset {node|short} in repo {root} refers to bug
  {bug}.\endetails:\en\et{desc|tabindent}\fP
-@@ -8325,10 +8298,10 @@
+@@ -8917,10 +8890,10 @@
  .
  Base URL for browsing Mercurial repositories. Referenced from
  templates as \fB{hgweb}\fP.
@@ -5730,7 +6392,7 @@
  .TP
  .B bugzilla.usermap
  .
-@@ -8337,13 +8310,13 @@
+@@ -8929,13 +8902,13 @@
  line:
  .sp
  .nf
@@ -5747,7 +6409,7 @@
  .sp
  The \fB[usermap]\fP section is used to specify mappings of Mercurial
  committer email to Bugzilla user email. See also \fBbugzilla.usermap\fP.
-@@ -8350,7 +8323,7 @@
+@@ -8942,7 +8915,7 @@
  Contains entries of the form \fBcommitter = Bugzilla user\fP.
  .sp
  XMLRPC access mode configuration:
@@ -5756,7 +6418,7 @@
  .TP
  .B bugzilla.bzurl
  .
-@@ -8365,22 +8338,22 @@
+@@ -8957,22 +8930,22 @@
  .B bugzilla.password
  .
  The password for Bugzilla login.
@@ -5783,7 +6445,7 @@
  .TP
  .B bugzilla.host
  .
-@@ -8420,12 +8393,12 @@
+@@ -9012,12 +8985,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".
@@ -5798,7 +6460,7 @@
  [extensions]
  bugzilla =
  
-@@ -8432,7 +8405,7 @@
+@@ -9024,7 +8997,7 @@
  [hooks]
  # run bugzilla hook on every change pulled or pushed in here
  incoming.bugzilla = python:hgext.bugzilla.hook
@@ -5807,7 +6469,7 @@
  .fi
  .sp
  Example configurations:
-@@ -8444,7 +8417,7 @@
+@@ -9036,7 +9009,7 @@
  with a web interface at \fBhttp://my\-project.org/hg\fP.
  .sp
  .nf
@@ -5816,7 +6478,7 @@
  [bugzilla]
  bzurl=http://my\-project.org/bugzilla
  user=bugmail@my\-project.org
-@@ -8457,7 +8430,7 @@
+@@ -9049,7 +9022,7 @@
  
  [web]
  baseurl=http://my\-project.org/hg
@@ -5825,7 +6487,7 @@
  .fi
  .sp
  XMLRPC+email example configuration. This uses the Bugzilla at
-@@ -8469,7 +8442,7 @@
+@@ -9061,7 +9034,7 @@
  \fBbugzilla@my\-project.org\fP.
  .sp
  .nf
@@ -5834,7 +6496,7 @@
  [bugzilla]
  bzurl=http://my\-project.org/bugzilla
  user=bugmail@my\-project.org
-@@ -8486,7 +8459,7 @@
+@@ -9078,7 +9051,7 @@
  
  [usermap]
  user@emaildomain.com=user.name@bugzilladomain.com
@@ -5843,7 +6505,7 @@
  .fi
  .sp
  MySQL example configuration. This has a local Bugzilla 3.2 installation
-@@ -8497,7 +8470,7 @@
+@@ -9089,7 +9062,7 @@
  with a web interface at \fBhttp://my\-project.org/hg\fP.
  .sp
  .nf
@@ -5852,7 +6514,7 @@
  [bugzilla]
  host=localhost
  password=XYZZY
-@@ -8514,18 +8487,18 @@
+@@ -9106,18 +9079,18 @@
  
  [usermap]
  user@emaildomain.com=user.name@bugzilladomain.com
@@ -5874,13 +6536,13 @@
  .fi
  .SS censor
  .sp
-@@ -8539,14 +8512,14 @@
+@@ -9131,14 +9104,14 @@
  Typical uses for censor are due to security or legal requirements, including:
  .sp
  .nf
 -.ft C
 +.ft
- * Passwords, private keys, crytographic material
+ * Passwords, private keys, cryptographic material
  * Licensed data/code/libraries for which the license has expired
  * Personally Identifiable Information or other private data
 -.ft P
@@ -5892,7 +6554,7 @@
  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
-@@ -8556,13 +8529,13 @@
+@@ -9148,13 +9121,13 @@
  .SS censor
  .sp
  .nf
@@ -5909,12 +6571,50 @@
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
-@@ -8571,13 +8544,13 @@
+@@ -9163,42 +9136,42 @@
  .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)
@@ -5926,7 +6626,7 @@
  .SS Commands
  .SS children
  .sp
-@@ -8584,12 +8557,12 @@
+@@ -9205,30 +9178,30 @@
  show the children of the given or working directory revision:
  .sp
  .nf
@@ -5942,16 +6642,32 @@
  revision is given via \-r/\-\-rev, the children of that revision will
  be printed. If a file argument is given, revision in which the
  file was last changed (after the working directory revision or the
-@@ -8596,7 +8569,7 @@
  argument to \-\-rev if given) is printed.
  .sp
+-Please use \%\fBhg log\fP\: instead:
++Please use \fBhg log\fP instead:
+ .sp
+ .nf
+-.ft C
+-hg children => hg log \-r \(aqchildren()\(aq
+-hg children \-r REV => hg log \-r \(aqchildren(REV)\(aq
+-.ft P
++.ft
++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.
+ .sp
  Options:
 -.INDENT 0.0
 +.RS 0
  .TP
  .BI \-r,  \-\-rev \ <REV>
  .
-@@ -8609,7 +8582,7 @@
+@@ -9241,7 +9214,7 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template
@@ -5960,7 +6676,7 @@
  .SS churn
  .sp
  command to display statistics about repository history
-@@ -8619,9 +8592,9 @@
+@@ -9251,9 +9224,9 @@
  histogram of changes to the repository:
  .sp
  .nf
@@ -5972,7 +6688,7 @@
  .fi
  .sp
  This command will display a histogram representing the number
-@@ -8637,7 +8610,7 @@
+@@ -9269,7 +9242,7 @@
  Examples:
  .sp
  .nf
@@ -5981,7 +6697,7 @@
  # display count of changed lines for every committer
  hg churn \-t "{author|email}"
  
-@@ -8649,7 +8622,7 @@
+@@ -9281,7 +9254,7 @@
  
  # display count of lines changed in every year
  hg churn \-f "%Y" \-s
@@ -5990,7 +6706,7 @@
  .fi
  .sp
  It is possible to map alternate email addresses to a main address
-@@ -8656,9 +8629,9 @@
+@@ -9288,9 +9261,9 @@
  by providing a file using the following format:
  .sp
  .nf
@@ -6002,7 +6718,7 @@
  .fi
  .sp
  Such a file may be specified with the \-\-aliases option, otherwise
-@@ -8666,7 +8639,7 @@
+@@ -9298,7 +9271,7 @@
  Aliases will be split from the rightmost "=".
  .sp
  Options:
@@ -6011,7 +6727,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV[+]>
  .
-@@ -8711,7 +8684,7 @@
+@@ -9343,7 +9316,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -6019,8 +6735,154 @@
 +.RE
  .sp
  [+] marked option can be specified multiple times
- .SS color
-@@ -8731,10 +8704,10 @@
+ .SS clonebundles
+@@ -9356,7 +9329,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
+@@ -9364,8 +9337,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
+@@ -9392,10 +9365,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
+ repository could have been updated between when the bundle was created
+ and when the client started the clone.)
+-.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
+@@ -9405,7 +9378,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,
+@@ -9419,23 +9392,23 @@
+ .
+ A process for keeping the bundles manifest in sync with available bundle
+ files.
+-.UNINDENT
++.RE
+ .sp
+-Strictly speaking, using a static file hosting server isn\(aqt required: a server
++Strictly speaking, using a static file hosting server isn't required: a server
+ operator could use a dynamic service for retrieving bundle data. However,
+ static file hosting services are simple and scalable and should be sufficient
+ for most needs.
+ .sp
+-Bundle files can be generated with the \%\fBhg bundle\fP\: command. Typically
+-\%\fBhg bundle \-\-all\fP\: is used to produce a bundle of the entire repository.
++Bundle files can be generated with the \fBhg bundle\fP command. Typically
++\fBhg bundle \-\-all\fP is used to produce a bundle of the entire repository.
+ .sp
+-\%\fBhg debugcreatestreamclonebundle\fP\: can be used to produce a special
++\fBhg debugcreatestreamclonebundle\fP can be used to produce a special
+ \fIstreaming clone bundle\fP. These are bundle files that are extremely efficient
+ to produce and consume (read: fast). However, they are larger than
+ traditional bundle formats and require that clients support the exact set
+ of repository data store formats in use by the repository that created them.
+ Typically, a newer server can serve data that is compatible with older clients.
+-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
+@@ -9448,12 +9421,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
++.RS 0
++.RS 3
+ .sp
+ <URL> [<key>=<value>[ <key>=<value>]]
+-.UNINDENT
+-.UNINDENT
++.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
+@@ -9466,7 +9439,7 @@
+ data center closest to them.
+ .sp
+ The following reserved keys are currently defined:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B BUNDLESPEC
+ .
+@@ -9473,21 +9446,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.
+ .sp
+ The values are parsed in strict mode, which means they must be of the
+ "<compression>\-<type>" form. See
+ mercurial.exchange.parsebundlespec() for more details.
+ .sp
+-\%\fBhg debugbundle \-\-spec\fP\: can be used to print the bundle specification
++\fBhg debugbundle \-\-spec\fP can be used to print the bundle specification
+ string for a bundle file. The output of this command can be used verbatim
+ for the value of \fBBUNDLESPEC\fP (it is already escaped).
+ .sp
+ Clients will automatically filter out specifications that are unknown or
+-unsupported so they won\(aqt attempt to download something that likely won\(aqt
++unsupported so they won't attempt to download something that likely won't
+ apply.
+ .sp
+-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
+@@ -9509,10 +9482,10 @@
+ with the clonebundles facility.
+ .sp
+ Value should be "true".
+-.UNINDENT
++.RE
+ .sp
+ Manifests can contain multiple entries. Assuming metadata is defined, clients
+-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.
+@@ -9522,7 +9495,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
+@@ -9555,10 +9528,10 @@
  available, then effects are rendered with the ECMA\-48 SGR control
  function (aka ANSI escape codes).
  .sp
@@ -6035,7 +6897,7 @@
  Some may not be available for a given terminal type, and will be
  silently ignored.
  .SS Labels
-@@ -8741,8 +8714,8 @@
+@@ -9565,8 +9538,8 @@
  .sp
  Text receives color effects depending on the labels that it has. Many
  default Mercurial commands emit labelled text. You can also define
@@ -6046,7 +6908,7 @@
  that case, effects given to the last label will override any other
  effects. This includes the special "none" effect, which nullifies
  other effects.
-@@ -8750,18 +8723,18 @@
+@@ -9574,18 +9547,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.
@@ -6070,7 +6932,7 @@
  [color]
  status.modified = blue bold underline red_background
  status.added = green bold
-@@ -8770,7 +8743,7 @@
+@@ -9594,7 +9567,7 @@
  status.unknown = magenta bold underline
  status.ignored = black bold
  
@@ -6079,7 +6941,7 @@
  status.clean = none
  status.copied = none
  
-@@ -8815,7 +8788,7 @@
+@@ -9639,7 +9612,7 @@
  shelve.name = blue bold
  
  histedit.remaining = red bold
@@ -6088,7 +6950,7 @@
  .fi
  .SS Custom colors
  .sp
-@@ -8824,18 +8797,18 @@
+@@ -9648,18 +9621,18 @@
  for your terminal type, assuming terminfo mode.  For instance:
  .sp
  .nf
@@ -6113,7 +6975,7 @@
  .SS Modes
  .sp
  By default, the color extension will use ANSI mode (or win32 mode on
-@@ -8843,19 +8816,19 @@
+@@ -9667,19 +9640,19 @@
  terminfo mode, for example), set the following configuration option:
  .sp
  .nf
@@ -6137,7 +6999,7 @@
  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).
-@@ -8866,11 +8839,11 @@
+@@ -9690,11 +9663,11 @@
  the pager is active:
  .sp
  .nf
@@ -6151,7 +7013,7 @@
  .fi
  .sp
  If \fBpagermode\fP is not defined, the \fBmode\fP will be used.
-@@ -8884,13 +8857,13 @@
+@@ -9708,13 +9681,13 @@
  convert a foreign SCM repository to a Mercurial one.:
  .sp
  .nf
@@ -6168,7 +7030,7 @@
  .IP \(bu 2
  .
  Mercurial [hg]
-@@ -8918,10 +8891,10 @@
+@@ -9742,10 +9715,10 @@
  .IP \(bu 2
  .
  Perforce [p4]
@@ -6181,7 +7043,7 @@
  .IP \(bu 2
  .
  Mercurial [hg]
-@@ -8928,7 +8901,7 @@
+@@ -9752,7 +9725,7 @@
  .IP \(bu 2
  .
  Subversion [svn] (history on branches is not preserved)
@@ -6190,7 +7052,7 @@
  .sp
  If no revision is given, all revisions will be converted.
  Otherwise, convert will only import up to the named revision
-@@ -8936,12 +8909,12 @@
+@@ -9760,12 +9733,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
@@ -6205,7 +7067,7 @@
  .TP
  .B \-\-branchsort
  .
-@@ -8966,21 +8939,21 @@
+@@ -9790,21 +9763,21 @@
  try to move closed revisions as close as possible
  to parent branches, only supported by Mercurial
  sources.
@@ -6233,7 +7095,7 @@
  and can be run repeatedly to copy new commits.
  .sp
  The authormap is a simple text file that maps each source commit
-@@ -8989,9 +8962,9 @@
+@@ -9813,9 +9786,9 @@
  author mapping and the line format is:
  .sp
  .nf
@@ -6245,7 +7107,7 @@
  .fi
  .sp
  Empty lines and lines starting with a \fB#\fP are ignored.
-@@ -9001,13 +8974,13 @@
+@@ -9825,13 +9798,13 @@
  directives:
  .sp
  .nf
@@ -6261,7 +7123,7 @@
  .fi
  .sp
  Comment lines start with \fB#\fP. A specified path matches if it
-@@ -9040,9 +9013,9 @@
+@@ -9864,9 +9837,9 @@
  comma\-separated values:
  .sp
  .nf
@@ -6273,7 +7135,7 @@
  .fi
  .sp
  The key is the revision ID in the source
-@@ -9062,9 +9035,9 @@
+@@ -9886,9 +9859,9 @@
  lines of the form:
  .sp
  .nf
@@ -6285,7 +7147,7 @@
  .fi
  .sp
  where "original_branch_name" is the name of the branch in the
-@@ -9076,7 +9049,7 @@
+@@ -9900,7 +9873,7 @@
  .sp
  The Mercurial source recognizes the following configuration
  options, which you can set on the command line with \fB\-\-config\fP:
@@ -6294,7 +7156,7 @@
  .TP
  .B convert.hg.ignoreerrors
  .
-@@ -9093,7 +9066,7 @@
+@@ -9922,7 +9895,7 @@
  .B convert.hg.revs
  .
  revset specifying the source revisions to convert.
@@ -6303,7 +7165,7 @@
  .SS CVS Source
  .sp
  CVS source will use a sandbox (i.e. a checked\-out copy) from CVS
-@@ -9107,7 +9080,7 @@
+@@ -9936,7 +9909,7 @@
  sandbox is ignored.
  .sp
  The following options can be used with \fB\-\-config\fP:
@@ -6312,7 +7174,7 @@
  .TP
  .B convert.cvsps.cache
  .
-@@ -9158,7 +9131,7 @@
+@@ -9987,7 +9960,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.
@@ -6321,7 +7183,7 @@
  .sp
  An additional "debugcvsps" Mercurial command allows the builtin
  changeset merging code to be run without doing a conversion. Its
-@@ -9178,7 +9151,7 @@
+@@ -10007,7 +9980,7 @@
  detection.
  .sp
  The following options can be set with \fB\-\-config\fP:
@@ -6330,7 +7192,7 @@
  .TP
  .B convert.svn.branches
  .
-@@ -9200,28 +9173,28 @@
+@@ -10029,28 +10002,28 @@
  use local time (as determined by the TZ
  environment variable) for changeset date/times. The default
  is False (use UTC).
@@ -6364,7 +7226,7 @@
  .TP
  .B convert.git.similarity
  .
-@@ -9229,7 +9202,7 @@
+@@ -10058,7 +10031,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
@@ -6373,23 +7235,32 @@
  changed. The default is \fB50\fP.
  .TP
  .B convert.git.findcopiesharder
-@@ -9238,7 +9211,7 @@
- files in the working copy instead of just changed ones. This
- is very expensive for large projects, and is only effective when
- \fBconvert.git.similarity\fP is greater than 0. The default is False.
+@@ -10072,13 +10045,13 @@
+ .
+ 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
+ .
+ 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
-@@ -9250,17 +9223,17 @@
- .sp
- It is possible to limit the amount of source history to be
- converted by specifying an initial Perforce revision:
--.INDENT 0.0
-+.RS 0
- .TP
- .B convert.p4.startrev
+@@ -10089,7 +10062,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
+ .
+@@ -10101,7 +10074,7 @@
  .
  specify initial Perforce revision (a
  Perforce changelist number).
@@ -6397,16 +7268,49 @@
 +.RE
  .SS Mercurial Destination
  .sp
+ The Mercurial destination will recognize Mercurial subrepositories in the
+@@ -10113,7 +10086,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
+ 
+@@ -10120,11 +10093,11 @@
+ $ hg convert orig/sub1 converted/sub1
+ $ hg convert orig/sub2 converted/sub2
+ $ hg convert orig converted
+-.ft P
++.ft
+ .fi
+ .sp
  The following options are supported:
 -.INDENT 0.0
 +.RS 0
  .TP
  .B convert.hg.clonebranches
  .
-@@ -9276,10 +9249,10 @@
- .
- preserve branch names. The default is
- True.
+@@ -10143,22 +10116,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
+ value on each commit made in the target repository. The default is None.
+-.UNINDENT
++.RE
+ .SS All Destinations
+ .sp
+ All destination types accept the following options:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B convert.skiptags
+ .
+ does not convert tags from the source repo to the target
+ repo. The default is False.
 -.UNINDENT
 +.RE
  .sp
@@ -6416,16 +7320,16 @@
  .TP
  .BI \-\-authors \ <FILE>
  .
-@@ -9332,7 +9305,7 @@
+@@ -10211,7 +10184,7 @@
  .B \-\-closesort
  .
  try to reorder closed revisions
 -.UNINDENT
 +.RE
+ .sp
+ [+] marked option can be specified multiple times
  .SS eol
- .sp
- automatically manage newlines in repository files
-@@ -9344,7 +9317,7 @@
+@@ -10225,7 +10198,7 @@
  .sp
  The extension reads its configuration from a versioned \fB.hgeol\fP
  configuration file found in the root of the working directory. The
@@ -6434,7 +7338,7 @@
  configuration files. It uses two sections, \fB[patterns]\fP and
  \fB[repository]\fP.
  .sp
-@@ -9357,9 +9330,9 @@
+@@ -10238,9 +10211,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,
@@ -6443,10 +7347,10 @@
  ending: \fBLF\fP on Unix (including Mac OS X) and \fBCRLF\fP on
 -Windows. Note that \fBBIN\fP (do nothing to line endings) is Mercurial\(aqs
 +Windows. Note that \fBBIN\fP (do nothing to line endings) is Mercurial's
- default behaviour; it is only needed if you need to override a later,
+ default behavior; it is only needed if you need to override a later,
  more general pattern.
  .sp
-@@ -9376,7 +9349,7 @@
+@@ -10257,7 +10230,7 @@
  Example versioned \fB.hgeol\fP file:
  .sp
  .nf
@@ -6455,7 +7359,7 @@
  [patterns]
  **.py = native
  **.vcproj = CRLF
-@@ -9386,7 +9359,7 @@
+@@ -10267,7 +10240,7 @@
  
  [repository]
  native = LF
@@ -6464,7 +7368,7 @@
  .fi
  .IP Note
  .
-@@ -9398,12 +9371,12 @@
+@@ -10279,12 +10252,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:
@@ -6479,7 +7383,7 @@
  generate an archive where files have line endings for Windows.
  .IP \(bu 2
  .
-@@ -9417,7 +9390,7 @@
+@@ -10298,7 +10271,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).
@@ -6488,7 +7392,7 @@
  .sp
  The extension provides \fBcleverencode:\fP and \fBcleverdecode:\fP filters
  like the deprecated win32text extension does. This means that you can
-@@ -9433,7 +9406,7 @@
+@@ -10314,7 +10287,7 @@
  \fBeol.checkallhook\fP hook. These hooks are best used as
  \fBpretxnchangegroup\fP hooks.
  .sp
@@ -6497,7 +7401,7 @@
  used.
  .SS extdiff
  .sp
-@@ -9446,12 +9419,12 @@
+@@ -10327,12 +10300,12 @@
  files to compare.
  .sp
  The extdiff extension also allows you to configure new diff commands, so
@@ -6513,7 +7417,7 @@
  cdiff = gdiff \-Nprc5
  ## or the old way:
  #cmd.cdiff = gdiff
-@@ -9467,20 +9440,20 @@
+@@ -10348,20 +10321,20 @@
  # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in
  # your .vimrc
  vimdiff = gvim \-f "+next" \e
@@ -6538,7 +7442,7 @@
  .fi
  .sp
  The extdiff extension will look in your [diff\-tools] and [merge\-tools]
-@@ -9487,17 +9460,17 @@
+@@ -10368,17 +10341,17 @@
  sections for diff tool arguments, when none are specified in [extdiff].
  .sp
  .nf
@@ -6560,7 +7464,7 @@
  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
-@@ -9506,9 +9479,9 @@
+@@ -10387,9 +10360,9 @@
  use external program to diff repository (or selected files):
  .sp
  .nf
@@ -6572,7 +7476,7 @@
  .fi
  .sp
  Show differences between revisions for the specified files, using
-@@ -9527,7 +9500,7 @@
+@@ -10408,7 +10381,7 @@
  to its parent.
  .sp
  Options:
@@ -6581,16 +7485,16 @@
  .TP
  .BI \-p,  \-\-program \ <CMD>
  .
-@@ -9552,7 +9525,7 @@
- .BI \-X,  \-\-exclude \ <PATTERN[+]>
- .
- exclude names matching the given patterns
+@@ -10441,7 +10414,7 @@
+ .B \-S,  \-\-subrepos
+ .
+ recurse into subrepositories
 -.UNINDENT
 +.RE
  .sp
  [+] marked option can be specified multiple times
  .SS factotum
-@@ -9568,9 +9541,9 @@
+@@ -10457,9 +10430,9 @@
  By default, keys are specified as:
  .sp
  .nf
@@ -6602,7 +7506,7 @@
  .fi
  .sp
  If the factotum extension is unable to read the required key, one will be
-@@ -9580,12 +9553,12 @@
+@@ -10469,12 +10442,12 @@
  default, these entries are:
  .sp
  .nf
@@ -6617,7 +7521,7 @@
  .fi
  .sp
  The executable entry defines the full path to the factotum binary. The
-@@ -9600,9 +9573,9 @@
+@@ -10489,9 +10462,9 @@
  pull changes from a remote repository, merge new changes if needed.:
  .sp
  .nf
@@ -6629,7 +7533,7 @@
  .fi
  .sp
  This finds all changes from the repository at the specified path
-@@ -9617,12 +9590,12 @@
+@@ -10506,12 +10479,12 @@
  the newly pulled changes. Local changes are then merged into the
  pulled changes. To switch the merge order, use \-\-switch\-parent.
  .sp
@@ -6644,7 +7548,7 @@
  .TP
  .BI \-r,  \-\-rev \ <REV[+]>
  .
-@@ -9667,7 +9640,7 @@
+@@ -10556,7 +10529,7 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -6653,7 +7557,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS gpg
-@@ -9679,9 +9652,9 @@
+@@ -10568,9 +10541,9 @@
  verify all the signatures there may be for a particular revision:
  .sp
  .nf
@@ -6665,7 +7569,7 @@
  .fi
  .sp
  verify all the signatures there may be for a particular revision
-@@ -9690,18 +9663,18 @@
+@@ -10579,9 +10552,9 @@
  add a signature for the current or given revision:
  .sp
  .nf
@@ -6677,7 +7581,9 @@
  .fi
  .sp
  If no revision is given, the parent of the working directory is used,
- or tip if no revision is checked out.
+@@ -10590,10 +10563,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.
@@ -6688,7 +7594,7 @@
  .TP
  .B \-l,  \-\-local
  .
-@@ -9734,15 +9707,15 @@
+@@ -10626,15 +10599,15 @@
  .BI \-u,  \-\-user \ <USER>
  .
  record the specified user as committer
@@ -6707,7 +7613,16 @@
  .fi
  .sp
  list signed changesets
-@@ -9762,9 +9735,9 @@
+@@ -10643,7 +10616,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
+@@ -10654,9 +10627,9 @@
  show revision history alongside an ASCII revision graph:
  .sp
  .nf
@@ -6719,16 +7634,20 @@
  .fi
  .sp
  Print a revision history alongside a revision graph drawn with
-@@ -9774,7 +9747,7 @@
+@@ -10665,10 +10638,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.
+ .sp
  Options:
 -.INDENT 0.0
 +.RS 0
  .TP
  .B \-f,  \-\-follow
  .
-@@ -9863,7 +9836,7 @@
+@@ -10757,7 +10730,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -6737,7 +7656,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS hgcia
-@@ -9874,7 +9847,7 @@
+@@ -10768,7 +10741,7 @@
  configure it, set the following options in your hgrc:
  .sp
  .nf
@@ -6746,7 +7665,7 @@
  [cia]
  # your registered CIA user name
  user = foo
-@@ -9906,7 +9879,7 @@
+@@ -10800,7 +10773,7 @@
  [web]
  # If you want hyperlinks (optional)
  baseurl = http://server/path/to/repo
@@ -6755,7 +7674,7 @@
  .fi
  .SS hgk
  .sp
-@@ -9918,19 +9891,18 @@
+@@ -10812,19 +10785,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,
@@ -6776,13 +7695,13 @@
 -.ft C
 +.ft
  [hgk]
- path=/location/of/hgk
+ path = /location/of/hgk
 -.ft P
 +.ft
  .fi
  .sp
  hgk can make use of the extdiff extension to visualize revisions.
-@@ -9937,10 +9909,10 @@
+@@ -10831,10 +10803,10 @@
  Assuming you had already configured extdiff vdiff command, just add:
  .sp
  .nf
@@ -6795,7 +7714,7 @@
  .fi
  .sp
  Revisions context menu will now display additional entries to fire
-@@ -9951,37 +9923,37 @@
+@@ -10845,36 +10817,36 @@
  start interactive history viewer:
  .sp
  .nf
@@ -6825,23 +7744,22 @@
 -\%http://pygments.org/\:
 +http://pygments.org/
  .sp
- There is a single configuration option:
+ There are the following configuration options:
  .sp
  .nf
 -.ft C
 +.ft
  [web]
- pygments_style = <style>
--.ft P
-+.ft
- .fi
- .sp
--The default is \(aqcolorful\(aq.
-+The default is 'colorful'.
- .SS histedit
- .sp
- interactive history editing
-@@ -9990,7 +9962,7 @@
+ pygments_style = <style> (default: colorful)
+-highlightfiles = <fileset> (default: size(\(aq<5M\(aq))
++highlightfiles = <fileset> (default: size('<5M'))
+ highlightonlymatchfilename = <bool> (default False)
+-.ft P
++.ft
+ .fi
+ .sp
+ \fBhighlightonlymatchfilename\fP will only highlight files if their type could
+@@ -10889,7 +10861,7 @@
  is as follows, assuming the following history:
  .sp
  .nf
@@ -6850,7 +7768,7 @@
  @  3[tip]   7c2fd3b9020c   2009\-04\-27 18:04 \-0500   durin42
  |    Add delta
  |
-@@ -10002,7 +9974,7 @@
+@@ -10901,7 +10873,7 @@
  |
  o  0   d8d2fcd0e319   2009\-04\-27 18:04 \-0500   durin42
       Add alpha
@@ -6859,7 +7777,7 @@
  .fi
  .sp
  If you were to run \fBhg histedit c561b4e977df\fP, you would see the following
-@@ -10009,7 +9981,7 @@
+@@ -10908,7 +10880,7 @@
  file open in your editor:
  .sp
  .nf
@@ -6868,21 +7786,21 @@
  pick c561b4e977df Add beta
  pick 030b686bedc4 Add gamma
  pick 7c2fd3b9020c Add delta
-@@ -10022,11 +9994,11 @@
+@@ -10921,11 +10893,11 @@
  #  p, pick = use commit
  #  e, edit = use commit, but stop for amending
  #  f, fold = use commit, but combine it with the one above
 -#  r, roll = like fold, but discard this commit\(aqs description
 +#  r, roll = like fold, but discard this commit's description
  #  d, drop = remove commit from history
- #  m, mess = edit message without changing commit content
+ #  m, mess = edit commit message without changing commit content
  #
 -.ft P
 +.ft
  .fi
  .sp
  In this file, lines beginning with \fB#\fP are ignored. You must specify a rule
-@@ -10035,7 +10007,7 @@
+@@ -10934,7 +10906,7 @@
  would reorganize the file to look like this:
  .sp
  .nf
@@ -6891,21 +7809,21 @@
  pick 030b686bedc4 Add gamma
  pick c561b4e977df Add beta
  fold 7c2fd3b9020c Add delta
-@@ -10048,11 +10020,11 @@
+@@ -10947,11 +10919,11 @@
  #  p, pick = use commit
  #  e, edit = use commit, but stop for amending
  #  f, fold = use commit, but combine it with the one above
 -#  r, roll = like fold, but discard this commit\(aqs description
 +#  r, roll = like fold, but discard this commit's description
  #  d, drop = remove commit from history
- #  m, mess = edit message without changing commit content
+ #  m, mess = edit commit message without changing commit content
  #
 -.ft P
 +.ft
  .fi
  .sp
  At which point you close the editor and \fBhistedit\fP starts working. When you
-@@ -10060,21 +10032,21 @@
+@@ -10959,21 +10931,21 @@
  those revisions together, offering you a chance to clean up the commit message:
  .sp
  .nf
@@ -6931,7 +7849,7 @@
  @  2[tip]   989b4d060121   2009\-04\-27 18:04 \-0500   durin42
  |    Add beta and delta.
  |
-@@ -10083,12 +10055,12 @@
+@@ -10982,12 +10954,12 @@
  |
  o  0   d8d2fcd0e319   2009\-04\-27 18:04 \-0500   durin42
       Add alpha
@@ -6946,7 +7864,7 @@
  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.
-@@ -10095,20 +10067,20 @@
+@@ -10994,20 +10966,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
@@ -6973,7 +7891,7 @@
  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
-@@ -10118,7 +10090,7 @@
+@@ -11017,7 +10989,7 @@
  changes, such that we have the following history:
  .sp
  .nf
@@ -6982,7 +7900,7 @@
  @  6[tip]   038383181893   2009\-04\-27 18:04 \-0500   stefan
  |    Add theta
  |
-@@ -10139,7 +10111,7 @@
+@@ -11038,7 +11010,7 @@
  |
  o  0   d8d2fcd0e319   2009\-04\-27 18:04 \-0500   durin42
       Add alpha
@@ -6991,7 +7909,7 @@
  .fi
  .sp
  If you run \fBhg histedit \-\-outgoing\fP on the clone then it is the same
-@@ -10152,10 +10124,10 @@
+@@ -11052,10 +11024,10 @@
  configuration file:
  .sp
  .nf
@@ -7002,30 +7920,90 @@
 -.ft P
 +.ft
  .fi
+ .sp
+ \fBhg histedit\fP attempts to automatically choose an appropriate base
+@@ -11063,10 +11035,10 @@
+ revset in your configuration file:
+ .sp
+ .nf
+-.ft C
++.ft
+ [histedit]
+ defaultrev = only(.) & draft()
+-.ft P
++.ft
+ .fi
+ .sp
+ By default each edited revision needs to be present in histedit commands.
+@@ -11074,10 +11046,10 @@
+ the drop to be implicit for missing commits by adding:
+ .sp
+ .nf
+-.ft C
++.ft
+ [histedit]
+ dropmissing = True
+-.ft P
++.ft
+ .fi
  .SS Commands
  .SS histedit
-@@ -10163,9 +10135,9 @@
+@@ -11085,15 +11057,15 @@
  interactively edit changeset history:
  .sp
  .nf
 -.ft C
 +.ft
- hg histedit ANCESTOR | \-\-outgoing [URL]
--.ft P
-+.ft
- .fi
- .sp
- This command edits changesets between ANCESTOR and the parent of
-@@ -10173,7 +10145,7 @@
- .sp
- With \-\-outgoing, this edits changesets not found in the
- destination repository. If URL of the destination is omitted, the
--\(aqdefault\-push\(aq (or \(aqdefault\(aq) path will be used.
-+\&'default\-push' (or 'default') path will be used.
- .sp
- For safety, this command is aborted, also if there are ambiguous
- outgoing revisions which may confuse users: for example, there are
-@@ -10181,7 +10153,7 @@
+ hg histedit [OPTIONS] ([ANCESTOR] | \-\-outgoing [URL])
+-.ft P
++.ft
+ .fi
+ .sp
+ This command lets you edit a linear series of changesets (up to
+ and including the working directory, which should be clean).
+ You can:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
+ \fIpick\fP to [re]order a changeset
+@@ -11108,14 +11080,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
+ .IP \(bu 2
+ .
+ \fIedit\fP to edit this changeset
+-.UNINDENT
++.RE
+ .sp
+ There are a number of ways to select the root changeset:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
+ Specify ANCESTOR directly
+@@ -11122,7 +11094,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.default\-push\fP)
+ .IP \(bu 2
+ .
+ Otherwise, the value from the "histedit.defaultrev" config option
+@@ -11130,7 +11102,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
+@@ -11138,13 +11110,13 @@
  .sp
  Use "min(outgoing() and ::.)" or similar revset specification
  instead of \-\-outgoing to specify edit target revision exactly in
@@ -7033,8 +8011,108 @@
 +such ambiguous situation. See \fBhg help revsets\fP for detail about
  selecting revisions.
  .sp
+ Examples:
+-.INDENT 0.0
+-.INDENT 3.5
+-.INDENT 0.0
++.RS 0
++.RS 3
++.RS 0
+ .IP \(bu 2
+ .
+ A number of changes have been made.
+@@ -11153,9 +11125,9 @@
+ Start history editing from revision 3:
+ .sp
+ .nf
+-.ft C
++.ft
+ hg histedit \-r 3
+-.ft P
++.ft
+ .fi
+ .sp
+ An editor opens, containing the list of revisions,
+@@ -11162,11 +11134,11 @@
+ with specific actions specified:
+ .sp
+ .nf
+-.ft C
++.ft
+ pick 5339bf82f0ca 3 Zworgle the foobar
+ pick 8ef592ce7cc4 4 Bedazzle the zerlog
+ pick 0a9639fcda9d 5 Morgify the cromulancy
+-.ft P
++.ft
+ .fi
+ .sp
+ Additional information about the possible actions
+@@ -11174,14 +11146,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':
+ .sp
+ .nf
+-.ft C
++.ft
+ drop 5339bf82f0ca 3 Zworgle the foobar
+ pick 8ef592ce7cc4 4 Bedazzle the zerlog
+ pick 0a9639fcda9d 5 Morgify the cromulancy
+-.ft P
++.ft
+ .fi
+ .IP \(bu 2
+ .
+@@ -11191,9 +11163,9 @@
+ Start history editing from revision 2:
+ .sp
+ .nf
+-.ft C
++.ft
+ hg histedit \-r 2
+-.ft P
++.ft
+ .fi
+ .sp
+ An editor opens, containing the list of revisions,
+@@ -11200,11 +11172,11 @@
+ with specific actions specified:
+ .sp
+ .nf
+-.ft C
++.ft
+ pick 252a1af424ad 2 Blorb a morgwazzle
+ pick 5339bf82f0ca 3 Zworgle the foobar
+ pick 8ef592ce7cc4 4 Bedazzle the zerlog
+-.ft P
++.ft
+ .fi
+ .sp
+ To swap revision 2 and 4, its lines are swapped
+@@ -11211,15 +11183,15 @@
+ in the editor:
+ .sp
+ .nf
+-.ft C
++.ft
+ pick 8ef592ce7cc4 4 Bedazzle the zerlog
+ pick 5339bf82f0ca 3 Zworgle the foobar
+ pick 252a1af424ad 2 Blorb a morgwazzle
+-.ft P
++.ft
+ .fi
+-.UNINDENT
+-.UNINDENT
+-.UNINDENT
++.RE
++.RE
++.RE
+ .sp
  Returns 0 on success, 1 if user intervention is required (not only
-@@ -10189,7 +10161,7 @@
+ for intentional "edit" command, but also for resolving unexpected
+@@ -11226,7 +11198,7 @@
  conflicts).
  .sp
  Options:
@@ -7043,7 +8121,7 @@
  .TP
  .BI \-\-commands \ <FILE>
  .
-@@ -10205,7 +10177,7 @@
+@@ -11242,7 +11214,7 @@
  .TP
  .B \-k,  \-\-keep
  .
@@ -7052,7 +8130,7 @@
  .TP
  .B \-\-abort
  .
-@@ -10222,7 +10194,7 @@
+@@ -11259,7 +11231,7 @@
  .BI \-r,  \-\-rev \ <REV[+]>
  .
  first revision to be edited
@@ -7061,7 +8139,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS keyword
-@@ -10245,7 +10217,7 @@
+@@ -11282,7 +11254,7 @@
  Example:
  .sp
  .nf
@@ -7070,7 +8148,7 @@
  [keyword]
  # expand keywords in every python file except those matching "x*"
  **.py =
-@@ -10254,7 +10226,7 @@
+@@ -11291,7 +11263,7 @@
  [keywordset]
  # prefer svn\- over cvs\-like default keywordmaps
  svn = True
@@ -7079,7 +8157,7 @@
  .fi
  .IP Note
  .
-@@ -10263,11 +10235,11 @@
+@@ -11300,11 +11272,11 @@
  .RE
  .sp
  For [keywordmaps] template mapping and expansion demonstration and
@@ -7093,7 +8171,7 @@
  .TP
  .B \fButcdate\fP
  .sp
-@@ -10280,20 +10252,20 @@
+@@ -11317,20 +11289,20 @@
  .B \fBsvnisodate\fP
  .sp
  "2006\-09\-18 08:13:13 \-700 (Mon, 18 Sep 2006)"
@@ -7120,7 +8198,7 @@
  {desc}" expands to the first line of the changeset description.
  .SS Commands
  .SS kwdemo
-@@ -10301,9 +10273,9 @@
+@@ -11338,9 +11310,9 @@
  print [keywordmaps] configuration and an expansion example:
  .sp
  .nf
@@ -7132,7 +8210,7 @@
  .fi
  .sp
  Show current, custom, or default keyword template maps and their
-@@ -10314,10 +10286,10 @@
+@@ -11351,10 +11323,10 @@
  .sp
  Use \-d/\-\-default to disable current configuration.
  .sp
@@ -7145,7 +8223,7 @@
  .TP
  .B \-d,  \-\-default
  .
-@@ -10326,15 +10298,15 @@
+@@ -11363,15 +11335,15 @@
  .BI \-f,  \-\-rcfile \ <FILE>
  .
  read maps from rcfile
@@ -7164,7 +8242,7 @@
  .fi
  .sp
  Run after (re)enabling keyword expansion.
-@@ -10342,7 +10314,7 @@
+@@ -11379,7 +11351,7 @@
  kwexpand refuses to run if given files contain local changes.
  .sp
  Options:
@@ -7173,7 +8251,7 @@
  .TP
  .BI \-I,  \-\-include \ <PATTERN[+]>
  .
-@@ -10351,7 +10323,7 @@
+@@ -11388,7 +11360,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -7182,7 +8260,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS kwfiles
-@@ -10359,9 +10331,9 @@
+@@ -11396,9 +11368,9 @@
  show files configured for keyword expansion:
  .sp
  .nf
@@ -7194,7 +8272,7 @@
  .fi
  .sp
  List which files in the working directory are matched by the
-@@ -10371,7 +10343,7 @@
+@@ -11408,7 +11380,7 @@
  execution by including only files that are actual candidates for
  expansion.
  .sp
@@ -7203,7 +8281,7 @@
  inclusion and exclusion of files.
  .sp
  With \-A/\-\-all and \-v/\-\-verbose the codes used to show the status
-@@ -10378,16 +10350,16 @@
+@@ -11415,16 +11387,16 @@
  of files are:
  .sp
  .nf
@@ -7223,7 +8301,7 @@
  .TP
  .B \-A,  \-\-all
  .
-@@ -10408,7 +10380,7 @@
+@@ -11445,7 +11417,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -7232,7 +8310,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS kwshrink
-@@ -10416,9 +10388,9 @@
+@@ -11453,9 +11425,9 @@
  revert expanded keywords in the working directory:
  .sp
  .nf
@@ -7244,7 +8322,7 @@
  .fi
  .sp
  Must be run before changing/disabling active keywords.
-@@ -10426,7 +10398,7 @@
+@@ -11463,7 +11435,7 @@
  kwshrink refuses to run if given files contain local changes.
  .sp
  Options:
@@ -7253,7 +8331,7 @@
  .TP
  .BI \-I,  \-\-include \ <PATTERN[+]>
  .
-@@ -10435,7 +10407,7 @@
+@@ -11472,7 +11444,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -7262,7 +8340,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS largefiles
-@@ -10444,10 +10416,10 @@
+@@ -11481,10 +11453,10 @@
  .sp
  Large binary files tend to be not very compressible, not very
  diffable, and not at all mergeable. Such files are not handled
@@ -7275,7 +8353,7 @@
  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
-@@ -10459,18 +10431,18 @@
+@@ -11496,18 +11468,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
@@ -7299,7 +8377,7 @@
  .fi
  .sp
  When you push a changeset that adds/modifies largefiles to a remote
-@@ -10487,8 +10459,8 @@
+@@ -11524,8 +11496,8 @@
  copy to the latest pulled revision (and thereby downloading any new
  largefiles).
  .sp
@@ -7310,7 +8388,7 @@
  .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
-@@ -10507,12 +10479,12 @@
+@@ -11544,12 +11516,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
@@ -7326,7 +8404,7 @@
  .fi
  .sp
  In repositories that already have largefiles in them, any new file
-@@ -10522,20 +10494,20 @@
+@@ -11559,20 +11531,20 @@
  \-\-lfsize option to the add command (also in megabytes):
  .sp
  .nf
@@ -7351,7 +8429,7 @@
  [largefiles]
  patterns =
    *.jpg
-@@ -10542,7 +10514,7 @@
+@@ -11579,7 +11551,7 @@
    re:.*\e.(png|bmp)$
    library.zip
    content/audio/*
@@ -7360,7 +8438,7 @@
  .fi
  .sp
  Files that match one of these patterns will be added as largefiles
-@@ -10551,7 +10523,7 @@
+@@ -11588,7 +11560,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
@@ -7369,7 +8447,7 @@
  command.
  .SS Commands
  .SS lfconvert
-@@ -10559,9 +10531,9 @@
+@@ -11596,9 +11568,9 @@
  convert a normal repository to a largefiles repository:
  .sp
  .nf
@@ -7381,7 +8459,7 @@
  .fi
  .sp
  Convert repository SOURCE to a new repository DEST, identical to
-@@ -10581,7 +10553,7 @@
+@@ -11618,7 +11590,7 @@
  this, the DEST repository can be used without largefiles at all.
  .sp
  Options:
@@ -7390,7 +8468,7 @@
  .TP
  .BI \-s,  \-\-size \ <SIZE>
  .
-@@ -10590,33 +10562,33 @@
+@@ -11627,33 +11599,33 @@
  .B \-\-to\-normal
  .
  convert from a largefiles repo to a normal repo
@@ -7432,7 +8510,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -10623,14 +10595,14 @@
+@@ -11660,14 +11632,14 @@
  pull largefiles on the default branch:
  .sp
  .nf
@@ -7451,7 +8529,7 @@
  .TP
  .BI \-r,  \-\-rev \ <VALUE[+]>
  .
-@@ -10647,7 +10619,7 @@
+@@ -11684,7 +11656,7 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -7460,7 +8538,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS mq
-@@ -10661,10 +10633,10 @@
+@@ -11698,10 +11670,10 @@
  Known patches are represented as patch files in the .hg/patches
  directory. Applied patches are both patch files and changesets.
  .sp
@@ -7473,7 +8551,7 @@
  create new patch                          qnew
  import existing patch                     qimport
  
-@@ -10674,7 +10646,7 @@
+@@ -11711,7 +11683,7 @@
  add known patch to applied stack          qpush
  remove patch from applied stack           qpop
  refresh contents of top applied patch     qrefresh
@@ -7482,8 +8560,8 @@
  .fi
  .sp
  By default, mq will automatically use git patches when required to
-@@ -10682,29 +10654,29 @@
- files creations or deletions. This behaviour can be configured with:
+@@ -11719,29 +11691,29 @@
+ files creations or deletions. This behavior can be configured with:
  .sp
  .nf
 -.ft C
@@ -7521,7 +8599,7 @@
  .sp
  If the working directory contains uncommitted files, qpush, qpop and
  qgoto abort immediately. If \-f/\-\-force is used, the changes are
-@@ -10711,10 +10683,10 @@
+@@ -11748,10 +11720,10 @@
  discarded. Setting:
  .sp
  .nf
@@ -7534,7 +8612,7 @@
  .fi
  .sp
  make them behave as if \-\-keep\-changes were passed, and non\-conflicting
-@@ -10729,15 +10701,15 @@
+@@ -11766,15 +11738,15 @@
  print the patches already applied:
  .sp
  .nf
@@ -7553,7 +8631,7 @@
  .TP
  .B \-1,  \-\-last
  .
-@@ -10746,15 +10718,15 @@
+@@ -11783,15 +11755,15 @@
  .B \-s,  \-\-summary
  .
  print first line of patch header
@@ -7572,7 +8650,7 @@
  .fi
  .sp
  If source is local, destination will have no patches applied. If
-@@ -10767,12 +10739,12 @@
+@@ -11804,12 +11776,12 @@
  default. Use \-p <url> to change.
  .sp
  The patch directory must be a nested Mercurial repository, as
@@ -7587,7 +8665,7 @@
  .TP
  .B \-\-pull
  .
-@@ -10801,21 +10773,21 @@
+@@ -11838,21 +11810,21 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -7614,7 +8692,7 @@
  .TP
  .B \-A,  \-\-addremove
  .
-@@ -10868,23 +10840,23 @@
+@@ -11905,23 +11877,23 @@
  .B \-S,  \-\-subrepos
  .
  recurse into subrepositories
@@ -7645,7 +8723,7 @@
  .fi
  .sp
  The patches must not be applied, and at least one patch is required. Exact
-@@ -10892,10 +10864,10 @@
+@@ -11929,10 +11901,10 @@
  preserved in the patch directory.
  .sp
  To stop managing a patch and move it into permanent history,
@@ -7658,7 +8736,7 @@
  .TP
  .B \-k,  \-\-keep
  .
-@@ -10904,23 +10876,23 @@
+@@ -11941,23 +11913,23 @@
  .BI \-r,  \-\-rev \ <REV[+]>
  .
  stop managing a revision (DEPRECATED)
@@ -7689,7 +8767,7 @@
  .fi
  .sp
  Shows a diff which includes the current patch as well as any
-@@ -10928,8 +10900,8 @@
+@@ -11965,8 +11937,8 @@
  last refresh (thus showing what the current patch would become
  after a qrefresh).
  .sp
@@ -7700,7 +8778,7 @@
  made by the current patch without including changes made since the
  qrefresh.
  .sp
-@@ -10936,7 +10908,7 @@
+@@ -11973,7 +11945,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -7709,7 +8787,7 @@
  .TP
  .B \-a,  \-\-text
  .
-@@ -10993,7 +10965,7 @@
+@@ -12030,7 +12002,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -7718,7 +8796,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS qfinish
-@@ -11001,9 +10973,9 @@
+@@ -12038,9 +12010,9 @@
  move applied patches into repository history:
  .sp
  .nf
@@ -7730,7 +8808,7 @@
  .fi
  .sp
  Finishes the specified revisions (corresponding to applied
-@@ -11022,20 +10994,20 @@
+@@ -12059,20 +12031,20 @@
  Returns 0 on success.
  .sp
  Options:
@@ -7755,7 +8833,7 @@
  .fi
  .sp
  Patches must not yet be applied. Each patch will be successively
-@@ -11051,7 +11023,7 @@
+@@ -12088,7 +12060,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -7764,7 +8842,7 @@
  .TP
  .B \-e,  \-\-edit
  .
-@@ -11068,21 +11040,21 @@
+@@ -12105,21 +12077,21 @@
  .BI \-l,  \-\-logfile \ <FILE>
  .
  read commit message from file
@@ -7790,7 +8868,7 @@
  .TP
  .B \-\-keep\-changes
  .
-@@ -11095,21 +11067,21 @@
+@@ -12132,21 +12104,21 @@
  .B \-\-no\-backup
  .
  do not save backup copies of files
@@ -7817,7 +8895,7 @@
  has activated it.
  .sp
  With no arguments, print the currently active guards.
-@@ -11116,21 +11088,21 @@
+@@ -12153,21 +12125,21 @@
  With arguments, set guards for the named patch.
  .IP Note
  .
@@ -7843,7 +8921,7 @@
  .TP
  .B \-l,  \-\-list
  .
-@@ -11139,15 +11111,15 @@
+@@ -12176,15 +12148,15 @@
  .B \-n,  \-\-none
  .
  drop all guards
@@ -7862,7 +8940,7 @@
  .fi
  .sp
  Returns 0 on success.
-@@ -11156,9 +11128,9 @@
+@@ -12193,9 +12165,9 @@
  import a patch or existing changeset:
  .sp
  .nf
@@ -7874,7 +8952,7 @@
  .fi
  .sp
  The patch is inserted into the series after the last applied
-@@ -11179,7 +11151,7 @@
+@@ -12216,7 +12188,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
@@ -7883,7 +8961,7 @@
  from mq control.
  .sp
  To import a patch from standard input, pass \- as the patch file.
-@@ -11189,15 +11161,15 @@
+@@ -12226,15 +12198,15 @@
  To import an existing patch while renaming it:
  .sp
  .nf
@@ -7902,7 +8980,7 @@
  .TP
  .B \-e,  \-\-existing
  .
-@@ -11222,7 +11194,7 @@
+@@ -12259,7 +12231,7 @@
  .B \-P,  \-\-push
  .
  qpush after importing
@@ -7911,7 +8989,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS qinit
-@@ -11230,9 +11202,9 @@
+@@ -12267,9 +12239,9 @@
  init a new queue repository (DEPRECATED):
  .sp
  .nf
@@ -7923,7 +9001,7 @@
  .fi
  .sp
  The queue repository is unversioned by default. If
-@@ -11241,24 +11213,24 @@
+@@ -12278,24 +12250,24 @@
  an unversioned patch repository into a versioned one). You can use
  qcommit to commit changes to this queue repository.
  .sp
@@ -7954,7 +9032,7 @@
  .fi
  .sp
  qnew creates a new patch on top of the currently\-applied patch (if
-@@ -11274,7 +11246,7 @@
+@@ -12311,7 +12283,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
@@ -7963,7 +9041,7 @@
  .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
-@@ -11284,7 +11256,7 @@
+@@ -12321,7 +12293,7 @@
  Returns 0 on successful creation of a new patch.
  .sp
  Options:
@@ -7972,7 +9050,7 @@
  .TP
  .B \-e,  \-\-edit
  .
-@@ -11329,7 +11301,7 @@
+@@ -12366,7 +12338,7 @@
  .BI \-l,  \-\-logfile \ <FILE>
  .
  read commit message from file
@@ -7981,7 +9059,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS qnext
-@@ -11337,28 +11309,28 @@
+@@ -12374,28 +12346,28 @@
  print the name of the next pushable patch:
  .sp
  .nf
@@ -8016,7 +9094,7 @@
  .fi
  .sp
  Without argument, pops off the top of the patch stack. If given a
-@@ -11373,7 +11345,7 @@
+@@ -12410,7 +12382,7 @@
  Return 0 on success.
  .sp
  Options:
@@ -8025,7 +9103,7 @@
  .TP
  .B \-a,  \-\-all
  .
-@@ -11394,34 +11366,34 @@
+@@ -12431,34 +12403,34 @@
  .B \-\-no\-backup
  .
  do not save backup copies of files
@@ -8067,7 +9145,7 @@
  .fi
  .sp
  By default, abort if the working directory contains uncommitted
-@@ -11432,7 +11404,7 @@
+@@ -12469,7 +12441,7 @@
  Return 0 on success.
  .sp
  Options:
@@ -8076,7 +9154,7 @@
  .TP
  .B \-\-keep\-changes
  .
-@@ -11469,15 +11441,15 @@
+@@ -12506,15 +12478,15 @@
  .B \-\-no\-backup
  .
  do not save backup copies of files
@@ -8095,7 +9173,7 @@
  .fi
  .sp
  Supports switching between different patch queues, as well as creating
-@@ -11499,7 +11471,7 @@
+@@ -12536,7 +12508,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -8104,7 +9182,7 @@
  .TP
  .B \-l,  \-\-list
  .
-@@ -11524,15 +11496,15 @@
+@@ -12561,15 +12533,15 @@
  .B \-\-purge
  .
  delete queue, and remove patch dir
@@ -8123,7 +9201,7 @@
  .fi
  .sp
  If any file patterns are provided, the refreshed patch will
-@@ -11554,7 +11526,7 @@
+@@ -12591,7 +12563,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -8132,7 +9210,7 @@
  .TP
  .B \-e,  \-\-edit
  .
-@@ -11599,7 +11571,7 @@
+@@ -12636,7 +12608,7 @@
  .BI \-l,  \-\-logfile \ <FILE>
  .
  read commit message from file
@@ -8141,7 +9219,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS qrename
-@@ -11607,9 +11579,9 @@
+@@ -12644,9 +12616,9 @@
  rename a patch:
  .sp
  .nf
@@ -8153,7 +9231,7 @@
  .fi
  .sp
  With one argument, renames the current patch to PATCH1.
-@@ -11616,26 +11588,26 @@
+@@ -12653,26 +12625,26 @@
  With two arguments, renames PATCH1 to PATCH2.
  .sp
  Returns 0 on success.
@@ -8188,7 +9266,7 @@
  .TP
  .B \-d,  \-\-delete
  .
-@@ -11644,21 +11616,21 @@
+@@ -12681,21 +12653,21 @@
  .B \-u,  \-\-update
  .
  update queue working directory
@@ -8215,7 +9293,7 @@
  .TP
  .B \-c,  \-\-copy
  .
-@@ -11683,18 +11655,18 @@
+@@ -12720,18 +12692,18 @@
  .BI \-l,  \-\-logfile \ <FILE>
  .
  read commit message from file
@@ -8238,7 +9316,7 @@
  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
-@@ -11701,11 +11673,11 @@
+@@ -12738,11 +12710,11 @@
  match the current guard. For example:
  .sp
  .nf
@@ -8252,7 +9330,7 @@
  .fi
  .sp
  This activates the "stable" guard. mq will skip foo.patch (because
-@@ -11731,7 +11703,7 @@
+@@ -12768,7 +12740,7 @@
  Returns 0 on success.
  .sp
  Options:
@@ -8261,7 +9339,7 @@
  .TP
  .B \-n,  \-\-none
  .
-@@ -11748,21 +11720,21 @@
+@@ -12785,21 +12757,21 @@
  .B \-\-reapply
  .
  pop, then reapply patches
@@ -8287,7 +9365,7 @@
  .TP
  .B \-m,  \-\-missing
  .
-@@ -11771,40 +11743,40 @@
+@@ -12808,40 +12780,40 @@
  .B \-s,  \-\-summary
  .
  print first line of patch header
@@ -8336,7 +9414,7 @@
  .TP
  .B \-1,  \-\-first
  .
-@@ -11813,7 +11785,7 @@
+@@ -12850,7 +12822,7 @@
  .B \-s,  \-\-summary
  .
  print first line of patch header
@@ -8345,7 +9423,7 @@
  .SS notify
  .sp
  hooks for sending email push notifications
-@@ -11821,13 +11793,13 @@
+@@ -12858,13 +12830,13 @@
  This extension implements hooks to send email notifications when
  changesets are sent from or received by the local repository.
  .sp
@@ -8361,7 +9439,7 @@
  [hooks]
  # one email for each incoming changeset
  incoming.notify = python:hgext.notify.hook
-@@ -11836,7 +11808,7 @@
+@@ -12873,7 +12845,7 @@
  
  # one email for all outgoing changesets
  outgoing.notify = python:hgext.notify.hook
@@ -8370,7 +9448,7 @@
  .fi
  .sp
  This registers the hooks. To enable notification, subscribers must
-@@ -11845,7 +11817,7 @@
+@@ -12882,7 +12854,7 @@
  multiple recipients to a single repository:
  .sp
  .nf
@@ -8379,7 +9457,7 @@
  [usersubs]
  # key is subscriber email, value is a comma\-separated list of repo patterns
  user@host = pattern
-@@ -11853,7 +11825,7 @@
+@@ -12890,7 +12862,7 @@
  [reposubs]
  # key is repo pattern, value is a comma\-separated list of subscriber emails
  pattern = user@host
@@ -8388,7 +9466,7 @@
  .fi
  .sp
  A \fBpattern\fP is a \fBglob\fP matching the absolute path to a repository,
-@@ -11861,10 +11833,10 @@
+@@ -12898,10 +12870,10 @@
  present, is separated from the glob by a hash. Example:
  .sp
  .nf
@@ -8401,7 +9479,7 @@
  .fi
  .sp
  This sends to \fBqa\-team@example.com\fP whenever a changeset on the \fBrelease\fP
-@@ -11875,10 +11847,10 @@
+@@ -12912,10 +12884,10 @@
  incorporated by reference:
  .sp
  .nf
@@ -8414,7 +9492,7 @@
  .fi
  .sp
  Notifications will not be sent until the \fBnotify.test\fP value is set
-@@ -11885,7 +11857,7 @@
+@@ -12922,7 +12894,7 @@
  to \fBFalse\fP; see below.
  .sp
  Notifications content can be tweaked with the following configuration entries:
@@ -8423,7 +9501,7 @@
  .TP
  .B notify.test
  .
-@@ -11894,8 +11866,8 @@
+@@ -12931,8 +12903,8 @@
  .B notify.sources
  .
  Space\-separated list of change sources. Notifications are activated only
@@ -8434,7 +9512,7 @@
  .TP
  .B \fBserve\fP
  .sp
-@@ -11916,7 +11888,7 @@
+@@ -12953,7 +12925,7 @@
  .B \fBbundle\fP
  .sp
  changesets sent via \fBhg unbundle\fP
@@ -8443,7 +9521,7 @@
  .sp
  Default: serve.
  .TP
-@@ -11959,7 +11931,7 @@
+@@ -12996,7 +12968,7 @@
  .TP
  .B notify.maxsubject
  .
@@ -8452,7 +9530,7 @@
  .TP
  .B notify.diffstat
  .
-@@ -11978,11 +11950,11 @@
+@@ -13015,11 +12987,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.
@@ -8466,7 +9544,7 @@
  .TP
  .B email.from
  .
-@@ -11993,7 +11965,7 @@
+@@ -13030,7 +13002,7 @@
  .
  Root repository URL to combine with repository paths when making
  references. See also \fBnotify.strip\fP.
@@ -8475,7 +9553,7 @@
  .SS pager
  .sp
  browse command output with an external pager
-@@ -12001,10 +11973,10 @@
+@@ -13038,10 +13010,10 @@
  To set the pager that should be used, set the application variable:
  .sp
  .nf
@@ -8488,7 +9566,7 @@
  .fi
  .sp
  If no pager is set, the pager extensions uses the environment variable
-@@ -12014,10 +11986,10 @@
+@@ -13051,10 +13023,10 @@
  pager.ignore list:
  .sp
  .nf
@@ -8501,7 +9579,7 @@
  .fi
  .sp
  You can also enable the pager only for certain commands using
-@@ -12024,10 +11996,10 @@
+@@ -13061,10 +13033,10 @@
  pager.attend. Below is the default list of commands to be paged:
  .sp
  .nf
@@ -8514,7 +9592,7 @@
  .fi
  .sp
  Setting pager.attend to an empty value will cause all commands to be
-@@ -12040,13 +12012,13 @@
+@@ -13077,13 +13049,13 @@
  existing attend and ignore options and defaults:
  .sp
  .nf
@@ -8530,8 +9608,23 @@
 +To ignore global commands like \fBhg version\fP or \fBhg help\fP, you have
  to specify them in your user configuration file.
  .sp
- The \-\-pager=... option can also be used to control when the pager is
-@@ -12062,7 +12034,7 @@
+ To control whether the pager is used at all for an individual command,
+@@ -13090,12 +13062,12 @@
+ you can use \-\-pager=<value>:
+ .sp
+ .nf
+-.ft C
++.ft
+ \- use as needed: \(gaauto\(ga.
+ \- require the pager: \(gayes\(ga or \(gaon\(ga.
+ \- suppress the pager: \(gano\(ga or \(gaoff\(ga (any unrecognized value
+ will also work).
+-.ft P
++.ft
+ .fi
+ .SS patchbomb
+ .sp
+@@ -13107,7 +13079,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:
@@ -8540,7 +9633,7 @@
  .IP \(bu 2
  .
  The changeset description.
-@@ -12071,8 +12043,8 @@
+@@ -13116,8 +13088,8 @@
  [Optional] The result of running diffstat on the patch.
  .IP \(bu 2
  .
@@ -8551,7 +9644,7 @@
  .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
-@@ -12082,7 +12054,7 @@
+@@ -13127,7 +13099,7 @@
  configuration file:
  .sp
  .nf
@@ -8560,7 +9653,7 @@
  [email]
  from = My Name <my@email>
  to = recipient1, recipient2, ...
-@@ -12089,13 +12061,13 @@
+@@ -13134,13 +13106,13 @@
  cc = cc1, cc2, ...
  bcc = bcc1, bcc2, ...
  reply\-to = address1, address2, ...
@@ -8576,7 +9669,26 @@
  changesets as a patchbomb.
  .sp
  You can also either configure the method option in the email section
-@@ -12109,12 +12081,12 @@
+@@ -13149,15 +13121,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
+ you do not supply one via configuration or the command line.  You can
+ override this to never prompt by configuring an empty value:
+ .sp
+ .nf
+-.ft C
++.ft
+ [email]
+ cc =
+-.ft P
++.ft
+ .fi
+ .sp
+ You can control the default inclusion of an introduction message with the
+@@ -13165,12 +13137,12 @@
  overwritten by command line flags like \-\-intro and \-\-desc:
  .sp
  .nf
@@ -8591,7 +9703,7 @@
  .fi
  .sp
  You can set patchbomb to always ask for confirmation by setting
-@@ -12125,13 +12097,13 @@
+@@ -13181,13 +13153,13 @@
  send changesets by email:
  .sp
  .nf
@@ -8608,7 +9720,7 @@
  of N]" introduction, which describes the series as a whole.
  .sp
  Each patch email has a Subject line of "[PATCH M of N] ...", using
-@@ -12142,7 +12114,7 @@
+@@ -13198,7 +13170,7 @@
  With the \-d/\-\-diffstat option, if the diffstat program is
  installed, the result of running diffstat on the patch is inserted.
  .sp
@@ -8617,7 +9729,16 @@
  .sp
  With the \-d/\-\-diffstat or \-\-confirm options, you will be presented
  with a final summary of all messages and asked for confirmation before
-@@ -12180,12 +12152,12 @@
+@@ -13218,7 +13190,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
+@@ -13237,12 +13209,12 @@
  introductory message in \fB.hg/last\-email.txt\fP.
  .sp
  The default behavior of this command can be customized through
@@ -8632,7 +9753,7 @@
  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
-@@ -12206,7 +12178,7 @@
+@@ -13263,7 +13235,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
@@ -8641,7 +9762,7 @@
  .fi
  .sp
  Before using this command, you will need to enable email in your
-@@ -12213,7 +12185,7 @@
+@@ -13270,7 +13242,7 @@
  hgrc. See the [email] section in hgrc(5) for details.
  .sp
  Options:
@@ -8650,7 +9771,7 @@
  .TP
  .B \-g,  \-\-git
  .
-@@ -12330,7 +12302,7 @@
+@@ -13387,7 +13359,7 @@
  .B \-\-insecure
  .
  do not verify server certificate (ignoring web.cacerts config)
@@ -8658,32 +9779,8 @@
 +.RE
  .sp
  [+] marked option can be specified multiple times
- .SS progress
-@@ -12345,7 +12317,7 @@
- The following settings are available:
- .sp
- .nf
--.ft C
-+.ft
- [progress]
- delay = 3 # number of seconds (float) before showing the progress bar
- changedelay = 1 # changedelay: minimum delay before showing a new topic.
-@@ -12355,11 +12327,11 @@
- format = topic bar number estimate # format of the progress bar
- width = <none> # if set, the maximum width of the progress information
-                # (that is, min(width, term width) will be used)
--clear\-complete = True # clear the progress bar after it\(aqs done
--disable = False # if true, don\(aqt show a progress bar
-+clear\-complete = True # clear the progress bar after it's done
-+disable = False # if true, don't show a progress bar
- assume\-tty = False # if true, ALWAYS show a progress bar, unless
-                    # disable is given
--.ft P
-+.ft
- .fi
- .sp
- Valid entries for the format field are topic, bar, number, unit,
-@@ -12376,9 +12348,9 @@
+ .SS purge
+@@ -13399,9 +13371,9 @@
  removes files not tracked by Mercurial:
  .sp
  .nf
@@ -8695,7 +9792,7 @@
  .fi
  .sp
  Delete files not known to Mercurial. This is useful to test local
-@@ -12385,18 +12357,18 @@
+@@ -13408,18 +13380,18 @@
  and uncommitted changes in an otherwise\-clean source tree.
  .sp
  This means that purge will delete the following by default:
@@ -8718,7 +9815,7 @@
  .IP \(bu 2
  .
  Modified and unmodified tracked files
-@@ -12405,8 +12377,8 @@
+@@ -13428,8 +13400,8 @@
  Ignored files (unless \-\-all is specified)
  .IP \(bu 2
  .
@@ -8729,7 +9826,7 @@
  .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,
-@@ -12421,7 +12393,7 @@
+@@ -13444,7 +13416,7 @@
  option.
  .sp
  Options:
@@ -8738,7 +9835,7 @@
  .TP
  .B \-a,  \-\-abort\-on\-err
  .
-@@ -12454,15 +12426,15 @@
+@@ -13477,15 +13449,15 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -8759,16 +9856,16 @@
  .SS rebase
  .sp
  command to move sets of revisions to a different ancestor
-@@ -12471,7 +12443,7 @@
+@@ -13494,7 +13466,7 @@
  repository.
  .sp
  For more information:
--\%http://mercurial.selenic.com/wiki/RebaseExtension\:
-+http://mercurial.selenic.com/wiki/RebaseExtension
+-\%https://mercurial\-scm.org/wiki/RebaseExtension\:
++https://mercurial\-scm.org/wiki/RebaseExtension
  .SS Commands
  .SS rebase
  .sp
-@@ -12478,9 +12450,9 @@
+@@ -13501,9 +13473,9 @@
  move changeset (and descendants) to a different branch:
  .sp
  .nf
@@ -8780,28 +9877,45 @@
  .fi
  .sp
  Rebase uses repeated merging to graft changesets from one part of
-@@ -12494,9 +12466,9 @@
- pulling in your rebased changesets.
- .sp
- In its default configuration, Mercurial will prevent you from
--rebasing published changes. See \%\fBhg help phases\fP\: for details.
-+rebasing published changes. See \fBhg help phases\fP for details.
+@@ -13511,18 +13483,18 @@
+ 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't specify a destination changeset (\fB\-d/\-\-dest\fP),
  rebase uses the current branch tip as the destination. (The
  destination changeset is not modified by rebasing, but new
  changesets are added as its descendants.)
-@@ -12528,7 +12500,7 @@
- and source branch is that, unlike \fBmerge\fP, rebase will do
- nothing if you are at the branch tip of a named branch
- with two heads. You need to explicitly specify source and/or
--destination (or \fBupdate\fP to the other head, if it\(aqs the head of
-+destination (or \fBupdate\fP to the other head, if it's the head of
- the intended source branch).
- .sp
- If a rebase is interrupted to manually resolve a merge, it can be
-@@ -12535,7 +12507,7 @@
+ .sp
+ Here are the ways to select changesets:
+-.INDENT 0.0
+-.INDENT 3.5
+-.INDENT 0.0
++.RS 0
++.RS 3
++.RS 0
+ .IP 1. 3
+ .
+ Explicitly select them using \fB\-\-rev\fP.
+@@ -13538,9 +13510,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
+-.UNINDENT
++.RE
++.RE
++.RE
+ .sp
+ Rebase will destroy original changesets unless you use \fB\-\-keep\fP.
+ It will also move your bookmarks (even if you do).
+@@ -13556,7 +13528,7 @@
  continued with \-\-continue/\-c or aborted with \-\-abort/\-a.
  .sp
  Examples:
@@ -8810,7 +9924,7 @@
  .IP \(bu 2
  .
  move "local changes" (current commit back to branching point)
-@@ -12542,9 +12514,9 @@
+@@ -13563,9 +13535,9 @@
  to the current branch tip after a pull:
  .sp
  .nf
@@ -8822,7 +9936,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -12551,9 +12523,9 @@
+@@ -13572,9 +13544,9 @@
  move a single changeset to the stable branch:
  .sp
  .nf
@@ -8834,7 +9948,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -12560,9 +12532,9 @@
+@@ -13581,9 +13553,9 @@
  splice a commit and all its descendants onto another part of history:
  .sp
  .nf
@@ -8846,7 +9960,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -12570,9 +12542,9 @@
+@@ -13591,9 +13563,9 @@
  default branch:
  .sp
  .nf
@@ -8858,7 +9972,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -12579,9 +12551,9 @@
+@@ -13600,9 +13572,9 @@
  collapse a sequence of changes into a single commit:
  .sp
  .nf
@@ -8870,7 +9984,7 @@
  .fi
  .IP \(bu 2
  .
-@@ -12588,17 +12560,17 @@
+@@ -13609,17 +13581,17 @@
  move a named branch while preserving its name:
  .sp
  .nf
@@ -8892,7 +10006,7 @@
  .TP
  .BI \-s,  \-\-source \ <REV>
  .
-@@ -12667,7 +12639,7 @@
+@@ -13688,7 +13660,7 @@
  .BI \-T,  \-\-template \ <TEMPLATE>
  .
  display with template
@@ -8901,7 +10015,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS record
-@@ -12679,12 +12651,12 @@
+@@ -13700,12 +13672,12 @@
  interactively record a new patch:
  .sp
  .nf
@@ -8917,7 +10031,7 @@
  usage.
  .SS record
  .sp
-@@ -12691,15 +12663,15 @@
+@@ -13712,15 +13684,15 @@
  interactively select changes to commit:
  .sp
  .nf
@@ -8937,7 +10051,7 @@
  .sp
  You will be prompted for whether to record changes to each
  modified file, and for files with multiple changes, for each
-@@ -12707,7 +12679,7 @@
+@@ -13728,7 +13700,7 @@
  possible:
  .sp
  .nf
@@ -8946,7 +10060,7 @@
  y \- record this change
  n \- skip this change
  e \- edit this change manually
-@@ -12720,13 +12692,13 @@
+@@ -13741,13 +13713,13 @@
  q \- quit, recording no changes
  
  ? \- display help
@@ -8962,7 +10076,7 @@
  .TP
  .B \-A,  \-\-addremove
  .
-@@ -12787,7 +12759,7 @@
+@@ -13808,7 +13780,7 @@
  .B \-B,  \-\-ignore\-blank\-lines
  .
  ignore changes whose lines are all blank
@@ -8971,7 +10085,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS relink
-@@ -12799,9 +12771,9 @@
+@@ -13820,9 +13792,9 @@
  recreate hardlinks between two repositories:
  .sp
  .nf
@@ -8983,7 +10097,7 @@
  .fi
  .sp
  When repositories are cloned locally, their data files will be
-@@ -12833,18 +12805,18 @@
+@@ -13854,18 +13826,18 @@
  lot of repositories to act like a scheme, for example:
  .sp
  .nf
@@ -9006,7 +10120,7 @@
  .fi
  .sp
  Additionally there is support for some more complex schemas, for
-@@ -12851,10 +12823,10 @@
+@@ -13872,10 +13844,10 @@
  example used by Google Code:
  .sp
  .nf
@@ -9019,7 +10133,7 @@
  .fi
  .sp
  The syntax is taken from Mercurial templates, and you have unlimited
-@@ -12866,7 +12838,7 @@
+@@ -13887,7 +13859,7 @@
  For convenience, the extension adds these schemes by default:
  .sp
  .nf
@@ -9028,7 +10142,7 @@
  [schemes]
  py = http://hg.python.org/
  bb = https://bitbucket.org/
-@@ -12873,7 +12845,7 @@
+@@ -13894,7 +13866,7 @@
  bb+ssh = ssh://hg@bitbucket.org/
  gcode = https://{1}.googlecode.com/hg/
  kiln = https://{1}.kilnhg.com/Repo/
@@ -9037,7 +10151,48 @@
  .fi
  .sp
  You can override a predefined scheme by defining a new scheme with the
-@@ -12887,9 +12859,9 @@
+@@ -13904,19 +13876,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
+ automatically share/pool storage across multiple clones. This
+-mode effectively converts \%\fBhg clone\fP\: to \%\fBhg clone\fP\: + \%\fBhg share\fP\:.
++mode effectively converts \fBhg clone\fP to \fBhg clone\fP + \fBhg share\fP.
+ The benefit of using this mode is the automatic management of
+ store paths and intelligent pooling of related repositories.
+ .sp
+ The following \fBshare.\fP config options influence this feature:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \fBshare.pool\fP
+ .sp
+ Filesystem path where shared repository data will be stored. When
+-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
+@@ -13928,13 +13900,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
+ path or URL. In this mode, storage is only shared if the path or URL
+-requested in the \%\fBhg clone\fP\: command matches exactly to a repository
++requested in the \fBhg clone\fP command matches exactly to a repository
+ that was cloned before.
+ .sp
+ The default naming mode is "identity."
+-.UNINDENT
++.RE
+ .SS Commands
+ .SS share
+ .sp
+@@ -13941,9 +13913,9 @@
  create a new shared repository:
  .sp
  .nf
@@ -9049,7 +10204,7 @@
  .fi
  .sp
  Initialize a new repository and working directory that shares its
-@@ -12907,7 +12879,7 @@
+@@ -13961,7 +13933,7 @@
  .RE
  .sp
  Options:
@@ -9058,7 +10213,7 @@
  .TP
  .B \-U,  \-\-noupdate
  .
-@@ -12916,15 +12888,15 @@
+@@ -13970,15 +13942,15 @@
  .B \-B,  \-\-bookmarks
  .
  also share bookmarks
@@ -9077,7 +10232,7 @@
  .fi
  .sp
  Copy the store data to the repo and remove the sharedpath data.
-@@ -12938,7 +12910,7 @@
+@@ -13992,7 +13964,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
@@ -9086,7 +10241,7 @@
  conflicts if necessary.
  .sp
  You can have more than one shelved change outstanding at a time; each
-@@ -12950,9 +12922,9 @@
+@@ -14004,9 +13976,9 @@
  save and set aside changes from the working directory:
  .sp
  .nf
@@ -9098,7 +10253,7 @@
  .fi
  .sp
  Shelving takes files that "hg status" reports as not clean, saves
-@@ -12980,7 +12952,7 @@
+@@ -14034,7 +14006,7 @@
  all shelved changes, use \fB\-\-cleanup\fP.
  .sp
  Options:
@@ -9107,7 +10262,7 @@
  .TP
  .B \-A,  \-\-addremove
  .
-@@ -13033,7 +13005,7 @@
+@@ -14091,7 +14063,7 @@
  .BI \-X,  \-\-exclude \ <PATTERN[+]>
  .
  exclude names matching the given patterns
@@ -9116,7 +10271,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS unshelve
-@@ -13041,9 +13013,9 @@
+@@ -14099,9 +14071,9 @@
  restore a shelved change to the working directory:
  .sp
  .nf
@@ -9128,8 +10283,8 @@
  .fi
  .sp
  This command accepts an optional name of a shelved change to
-@@ -13064,7 +13036,7 @@
- does not delete the bundle.)
+@@ -14132,7 +14104,7 @@
+ prevents from deciding exact order of them, for safety.
  .sp
  Options:
 -.INDENT 0.0
@@ -9137,7 +10292,7 @@
  .TP
  .B \-a,  \-\-abort
  .
-@@ -13081,7 +13053,7 @@
+@@ -14153,7 +14125,7 @@
  .BI \-\-date \ <DATE>
  .
  set date for temporary commits (DEPRECATED)
@@ -9146,7 +10301,7 @@
  .SS strip
  .sp
  strip changesets and their descendants from history
-@@ -13094,9 +13066,9 @@
+@@ -14166,9 +14138,9 @@
  strip changesets and all their descendants from the repository:
  .sp
  .nf
@@ -9158,7 +10313,7 @@
  .fi
  .sp
  The strip command removes the specified changesets and all their
-@@ -13110,8 +13082,8 @@
+@@ -14182,8 +14154,8 @@
  completes.
  .sp
  Any stripped changesets are stored in \fB.hg/strip\-backup\fP as a
@@ -9169,7 +10324,7 @@
  where BUNDLE is the bundle file created by the strip. Note that
  the local revision numbers will in general be different after the
  restore.
-@@ -13126,7 +13098,7 @@
+@@ -14198,7 +14170,7 @@
  Return 0 on success.
  .sp
  Options:
@@ -9178,8 +10333,8 @@
  .TP
  .BI \-r,  \-\-rev \ <REV[+]>
  .
-@@ -13155,7 +13127,7 @@
- .BI \-B,  \-\-bookmark \ <VALUE>
+@@ -14227,7 +14199,7 @@
+ .BI \-B,  \-\-bookmark \ <VALUE[+]>
  .
  remove revs only reachable from given bookmark
 -.UNINDENT
@@ -9187,7 +10342,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS transplant
-@@ -13163,7 +13135,7 @@
+@@ -14235,7 +14207,7 @@
  command to transplant changesets from another branch
  .sp
  This extension allows you to transplant changes to another parent revision,
@@ -9196,7 +10351,7 @@
  .sp
  Transplanted patches are recorded in .hg/transplant/transplants, as a
  map from a changeset hash to its hash in the source repository.
-@@ -13173,9 +13145,9 @@
+@@ -14245,9 +14217,9 @@
  transplant changesets from another branch:
  .sp
  .nf
@@ -9208,7 +10363,7 @@
  .fi
  .sp
  Selected changesets will be applied on top of the current working
-@@ -13192,9 +13164,9 @@
+@@ -14264,9 +14236,9 @@
  of the form:
  .sp
  .nf
@@ -9220,7 +10375,7 @@
  .fi
  .sp
  You can rewrite the changelog message with the \-\-filter option.
-@@ -13210,17 +13182,17 @@
+@@ -14282,17 +14254,17 @@
  with \-\-branch will be transplanted.
  .sp
  Example:
@@ -9242,7 +10397,7 @@
  .sp
  You can optionally mark selected transplanted changesets as merge
  changesets. You will not be prompted to transplant any ancestors
-@@ -13228,17 +13200,17 @@
+@@ -14300,17 +14272,17 @@
  normally instead of transplanting them.
  .sp
  Merge changesets may be transplanted directly by specifying the
@@ -9265,7 +10420,7 @@
  .TP
  .BI \-s,  \-\-source \ <REPO>
  .
-@@ -13279,7 +13251,7 @@
+@@ -14351,7 +14323,7 @@
  .BI \-\-filter \ <CMD>
  .
  filter changesets through command
@@ -9274,7 +10429,7 @@
  .sp
  [+] marked option can be specified multiple times
  .SS win32mbcs
-@@ -13294,7 +13266,7 @@
+@@ -14366,7 +14338,7 @@
  operation.
  .sp
  This extension is useful for:
@@ -9283,7 +10438,7 @@
  .IP \(bu 2
  .
  Japanese Windows users using shift_jis encoding.
-@@ -13305,10 +13277,10 @@
+@@ -14377,10 +14349,10 @@
  .
  All users who use a repository with one of problematic encodings on
  case\-insensitive file system.
@@ -9296,7 +10451,7 @@
  .IP \(bu 2
  .
  Any user who use only ASCII chars in path.
-@@ -13315,10 +13287,10 @@
+@@ -14387,10 +14359,10 @@
  .IP \(bu 2
  .
  Any user who do not use any of problematic encodings.
@@ -9309,7 +10464,7 @@
  .IP \(bu 2
  .
  You should use single encoding in one repository.
-@@ -13328,16 +13300,16 @@
+@@ -14400,16 +14372,16 @@
  .IP \(bu 2
  .
  win32mbcs is not compatible with fixutf8 extension.
@@ -9329,7 +10484,7 @@
  .fi
  .sp
  It is useful for the users who want to commit with UTF\-8 log message.
-@@ -13344,8 +13316,8 @@
+@@ -14416,8 +14388,8 @@
  .SS win32text
  .sp
  perform automatic newline conversion (DEPRECATED)
@@ -9340,7 +10495,7 @@
  .sp
  Deprecation: The win32text extension requires each user to configure
  the extension again and again for each clone since the configuration
-@@ -13354,13 +13326,13 @@
+@@ -14426,13 +14398,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.
@@ -9357,7 +10512,7 @@
  [extensions]
  win32text =
  [encode]
-@@ -13370,17 +13342,17 @@
+@@ -14442,17 +14414,17 @@
  [decode]
  ** = cleverdecode:
  # or ** = macdecode:
@@ -9378,7 +10533,7 @@
  .fi
  .sp
  To do the same check on a server to prevent CRLF/CR from being
-@@ -13387,11 +13359,11 @@
+@@ -14459,11 +14431,11 @@
  pushed or pulled:
  .sp
  .nf
@@ -9392,7 +10547,7 @@
  .fi
  .SS zeroconf
  .sp
-@@ -13402,33 +13374,33 @@
+@@ -14474,33 +14446,33 @@
  without knowing their actual IP address.
  .sp
  To allow other people to discover your repository using run
@@ -9435,7 +10590,7 @@
  files.
  .TP
  .B \fB.hgignore\fP
-@@ -13435,13 +13407,13 @@
+@@ -14507,13 +14479,13 @@
  .sp
  This file contains regular expressions (one per line) that
  describe file names that should be ignored by \fBhg\fP. For details,
@@ -9451,7 +10606,7 @@
  .TP
  .B \fB.hgsubstate\fP
  .sp
-@@ -13456,7 +13428,7 @@
+@@ -14528,7 +14500,7 @@
  .TP
  .B \fB.hg/last\-message.txt\fP
  .sp
@@ -9460,7 +10615,7 @@
  in case the commit fails.
  .TP
  .B \fB.hg/localtags\fP
-@@ -13464,28 +13436,34 @@
+@@ -14536,28 +14508,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.
@@ -9491,8 +10646,8 @@
 +Written by Matt Mackall <mpm@selenic.com>
  .SH RESOURCES
  .sp
--Main Web Site: \%http://mercurial.selenic.com/\:
-+Main Web Site: http://mercurial.selenic.com/
+-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: http://selenic.com/hg
@@ -9501,9 +10656,9 @@
 +Mailing list: http://selenic.com/mailman/listinfo/mercurial
  .SH COPYING
  .sp
- Copyright (C) 2005\-2015 Matt Mackall.
---- mercurial-3.4/doc/hgignore.5.orig	Fri May  1 14:49:19 2015
-+++ mercurial-3.4/doc/hgignore.5	Mon May  4 14:57:28 2015
+ Copyright (C) 2005\-2016 Matt Mackall.
+--- mercurial-3.7.1/doc/hgignore.5.orig	Wed Feb  3 14:00:05 2016
++++ mercurial-3.7.1/doc/hgignore.5	Thu Feb  4 10:13:47 2016
 @@ -3,33 +3,6 @@
  .TH HGIGNORE 5 "" "" "Mercurial Manual"
  .SH NAME
@@ -9585,7 +10740,12 @@
  .sp
  The chosen syntax stays in effect when parsing all patterns that
  follow, until another syntax is selected.
-@@ -106,7 +79,7 @@
+@@ -106,11 +79,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.
  .IP Note
  .
  Patterns specified in other than \fB.hgignore\fP are always rooted.
@@ -9594,7 +10754,7 @@
  .RE
  .SH EXAMPLE
  .sp
-@@ -113,7 +86,7 @@
+@@ -117,7 +90,7 @@
  Here is an example ignore file.
  .sp
  .nf
@@ -9603,7 +10763,7 @@
  # use glob syntax.
  syntax: glob
  
-@@ -124,16 +97,16 @@
+@@ -128,16 +101,16 @@
  # switch to regexp syntax.
  syntax: regexp
  ^\e.pc/
@@ -9624,8 +10784,8 @@
  .SH COPYING
  .sp
  This manual page is copyright 2006 Vadim Gelfer.
---- mercurial-3.4/doc/hgrc.5.orig	Fri May  1 14:49:20 2015
-+++ mercurial-3.4/doc/hgrc.5	Mon May  4 14:57:32 2015
+--- mercurial-3.7.1/doc/hgrc.5.orig	Wed Feb  3 14:00:02 2016
++++ mercurial-3.7.1/doc/hgrc.5	Thu Feb  4 10:13:51 2016
 @@ -3,33 +3,6 @@
  .TH HGRC 5 "" "" "Mercurial Manual"
  .SH NAME
@@ -9660,7 +10820,22 @@
  .SH DESCRIPTION
  .sp
  The Mercurial system uses a set of configuration files to control
-@@ -40,11 +13,11 @@
+@@ -36,11 +9,11 @@
+ aspects of its behavior.
+ .SH TROUBLESHOOTING
+ .sp
+-If you\(aqre having problems with your configuration,
+-\%\fBhg config \-\-debug\fP\: can help you understand what is introducing
++If you're having problems with your configuration,
++\fBhg config \-\-debug\fP can help you understand what is introducing
+ a setting into your environment.
+ .sp
+-See \%\fBhg help config.syntax\fP\: and \%\fBhg help config.files\fP\:
++See \fBhg help config.syntax\fP and \fBhg help config.files\fP
+ for information about how and where to override things.
+ .SH STRUCTURE
+ .sp
+@@ -49,15 +22,15 @@
  by \fBname = value\fP entries:
  .sp
  .nf
@@ -9674,17 +10849,31 @@
  .fi
  .sp
  The above entries will be referred to as \fBui.username\fP and
-@@ -54,8 +27,7 @@
+-\fBui.verbose\fP, respectively. See \%\fBhg help config.syntax\fP\:.
++\fBui.verbose\fP, respectively. See \fBhg help config.syntax\fP.
+ .SH FILES
+ .sp
  Mercurial reads configuration data from several files, if they exist.
- These files do not exist by default and you will have to create the
- appropriate configuration files yourself: global configuration like
--the username setting is typically put into
--\fB%USERPROFILE%\emercurial.ini\fP or \fB$HOME/.hgrc\fP and local
-+the username setting is typically put into \fB$HOME/.hgrc\fP and local
- configuration is put into the per\-repository \fB<repo>/.hg/hgrc\fP file.
+@@ -67,16 +40,11 @@
+ Local configuration is put into the per\-repository \fB<repo>/.hg/hgrc\fP file.
+ .sp
+ Global configuration like the username setting is typically put into:
+-.INDENT 0.0
++.RS 0
+ .IP \(bu 2
+ .
+-\fB%USERPROFILE%\emercurial.ini\fP (on Windows)
+-.UNINDENT
+-.INDENT 0.0
+-.IP \(bu 2
+-.
+ \fB$HOME/.hgrc\fP (on Unix, Plan9)
+-.UNINDENT
++.RE
  .sp
  The names of these files depend on the system on which Mercurial is
-@@ -64,8 +36,8 @@
+ installed. \fB*.rc\fP files from a single directory are read in
+@@ -84,8 +52,8 @@
  paths are given below, settings from earlier paths override later
  ones.
  .sp
@@ -9695,7 +10884,7 @@
  .IP \(bu 2
  .
  \fB<repo>/.hg/hgrc\fP (per\-repository)
-@@ -87,79 +59,18 @@
+@@ -107,79 +75,16 @@
  .IP \(bu 2
  .
  \fB<internal>/default.d/*.rc\fP (defaults)
@@ -9720,13 +10909,13 @@
 -\fB%HOME%\eMercurial.ini\fP (per\-user)
 -.IP \(bu 2
 -.
--\fB<install\-dir>\eMercurial.ini\fP (per\-installation)
+-\fBHKEY_LOCAL_MACHINE\eSOFTWARE\eMercurial\fP (per\-installation)
 -.IP \(bu 2
 -.
 -\fB<install\-dir>\ehgrc.d\e*.rc\fP (per\-installation)
 -.IP \(bu 2
 -.
--\fBHKEY_LOCAL_MACHINE\eSOFTWARE\eMercurial\fP (per\-installation)
+-\fB<install\-dir>\eMercurial.ini\fP (per\-installation)
 -.IP \(bu 2
 -.
 -\fB<internal>/default.d/*.rc\fP (defaults)
@@ -9737,6 +10926,8 @@
 -is used when running 32\-bit Python on 64\-bit Windows.
  .RE
  .sp
+-On Windows 9x, \fB%HOME%\fP is replaced by \fB%APPDATA%\fP.
+-.sp
 -On Plan9, the following files are consulted:
 -.INDENT 0.0
 -.IP \(bu 2
@@ -9765,21 +10956,17 @@
  Per\-repository configuration options only apply in a
  particular repository. This file is not version\-controlled, and
  will not get transferred during a "clone" operation. Options in
--this file override options in all other configuration files. On
--Plan 9 and Unix, most of this file will be ignored if it doesn\(aqt
-+this file override options in all other configuration files.
-+Most of this file will be ignored if it doesn't
- belong to a trusted user or to a trusted group. See the documentation
- for the \fB[trusted]\fP section below for more details.
- .sp
--Per\-user configuration file(s) are for the user running Mercurial. On
--Windows 9x, \fB%HOME%\fP is replaced by \fB%APPDATA%\fP. Options in these
-+Per\-user configuration file(s) are for the user running Mercurial.
-+Options in these
- files apply to all Mercurial commands executed by this user in any
- directory. Options in these files override per\-system and per\-installation
- options.
-@@ -173,10 +84,8 @@
+ this file override options in all other configuration files.
+ .sp
+-On Plan 9 and Unix, most of this file will be ignored if it doesn\(aqt
++On Unix, most of this file will be ignored if it doesn't
+ belong to a trusted user or to a trusted group. See
+-\%\fBhg help config.trusted\fP\: for more details.
++\fBhg help config.trusted\fP for more details.
+ .sp
+ Per\-user configuration file(s) are for the user running Mercurial.  Options
+ in these files apply to all Mercurial commands executed by this user in any
+@@ -197,10 +102,8 @@
  .sp
  Per\-installation configuration files are for the system on
  which Mercurial is running. Options in these files apply to all
@@ -9792,7 +10979,7 @@
  order until one or more configuration files are detected.
  .sp
  Per\-system configuration files are for the system on which Mercurial
-@@ -197,12 +106,12 @@
+@@ -221,12 +124,12 @@
  \fBconfiguration keys\fP):
  .sp
  .nf
@@ -9807,7 +10994,7 @@
  .fi
  .sp
  Each line contains one entry. If the lines that follow are indented,
-@@ -214,12 +123,12 @@
+@@ -238,12 +141,12 @@
  will use the value that was configured last. As an example:
  .sp
  .nf
@@ -9822,7 +11009,7 @@
  .fi
  .sp
  This would set the configuration key named \fBeggs\fP to \fBsmall\fP.
-@@ -229,7 +138,7 @@
+@@ -253,7 +156,7 @@
  example:
  .sp
  .nf
@@ -9831,7 +11018,7 @@
  [foo]
  eggs=large
  ham=serrano
-@@ -244,7 +153,7 @@
+@@ -268,7 +171,7 @@
  ham=prosciutto
  eggs=medium
  bread=toasted
@@ -9840,7 +11027,7 @@
  .fi
  .sp
  This would set the \fBeggs\fP, \fBham\fP, and \fBbread\fP configuration keys
-@@ -266,9 +175,9 @@
+@@ -290,9 +193,9 @@
  \fBfile\fP. This lets you do something like:
  .sp
  .nf
@@ -9852,7 +11039,7 @@
  .fi
  .sp
  to include a different configuration file on each computer you use.
-@@ -285,9 +194,9 @@
+@@ -309,9 +212,9 @@
  placed in double quotation marks:
  .sp
  .nf
@@ -9864,7 +11051,7 @@
  .fi
  .sp
  Quotation marks can be escaped by prefixing them with a backslash. Only
-@@ -311,17 +220,17 @@
+@@ -336,17 +239,17 @@
  Alias definitions consist of lines of the form:
  .sp
  .nf
@@ -9886,7 +11073,7 @@
  .fi
  .sp
  creates a new command \fBlatest\fP that shows only the five most recent
-@@ -328,9 +237,9 @@
+@@ -353,9 +256,9 @@
  changesets. You can define subsequent aliases using earlier ones:
  .sp
  .nf
@@ -9898,7 +11085,7 @@
  .fi
  .IP Note
  .
-@@ -344,9 +253,9 @@
+@@ -369,9 +272,9 @@
  run arbitrary commands. As an example,
  .sp
  .nf
@@ -9910,7 +11097,7 @@
  .fi
  .sp
  will let you do \fBhg echo foo\fP to have \fBfoo\fP printed in your
-@@ -353,9 +262,9 @@
+@@ -378,9 +281,9 @@
  terminal. A better example might be:
  .sp
  .nf
@@ -9922,16 +11109,19 @@
  .fi
  .sp
  which will make \fBhg purge\fP delete all unknown files in the
-@@ -385,7 +294,7 @@
+@@ -408,9 +311,9 @@
+ .SS \fBannotate\fP
+ .sp
  Settings used when displaying file annotations. All values are
- Booleans and default to False. See \fBdiff\fP section for related
- options for the diff command.
+-Booleans and default to False. See \%\fBhg help config.diff\fP\: for
++Booleans and default to False. See \fBhg help config.diff\fP for
+ related options for the diff command.
 -.INDENT 0.0
 +.RS 0
  .TP
  .B \fBignorews\fP
  .sp
-@@ -398,7 +307,7 @@
+@@ -423,20 +326,20 @@
  .B \fBignoreblanklines\fP
  .sp
  Ignore changes whose lines are all blank.
@@ -9940,7 +11130,11 @@
  .SS \fBauth\fP
  .sp
  Authentication credentials for HTTP authentication. This section
-@@ -409,9 +318,9 @@
+ allows you to store usernames and passwords for use when logging
+-\fIinto\fP HTTP servers. See \%\fBhg help config.web\fP\: if
++\fIinto\fP HTTP servers. See \fBhg help config.web\fP if
+ you want to configure \fIwho\fP can login to your HTTP server.
+ .sp
  Each line has the following format:
  .sp
  .nf
@@ -9952,7 +11146,7 @@
  .fi
  .sp
  where \fB<name>\fP is used to group arguments into authentication
-@@ -418,7 +327,7 @@
+@@ -443,7 +346,7 @@
  entries. Example:
  .sp
  .nf
@@ -9961,7 +11155,7 @@
  foo.prefix = hg.intevation.org/mercurial
  foo.username = foo
  foo.password = bar
-@@ -428,11 +337,11 @@
+@@ -453,11 +356,11 @@
  bar.key = path/to/file.key
  bar.cert = path/to/file.cert
  bar.schemes = https
@@ -9975,7 +11169,7 @@
  .TP
  .B \fBprefix\fP
  .sp
-@@ -439,7 +348,7 @@
+@@ -464,7 +367,7 @@
  Either \fB*\fP or a URI prefix with or without the scheme part.
  The authentication entry with the longest matching prefix is used
  (where \fB*\fP matches everything and counts as a match of length
@@ -9984,7 +11178,7 @@
  against the URI with its scheme stripped as well, and the schemes
  argument, q.v., is then subsequently consulted.
  .TP
-@@ -471,11 +380,11 @@
+@@ -496,195 +399,195 @@
  .B \fBschemes\fP
  .sp
  Optional. Space separated list of URI schemes to use this
@@ -9992,13 +11186,22 @@
 +authentication entry with. Only used if the prefix doesn't include
  a scheme. Supported schemes are http and https. They will match
  static\-http and static\-https respectively, as well.
- Default: https.
+ (default: https)
 -.UNINDENT
 +.RE
  .sp
  If no suitable authentication entry is found, the user is prompted
  for credentials as usual if required by the remote.
-@@ -486,176 +395,176 @@
+ .SS \fBcommittemplate\fP
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \fBchangeset\fP
+ .sp
+ String: configuration in this section is used as the template to
+ customize the text shown in the editor when committing.
+-.UNINDENT
++.RE
  .sp
  In addition to pre\-defined template keywords, commit log specific one
  below can be used for customization:
@@ -10028,10 +11231,10 @@
      HG: \-\-
      HG: user: {author}\en{ifeq(p2rev, "\-1", "",
     "HG: branch merge\en")
--   }HG: branch \(aq{branch}\(aq\en{if(currentbookmark,
--   "HG: bookmark \(aq{currentbookmark}\(aq\en")  }{subrepos %
-+   }HG: branch '{branch}'\en{if(currentbookmark,
-+   "HG: bookmark '{currentbookmark}'\en")  }{subrepos %
+-   }HG: branch \(aq{branch}\(aq\en{if(activebookmark,
+-   "HG: bookmark \(aq{activebookmark}\(aq\en")   }{subrepos %
++   }HG: branch '{branch}'\en{if(activebookmark,
++   "HG: bookmark '{activebookmark}'\en")   }{subrepos %
     "HG: subrepo {subrepo}\en"              }{file_adds %
     "HG: added {file}\en"                   }{file_mods %
     "HG: changed {file}\en"                 }{file_dels %
@@ -10047,12 +11250,12 @@
  detail), this customization should be configured carefully, to
  avoid showing broken characters.
  .sp
- For example, if multibyte character ending with backslash (0x5c) is
--followed by ASCII character \(aqn\(aq in the customized template,
--sequence of backslash and \(aqn\(aq is treated as line\-feed unexpectedly
-+followed by ASCII character 'n' in the customized template,
-+sequence of backslash and 'n' is treated as line\-feed unexpectedly
- (and multibyte character is broken, too).
+ For example, if a multibyte character ending with backslash (0x5c) is
+-followed by the ASCII character \(aqn\(aq in the customized template,
+-the sequence of backslash and \(aqn\(aq is treated as line\-feed unexpectedly
++followed by the ASCII character 'n' in the customized template,
++the sequence of backslash and 'n' is treated as line\-feed unexpectedly
+ (and the multibyte character is broken, too).
  .RE
  .sp
  Customized template is used for commands below (\fB\-\-edit\fP may be
@@ -10229,9 +11432,9 @@
 +only for \fBhg tag \-\-remove\fP, but \fBchangeset.tag\fP customizes the
 +commit message for \fBhg tag\fP regardless of \fB\-\-remove\fP option.
  .sp
- At the external editor invocation for committing, corresponding
- dot\-separated list of names without \fBchangeset.\fP prefix
-@@ -666,7 +575,7 @@
+ 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 @@
  below can be referred as \fB{listupfiles}\fP:
  .sp
  .nf
@@ -10240,7 +11443,7 @@
  [committemplate]
  listupfiles = {file_adds %
     "HG: added {file}\en"     }{file_mods %
-@@ -673,7 +582,7 @@
+@@ -703,7 +606,7 @@
     "HG: changed {file}\en"   }{file_dels %
     "HG: removed {file}\en"   }{if(files, "",
     "HG: no files changed\en")}
@@ -10249,7 +11452,7 @@
  .fi
  .SS \fBdecode/encode\fP
  .sp
-@@ -697,7 +606,7 @@
+@@ -727,7 +630,7 @@
  Pipe example:
  .sp
  .nf
@@ -10258,7 +11461,7 @@
  [encode]
  # uncompress gzip files on checkin to improve delta compression
  # note: not necessarily a good idea, just an example
-@@ -705,9 +614,9 @@
+@@ -735,9 +638,9 @@
  
  [decode]
  # recompress gzip files when writing them to the working dir (we
@@ -10270,7 +11473,7 @@
  .fi
  .sp
  A \fBtempfile:\fP command is a template. The string \fBINFILE\fP is replaced
-@@ -715,12 +624,6 @@
+@@ -745,12 +648,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.
@@ -10283,12 +11486,12 @@
  .sp
  This filter mechanism is used internally by the \fBeol\fP extension to
  translate line ending characters between Windows (CRLF) and Unix (LF)
-@@ -727,20 +630,20 @@
+@@ -757,20 +654,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)
+-(defaults are deprecated. Don\(aqt use them. Use aliases instead.)
++(defaults are deprecated. Don't use them. Use aliases instead.)
  .sp
  Use the \fB[defaults]\fP section to define command defaults, i.e. the
  default options/arguments to pass to the specified commands.
@@ -10309,16 +11512,19 @@
  .fi
  .sp
  The actual commands, instead of their aliases, must be used when
-@@ -751,7 +654,7 @@
+@@ -779,9 +676,9 @@
+ .SS \fBdiff\fP
+ .sp
  Settings used when displaying diffs. Everything except for \fBunified\fP
- is a Boolean and defaults to False. See \fBannotate\fP section for
- related options for the annotate command.
+-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
+ for related options for the annotate command.
 -.INDENT 0.0
 +.RS 0
  .TP
  .B \fBgit\fP
  .sp
-@@ -763,11 +666,11 @@
+@@ -793,11 +690,11 @@
  .TP
  .B \fBnodates\fP
  .sp
@@ -10332,7 +11538,7 @@
  .TP
  .B \fBshowfunc\fP
  .sp
-@@ -788,11 +691,11 @@
+@@ -818,11 +715,11 @@
  .B \fBunified\fP
  .sp
  Number of lines of context to show.
@@ -10346,7 +11552,7 @@
  .TP
  .B \fBfrom\fP
  .sp
-@@ -801,16 +704,16 @@
+@@ -831,16 +728,16 @@
  .TP
  .B \fBto\fP
  .sp
@@ -10366,8 +11572,12 @@
  email addresses.
  .TP
  .B \fBmethod\fP
-@@ -833,7 +736,7 @@
- empty (explicit) list.
+@@ -860,10 +757,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: '')
  .sp
  Order of outgoing email character sets:
 -.INDENT 7.0
@@ -10375,7 +11585,7 @@
  .IP 1. 3
  .
  \fBus\-ascii\fP: always first, regardless of settings
-@@ -849,13 +752,13 @@
+@@ -879,13 +776,13 @@
  .IP 5. 3
  .
  \fButf\-8\fP: always last, regardless of settings
@@ -10392,7 +11602,7 @@
  [email]
  from = Joseph User <joe.user@example.com>
  method = /usr/sbin/sendmail
-@@ -862,7 +765,7 @@
+@@ -892,7 +789,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
@@ -10401,7 +11611,7 @@
  .fi
  .SS \fBextensions\fP
  .sp
-@@ -869,7 +772,7 @@
+@@ -899,7 +796,7 @@
  Mercurial has an extension mechanism for adding new features. To
  enable an extension, create an entry for it in this section.
  .sp
@@ -10410,16 +11620,16 @@
  you can give the name of the module, followed by \fB=\fP, with nothing
  after the \fB=\fP.
  .sp
-@@ -884,16 +787,16 @@
+@@ -914,16 +811,16 @@
  Example for \fB~/.hgrc\fP:
  .sp
  .nf
 -.ft C
 +.ft
  [extensions]
--# (the progress extension will get loaded from Mercurial\(aqs path)
-+# (the progress extension will get loaded from Mercurial's path)
- progress =
+-# (the color extension will get loaded from Mercurial\(aqs path)
++# (the color extension will get loaded from Mercurial's path)
+ color =
  # (this extension will get loaded from the file specified)
  myfeature = ~/.hgext/myfeature.py
 -.ft P
@@ -10429,18 +11639,18 @@
 -.INDENT 0.0
 +.RS 0
  .TP
- .B \fBusestore\fP
- .sp
-@@ -921,7 +824,7 @@
- Mac OS X and spaces on Windows. Enabled by default. Disabling this
- option ensures that the on\-disk format of newly created
- repositories will be compatible with Mercurial before version 1.7.
+ .B \fBusegeneraldelta\fP
+ .sp
+@@ -968,7 +865,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
-@@ -931,9 +834,9 @@
+@@ -978,9 +875,9 @@
  Each line has the following format:
  .sp
  .nf
@@ -10452,7 +11662,7 @@
  .fi
  .sp
  where \fB<branch>\fP is the name of the branch being
-@@ -940,17 +843,17 @@
+@@ -987,17 +884,17 @@
  customized. Example:
  .sp
  .nf
@@ -10473,7 +11683,7 @@
  .TP
  .B \fBwidth\fP
  .sp
-@@ -959,7 +862,7 @@
+@@ -1006,7 +903,7 @@
  .B \fBcolor\fP
  .sp
  Set branch edges color in hexadecimal RGB notation.
@@ -10482,7 +11692,7 @@
  .SS \fBhooks\fP
  .sp
  Commands or Python functions that get automatically executed by
-@@ -974,7 +877,7 @@
+@@ -1020,7 +917,7 @@
  Example \fB.hg/hgrc\fP:
  .sp
  .nf
@@ -10491,7 +11701,7 @@
  [hooks]
  # update working directory after adding changesets
  changegroup.update = hg update
-@@ -984,13 +887,13 @@
+@@ -1030,13 +927,13 @@
  incoming.autobuild = /my/build/hook
  # force autobuild hook to run before other incoming hooks
  priority.incoming.autobuild = 1
@@ -10507,16 +11717,40 @@
  .TP
  .B \fBchangegroup\fP
  .sp
-@@ -1034,7 +937,7 @@
+@@ -1060,7 +957,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.preoutgoing\fP hook.
+ .TP
+ .B \fBpost\-<command>\fP
+ .sp
+@@ -1080,7 +977,7 @@
  representations of the data internally passed to <command>. \fB$HG_OPTS\fP
- is a  dictionary of options (with unspecified options set to their
+ 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
-@@ -1167,7 +1070,7 @@
+@@ -1152,12 +1049,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.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.pretxnclose\fP
+ docs for details about available variables.
+ .TP
+ .B \fBpretxnchangegroup\fP
+@@ -1211,7 +1108,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.
@@ -10525,7 +11759,7 @@
  .IP Note
  .
  It is generally better to use standard hooks rather than the
-@@ -1176,21 +1079,14 @@
+@@ -1220,21 +1117,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
@@ -10549,7 +11783,7 @@
  .fi
  .sp
  Python hooks are run within the Mercurial process. Each hook is
-@@ -1214,10 +1110,10 @@
+@@ -1258,10 +1148,10 @@
  For example:
  .sp
  .nf
@@ -10562,7 +11796,7 @@
  .fi
  .sp
  This feature is only supported when using Python 2.6 or later.
-@@ -1225,7 +1121,7 @@
+@@ -1269,7 +1159,7 @@
  .sp
  Used to access web\-based Mercurial repositories through a HTTP
  proxy.
@@ -10571,16 +11805,16 @@
  .TP
  .B \fBhost\fP
  .sp
-@@ -1249,7 +1145,7 @@
+@@ -1293,7 +1183,7 @@
  .sp
  Optional. Always use the proxy, even for localhost and any entries
- in \fBhttp_proxy.no\fP. True or False. Default: False.
+ in \fBhttp_proxy.no\fP. (default: False)
 -.UNINDENT
 +.RE
  .SS \fBmerge\-patterns\fP
  .sp
  This section specifies merge tools to associate with particular file
-@@ -1260,23 +1156,23 @@
+@@ -1304,23 +1194,23 @@
  Example:
  .sp
  .nf
@@ -10609,7 +11843,7 @@
  [merge\-tools]
  # Override stock tool location
  kdiff3.executable = ~/bin/kdiff3
-@@ -1290,13 +1186,12 @@
+@@ -1337,13 +1227,12 @@
  
  # Define new tool
  myHtmlTool.args = \-m $local $other $base $output
@@ -10625,27 +11859,26 @@
  .TP
  .B \fBpriority\fP
  .sp
-@@ -1305,9 +1200,7 @@
- .TP
- .B \fBexecutable\fP
- .sp
--Either just the name of the executable or its pathname.  On Windows,
--the path can use environment variables with ${ProgramFiles} syntax.
--Default: the tool name.
-+Either just the name of the executable or its pathname.  Default: the tool name.
+@@ -1354,9 +1243,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
- .sp
-@@ -1329,7 +1222,7 @@
+@@ -1379,7 +1265,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
+ (default: True)
  .TP
  .B \fBbinary\fP
-@@ -1345,7 +1238,7 @@
+@@ -1394,7 +1280,7 @@
  .B \fBcheck\fP
  .sp
  A list of merge success\-checking options:
@@ -10654,7 +11887,7 @@
  .TP
  .B \fBchanged\fP
  .sp
-@@ -1358,7 +1251,7 @@
+@@ -1407,7 +1293,7 @@
  .B \fBprompt\fP
  .sp
  Always prompt for merge success, regardless of success reported by tool.
@@ -10663,17 +11896,19 @@
  .TP
  .B \fBfixeol\fP
  .sp
-@@ -1368,42 +1261,16 @@
+@@ -1417,44 +1303,16 @@
  .B \fBgui\fP
  .sp
- This tool requires a graphical interface to run. Default: False
+ This tool requires a graphical interface to run. (default: False)
+-.UNINDENT
+-.INDENT 0.0
 -.TP
 -.B \fBregkey\fP
 -.sp
 -Windows registry key which describes install location of this
 -tool. Mercurial will search for this key first under
 -\fBHKEY_CURRENT_USER\fP and then under \fBHKEY_LOCAL_MACHINE\fP.
--Default: None
+-(default: None)
 -.TP
 -.B \fBregkeyalt\fP
 -.sp
@@ -10681,18 +11916,18 @@
 -found.  The alternate key uses the same \fBregname\fP and \fBregappend\fP
 -semantics of the primary key.  The most common use for this key
 -is to search for 32bit applications on 64bit operating systems.
--Default: None
+-(default: None)
 -.TP
 -.B \fBregname\fP
 -.sp
--Name of value to read from specified registry key. Defaults to the
--unnamed (default) value.
+-Name of value to read from specified registry key.
+-(default: the unnamed (default) value)
 -.TP
 -.B \fBregappend\fP
 -.sp
 -String to append to the value read from the registry, typically
 -the executable name of the tool.
--Default: None
+-(default: None)
 -.UNINDENT
 +.RE
  .SS \fBpatch\fP
@@ -10710,52 +11945,83 @@
  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
-@@ -1412,7 +1279,7 @@
- on a per\-file basis. If target file does not exist or has no end
- of line, patch line endings are preserved.
- Default: strict.
+@@ -1466,11 +1324,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
+ controls how much context the patcher is allowed to ignore when
+ trying to apply a patch.
+ (default: 2)
 -.UNINDENT
 +.RE
  .SS \fBpaths\fP
  .sp
- Assigns symbolic names to repositories. The left side is the
-@@ -1419,7 +1286,7 @@
- symbolic name, and the right gives the directory or URL that is the
- location of the repository. Default paths can be declared by setting
- the following entries.
--.INDENT 0.0
-+.RS 0
- .TP
- .B \fBdefault\fP
- .sp
-@@ -1431,30 +1298,30 @@
- .sp
- Optional. Directory or URL to use when pushing if no destination
- is specified.
--.UNINDENT
-+.RE
- .sp
- Custom paths can be defined by assigning the path to a name that later can be
- used from the command line. Example:
+ Assigns symbolic names and behavior to repositories.
+@@ -1479,57 +1337,57 @@
+ location of the repository. Example:
  .sp
  .nf
 -.ft C
 +.ft
  [paths]
- my_path = http://example.com/path
--.ft P
-+.ft
- .fi
- .sp
- To push to the path defined in \fBmy_path\fP run the command:
- .sp
- .nf
--.ft C
-+.ft
- hg push my_path
--.ft P
-+.ft
- .fi
+ my_server = https://example.com/my_repo
+ local_path = /home/me/repo
+-.ft P
++.ft
+ .fi
+ .sp
+ These symbolic names can be used from the command line. To pull
+-from \fBmy_server\fP: \%\fBhg pull my_server\fP\:. To push to \fBlocal_path\fP:
+-\%\fBhg push local_path\fP\:.
++from \fBmy_server\fP: \fBhg pull my_server\fP. To push to \fBlocal_path\fP:
++\fBhg push local_path\fP.
+ .sp
+ Options containing colons (\fB:\fP) denote sub\-options that can influence
+ behavior for that specific path. Example:
+ .sp
+ .nf
+-.ft C
++.ft
+ [paths]
+ my_server = https://example.com/my_path
+ my_server:pushurl = ssh://example.com/my_path
+-.ft P
++.ft
+ .fi
+ .sp
+ The following sub\-options can be defined:
+-.INDENT 0.0
++.RS 0
+ .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.
++.RE
+ .sp
+ The following special named paths exist:
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \fBdefault\fP
+ .sp
+ The URL or directory to use when no source or remote is specified.
+ .sp
+-\%\fBhg clone\fP\: will automatically define this path to the location the
++\fBhg clone\fP will automatically define this path to the location the
+ repository was cloned from.
+ .TP
+ .B \fBdefault\-push\fP
+ .sp
+-(deprecated) The URL or directory for the default \%\fBhg push\fP\: location.
++(deprecated) The URL or directory for the default \fBhg push\fP location.
+ \fBdefault:pushurl\fP should be used instead.
+-.UNINDENT
++.RE
  .SS \fBphases\fP
  .sp
 -Specifies default handling of phases. See \%\fBhg help phases\fP\: for more
@@ -10766,16 +12032,16 @@
  .TP
  .B \fBpublish\fP
  .sp
-@@ -1479,7 +1346,7 @@
+@@ -1554,7 +1412,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"
+ (default: follow)
 -.UNINDENT
 +.RE
  .SS \fBprofiling\fP
  .sp
  Specifies profiling type, format, and file output. Two profilers are
-@@ -1486,21 +1353,21 @@
+@@ -1561,21 +1419,21 @@
  supported: an instrumenting profiler (named \fBls\fP), and a sampling
  profiler (named \fBstat\fP).
  .sp
@@ -10791,7 +12057,7 @@
  .B \fBtype\fP
  .sp
  The type of profiler to use.
- Default: ls.
+ (default: ls)
 -.INDENT 7.0
 +.RS 7
  .TP
@@ -10802,7 +12068,7 @@
  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.
-@@ -1510,13 +1377,13 @@
+@@ -1585,13 +1443,13 @@
  Use a third\-party statistical profiler, statprof. This profiler
  currently runs only on Unix systems, and is most useful for
  profiling commands that run for longer than about 0.1 seconds.
@@ -10812,13 +12078,13 @@
  .B \fBformat\fP
  .sp
  Profiling format.  Specific to the \fBls\fP instrumenting profiler.
- Default: text.
+ (default: text)
 -.INDENT 7.0
 +.RS 7
  .TP
  .B \fBtext\fP
  .sp
-@@ -1529,7 +1396,7 @@
+@@ -1604,7 +1462,7 @@
  Format profiling data for kcachegrind use: when saving to a
  file, the generated file can directly be loaded into
  kcachegrind.
@@ -10827,10 +12093,47 @@
  .TP
  .B \fBfrequency\fP
  .sp
-@@ -1560,14 +1427,14 @@
+@@ -1635,13 +1493,13 @@
  This can help explain the difference between Total and Inline.
  Specific to the \fBls\fP instrumenting profiler.
- Default: 5.
+ (default: 5)
+-.UNINDENT
++.RE
+ .SS \fBprogress\fP
+ .sp
+ Mercurial commands can draw progress bars that are as informative as
+ possible. Some progress bars only offer indeterminate information, while others
+ have a definite end point.
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \fBdelay\fP
+ .sp
+@@ -1675,31 +1533,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)
+ .TP
+ .B \fBdisable\fP
+ .sp
+-If true, don\(aqt show a progress bar.
++If true, don't show a progress bar.
+ .TP
+ .B \fBassume\-tty\fP
+ .sp
+ If true, ALWAYS show a progress bar, unless disable is given.
+-.UNINDENT
++.RE
+ .SS \fBrebase\fP
+-.INDENT 0.0
++.RS 0
+ .TP
+ .B \fBallowdivergence\fP
+ .sp
+ Default to False, when True allow creating divergence when performing
+ rebase of obsolete changesets.
 -.UNINDENT
 +.RE
  .SS \fBrevsetalias\fP
@@ -10845,10 +12148,10 @@
  .TP
  .B \fBuncompressed\fP
  .sp
-@@ -1592,11 +1459,11 @@
- Whether to validate the completeness of pushed changesets by
- checking that all new file revisions specified in manifests are
- present. Default is False.
+@@ -1764,11 +1622,11 @@
+ consider setting this option because converting \fIgeneraldelta\fP
+ repositories to the exchange format required by the bundle1 data
+ format can consume a lot of CPU.
 -.UNINDENT
 +.RE
  .SS \fBsmtp\fP
@@ -10859,28 +12162,25 @@
  .TP
  .B \fBhost\fP
  .sp
-@@ -1621,7 +1488,7 @@
+@@ -1793,7 +1651,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".
+-\%\fBhg email\fP\: overwrites this as "loose". (default: strict)
++\fBhg email\fP overwrites this as "loose". (default: strict)
  .TP
  .B \fBusername\fP
  .sp
-@@ -1636,9 +1503,9 @@
- .TP
- .B \fBlocal_hostname\fP
- .sp
--Optional. It\(aqs the hostname that the sender can use to identify
-+Optional. It's the hostname that the sender can use to identify
+@@ -1810,7 +1668,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
-@@ -1646,9 +1513,9 @@
+@@ -1818,9 +1676,9 @@
  rewrite rules of the form:
  .sp
  .nf
@@ -10892,7 +12192,7 @@
  .fi
  .sp
  where \fBpattern\fP is a regular expression matching a subrepository
-@@ -1657,9 +1524,9 @@
+@@ -1829,9 +1687,9 @@
  \fBreplacements\fP. For instance:
  .sp
  .nf
@@ -10904,7 +12204,7 @@
  .fi
  .sp
  rewrites \fBhttp://server/foo\-hg/\fP into \fBhttp://hg.server/foo/\fP.
-@@ -1670,7 +1537,7 @@
+@@ -1842,7 +1700,7 @@
  .SS \fBtrusted\fP
  .sp
  Mercurial will not use the settings in the
@@ -10913,7 +12213,7 @@
  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,
-@@ -1682,7 +1549,7 @@
+@@ -1854,7 +1712,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.
@@ -10922,7 +12222,7 @@
  .TP
  .B \fBusers\fP
  .sp
-@@ -1691,17 +1558,17 @@
+@@ -1863,17 +1721,17 @@
  .B \fBgroups\fP
  .sp
  Comma\-separated list of trusted groups.
@@ -10940,19 +12240,58 @@
  (hashes for the repository base and for tip) in archives created
 -by the \%\fBhg archive\fP\: command or downloaded via hgweb.
 +by the \fBhg archive\fP command or downloaded via hgweb.
- Default is True.
+ (default: True)
  .TP
  .B \fBaskusername\fP
-@@ -1729,7 +1596,7 @@
+@@ -1888,7 +1746,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.
+@@ -1906,7 +1764,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)
+@@ -1921,17 +1779,17 @@
+ bundle over another.
+ .sp
+ The following keys are defined by Mercurial:
+-.INDENT 7.0
++.RS 7
+ .TP
+ .B BUNDLESPEC
+ .
+-A bundle type specifier. These are strings passed to \%\fBhg bundle \-t\fP\:.
++A bundle type specifier. These are strings passed to \fBhg bundle \-t\fP.
+ e.g. \fBgzip\-v2\fP or \fBbzip2\-v1\fP.
+ .TP
+ .B COMPRESSION
+ .
+ The compression format of the bundle. e.g. \fBgzip\fP and \fBbzip2\fP.
+-.UNINDENT
++.RE
+ .sp
+ Server operators may define custom keys.
+ .sp
+@@ -1957,7 +1815,7 @@
  .TP
  .B \fBfallbackencoding\fP
  .sp
 -Encoding to try if it\(aqs not possible to decode the changelog using
 +Encoding to try if it's not possible to decode the changelog using
- UTF\-8. Default is ISO\-8859\-1.
- .TP
- .B \fBignore\fP
-@@ -1752,7 +1619,7 @@
+ UTF\-8. (default: ISO\-8859\-1)
+ .TP
+ .B \fBgraphnodetemplate\fP
+@@ -1985,7 +1843,7 @@
  .B \fBmerge\fP
  .sp
  The conflict resolution program to use during a manual merge.
@@ -10961,46 +12300,72 @@
  For configuring merge tools see the \fB[merge\-tools]\fP section.
  .TP
  .B \fBmergemarkers\fP
-@@ -1759,7 +1626,7 @@
+@@ -1992,7 +1850,7 @@
  .sp
  Sets the merge conflict marker label styling. The \fBdetailed\fP
  style uses the \fBmergemarkertemplate\fP setting to style the labels.
 -The \fBbasic\fP style just uses \(aqlocal\(aq and \(aqother\(aq as the marker label.
 +The \fBbasic\fP style just uses 'local' and 'other' as the marker label.
  One of \fBbasic\fP or \fBdetailed\fP.
- Default is \fBbasic\fP.
- .TP
-@@ -1766,7 +1633,7 @@
+ (default: \fBbasic\fP)
+ .TP
+@@ -1999,7 +1857,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
- the first line of the commit description.
-@@ -1784,7 +1651,7 @@
- Default is \fBwarn\fP.
- If set to \fBwarn\fP (or \fBtrue\fP), a warning message is printed on POSIX
- platforms, if a file with a non\-portable filename is added (e.g. a file
--with a name that can\(aqt be created on Windows because it contains reserved
-+with a name that can't be created on Windows because it contains reserved
- parts like \fBAUX\fP, reserved characters like \fB:\fP, or would cause a case
- collision with an existing file).
- If set to \fBignore\fP (or \fBfalse\fP), no warning is printed.
-@@ -1849,7 +1716,7 @@
+@@ -2036,12 +1894,12 @@
+ .sp
+ Check for portable filenames. Can be \fBwarn\fP, \fBignore\fP or \fBabort\fP.
+ (default: \fBwarn\fP)
+-.INDENT 7.0
++.RS 7
+ .TP
+ .B \fBwarn\fP
+ .sp
+ Print a warning message on POSIX platforms, if a file with a non\-portable
+-filename is added (e.g. a file with a name that can\(aqt be created on
++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).
+@@ -2048,7 +1906,7 @@
+ .TP
+ .B \fBignore\fP
+ .sp
+-Don\(aqt print a warning.
++Don't print a warning.
+ .TP
+ .B \fBabort\fP
+ .sp
+@@ -2061,9 +1919,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
+@@ -2127,7 +1983,7 @@
  .B \fBusername\fP
  .sp
  The committer of a changeset created when running "commit".
 -Typically a person\(aqs name and email address, e.g. \fBFred Widget
 +Typically a person's name and email address, e.g. \fBFred Widget
- <fred@example.com>\fP. Default is \fB$EMAIL\fP or \fBusername@hostname\fP. If
- the username in hgrc is empty, it has to be specified manually or
- in a different hgrc file (e.g. \fB$HOME/.hgrc\fP, if the admin set
-@@ -1859,11 +1726,11 @@
+ <fred@example.com>\fP. Environment variables in the
+ username are expanded.
+ .sp
+@@ -2139,11 +1995,11 @@
  .B \fBverbose\fP
  .sp
- Increase the amount of output printed. True or False. Default is False.
+ Increase the amount of output printed. (default: False)
 -.UNINDENT
 +.RE
  .SS \fBweb\fP
@@ -11011,7 +12376,7 @@
  run through a webserver (\fBhgweb.cgi\fP and the derivatives for FastCGI
  and WSGI).
  .sp
-@@ -1879,9 +1746,9 @@
+@@ -2159,9 +2015,9 @@
  command line:
  .sp
  .nf
@@ -11023,7 +12388,7 @@
  .fi
  .sp
  Note that this will allow anybody to push anything to the server and
-@@ -1888,7 +1755,7 @@
+@@ -2168,7 +2024,7 @@
  that this should not be used for public servers.
  .sp
  The full set of options is:
@@ -11032,7 +12397,7 @@
  .TP
  .B \fBaccesslog\fP
  .sp
-@@ -1972,13 +1839,13 @@
+@@ -2253,13 +2109,13 @@
  To disable SSL verification temporarily, specify \fB\-\-insecure\fP from
  command line.
  .sp
@@ -11048,7 +12413,7 @@
  \-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-
  \&... (certificate in base64 PEM encoding) ...
  \-\-\-\-\-END CERTIFICATE\-\-\-\-\-
-@@ -1985,7 +1852,7 @@
+@@ -2266,7 +2122,7 @@
  \-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-
  \&... (certificate in base64 PEM encoding) ...
  \-\-\-\-\-END CERTIFICATE\-\-\-\-\-
@@ -11057,25 +12422,34 @@
  .fi
  .TP
  .B \fBcache\fP
-@@ -2046,7 +1913,7 @@
+@@ -2275,7 +2131,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
+@@ -2332,7 +2188,7 @@
  .TP
  .B \fBdescription\fP
  .sp
 -Textual description of the repository\(aqs purpose or contents.
 +Textual description of the repository's purpose or contents.
- Default is "unknown".
+ (default: "unknown")
  .TP
  .B \fBencoding\fP
-@@ -2111,7 +1978,7 @@
+@@ -2397,7 +2253,7 @@
  .TP
  .B \fBprefix\fP
  .sp
--Prefix path to serve from. Default is \(aq\(aq (server root).
-+Prefix path to serve from. Default is '' (server root).
+-Prefix path to serve from. (default: \(aq\(aq (server root))
++Prefix path to serve from. (default: '' (server root))
  .TP
  .B \fBpush_ssl\fP
  .sp
-@@ -2140,7 +2007,7 @@
+@@ -2436,7 +2292,7 @@
  .sp
  Where to find the HTML templates. The default path to the HTML templates
  can be obtained from \fBhg debuginstall\fP.
@@ -11084,7 +12458,7 @@
  .SS \fBwebsub\fP
  .sp
  Web substitution filter definition. You can use this section to
-@@ -2162,9 +2029,9 @@
+@@ -2458,9 +2314,9 @@
  which in turn imitates the Unix sed replacement syntax:
  .sp
  .nf
@@ -11096,7 +12470,7 @@
  .fi
  .sp
  You can use any separator other than "/". The final "i" is optional
-@@ -2173,12 +2040,12 @@
+@@ -2469,12 +2325,12 @@
  Examples:
  .sp
  .nf
@@ -11111,7 +12485,7 @@
  .fi
  .SS \fBworker\fP
  .sp
-@@ -2185,7 +2052,7 @@
+@@ -2481,7 +2337,7 @@
  Parallel master/worker configuration. We currently perform working
  directory updates in parallel on Unix\-like systems, which greatly
  helps performance.
@@ -11120,10 +12494,28 @@
  .TP
  .B \fBnumcpus\fP
  .sp
-@@ -2192,18 +2059,18 @@
- Number of CPUs to use for parallel operations. Default is 4 or the
- number of CPUs on the system, whichever is larger. A zero or
- negative value is treated as \fBuse the default\fP.
+@@ -2492,7 +2348,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 appened to. By performing file closing
+ on background threads, file write rate can increase substantially.
+ (default: true on Windows, false elsewhere)
+@@ -2500,7 +2356,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
+@@ -2516,18 +2372,18 @@
+ Number of threads to process background file closes. Only relevant if
+ \fBbackgroundclose\fP is enabled.
+ (default: 4)
 -.UNINDENT
 +.RE
  .SH AUTHOR
@@ -11141,6 +12533,6 @@
  .sp
 -This manual page is copyright 2005 Bryan O\(aqSullivan.
 +This manual page is copyright 2005 Bryan O'Sullivan.
- Mercurial is copyright 2005\-2015 Matt Mackall.
+ Mercurial is copyright 2005\-2016 Matt Mackall.
  Free use of this software is granted under the terms of the GNU General
  Public License version 2 or any later version.
diff -r c8882ac2a393 -r 5e30cd0645e7 components/mercurial/patches/rst.patch
--- a/components/mercurial/patches/rst.patch	Mon Feb 22 10:26:36 2016 -0800
+++ b/components/mercurial/patches/rst.patch	Mon Feb 22 14:29:22 2016 -0800
@@ -36,19 +36,20 @@
  Some commands (e.g. revert) produce backup files ending in ``.orig``,
  if the ``.orig`` file already exists and is not tracked by Mercurial,
  it will be overwritten.
---- mercurial-3.4/mercurial/help/config.txt	Fri May  1 14:48:51 2015
-+++ mercurial-3.4/mercurial/help/config.txt	Mon May  4 14:54:54 2015
-@@ -18,8 +18,7 @@
- Mercurial reads configuration data from several files, if they exist.
- These files do not exist by default and you will have to create the
- appropriate configuration files yourself: global configuration like
--the username setting is typically put into
--``%USERPROFILE%\mercurial.ini`` or ``$HOME/.hgrc`` and local
-+the username setting is typically put into ``$HOME/.hgrc`` and local
- configuration is put into the per-repository ``<repo>/.hg/hgrc`` file.
+--- a/mercurial/help/config.txt
++++ b/mercurial/help/config.txt
+@@ -36,10 +36,6 @@ Local configuration is put into the per-
+ 
+ Global configuration like the username setting is typically put into:
  
- The names of these files depend on the system on which Mercurial is
-@@ -30,7 +29,7 @@
+-.. container:: windows
+-
+-  - ``%USERPROFILE%\mercurial.ini`` (on Windows)
+-
+ .. container:: unix.plan9
+ 
+   - ``$HOME/.hgrc`` (on Unix, Plan9)
+@@ -52,7 +48,7 @@ ones.
  
  .. container:: verbose.unix
  
@@ -57,7 +58,7 @@
  
    - ``<repo>/.hg/hgrc`` (per-repository)
    - ``$HOME/.hgrc`` (per-user)
-@@ -40,47 +39,16 @@
+@@ -62,41 +58,6 @@ ones.
    - ``/etc/mercurial/hgrc.d/*.rc`` (per-system)
    - ``<internal>/default.d/*.rc`` (defaults)
  
@@ -70,9 +71,9 @@
 -  - ``%USERPROFILE%\Mercurial.ini`` (per-user)
 -  - ``%HOME%\.hgrc`` (per-user)
 -  - ``%HOME%\Mercurial.ini`` (per-user)
--  - ``<install-dir>\Mercurial.ini`` (per-installation)
+-  - ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (per-installation)
 -  - ``<install-dir>\hgrc.d\*.rc`` (per-installation)
--  - ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (per-installation)
+-  - ``<install-dir>\Mercurial.ini`` (per-installation)
 -  - ``<internal>/default.d/*.rc`` (defaults)
 -
 -  .. note::
@@ -80,6 +81,10 @@
 -   The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial``
 -   is used when running 32-bit Python on 64-bit Windows.
 -
+-.. container:: windows
+-
+-  On Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``.
+-
 -.. container:: verbose.plan9
 -
 -  On Plan9, the following files are consulted:
@@ -95,21 +100,16 @@
  Per-repository configuration options only apply in a
  particular repository. This file is not version-controlled, and
  will not get transferred during a "clone" operation. Options in
--this file override options in all other configuration files. On
--Plan 9 and Unix, most of this file will be ignored if it doesn't
-+this file override options in all other configuration files.
-+Most of this file will be ignored if it doesn't
- belong to a trusted user or to a trusted group. See the documentation
- for the ``[trusted]`` section below for more details.
+@@ -104,7 +65,7 @@ this file override options in all other
+ 
+ .. container:: unix.plan9
  
--Per-user configuration file(s) are for the user running Mercurial. On
--Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``. Options in these
-+Per-user configuration file(s) are for the user running Mercurial.
-+Options in these
- files apply to all Mercurial commands executed by this user in any
- directory. Options in these files override per-system and per-installation
- options.
-@@ -94,10 +62,8 @@
+-  On Plan 9 and Unix, most of this file will be ignored if it doesn't
++  On Unix, most of this file will be ignored if it doesn't
+   belong to a trusted user or to a trusted group. See
+   :hg:`help config.trusted` for more details.
+ 
+@@ -126,10 +87,8 @@ parent directory of the **hg** executabl
  
  Per-installation configuration files are for the system on
  which Mercurial is running. Options in these files apply to all
@@ -122,20 +122,22 @@
  order until one or more configuration files are detected.
  
  Per-system configuration files are for the system on which Mercurial
-@@ -500,12 +466,6 @@
+@@ -535,14 +494,6 @@ filtered by the command. The string ``OU
  of an empty temporary file, where the filtered data must be written by
  the command.
  
--.. note::
+-.. container:: windows
+-
+-   .. note::
 -
--   The tempfile mechanism is recommended for Windows systems,
--   where the standard shell I/O redirection operators often have
--   strange effects and may corrupt the contents of your files.
+-     The tempfile mechanism is recommended for Windows systems,
+-     where the standard shell I/O redirection operators often have
+-     strange effects and may corrupt the contents of your files.
 -
  This filter mechanism is used internally by the ``eol`` extension to
  translate line ending characters between Windows (CRLF) and Unix (LF)
  format. We suggest you use the ``eol`` extension for convenience.
-@@ -891,13 +851,6 @@
+@@ -941,13 +892,6 @@ variables it is passed are listed with n
     Also, hooks like "commit" will be called in all contexts that
     generate a commit (e.g. tag) and not just the commit command.
  
@@ -149,7 +151,7 @@
  The syntax for Python hooks is as follows::
  
    hookname = python:modulename.submodule.callable
-@@ -993,7 +946,6 @@
+@@ -1046,7 +990,6 @@ Example ``~/.hgrc``::
  
    # Define new tool
    myHtmlTool.args = -m $local $other $base $output
@@ -157,44 +159,57 @@
    myHtmlTool.priority = 1
  
  Supported arguments:
-@@ -1003,9 +955,7 @@
-   Default: 0.
- 
+@@ -1058,11 +1001,6 @@ Supported arguments:
  ``executable``
--  Either just the name of the executable or its pathname.  On Windows,
--  the path can use environment variables with ${ProgramFiles} syntax.
--  Default: the tool name.
-+  Either just the name of the executable or its pathname.  Default: the tool name.
+   Either just the name of the executable or its pathname.
+ 
+-  .. container:: windows
+-
+-    On Windows, the path can use environment variables with ${ProgramFiles}
+-    syntax.
+-
+   (default: the tool name)
  
  ``args``
-   The arguments to pass to the tool executable. You can refer to the
-@@ -1053,29 +1003,6 @@
+@@ -1110,30 +1048,6 @@ Supported arguments:
  ``gui``
-   This tool requires a graphical interface to run. Default: False
+   This tool requires a graphical interface to run. (default: False)
  
--``regkey``
--  Windows registry key which describes install location of this
--  tool. Mercurial will search for this key first under
--  ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``.
--  Default: None
+-.. container:: windows
+-
+-  ``regkey``
+-    Windows registry key which describes install location of this
+-    tool. Mercurial will search for this key first under
+-    ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``.
+-    (default: None)
 -
--``regkeyalt``
--  An alternate Windows registry key to try if the first key is not
--  found.  The alternate key uses the same ``regname`` and ``regappend``
--  semantics of the primary key.  The most common use for this key
--  is to search for 32bit applications on 64bit operating systems.
--  Default: None
+-  ``regkeyalt``
+-    An alternate Windows registry key to try if the first key is not
+-    found.  The alternate key uses the same ``regname`` and ``regappend``
+-    semantics of the primary key.  The most common use for this key
+-    is to search for 32bit applications on 64bit operating systems.
+-    (default: None)
 -
--``regname``
--  Name of value to read from specified registry key. Defaults to the
--  unnamed (default) value.
+-  ``regname``
+-    Name of value to read from specified registry key.
+-    (default: the unnamed (default) value)
 -
--``regappend``
--  String to append to the value read from the registry, typically
--  the executable name of the tool.
--  Default: None
+-  ``regappend``
+-    String to append to the value read from the registry, typically
+-    the executable name of the tool.
+-    (default: None)
 -
--
+ 
  ``patch``
  ---------
+@@ -1658,10 +1572,6 @@ User interface controls.
+     ``false``
+       Alias for ``ignore``.
  
+-    .. container:: windows
+-
+-      On Windows, this configuration option is ignored and the command aborted.
+-
+ ``quiet``
+     Reduce the amount of output printed.
+     (default: False)