Imported from /srv/lorry/lorry-area/mercurial-tarball/mercurial-1.9.3.tar.gz.HEADmercurial-1.9.3master

12 files changed, 1271 insertions, 4937 deletions

diff --git a/doc/gendoc.py b/doc/gendoc.py
index ab8e9b6..78db86a 100644
--- a/doc/gendoc.py
+++ b/doc/gendoc.py
@@ -9,7 +9,6 @@ from mercurial.commands import table, globalopts
 from mercurial.i18n import _
 from mercurial.help import helptable
 from mercurial import extensions
-from mercurial import util
 
 def get_desc(docstr):
     if not docstr:
@@ -64,16 +63,16 @@ def get_cmd(cmd, cmdtable):
     return d
 
 def section(ui, s):
-    ui.write("%s\n%s\n\n" % (s, "\"" * encoding.colwidth(s)))
+    ui.write("%s\n%s\n\n" % (s, "-" * encoding.colwidth(s)))
 
 def subsection(ui, s):
-    ui.write("%s\n%s\n\n" % (s, '=' * encoding.colwidth(s)))
+    ui.write("%s\n%s\n\n" % (s, '"' * encoding.colwidth(s)))
 
 def subsubsection(ui, s):
-    ui.write("%s\n%s\n\n" % (s, "-" * encoding.colwidth(s)))
+    ui.write("%s\n%s\n\n" % (s, "." * encoding.colwidth(s)))
 
 def subsubsubsection(ui, s):
-    ui.write("%s\n%s\n\n" % (s, "." * encoding.colwidth(s)))
+    ui.write("%s\n%s\n\n" % (s, "#" * encoding.colwidth(s)))
 
 
 def show_doc(ui):
@@ -96,15 +95,15 @@ def show_doc(ui):
             ui.write(".. _%s:\n" % name)
         ui.write("\n")
         section(ui, sec)
-        if util.safehasattr(doc, '__call__'):
+        if hasattr(doc, '__call__'):
             doc = doc()
         ui.write(doc)
         ui.write("\n")
 
     section(ui, _("Extensions"))
-    ui.write(_("This section contains help for extensions that are "
-               "distributed together with Mercurial. Help for other "
-               "extensions is available in the help system."))
+    ui.write(_("This section contains help for extensions that are distributed "
+               "together with Mercurial. Help for other extensions is available "
+               "in the help system."))
     ui.write("\n\n"
              ".. contents::\n"
              "   :class: htmlonly\n"
diff --git a/doc/hg.1 b/doc/hg.1
index fe7865d..ed09ec4 100644
--- a/doc/hg.1
+++ b/doc/hg.1
@@ -192,15 +192,13 @@ 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
 commit.
 .sp
-Use the \-s/\-\-similarity option to detect renamed files. This
+Use the \-s/\-\-similarity option to detect renamed files. With a
+parameter greater than 0, this compares every removed file with
+every added file and records those similar enough as renames. This
 option takes a percentage between 0 (disabled) and 100 (files must
-be identical) as its parameter. 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
+be identical) as its parameter. Detecting renamed files this way
 can be expensive. After using this option, \%\fBhg status \-C\fP\: can be
-used to check which files were identified as moved or renamed. If
-not specified, \-s/\-\-similarity defaults to 100 and only renames of
-identical files are detected.
+used to check which files were identified as moved or renamed.
 .sp
 Returns 0 if all files are successfully added.
 .sp
@@ -287,18 +285,6 @@ list the changeset
 .
 show line number at the first appearance
 .TP
-.B \-w,  \-\-ignore\-all\-space
-.
-ignore white space when comparing lines
-.TP
-.B \-b,  \-\-ignore\-space\-change
-.
-ignore changes in the amount of white space
-.TP
-.B \-B,  \-\-ignore\-blank\-lines
-.
-ignore changes whose lines are all blank
-.TP
 .B \-I,  \-\-include
 .
 include names matching the given patterns
@@ -323,28 +309,6 @@ directory; use \-r/\-\-rev to specify a different revision.
 The archive type is automatically detected based on file
 extension (or override using \-t/\-\-type).
 .sp
-Examples:
-.INDENT 0.0
-.IP \(bu 2
-.
-create a zip file containing the 1.0 release:
-.sp
-.nf
-.ft C
-hg archive \-r 1.0 project\-1.0.zip
-.ft P
-.fi
-.IP \(bu 2
-.
-create a tarball excluding .hg files:
-.sp
-.nf
-.ft C
-hg archive project.tar.gz \-X ".hg*"
-.ft P
-.fi
-.UNINDENT
-.sp
 Valid types are:
 .INDENT 0.0
 .TP
@@ -428,21 +392,16 @@ current working directory.
 If REV is the parent of the working directory, then this new changeset
 is committed automatically. Otherwise, hg needs to merge the
 changes and the merged result is left uncommitted.
-.IP Note
-.
-backout cannot be used to fix either an unwanted or
-incorrect merge.
-.RE
 .sp
 By default, the pending changeset will have one parent,
-maintaining a linear history. With \-\-merge, the pending
-changeset will instead have two parents: the old parent of the
-working directory and a new child of REV that simply undoes REV.
+maintaining a linear history. With \-\-merge, the pending changeset
+will instead have two parents: the old parent of the working
+directory and a new child of REV that simply undoes REV.
 .sp
-Before version 1.7, the behavior without \-\-merge was equivalent
-to specifying \-\-merge followed by \%\fBhg update \-\-clean .\fP\: to
-cancel the merge and leave the child of REV as a head to be
-merged separately.
+Before version 1.7, the behavior without \-\-merge was equivalent to
+specifying \-\-merge followed by \%\fBhg update \-\-clean .\fP\: to cancel
+the merge and leave the child of REV as a head to be merged
+separately.
 .sp
 See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
 .sp
@@ -457,16 +416,16 @@ merge with old dirstate parent after backout
 .TP
 .B \-\-parent
 .
-parent to choose when backing out merge (DEPRECATED)
-.TP
-.B \-r,  \-\-rev
-.
-revision to backout
+parent to choose when backing out merge
 .TP
 .B \-t,  \-\-tool
 .
 specify merge tool
 .TP
+.B \-r,  \-\-rev
+.
+revision to backout
+.TP
 .B \-I,  \-\-include
 .
 include names matching the given patterns
@@ -512,110 +471,10 @@ As a shortcut, you can also use the revision argument to mark a
 revision as good or bad without checking it out first.
 .sp
 If you supply a command, it will be used for automatic bisection.
-The environment variable HG_NODE will contain the ID of the
-changeset being tested. The exit status of the command will be
-used to mark revisions as good or bad: status 0 means good, 125
-means to skip the revision, 127 (command not found) will abort the
-bisection, and any other non\-zero exit status means the revision
-is bad.
-.sp
-Some examples:
-.INDENT 0.0
-.IP \(bu 2
-.
-start a bisection with known bad revision 12, and good revision 34:
-.sp
-.nf
-.ft C
-hg bisect \-\-bad 34
-hg bisect \-\-good 12
-.ft P
-.fi
-.IP \(bu 2
-.
-advance the current bisection by marking current revision as good or
-bad:
-.sp
-.nf
-.ft C
-hg bisect \-\-good
-hg bisect \-\-bad
-.ft P
-.fi
-.IP \(bu 2
-.
-mark the current revision, or a known revision, to be skipped (eg. if
-that revision is not usable because of another issue):
-.sp
-.nf
-.ft C
-hg bisect \-\-skip
-hg bisect \-\-skip 23
-.ft P
-.fi
-.IP \(bu 2
-.
-forget the current bisection:
-.sp
-.nf
-.ft C
-hg bisect \-\-reset
-.ft P
-.fi
-.IP \(bu 2
-.
-use \(aqmake && make tests\(aq to automatically find the first broken
-revision:
-.sp
-.nf
-.ft C
-hg bisect \-\-reset
-hg bisect \-\-bad 34
-hg bisect \-\-good 12
-hg bisect \-\-command \(aqmake && make tests\(aq
-.ft P
-.fi
-.IP \(bu 2
-.
-see all changesets whose states are already known in the current
-bisection:
-.sp
-.nf
-.ft C
-hg log \-r "bisect(pruned)"
-.ft P
-.fi
-.IP \(bu 2
-.
-see the changeset currently being bisected (especially useful
-if running with \-U/\-\-noupdate):
-.sp
-.nf
-.ft C
-hg log \-r "bisect(current)"
-.ft P
-.fi
-.IP \(bu 2
-.
-see all changesets that took part in the current bisection:
-.sp
-.nf
-.ft C
-hg log \-r "bisect(range)"
-.ft P
-.fi
-.IP \(bu 2
-.
-with the graphlog extension, you can even get a nice graph:
-.sp
-.nf
-.ft C
-hg log \-\-graph \-r "bisect(range)"
-.ft P
-.fi
-.UNINDENT
-.sp
-See \%\fBhg help revsets\fP\: for more about the \fIbisect()\fP keyword.
+Its exit status will be used to mark revisions as good or bad:
+status 0 means good, 125 means to skip the revision, 127
+(command not found) will abort the bisection, and any other
+non\-zero exit status means the revision is bad.
 .sp
 Returns 0 on success.
 .sp
@@ -658,10 +517,10 @@ hg bookmarks [\-f] [\-d] [\-i] [\-m NAME] [\-r REV] [NAME]
 .ft P
 .fi
 .sp
-Bookmarks are pointers to certain commits that move when committing.
-Bookmarks are local. They can be renamed, copied and deleted. It is
-possible to use \%\fBhg merge NAME\fP\: to merge from a given bookmark, and
-\%\fBhg update NAME\fP\: to update to a given bookmark.
+Bookmarks are pointers to certain commits that move when
+committing. Bookmarks are local. They can be renamed, copied and
+deleted. It is possible to use bookmark names in \%\fBhg merge\fP\: and
+\%\fBhg update\fP\: to merge and update respectively to a given bookmark.
 .sp
 You can use \%\fBhg bookmark NAME\fP\: to set a bookmark on the working
 directory\(aqs parent revision with the given name. If you specify
@@ -673,11 +532,6 @@ push\fP\: and \%\fBhg help pull\fP\:). This requires both the local and remote
 repositories to support bookmarks. For versions prior to 1.8, this means
 the bookmarks extension must be enabled.
 .sp
-With \-i/\-\-inactive, the new bookmark will not be made the active
-bookmark. If \-r/\-\-rev is given, the new bookmark will not be made
-active even if \-i/\-\-inactive is not given. If no NAME is given, the
-current active bookmark will be marked inactive.
-.sp
 Options:
 .INDENT 0.0
 .TP
@@ -699,7 +553,7 @@ rename a given bookmark
 .TP
 .B \-i,  \-\-inactive
 .
-mark a bookmark inactive
+do not mark a new bookmark active
 .UNINDENT
 .SS branch
 .sp
@@ -708,12 +562,6 @@ mark a bookmark inactive
 hg branch [\-fC] [NAME]
 .ft P
 .fi
-.IP Note
-.
-Branch names are permanent and global. Use \%\fBhg bookmark\fP\: to create a
-light\-weight bookmark instead. See \%\fBhg help glossary\fP\: for more
-information about named branches and bookmarks.
-.RE
 .sp
 With no argument, show the current branch name. With one argument,
 set the working directory branch name (the branch will not exist
@@ -730,6 +578,12 @@ 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.
+.IP Note
+.
+Branch names are permanent. Use \%\fBhg bookmark\fP\: to create a
+light\-weight bookmark instead. See \%\fBhg help glossary\fP\: for more
+information about named branches and bookmarks.
+.RE
 .sp
 Returns 0 on success.
 .sp
@@ -914,30 +768,33 @@ basename of the source.
 The location of the source is added to the new repository\(aqs
 \fB.hg/hgrc\fP file, as the default to be used for future pulls.
 .sp
-Only local paths and \fBssh://\fP URLs are supported as
-destinations. For \fBssh://\fP destinations, no working directory or
-\fB.hg/hgrc\fP will be created on the remote side.
+See \%\fBhg help urls\fP\: for valid source format details.
+.sp
+It is possible to specify an \fBssh://\fP URL as the destination, but no
+\fB.hg/hgrc\fP and working directory will be created on the remote side.
+Please see \%\fBhg help urls\fP\: for important details about \fBssh://\fP URLs.
 .sp
-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
-\-\-pull, even for local source repositories. Note that specifying a
-tag will include the tagged changeset but not the changeset
-containing the tag.
+A set of changesets (tags, or branch names) to pull may be specified
+by listing each changeset (tag, or branch name) with \-r/\-\-rev.
+If \-r/\-\-rev is used, the cloned repository will contain only a subset
+of the changesets of the source repository. Only the set of changesets
+defined by all \-r/\-\-rev options (including all their ancestors)
+will be pulled into the destination repository.
+No subsequent changesets (including subsequent tags) will be present
+in the destination.
 .sp
-To check out a particular version, use \-u/\-\-update, or
-\-U/\-\-noupdate to create a clone with no working directory.
+Using \-r/\-\-rev (or \(aqclone src#rev dest\(aq) implies \-\-pull, even for
+local source repositories.
 .sp
-For efficiency, hardlinks are used for cloning whenever the
-source and destination are on the same filesystem (note this
-applies only to the repository data, not to the working
-directory). Some filesystems, such as AFS, implement hardlinking
-incorrectly, but do not report errors. In these cases, use the
-\-\-pull option to avoid hardlinking.
+For efficiency, hardlinks are used for cloning whenever the source
+and destination are on the same filesystem (note this applies only
+to the repository data, not to the working directory). Some
+filesystems, such as AFS, implement hardlinking incorrectly, but
+do not report errors. In these cases, use the \-\-pull option to
+avoid hardlinking.
 .sp
-In some cases, you can clone repositories and the working
-directory using full hardlinks with
+In some cases, you can clone repositories and the working directory
+using full hardlinks with
 .sp
 .nf
 .ft C
@@ -947,10 +804,10 @@ $ cp \-al REPO REPOCLONE
 .sp
 This is the fastest way to clone, but it is not always safe. The
 operation is not atomic (making sure REPO is not modified during
-the operation is up to you) and you have to make sure your
-editor breaks hardlinks (Emacs and most Linux Kernel tools do
-so). Also, this is not compatible with certain extensions that
-place their metadata under the .hg directory, such as mq.
+the operation is up to you) and you have to make sure your editor
+breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,
+this is not compatible with certain extensions that place their
+metadata under the .hg directory, such as mq.
 .sp
 Mercurial will update the working directory to the first applicable
 revision from this list:
@@ -983,67 +840,6 @@ the tipmost head of the default branch
 tip
 .UNINDENT
 .sp
-Examples:
-.INDENT 0.0
-.IP \(bu 2
-.
-clone a remote repository to a new directory named hg/:
-.sp
-.nf
-.ft C
-hg clone http://selenic.com/hg
-.ft P
-.fi
-.IP \(bu 2
-.
-create a lightweight local clone:
-.sp
-.nf
-.ft C
-hg clone project/ project\-feature/
-.ft P
-.fi
-.IP \(bu 2
-.
-clone from an absolute path on an ssh server (note double\-slash):
-.sp
-.nf
-.ft C
-hg clone ssh://user@server//home/projects/alpha/
-.ft P
-.fi
-.IP \(bu 2
-.
-do a high\-speed clone over a LAN while checking out a
-specified version:
-.sp
-.nf
-.ft C
-hg clone \-\-uncompressed http://server/repo \-u 1.5
-.ft P
-.fi
-.IP \(bu 2
-.
-create a repository without changesets after a particular revision:
-.sp
-.nf
-.ft C
-hg clone \-r 04e544 experimental/ good/
-.ft P
-.fi
-.IP \(bu 2
-.
-clone (and track) a particular named branch:
-.sp
-.nf
-.ft C
-hg clone http://selenic.com/hg#stable
-.ft P
-.fi
-.UNINDENT
-.sp
-See \%\fBhg help urls\fP\: for details on specifying URLs.
-.sp
 Returns 0 on success.
 .sp
 Options:
@@ -1108,20 +904,6 @@ 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.
 .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\:,
-if there are any. The old commit is stored in a backup bundle in
-\fB.hg/strip\-backup\fP (see \%\fBhg help bundle\fP\: and \%\fBhg help unbundle\fP\:
-on how to restore it).
-.sp
-Message, user and date are taken from the amended commit unless
-specified. When a message isn\(aqt specified on the command line,
-the editor will open with the message of the amended commit.
-.sp
-It is not possible to amend public changesets (see \%\fBhg help phases\fP\:)
-or changesets that have children.
-.sp
 See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
 .sp
 Returns 0 on success, 1 if nothing changed.
@@ -1137,10 +919,6 @@ mark new/missing files as added/removed before committing
 .
 mark a branch as closed, hiding it from the branch list
 .TP
-.B \-\-amend
-.
-amend the parent of the working dir
-.TP
 .B \-I,  \-\-include
 .
 include names matching the given patterns
@@ -1164,10 +942,6 @@ record the specified date as commit date
 .B \-u,  \-\-user
 .
 record the specified user as committer
-.TP
-.B \-S,  \-\-subrepos
-.
-recurse into subrepositories
 .sp
 aliases: ci
 .UNINDENT
@@ -1251,57 +1025,6 @@ anyway, probably with undesirable results.
 Use the \-g/\-\-git option to generate diffs in the git extended diff
 format. For more information, read \%\fBhg help diffs\fP\:.
 .sp
-Examples:
-.INDENT 0.0
-.IP \(bu 2
-.
-compare a file in the current working directory to its parent:
-.sp
-.nf
-.ft C
-hg diff foo.c
-.ft P
-.fi
-.IP \(bu 2
-.
-compare two historical versions of a directory, with rename info:
-.sp
-.nf
-.ft C
-hg diff \-\-git \-r 1.0:1.2 lib/
-.ft P
-.fi
-.IP \(bu 2
-.
-get change stats relative to the last change on some date:
-.sp
-.nf
-.ft C
-hg diff \-\-stat \-r "date(\(aqmay 2\(aq)"
-.ft P
-.fi
-.IP \(bu 2
-.
-diff all newly\-added files that contain a keyword:
-.sp
-.nf
-.ft C
-hg diff "set:added() and grep(GNU)"
-.ft P
-.fi
-.IP \(bu 2
-.
-compare a revision and its parents:
-.sp
-.nf
-.ft C
-hg diff \-c 9353         # compare against first parent
-hg diff \-r 9353^:9353   # same using revset syntax
-hg diff \-r 9353^2:9353  # compare against the second parent
-.ft P
-.fi
-.UNINDENT
-.sp
 Returns 0 on success.
 .sp
 Options:
@@ -1371,7 +1094,7 @@ recurse into subrepositories
 .sp
 .nf
 .ft C
-hg export [OPTION]... [\-o OUTFILESPEC] [\-r] REV...
+hg export [OPTION]... [\-o OUTFILESPEC] REV...
 .ft P
 .fi
 .sp
@@ -1415,10 +1138,6 @@ basename of the exporting repository
 .sp
 short\-form changeset hash (12 hexadecimal digits)
 .TP
-.B \fB%m\fP
-.sp
-first line of the commit message (only alphanumeric characters)
-.TP
 .B \fB%n\fP
 .sp
 zero\-padded sequence number, starting at 1
@@ -1438,40 +1157,6 @@ format. See \%\fBhg help diffs\fP\: for more information.
 With the \-\-switch\-parent option, the diff will be against the
 second parent. It can be useful to review a merge.
 .sp
-Examples:
-.INDENT 0.0
-.IP \(bu 2
-.
-use export and import to transplant a bugfix to the current
-branch:
-.sp
-.nf
-.ft C
-hg export \-r 9353 | hg import \-
-.ft P
-.fi
-.IP \(bu 2
-.
-export all the changesets between two revisions to a file with
-rename information:
-.sp
-.nf
-.ft C
-hg export \-\-git \-r 123:150 > changes.txt
-.ft P
-.fi
-.IP \(bu 2
-.
-split outgoing changes into a series of patches with
-descriptive names:
-.sp
-.nf
-.ft C
-hg export \-r "outgoing()" \-o "%n\-%m.patch"
-.ft P
-.fi
-.UNINDENT
-.sp
 Returns 0 on success.
 .sp
 Options:
@@ -1518,28 +1203,6 @@ working directory.
 .sp
 To undo a forget before the next commit, see \%\fBhg add\fP\:.
 .sp
-Examples:
-.INDENT 0.0
-.IP \(bu 2
-.
-forget newly\-added binary files:
-.sp
-.nf
-.ft C
-hg forget "set:added() and binary()"
-.ft P
-.fi
-.IP \(bu 2
-.
-forget files that would be excluded by .hgignore:
-.sp
-.nf
-.ft C
-hg forget "set:hgignore()"
-.ft P
-.fi
-.UNINDENT
-.sp
 Returns 0 on success.
 .sp
 Options:
@@ -1553,127 +1216,6 @@ include names matching the given patterns
 .
 exclude names matching the given patterns
 .UNINDENT
-.SS graft
-.sp
-.nf
-.ft C
-hg graft [OPTION]... [\-r] REV...
-.ft P
-.fi
-.sp
-This command uses Mercurial\(aqs merge logic to copy individual
-changes from other branches without merging branches in the
-history graph. This is sometimes known as \(aqbackporting\(aq or
-\(aqcherry\-picking\(aq. By default, graft will copy user, date, and
-description from the source changesets.
-.sp
-Changesets that are ancestors of the current revision, that have
-already been grafted, or that are merges will be skipped.
-.sp
-If \-\-log is specified, log messages will have a comment appended
-of the form:
-.sp
-.nf
-.ft C
-(grafted from CHANGESETHASH)
-.ft P
-.fi
-.sp
-If a graft merge results in conflicts, the graft process is
-interrupted so that the current merge can be manually resolved.
-Once all conflicts are addressed, the graft process can be
-continued with the \-c/\-\-continue option.
-.IP Note
-.
-The \-c/\-\-continue option does not reapply earlier options.
-.RE
-.sp
-Examples:
-.INDENT 0.0
-.IP \(bu 2
-.
-copy a single change to the stable branch and edit its description:
-.sp
-.nf
-.ft C
-hg update stable
-hg graft \-\-edit 9393
-.ft P
-.fi
-.IP \(bu 2
-.
-graft a range of changesets with one exception, updating dates:
-.sp
-.nf
-.ft C
-hg graft \-D "2085::2093 and not 2091"
-.ft P
-.fi
-.IP \(bu 2
-.
-continue a graft after resolving conflicts:
-.sp
-.nf
-.ft C
-hg graft \-c
-.ft P
-.fi
-.IP \(bu 2
-.
-show the source of a grafted changeset:
-.sp
-.nf
-.ft C
-hg log \-\-debug \-r tip
-.ft P
-.fi
-.UNINDENT
-.sp
-Returns 0 on successful completion.
-.sp
-Options:
-.INDENT 0.0
-.TP
-.B \-r,  \-\-rev
-.
-revisions to graft
-.TP
-.B \-c,  \-\-continue
-.
-resume interrupted graft
-.TP
-.B \-e,  \-\-edit
-.
-invoke editor on commit messages
-.TP
-.B \-\-log
-.
-append graft info to log message
-.TP
-.B \-D,  \-\-currentdate
-.
-record the current date as commit date
-.TP
-.B \-U,  \-\-currentuser
-.
-record the current user as committer
-.TP
-.B \-d,  \-\-date
-.
-record the specified date as commit date
-.TP
-.B \-u,  \-\-user
-.
-record the specified user as committer
-.TP
-.B \-t,  \-\-tool
-.
-specify merge tool
-.TP
-.B \-n,  \-\-dry\-run
-.
-do not perform actions, just print output
-.UNINDENT
 .SS grep
 .sp
 .nf
@@ -1752,7 +1294,7 @@ exclude names matching the given patterns
 .sp
 .nf
 .ft C
-hg heads [\-ct] [\-r STARTREV] [REV]...
+hg heads [\-ac] [\-r STARTREV] [REV]...
 .ft P
 .fi
 .sp
@@ -1831,10 +1373,6 @@ show only help for extensions
 .B \-c,  \-\-command
 .
 show only help for commands
-.TP
-.B \-k,  \-\-keyword
-.
-show topics matching keyword
 .UNINDENT
 .SS identify
 .sp
@@ -1855,37 +1393,6 @@ repository.
 Specifying a path to a repository root or Mercurial bundle will
 cause lookup to operate on that repository/bundle.
 .sp
-Examples:
-.INDENT 0.0
-.IP \(bu 2
-.
-generate a build identifier for the working directory:
-.sp
-.nf
-.ft C
-hg id \-\-id > build\-id.dat
-.ft P
-.fi
-.IP \(bu 2
-.
-find the revision corresponding to a tag:
-.sp
-.nf
-.ft C
-hg id \-n \-r 1.3
-.ft P
-.fi
-.IP \(bu 2
-.
-check the most recent revision of a remote repository:
-.sp
-.nf
-.ft C
-hg id \-r tip http://selenic.com/hg/
-.ft P
-.fi
-.UNINDENT
-.sp
 Returns 0 if successful.
 .sp
 Options:
@@ -1914,18 +1421,6 @@ show tags
 .B \-B,  \-\-bookmarks
 .
 show bookmarks
-.TP
-.B \-e,  \-\-ssh
-.
-specify ssh command to use
-.TP
-.B \-\-remotecmd
-.
-specify hg command to run on the remote side
-.TP
-.B \-\-insecure
-.
-do not verify server certificate (ignoring web.cacerts config)
 .sp
 aliases: id
 .UNINDENT
@@ -1967,53 +1462,12 @@ patches will be applied on top of the working directory parent
 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 \(aqaddremove\(aq.
 .sp
 To read a patch from standard input, use "\-" as the patch name. If
 a URL is specified, the patch will be downloaded from it.
 See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
 .sp
-Examples:
-.INDENT 0.0
-.IP \(bu 2
-.
-import a traditional patch from a website and detect renames:
-.sp
-.nf
-.ft C
-hg import \-s 80 http://example.com/bugfix.patch
-.ft P
-.fi
-.IP \(bu 2
-.
-import a changeset from an hgweb server:
-.sp
-.nf
-.ft C
-hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
-.ft P
-.fi
-.IP \(bu 2
-.
-import all the patches in an Unix\-style mbox:
-.sp
-.nf
-.ft C
-hg import incoming\-patches.mbox
-.ft P
-.fi
-.IP \(bu 2
-.
-attempt to exactly restore an exported changeset (not always
-possible):
-.sp
-.nf
-.ft C
-hg import \-\-exact proposed\-fix.patch
-.ft P
-.fi
-.UNINDENT
-.sp
 Returns 0 on success.
 .sp
 Options:
@@ -2027,10 +1481,6 @@ directory strip option for patch. This has the same meaning as the corresponding
 .
 base path (DEPRECATED)
 .TP
-.B \-e,  \-\-edit
-.
-invoke editor on commit messages
-.TP
 .B \-f,  \-\-force
 .
 skip check for outstanding uncommitted changes
@@ -2139,10 +1589,6 @@ do not show merges
 .
 output diffstat\-style summary of changes
 .TP
-.B \-G,  \-\-graph
-.
-show the revision DAG
-.TP
 .B \-\-style
 .
 display using template map file
@@ -2261,14 +1707,18 @@ hg log [OPTION]... [FILE]
 Print the revision history of the specified files or the entire
 project.
 .sp
-If no revision range is specified, the default is \fBtip:0\fP unless
-\-\-follow is set, in which case the working directory parent is
-used as the starting revision.
-.sp
 File history is shown without following rename or copy history of
 files. Use \-f/\-\-follow with a filename to follow history across
 renames and copies. \-\-follow without a filename will only show
-ancestors or descendants of the starting revision.
+ancestors or descendants of the starting revision. \-\-follow\-first
+only follows the first parent of merge revisions.
+.sp
+If no revision range is specified, the default is \fBtip:0\fP unless
+\-\-follow is set, in which case the working directory parent is
+used as the starting revision. You can specify a revision set for
+log, see \%\fBhg help revsets\fP\: for more information.
+.sp
+See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
 .sp
 By default this command prints revision number and changeset id,
 tags, non\-trivial parents, user, date and time, and a summary for
@@ -2281,106 +1731,6 @@ changesets, as it will only compare the merge changeset against
 its first parent. Also, only files different from BOTH parents
 will appear in files:.
 .RE
-.IP Note
-.
-for performance reasons, log FILE may omit duplicate changes
-made on branches and will not show deletions. To see all
-changes including duplicates and deletions, use the \-\-removed
-switch.
-.RE
-.sp
-Some examples:
-.INDENT 0.0
-.IP \(bu 2
-.
-changesets with full descriptions and file lists:
-.sp
-.nf
-.ft C
-hg log \-v
-.ft P
-.fi
-.IP \(bu 2
-.
-changesets ancestral to the working directory:
-.sp
-.nf
-.ft C
-hg log \-f
-.ft P
-.fi
-.IP \(bu 2
-.
-last 10 commits on the current branch:
-.sp
-.nf
-.ft C
-hg log \-l 10 \-b .
-.ft P
-.fi
-.IP \(bu 2
-.
-changesets showing all modifications of a file, including removals:
-.sp
-.nf
-.ft C
-hg log \-\-removed file.c
-.ft P
-.fi
-.IP \(bu 2
-.
-all changesets that touch a directory, with diffs, excluding merges:
-.sp
-.nf
-.ft C
-hg log \-Mp lib/
-.ft P
-.fi
-.IP \(bu 2
-.
-all revision numbers that match a keyword:
-.sp
-.nf
-.ft C
-hg log \-k bug \-\-template "{rev}\en"
-.ft P
-.fi
-.IP \(bu 2
-.
-check if a given changeset is included is a tagged release:
-.sp
-.nf
-.ft C
-hg log \-r "a21ccf and ancestor(1.9)"
-.ft P
-.fi
-.IP \(bu 2
-.
-find all changesets by some user in a date range:
-.sp
-.nf
-.ft C
-hg log \-k alice \-d "may 2008 to jul 2008"
-.ft P
-.fi
-.IP \(bu 2
-.
-summary of all changesets after the last tag:
-.sp
-.nf
-.ft C
-hg log \-r "last(tagged())::" \-\-template "{desc|firstline}\en"
-.ft P
-.fi
-.UNINDENT
-.sp
-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
-.sp
-See \%\fBhg help revisions\fP\: and \%\fBhg help revsets\fP\: for more about
-specifying revisions.
-.sp
-See \%\fBhg help templates\fP\: for more about pre\-packaged styles and
-specifying custom templates.
 .sp
 Returns 0 on success.
 .sp
@@ -2393,7 +1743,7 @@ follow changeset history, or file history across copies and renames
 .TP
 .B \-\-follow\-first
 .
-only follow the first parent of merge changesets (DEPRECATED)
+only follow the first parent of merge changesets
 .TP
 .B \-d,  \-\-date
 .
@@ -2417,7 +1767,7 @@ include revisions where files were removed
 .TP
 .B \-m,  \-\-only\-merges
 .
-show only merges (DEPRECATED)
+show only merges
 .TP
 .B \-u,  \-\-user
 .
@@ -2437,7 +1787,7 @@ do not display revision or any of its ancestors
 .TP
 .B \-\-hidden
 .
-show hidden changesets (DEPRECATED)
+show hidden changesets
 .TP
 .B \-p,  \-\-patch
 .
@@ -2459,10 +1809,6 @@ do not show merges
 .
 output diffstat\-style summary of changes
 .TP
-.B \-G,  \-\-graph
-.
-show the revision DAG
-.TP
 .B \-\-style
 .
 display using template map file
@@ -2552,6 +1898,10 @@ Options:
 .
 force a merge with outstanding changes
 .TP
+.B \-t,  \-\-tool
+.
+specify merge tool
+.TP
 .B \-r,  \-\-rev
 .
 revision to merge
@@ -2559,10 +1909,6 @@ revision to merge
 .B \-P,  \-\-preview
 .
 review revisions to merge (no merge is performed)
-.TP
-.B \-t,  \-\-tool
-.
-specify merge tool
 .UNINDENT
 .SS outgoing
 .sp
@@ -2623,10 +1969,6 @@ do not show merges
 .
 output diffstat\-style summary of changes
 .TP
-.B \-G,  \-\-graph
-.
-show the revision DAG
-.TP
 .B \-\-style
 .
 display using template map file
@@ -2716,54 +2058,6 @@ source is written as \fBdefault\fP in \fB.hg/hgrc\fP.  Note that
 See \%\fBhg help urls\fP\: for more information.
 .sp
 Returns 0 on success.
-.SS phase
-.sp
-.nf
-.ft C
-hg phase [\-p|\-d|\-s] [\-f] [\-r] REV...
-.ft P
-.fi
-.sp
-With no argument, show the phase name of specified revisions.
-.sp
-With one of \-p/\-\-public, \-d/\-\-draft or \-s/\-\-secret, change the
-phase value of the specified revisions.
-.sp
-Unless \-f/\-\-force is specified, \%\fBhg phase\fP\: won\(aqt move changeset from a
-lower phase to an higher phase. Phases are ordered as follows:
-.sp
-.nf
-.ft C
-public < draft < secret
-.ft P
-.fi
-.sp
-Return 0 on success, 1 if no phases were changed or some could not
-be changed.
-.sp
-Options:
-.INDENT 0.0
-.TP
-.B \-p,  \-\-public
-.
-set changeset phase to public
-.TP
-.B \-d,  \-\-draft
-.
-set changeset phase to draft
-.TP
-.B \-s,  \-\-secret
-.
-set changeset phase to secret
-.TP
-.B \-f,  \-\-force
-.
-allow to move boundary backward
-.TP
-.B \-r,  \-\-rev
-.
-target revision
-.UNINDENT
 .SS pull
 .sp
 .nf
@@ -2853,10 +2147,6 @@ changesets on all branches.
 If \-r/\-\-rev is used, the specified revision and all its ancestors
 will be pushed to the remote repository.
 .sp
-If \-B/\-\-bookmark is used, the specified bookmarked revision, its
-ancestors, and the bookmark will be pushed to the remote
-repository.
-.sp
 Please see \%\fBhg help urls\fP\: for important details about \fBssh://\fP
 URLs. If DESTINATION is omitted, a default path will be used.
 .sp
@@ -2920,86 +2210,36 @@ hg remove [OPTION]... FILE...
 .ft P
 .fi
 .sp
-Schedule the indicated files for removal from the current branch.
-.sp
-This command schedules the files to be removed at the next commit.
-To undo a remove before that, see \%\fBhg revert\fP\:. To undo added
-files, see \%\fBhg forget\fP\:.
+Schedule the indicated files for removal from the repository.
 .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
-can be used to remove files from the next revision without
-deleting them from the working directory.
+This only removes files from the current branch, not from the
+entire project history. \-A/\-\-after can be used to remove only
+files that have already been deleted, \-f/\-\-force can be used to
+force deletion, and \-Af can be used to remove files from the next
+revision without deleting them from the working directory.
 .sp
 The following table details the behavior of remove for different
 file states (columns) and option combinations (rows). The file
-states are Added [A], Clean [C], Modified [M] and Missing [!]
-(as reported by \%\fBhg status\fP\:). The actions are Warn, Remove
-(from branch) and Delete (from disk):
-.TS
-center;
-|l|l|l|l|l|.
-_
-T{
-T}	T{
-T}	T{
-T}	T{
-T}	T{
-T}
-_
-T{
-none
-T}	T{
-W
-T}	T{
-RD
-T}	T{
-W
-T}	T{
-R
-T}
-_
-T{
-\-f
-T}	T{
-R
-T}	T{
-RD
-T}	T{
-RD
-T}	T{
-R
-T}
-_
-T{
-\-A
-T}	T{
-W
-T}	T{
-W
-T}	T{
-W
-T}	T{
-R
-T}
-_
-T{
-\-Af
-T}	T{
-R
-T}	T{
-R
-T}	T{
-R
-T}	T{
-R
-T}
-_
-.TE
+states are Added [A], Clean [C], Modified [M] and Missing [!] (as
+reported by \%\fBhg status\fP\:). The actions are Warn, Remove (from
+branch) and Delete (from disk):
+.sp
+.nf
+.ft C
+       A  C  M  !
+none   W  RD W  R
+\-f     R  RD RD R
+\-A     W  W  W  R
+\-Af    R  R  R  R
+.ft P
+.fi
 .sp
 Note that remove never deletes files in Added [A] state from the
 working directory, not even if option \-\-force is specified.
 .sp
+This command schedules the files to be removed at the next commit.
+To undo a remove before that, see \%\fBhg revert\fP\:.
+.sp
 Returns 0 on success, 1 if any warnings encountered.
 .sp
 Options:
@@ -3082,8 +2322,7 @@ non\-interactive merging using the \fBinternal:merge\fP configuration
 setting, or a command\-line merge tool like \fBdiff3\fP. The resolve
 command is used to manage the files involved in a merge, after
 \%\fBhg merge\fP\: has been run, and before \%\fBhg commit\fP\: is run (i.e. the
-working directory must have two parents). See \%\fBhg help
-merge\-tools\fP\: for information on configuring merge tools.
+working directory must have two parents).
 .sp
 The resolve command can be used in the following ways:
 .INDENT 0.0
@@ -3094,8 +2333,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
 the merge tool used for the given files. It overrides the HGMERGE
-environment variable and your configuration files.  Previous file
-contents are saved with a \fB.orig\fP suffix.
+environment variable and your configuration files.
 .IP \(bu 2
 .
 \%\fBhg resolve \-m [FILE]\fP\:: mark a file as having been resolved
@@ -3136,14 +2374,14 @@ mark files as resolved
 .
 mark files as unresolved
 .TP
-.B \-n,  \-\-no\-status
-.
-hide status prefix
-.TP
 .B \-t,  \-\-tool
 .
 specify merge tool
 .TP
+.B \-n,  \-\-no\-status
+.
+hide status prefix
+.TP
 .B \-I,  \-\-include
 .
 include names matching the given patterns
@@ -3162,8 +2400,7 @@ hg revert [OPTION]... [\-r REV] [NAME]...
 .IP Note
 .
 To check out earlier revisions, you should use \%\fBhg update REV\fP\:.
-To cancel an uncommitted merge (and lose your changes), use
-\%\fBhg update \-\-clean .\fP\:.
+To cancel a merge (and lose your changes), use \%\fBhg update \-\-clean .\fP\:.
 .RE
 .sp
 With no revision specified, revert the specified files or directories
@@ -3202,7 +2439,7 @@ tipmost revision matching date
 .
 revert to the specified revision
 .TP
-.B \-C,  \-\-no\-backup
+.B \-\-no\-backup
 .
 do not save backup copies of files
 .TP
@@ -3234,10 +2471,8 @@ the working directory.
 .sp
 Transactions are used to encapsulate the effects of all commands
 that create new changesets or propagate existing changesets into a
-repository.
-.sp
-For example, the following commands are transactional, and their
-effects can be rolled back:
+repository. For example, the following commands are transactional,
+and their effects can be rolled back:
 .INDENT 0.0
 .IP \(bu 2
 .
@@ -3256,10 +2491,6 @@ push (with this repository as the destination)
 unbundle
 .UNINDENT
 .sp
-To avoid permanent data loss, rollback will refuse to rollback a
-commit transaction if it isn\(aqt checked out. Use \-\-force to
-override this protection.
-.sp
 This command is not intended for use on public repositories. Once
 changes are visible for pull by other users, rolling a transaction
 back locally is ineffective (someone else may already have pulled
@@ -3275,10 +2506,6 @@ Options:
 .B \-n,  \-\-dry\-run
 .
 do not perform actions, just print output
-.TP
-.B \-f,  \-\-force
-.
-ignore safety measures
 .UNINDENT
 .SS root
 .sp
@@ -3466,38 +2693,6 @@ I = ignored
 .ft P
 .fi
 .sp
-Examples:
-.INDENT 0.0
-.IP \(bu 2
-.
-show changes in the working directory relative to a
-changeset:
-.sp
-.nf
-.ft C
-hg status \-\-rev 9353
-.ft P
-.fi
-.IP \(bu 2
-.
-show all changes including copies in an existing changeset:
-.sp
-.nf
-.ft C
-hg status \-\-copies \-\-change 9353
-.ft P
-.fi
-.IP \(bu 2
-.
-get a NUL separated list of added files, suitable for xargs:
-.sp
-.nf
-.ft C
-hg status \-an0
-.ft P
-.fi
-.UNINDENT
-.sp
 Returns 0 on success.
 .sp
 Options:
@@ -3746,18 +2941,17 @@ hg update [\-c] [\-C] [\-d DATE] [[\-r] REV]
 .sp
 Update the repository\(aqs 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
-bookmarks\fP\:).
+current named branch.
+.sp
+If the changeset is not a descendant of the working directory\(aqs
+parent, the update is aborted. With the \-c/\-\-check option, the
+working directory is checked for uncommitted changes; if none are
+found, the working directory is updated to the specified
+changeset.
 .sp
 Update sets the working directory\(aqs parent revison to the specified
 changeset (see \%\fBhg help parents\fP\:).
 .sp
-If the changeset is not a descendant or ancestor of the working
-directory\(aqs parent, the update is aborted. With the \-c/\-\-check
-option, the working directory is checked for uncommitted changes; if
-none are found, the working directory is updated to the specified
-changeset.
-.sp
 The following rules apply when the working directory contains
 uncommitted changes:
 .INDENT 0.0
@@ -3781,9 +2975,6 @@ With the \-C/\-\-clean option, uncommitted changes are discarded and
 the working directory is updated to the requested changeset.
 .UNINDENT
 .sp
-To cancel an uncommitted merge (and lose your changes), use
-\%\fBhg update \-\-clean .\fP\:.
-.sp
 Use null as the changeset to remove the working directory (like
 \%\fBhg clone \-U\fP\:).
 .sp
@@ -4161,7 +3352,7 @@ hooks for integrating with the Bugzilla bug tracker
 .TP
 .B children
 .
-command to display child changesets (DEPRECATED)
+command to display child changesets
 .TP
 .B churn
 .
@@ -4183,13 +3374,9 @@ automatically manage newlines in repository files
 .
 command to allow external programs to compare revisions
 .TP
-.B factotum
-.
-http authentication with factotum
-.TP
 .B fetch
 .
-pull, update and merge in one command (DEPRECATED)
+pull, update and merge in one command
 .TP
 .B gpg
 .
@@ -4211,10 +3398,6 @@ browse the repository in a graphical way
 .
 syntax highlighting for hgweb (requires Pygments)
 .TP
-.B histedit
-.
-interactive history editing
-.TP
 .B inotify
 .
 accelerate status report using Linux\(aqs inotify service
@@ -4227,17 +3410,13 @@ expand expressions into changelog and summaries
 .
 expand keywords in tracked files
 .TP
-.B largefiles
-.
-track large binary files
-.TP
 .B mq
 .
 manage a stack of patches
 .TP
 .B notify
 .
-hooks for sending email push notifications
+hooks for sending email notifications at commit/push time
 .TP
 .B pager
 .
@@ -4413,10 +3592,6 @@ File size matches the given expression. Examples:
 4k \- 1MB (files from 4096 bytes to 1048576 bytes)
 .UNINDENT
 .TP
-.B \fBsubrepo([pattern])\fP
-.sp
-Subrepositories whose paths match the given pattern.
-.TP
 .B \fBsymlink()\fP
 .sp
 File that is marked as a symlink.
@@ -4466,7 +3641,7 @@ Find C files in a non\-standard encoding:
 .sp
 .nf
 .ft C
-hg locate "set:**.c and not encoding(\(aqUTF\-8\(aq)"
+hg locate "set:**.c and not encoding(ascii)"
 .ft P
 .fi
 .IP \(bu 2
@@ -4650,7 +3825,7 @@ See \(aqChangeset, child\(aq.
 .TP
 .B Close changeset
 .
-See \(aqHead, closed branch\(aq
+See \(aqChangeset, close\(aq.
 .TP
 .B Closed branch
 .
@@ -4737,12 +3912,6 @@ changeset, known as the parent of the working directory. See
 to the files introduced manually or by a merge. The repository
 metadata exists in the .hg directory inside the working directory.
 .TP
-.B Draft
-.
-Changesets in the draft phase have not been shared with publishing
-repositories and may thus be safely changed by history\-modifying
-extensions. See \%\fBhg help phases\fP\:.
-.TP
 .B Graph
 .
 See DAG and \%\fBhg help graphlog\fP\:.
@@ -4766,9 +3935,6 @@ A changeset that marks a head as no longer interesting. The closed
 head is no longer listed by \%\fBhg heads\fP\:. A branch is considered
 closed when all its heads are closed and consequently is not
 listed by \%\fBhg branches\fP\:.
-.sp
-Closed heads can be re\-opened by committing new changeset as the
-child of the changeset that marks a head as closed.
 .TP
 .B Head, repository
 .
@@ -4852,17 +4018,6 @@ changeset into another.
 .sp
 Example: "You will need to patch that revision."
 .TP
-.B Phase
-.
-A per\-changeset state tracking how the changeset has been or
-should be shared. See \%\fBhg help phases\fP\:.
-.TP
-.B Public
-.
-Changesets in the public phase have been shared with publishing
-repositories and are therefore considered immutable. See \%\fBhg help
-phases\fP\:.
-.TP
 .B Pull
 .
 An operation in which changesets in a remote repository which are
@@ -4923,11 +4078,6 @@ See \(aqHistory, rewriting\(aq.
 A changeset that has only the null changeset as its parent. Most
 repositories have only a single root changeset.
 .TP
-.B Secret
-.
-Changesets in the secret phase may not be shared via push, pull,
-or clone. See \%\fBhg help phases\fP\:.
-.TP
 .B Tag
 .
 An alternative name given to a changeset. Tags can be used in all
@@ -4969,12 +4119,12 @@ See \(aqDirectory, working\(aq.
 See \(aqParent, working directory\(aq.
 .UNINDENT
 .SH SYNTAX FOR MERCURIAL IGNORE FILES
-.SS Synopsis
+.SH SYNOPSIS
 .sp
 The Mercurial system uses a file called \fB.hgignore\fP in the root
 directory of a repository to control its behavior when it searches
 for files that it is not currently tracking.
-.SS Description
+.SH DESCRIPTION
 .sp
 The working directory of a Mercurial repository will often contain
 files that should not be tracked by Mercurial. These include backup
@@ -5000,12 +4150,7 @@ configure these files.
 To control Mercurial\(aqs handling of files that it manages, many
 commands support the \fB\-I\fP and \fB\-X\fP options; see
 \%\fBhg help <command>\fP\: and \%\fBhg help patterns\fP\: for details.
-.sp
-Files that are already tracked are not affected by .hgignore, even
-if they appear in .hgignore. An untracked file X can be explicitly
-added with \%\fBhg add X\fP\:, even if X would be excluded by a pattern
-in .hgignore.
-.SS Syntax
+.SH SYNTAX
 .sp
 An ignore file is a plain text file consisting of a list of patterns,
 with one pattern per line. Empty lines are skipped. The \fB#\fP
@@ -5042,12 +4187,7 @@ Neither glob nor regexp patterns are rooted. A glob\-syntax pattern of
 the form \fB*.c\fP will match a file ending in \fB.c\fP in any directory,
 and a regexp pattern of the form \fB\e.c$\fP will do the same. To root a
 regexp pattern, start it with \fB^\fP.
-.IP Note
-.
-Patterns specified in other than \fB.hgignore\fP are always rooted.
-Please see \%\fBhg help patterns\fP\: for details.
-.RE
-.SS Example
+.SH EXAMPLE
 .sp
 Here is an example ignore file.
 .sp
@@ -5068,13 +4208,12 @@ syntax: regexp
 .SH CONFIGURING HGWEB
 .sp
 Mercurial\(aqs internal web server, hgweb, can serve either a single
-repository, or a tree of repositories. In the second case, repository
-paths and global options can be defined using a dedicated
-configuration file common to \%\fBhg serve\fP\:, \fBhgweb.wsgi\fP,
-\fBhgweb.cgi\fP and \fBhgweb.fcgi\fP.
+repository, or a collection of them. In the latter case, a special
+configuration file can be used to specify the repository paths to use
+and global web configuration options.
 .sp
-This file uses the same syntax as other Mercurial configuration files
-but recognizes only the following sections:
+This file uses the same syntax as other Mercurial configuration files,
+but only the following sections are recognized:
 .INDENT 0.0
 .INDENT 3.5
 .INDENT 0.0
@@ -5091,34 +4230,21 @@ collections
 .UNINDENT
 .UNINDENT
 .sp
-The \fBweb\fP options are thorougly described in \%\fBhg help config\fP\:.
-.sp
-The \fBpaths\fP section maps URL paths to paths of repositories in the
-filesystem. hgweb will not expose the filesystem directly \- only
-Mercurial repositories can be published and only according to the
-configuration.
-.sp
-The left hand side is the path in the URL. Note that hgweb reserves
-subpaths like \fBrev\fP or \fBfile\fP, try using different names for
-nested repositories to avoid confusing effects.
+The \fBweb\fP section can specify all the settings described in the web
+section of the hgrc(5) documentation. See \%\fBhg help config\fP\: for
+information on where to find the manual page.
 .sp
-The right hand side is the path in the filesystem. If the specified
-path ends with \fB*\fP or \fB**\fP the filesystem will be searched
-recursively for repositories below that point.
-With \fB*\fP it will not recurse into the repositories it finds (except for
-\fB.hg/patches\fP).
-With \fB**\fP it will also search inside repository working directories
-and possibly find subrepositories.
-.sp
-In this example:
+The \fBpaths\fP section provides mappings of physical repository
+paths to virtual ones. For instance:
 .sp
 .nf
 .ft C
 [paths]
-/projects/a = /srv/tmprepos/a
-/projects/b = c:/repos/b
-/ = /srv/repos/*
-/user/bob = /home/bob/repos/**
+projects/a = /foo/bar
+projects/b = /baz/quux
+web/root = /real/root/*
+/ = /real/root2/*
+virtual/root2 = /real/root2/**
 .ft P
 .fi
 .INDENT 0.0
@@ -5128,17 +4254,34 @@ The first two entries make two repositories in different directories
 appear under the same directory in the web interface
 .IP \(bu 2
 .
-The third entry will publish every Mercurial repository found in
-\fB/srv/repos/\fP, for instance the repository \fB/srv/repos/quux/\fP
-will appear as \fBhttp://server/quux/\fP
+The third entry maps every Mercurial repository found in \(aq/real/root\(aq
+into \(aqweb/root\(aq. This format is preferred over the [collections] one,
+since using absolute paths as configuration keys is not supported on every
+platform (especially on Windows).
+.IP \(bu 2
+.
+The fourth entry is a special case mapping all repositories in
+\(aq/real/root2\(aq in the root of the virtual directory.
 .IP \(bu 2
 .
-The fourth entry will publish both \fBhttp://server/user/bob/quux/\fP
-and \fBhttp://server/user/bob/quux/testsubrepo/\fP
+The fifth entry recursively finds all repositories under the real
+root, and maps their relative paths under the virtual root.
 .UNINDENT
 .sp
-The \fBcollections\fP section is deprecated and has been superseeded by
-\fBpaths\fP.
+The \fBcollections\fP section provides mappings of trees of physical
+repositories paths to virtual ones, though the paths syntax is generally
+preferred. For instance:
+.sp
+.nf
+.ft C
+[collections]
+/foo = /foo
+.ft P
+.fi
+.sp
+Here, the left side will be stripped off all repositories found in the
+right side. Thus \fB/foo/bar\fP and \fBfoo/quux/baz\fP will be listed as
+\fBbar\fP and \fBquux/baz\fP respectively.
 .SH MERGE TOOLS
 .sp
 To merge files Mercurial uses merge tools.
@@ -5176,14 +4319,11 @@ There are some internal merge tools which can be used. The internal
 merge tools are:
 .INDENT 0.0
 .TP
-.B \fBinternal:dump\fP
+.B \fBinternal:merge\fP
 .sp
-Creates three versions of the files to merge, containing the
-contents of local, other and base. These files can then be used to
-perform a merge manually. If the file to be merged is named
-\fBa.txt\fP, these files will accordingly be named \fBa.txt.local\fP,
-\fBa.txt.other\fP and \fBa.txt.base\fP and they will be placed in the
-same directory as \fBa.txt\fP.
+Uses the internal non\-interactive simple merge algorithm for merging
+files. It will fail if there are any conflicts and leave markers in
+the partially merged file.
 .TP
 .B \fBinternal:fail\fP
 .sp
@@ -5195,12 +4335,6 @@ used to resolve these conflicts.
 .sp
 Uses the local version of files as the merged version.
 .TP
-.B \fBinternal:merge\fP
-.sp
-Uses the internal non\-interactive simple merge algorithm for merging
-files. It will fail if there are any conflicts and leave markers in
-the partially merged file.
-.TP
 .B \fBinternal:other\fP
 .sp
 Uses the other version of files as the merged version.
@@ -5209,6 +4343,15 @@ Uses the other version of files as the merged version.
 .sp
 Asks the user which of the local or the other version to keep as
 the merged version.
+.TP
+.B \fBinternal:dump\fP
+.sp
+Creates three versions of the files to merge, containing the
+contents of local, other and base. These files can then be used to
+perform a merge manually. If the file to be merged is named
+\fBa.txt\fP, these files will accordingly be named \fBa.txt.local\fP,
+\fBa.txt.other\fP and \fBa.txt.base\fP and they will be placed in the
+same directory as \fBa.txt\fP.
 .UNINDENT
 .sp
 Internal tools are always available and do not require a GUI but will by default
@@ -5290,11 +4433,6 @@ By default, Mercurial treats filenames as shell\-style extended glob
 patterns.
 .sp
 Alternate pattern notations must be specified explicitly.
-.IP Note
-.
-Patterns specified in \fB.hgignore\fP are not rooted.
-Please see \%\fBhg help hgignore\fP\: for details.
-.RE
 .sp
 To use a plain path name without any pattern matching, start it with
 \fBpath:\fP. These path names must completely match starting at the
@@ -5357,136 +4495,6 @@ listfile0:list.txt read list from list.txt with null byte delimiters
 .fi
 .sp
 See also \%\fBhg help filesets\fP\:.
-.SH WORKING WITH PHASES
-.SS What are phases?
-.sp
-Phases are a system for tracking which changesets have been or should
-be shared. This helps prevent common mistakes when modifying history
-(for instance, with the mq or rebase extensions).
-.sp
-Each changeset in a repository is in one of the following phases:
-.INDENT 0.0
-.INDENT 3.5
-.INDENT 0.0
-.IP \(bu 2
-.
-public : changeset is visible on a public server
-.IP \(bu 2
-.
-draft : changeset is not yet published
-.IP \(bu 2
-.
-secret : changeset should not be pushed, pulled, or cloned
-.UNINDENT
-.UNINDENT
-.UNINDENT
-.sp
-These phases are ordered (public < draft < secret) and no changeset
-can be in a lower phase than its ancestors. For instance, if a
-changeset is public, all its ancestors are also public. Lastly,
-changeset phases should only be changed towards the public phase.
-.SS How are phases managed?
-.sp
-For the most part, phases should work transparently. By default, a
-changeset is created in the draft phase and is moved into the public
-phase when it is pushed to another repository.
-.sp
-Once changesets become public, extensions like mq and rebase will
-refuse to operate on them to prevent creating duplicate changesets.
-Phases can also be manually manipulated with the \%\fBhg phase\fP\: command
-if needed. See \%\fBhg help \-v phase\fP\: for examples.
-.SS Phases and servers
-.sp
-Normally, all servers are \fBpublishing\fP by default. This means:
-.sp
-.nf
-.ft C
-\- all draft changesets that are pulled or cloned appear in phase
-public on the client
-
-\- all draft changesets that are pushed appear as public on both
-client and server
-
-\- secret changesets are neither pushed, pulled, or cloned
-.ft P
-.fi
-.IP Note
-.
-Pulling a draft changeset from a publishing server does not mark it
-as public on the server side due to the read\-only nature of pull.
-.RE
-.sp
-Sometimes it may be desirable to push and pull changesets in the draft
-phase to share unfinished work. This can be done by setting a
-repository to disable publishing in its configuration file:
-.sp
-.nf
-.ft C
-[phases]
-publish = False
-.ft P
-.fi
-.sp
-See \%\fBhg help config\fP\: for more information on config files.
-.IP Note
-.
-Servers running older versions of Mercurial are treated as
-publishing.
-.RE
-.SS Examples
-.INDENT 0.0
-.INDENT 3.5
-.INDENT 0.0
-.IP \(bu 2
-.
-list changesets in draft or secret phase:
-.sp
-.nf
-.ft C
-hg log \-r "not public()"
-.ft P
-.fi
-.IP \(bu 2
-.
-change all secret changesets to draft:
-.sp
-.nf
-.ft C
-hg phase \-\-draft "secret()"
-.ft P
-.fi
-.IP \(bu 2
-.
-forcibly move the current changeset and descendants from public to draft:
-.sp
-.nf
-.ft C
-hg phase \-\-force \-\-draft .
-.ft P
-.fi
-.IP \(bu 2
-.
-show a list of changeset revision and phase:
-.sp
-.nf
-.ft C
-hg log \-\-template "{rev} {phase}\en"
-.ft P
-.fi
-.IP \(bu 2
-.
-resynchronize draft changesets relative to a remote repository:
-.sp
-.nf
-.ft C
-hg phase \-fd \(aqoutgoing(URL)\(aq
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.UNINDENT
-.sp
-See \%\fBhg help phase\fP\: for more information on manually manipulating phases.
 .SH SPECIFYING SINGLE REVISIONS
 .sp
 Mercurial supports several ways to specify individual revisions.
@@ -5503,13 +4511,13 @@ unique revision identifier and is referred to as a short\-form
 identifier. A short\-form identifier is only valid if it is the prefix
 of exactly one full\-length identifier.
 .sp
-Any other string is treated as a bookmark, tag, or branch name. A
-bookmark is a movable pointer to a revision. A tag is a permanent name
-associated with a revision. A branch name denotes the tipmost revision
-of that branch. Bookmark, tag, and branch names must not contain the ":"
-character.
+Any other string is treated as a tag or branch name. A tag name is a
+symbolic name associated with a revision identifier. A branch name
+denotes the tipmost revision of that branch. Tag and branch names must
+not contain the ":" character.
 .sp
-The reserved name "tip" always identifies the most recent revision.
+The reserved name "tip" is a special tag that always identifies the
+most recent revision.
 .sp
 The reserved name "null" indicates the null revision. This is the
 revision of an empty repository, and the parent of revision 0.
@@ -5526,9 +4534,10 @@ revisions.
 The language supports a number of predicates which are joined by infix
 operators. Parenthesis can be used for grouping.
 .sp
-Identifiers such as branch names may need quoting with single or
-double quotes if they contain characters like \fB\-\fP or if they match
-one of the predefined predicates.
+Identifiers such as branch names must be quoted with single or double
+quotes if they contain characters outside of
+\fB[._a\-zA\-Z0\-9\ex80\-\exff]\fP or if they match one of the predefined
+predicates.
 .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
@@ -5615,49 +4624,18 @@ Changesets that are ancestors of a changeset in set.
 .sp
 Alias for \fBuser(string)\fP.
 .TP
-.B \fBbisect(string)\fP
+.B \fBbisected(string)\fP
 .sp
-Changesets marked in the specified bisect status:
-.INDENT 7.0
-.IP \(bu 2
-.
-\fBgood\fP, \fBbad\fP, \fBskip\fP: csets explicitly marked as good/bad/skip
-.IP \(bu 2
-.
-\fBgoods\fP, \fBbads\fP      : csets topologicaly good/bad
-.IP \(bu 2
-.
-\fBrange\fP              : csets taking part in the bisection
-.IP \(bu 2
-.
-\fBpruned\fP             : csets that are goods, bads or skipped
-.IP \(bu 2
-.
-\fBuntested\fP           : csets whose fate is yet unknown
-.IP \(bu 2
-.
-\fBignored\fP            : csets ignored due to DAG topology
-.IP \(bu 2
-.
-\fBcurrent\fP            : the cset currently being bisected
-.UNINDENT
+Changesets marked in the specified bisect state (good, bad, skip).
 .TP
 .B \fBbookmark([name])\fP
 .sp
 The named bookmark or all bookmarks.
-.sp
-If \fIname\fP starts with \fIre:\fP, the remainder of the name is treated as
-a regular expression. To match a bookmark that actually starts with \fIre:\fP,
-use the prefix \fIliteral:\fP.
 .TP
 .B \fBbranch(string or set)\fP
 .sp
 All changesets belonging to the given branch or the branches of the given
 changesets.
-.sp
-If \fIstring\fP starts with \fIre:\fP, the remainder of the name is treated as
-a regular expression. To match a branch that actually starts with \fIre:\fP,
-use the prefix \fIliteral:\fP.
 .TP
 .B \fBchildren(set)\fP
 .sp
@@ -5672,11 +4650,6 @@ Changeset is closed.
 Revision contains a file matching pattern. See \%\fBhg help patterns\fP\:
 for information about file patterns.
 .TP
-.B \fBconverted([id])\fP
-.sp
-Changesets converted from the given identifier in the old repository if
-present, or all converted changesets if no identifier is specified.
-.TP
 .B \fBdate(interval)\fP
 .sp
 Changesets within the interval, see \%\fBhg help dates\fP\:.
@@ -5689,47 +4662,13 @@ Search commit message for string. The match is case\-insensitive.
 .sp
 Changesets which are descendants of changesets in set.
 .TP
-.B \fBdestination([set])\fP
-.sp
-Changesets that were created by a graft, transplant or rebase operation,
-with the given revisions specified as the source.  Omitting the optional set
-is the same as passing all().
-.TP
-.B \fBdraft()\fP
-.sp
-Changeset in draft phase.
-.TP
-.B \fBextinct()\fP
-.sp
-Obsolete changesets with obsolete descendants only.
-.TP
-.B \fBextra(label, [value])\fP
-.sp
-Changesets with the given label in the extra metadata, with the given
-optional value.
-.sp
-If \fIvalue\fP starts with \fIre:\fP, the remainder of the value is treated as
-a regular expression. To match a value that actually starts with \fIre:\fP,
-use the prefix \fIliteral:\fP.
-.TP
 .B \fBfile(pattern)\fP
 .sp
 Changesets affecting files matched by pattern.
-.sp
-For a faster but less accurate result, consider using \fBfilelog()\fP
-instead.
 .TP
 .B \fBfilelog(pattern)\fP
 .sp
 Changesets connected to the specified filelog.
-.sp
-For performance reasons, \fBfilelog()\fP does not show every changeset
-that affects the requested file(s). See \%\fBhg help log\fP\: for details. For
-a slower, more accurate result, use \fBfile()\fP.
-.TP
-.B \fBfirst(set, [n])\fP
-.sp
-An alias for limit().
 .TP
 .B \fBfollow([file])\fP
 .sp
@@ -5760,38 +4699,13 @@ Revision non\-ambiguously specified by the given hex string prefix.
 Search commit message, user name, and names of changed files for
 string. The match is case\-insensitive.
 .TP
-.B \fBlast(set, [n])\fP
+.B \fBlast(set, n)\fP
 .sp
-Last n members of set, defaulting to 1.
+Last n members of set.
 .TP
-.B \fBlimit(set, [n])\fP
-.sp
-First n members of set, defaulting to 1.
-.TP
-.B \fBmatching(revision [, field])\fP
-.sp
-Changesets in which a given set of fields match the set of fields in the
-selected revision or set.
+.B \fBlimit(set, n)\fP
 .sp
-To match more than one field pass the list of fields to match separated
-by spaces (e.g. \fBauthor description\fP).
-.sp
-Valid fields are most regular revision fields and some special fields.
-.sp
-Regular revision fields are \fBdescription\fP, \fBauthor\fP, \fBbranch\fP,
-\fBdate\fP, \fBfiles\fP, \fBphase\fP, \fBparents\fP, \fBsubstate\fP, \fBuser\fP
-and \fBdiff\fP.
-Note that \fBauthor\fP and \fBuser\fP are synonyms. \fBdiff\fP refers to the
-contents of the revision. Two revisions matching their \fBdiff\fP will
-also match their \fBfiles\fP.
-.sp
-Special fields are \fBsummary\fP and \fBmetadata\fP:
-\fBsummary\fP matches the first line of the description.
-\fBmetadata\fP is equivalent to matching \fBdescription user date\fP
-(i.e. it matches the main metadata fields).
-.sp
-\fBmetadata\fP is the default field which is used when no fields are
-specified. You can match more than one field at a time.
+First n members of set.
 .TP
 .B \fBmax(set)\fP
 .sp
@@ -5809,18 +4723,6 @@ Changeset with lowest revision number in set.
 .sp
 Changesets modifying files matched by pattern.
 .TP
-.B \fBobsolete()\fP
-.sp
-Mutable changeset with a newer version.
-.TP
-.B \fBorigin([set])\fP
-.sp
-Changesets that were specified as a source for the grafts, transplants or
-rebases that created the given revisions.  Omitting the optional set is the
-same as passing all().  If a changeset created by these operations is itself
-specified as a source for one of these operations, only the source changeset
-for the first operation is selected.
-.TP
 .B \fBoutgoing([path])\fP
 .sp
 Changesets not found in the specified destination repository, or the
@@ -5842,20 +4744,6 @@ The set of all parents for all changesets in set, or the working directory.
 .sp
 An empty set, if any revision in set isn\(aqt found; otherwise,
 all revisions in set.
-.sp
-If any of specified revisions is not present in the local repository,
-the query is normally aborted. But this predicate allows the query
-to continue even in such cases.
-.TP
-.B \fBpublic()\fP
-.sp
-Changeset in public phase.
-.TP
-.B \fBremote([id [,path]])\fP
-.sp
-Local revision that corresponds to the given identifier in a
-remote repository, if present. Here, the \(aq.\(aq identifier is a
-synonym for the current local branch.
 .TP
 .B \fBremoves(pattern)\fP
 .sp
@@ -5871,11 +4759,7 @@ Reverse order of set.
 .TP
 .B \fBroots(set)\fP
 .sp
-Changesets in set with no parent changeset in set.
-.TP
-.B \fBsecret()\fP
-.sp
-Changeset in secret phase.
+Changesets with no parent changeset in set.
 .TP
 .B \fBsort(set[, [\-]key...])\fP
 .sp
@@ -5905,17 +4789,9 @@ The keys can be:
 .sp
 The specified tag by name, or all tagged revisions if no name is given.
 .TP
-.B \fBunstable()\fP
-.sp
-Non\-obsolete changesets with obsolete ancestors.
-.TP
 .B \fBuser(string)\fP
 .sp
 User name contains string. The match is case\-insensitive.
-.sp
-If \fIstring\fP starts with \fIre:\fP, the remainder of the string is treated as
-a regular expression. To match a user that actually contains \fIre:\fP, use
-the prefix \fIliteral:\fP.
 .UNINDENT
 .sp
 New predicates (known as "aliases") can be defined, using any combination of
@@ -6023,21 +4899,19 @@ hg log \-r "(keyword(bug) or keyword(issue)) and not ancestors(tagged())"
 .sp
 Subrepositories let you nest external repositories or projects into a
 parent Mercurial repository, and make commands operate on them as a
-group.
-.sp
-Mercurial currently supports Mercurial, Git, and Subversion
-subrepositories.
+group. External Mercurial and Subversion projects are currently
+supported.
 .sp
 Subrepositories are made of three components:
 .INDENT 0.0
 .IP 1. 3
 .
 Nested repository checkouts. They can appear anywhere in the
-parent working directory.
+parent working directory, and are Mercurial clones or Subversion
+checkouts.
 .IP 2. 3
 .
-Nested repository references. They are defined in \fB.hgsub\fP, which
-should be placed in the root of working directory, and
+Nested repository references. They are defined in \fB.hgsub\fP and
 tell where the subrepository checkouts come from. Mercurial
 subrepositories are referenced like:
 .INDENT 3.0
@@ -6047,27 +4921,23 @@ path/to/nested = \%https://example.com/nested/repo/path\:
 .UNINDENT
 .UNINDENT
 .sp
-Git and Subversion subrepos are also supported:
+where \fBpath/to/nested\fP is the checkout location relatively to the
+parent Mercurial root, and \fBhttps://example.com/nested/repo/path\fP
+is the source repository path. The source can also reference a
+filesystem path. Subversion repositories are defined with:
 .INDENT 3.0
 .INDENT 3.5
 .sp
-path/to/nested = [git]git://example.com/nested/repo/path
 path/to/nested = [svn]https://example.com/nested/trunk/path
 .UNINDENT
 .UNINDENT
 .sp
-where \fBpath/to/nested\fP is the checkout location relatively to the
-parent Mercurial root, and \fBhttps://example.com/nested/repo/path\fP
-is the source repository path. The source can also reference a
-filesystem path.
-.sp
 Note that \fB.hgsub\fP does not exist by default in Mercurial
 repositories, you have to create and add it to the parent
 repository before using subrepositories.
 .IP 3. 3
 .
-Nested repository states. They are defined in \fB.hgsubstate\fP, which
-is placed in the root of working directory, and
+Nested repository states. They are defined in \fB.hgsubstate\fP and
 capture whatever information is required to restore the
 subrepositories to the state they were committed in a parent
 repository changeset. Mercurial automatically record the nested
@@ -6077,7 +4947,7 @@ repositories states when committing in the parent repository.
 The \fB.hgsubstate\fP file should not be edited manually.
 .RE
 .UNINDENT
-.SS Adding a Subrepository
+.SH ADDING A SUBREPOSITORY
 .sp
 If \fB.hgsub\fP does not exist, create it and add it to the parent
 repository. Clone or checkout the external projects where you want it
@@ -6085,7 +4955,7 @@ to live in the parent repository. Edit \fB.hgsub\fP and add the
 subrepository entry as described above. At this point, the
 subrepository is tracked and the next commit will record its state in
 \fB.hgsubstate\fP and bind it to the committed changeset.
-.SS Synchronizing a Subrepository
+.SH SYNCHRONIZING A SUBREPOSITORY
 .sp
 Subrepos do not automatically track the latest changeset of their
 sources. Instead, they are updated to the changeset that corresponds
@@ -6096,19 +4966,17 @@ libraries when they update.
 Thus, updating subrepos is a manual process. Simply check out target
 subrepo at the desired revision, test in the top\-level repo, then
 commit in the parent repository to record the new combination.
-.SS Deleting a Subrepository
+.SH DELETING A SUBREPOSITORY
 .sp
 To remove a subrepository from the parent repository, delete its
 reference from \fB.hgsub\fP, then remove its files.
-.SS Interaction with Mercurial Commands
+.SH INTERACTION WITH MERCURIAL COMMANDS
 .INDENT 0.0
 .TP
 .B add
 .
 add does not recurse in subrepos unless \-S/\-\-subrepos is
-specified.  However, if you specify the full path of a file in a
-subrepo, it will be added even without \-S/\-\-subrepos specified.
-Git and Subversion subrepositories are currently silently
+specified. Subversion subrepositories are currently silently
 ignored.
 .TP
 .B archive
@@ -6119,37 +4987,31 @@ archive does not recurse in subrepositories unless
 .B commit
 .
 commit creates a consistent snapshot of the state of the
-entire project and its subrepositories. If any subrepositories
-have been modified, Mercurial will abort.  Mercurial can be made
-to instead commit all modified subrepositories by specifying
-\-S/\-\-subrepos, or setting "ui.commitsubrepos=True" in a
-configuration file (see \%\fBhg help config\fP\:).  After there are no
-longer any modified subrepositories, it records their state and
-finally commits it in the parent repository.
+entire project and its subrepositories. It does this by first
+attempting to commit all modified subrepositories, then recording
+their state and finally committing it in the parent
+repository. Mercurial can be made to abort if any subrepository
+content is modified by setting "ui.commitsubrepos=no" in a
+configuration file (see \%\fBhg help config\fP\:).
 .TP
 .B diff
 .
 diff does not recurse in subrepos unless \-S/\-\-subrepos is
 specified. Changes are displayed as usual, on the subrepositories
-elements. Git and Subversion subrepositories are currently
-silently ignored.
-.TP
-.B forget
-.
-forget currently only handles exact file matches in subrepos.
-Git and Subversion subrepositories are currently silently ignored.
+elements. Subversion subrepositories are currently silently
+ignored.
 .TP
 .B incoming
 .
 incoming does not recurse in subrepos unless \-S/\-\-subrepos
-is specified. Git and Subversion subrepositories are currently
-silently ignored.
+is specified. Subversion subrepositories are currently silently
+ignored.
 .TP
 .B outgoing
 .
 outgoing does not recurse in subrepos unless \-S/\-\-subrepos
-is specified. Git and Subversion subrepositories are currently
-silently ignored.
+is specified. Subversion subrepositories are currently silently
+ignored.
 .TP
 .B pull
 .
@@ -6164,7 +5026,7 @@ case.
 Mercurial will automatically push all subrepositories first
 when the parent repository is being pushed. This ensures new
 subrepository changes are available when referenced by top\-level
-repositories.  Push is a no\-op for Subversion subrepositories.
+repositories.
 .TP
 .B status
 .
@@ -6182,7 +5044,7 @@ changeset is not available in the current subrepository, Mercurial
 will pull it in first before updating.  This means that updating
 can require network access when using subrepositories.
 .UNINDENT
-.SS Remapping Subrepositories Sources
+.SH REMAPPING SUBREPOSITORIES SOURCES
 .sp
 A subrepository source location may change during a project life,
 invalidating references stored in the parent repository history. To
@@ -6229,10 +5091,6 @@ keywords are usually available for templating a log\-like command:
 .
 String. The unmodified author of the changeset.
 .TP
-.B bisect
-.
-String. The changeset bisection status.
-.TP
 .B bookmarks
 .
 List of strings. Any bookmarks associated with the
@@ -6307,20 +5165,6 @@ Integer. Longest path to the latest tag.
 String. The changeset identification hash, as a 40 hexadecimal
 digit string.
 .TP
-.B parents
-.
-List of strings. The parents of the changeset in "rev:node"
-format. If the changeset has only one "natural" parent (the predecessor
-revision) nothing is shown.
-.TP
-.B phase
-.
-String. The changeset phase name.
-.TP
-.B phaseidx
-.
-Integer. The changeset phase index.
-.TP
 .B rev
 .
 Integer. The repository\-local changeset revision number.
@@ -6381,10 +5225,6 @@ Any text. Extracts the first string that looks like an email
 address. Example: \fBUser <user@example.com>\fP becomes
 \fBuser@example.com\fP.
 .TP
-.B emailuser
-.
-Any text. Returns the user portion of an email address.
-.TP
 .B escape
 .
 Any text. Replaces the special XML/XHTML characters "&", "<"
@@ -6438,8 +5278,7 @@ XML entities.
 .TP
 .B person
 .
-Any text. Returns the name before an email address,
-interpreting it as per RFC 5322.
+Any text. Returns the text before an email address.
 .TP
 .B rfc3339date
 .
@@ -6456,13 +5295,6 @@ headers: "Tue, 18 Aug 2009 13:00:13 +0200".
 Changeset hash. Returns the short form of a changeset hash,
 i.e. a 12 hexadecimal digit string.
 .TP
-.B shortbisect
-.
-Any text. Treats \fItext\fP as a bisection status, and
-returns a single\-character representing the status (G: good, B: bad,
-S: skipped, U: untested, I: ignored). Returns single space if \fItext\fP
-is not a valid bisection status.
-.TP
 .B shortdate
 .
 Date. Returns a date like "2006\-09\-18".
@@ -6493,8 +5325,7 @@ Any text. Escapes all "special" characters. For example,
 .TP
 .B user
 .
-Any text. Returns a short representation of a user name or email
-address.
+Any text. Returns the user portion of an email address.
 .UNINDENT
 .SH URL PATHS
 .sp
@@ -6652,9 +5483,6 @@ a comma\-separated list containing users and groups, or
 .
 an asterisk, to match anyone;
 .UNINDENT
-.sp
-You can add the "!" prefix to a user or group name to invert the sense
-of the match.
 .SS Path\-based Access Control
 .sp
 Use the \fBacl.deny\fP and \fBacl.allow\fP sections to have path\-based
@@ -6743,54 +5571,14 @@ docs/** = doc_writer
 # under the "images" folder:
 images/** = jack, @designers
 
-# Everyone (except for "user6" and "@hg\-denied" \- see acl.deny above)
-# will have write access to any file under the "resources" folder
-# (except for 1 file. See acl.deny):
+# Everyone (except for "user6" \- see acl.deny above) will have write
+# access to any file under the "resources" folder (except for 1
+# file. See acl.deny):
 src/main/resources/** = *
 
 \&.hgtags = release_engineer
 .ft P
 .fi
-.SS Examples using the "!" prefix
-.sp
-Suppose there\(aqs a branch that only a given user (or group) should be able to
-push to, and you don\(aqt want to restrict access to any other branch that may
-be created.
-.sp
-The "!" prefix allows you to prevent anyone except a given user or group to
-push changesets in a given branch or path.
-.sp
-In the examples below, we will:
-1) Deny access to branch "ring" to anyone but user "gollum"
-2) Deny access to branch "lake" to anyone but members of the group "hobbit"
-3) Deny access to a file to anyone but user "gollum"
-.sp
-.nf
-.ft C
-[acl.allow.branches]
-# Empty
-
-[acl.deny.branches]
-
-# 1) only \(aqgollum\(aq can commit to branch \(aqring\(aq;
-# \(aqgollum\(aq and anyone else can still commit to any other branch.
-ring = !gollum
-
-# 2) only members of the group \(aqhobbit\(aq can commit to branch \(aqlake\(aq;
-# \(aqhobbit\(aq members and anyone else can still commit to any other branch.
-lake = !@hobbit
-
-# You can also deny access based on file paths:
-
-[acl.allow]
-# Empty
-
-[acl.deny]
-# 3) only \(aqgollum\(aq can change the file below;
-# \(aqgollum\(aq and anyone else can still change any other file.
-/misty/mountains/cave/ring = !gollum
-.ft P
-.fi
 .SS bugzilla
 .sp
 hooks for integrating with the Bugzilla bug tracker
@@ -6799,8 +5587,7 @@ This hook extension adds comments on bugs in Bugzilla when changesets
 that refer to bugs by Bugzilla ID are seen. The comment is formatted using
 the Mercurial template mechanism.
 .sp
-The bug references can optionally include an update for Bugzilla of the
-hours spent working on the bug. Bugs can also be marked fixed.
+The hook does not change bug status.
 .sp
 Three basic modes of access to Bugzilla are provided:
 .INDENT 0.0
@@ -6825,13 +5612,13 @@ permission to read Bugzilla configuration details and the necessary
 MySQL user and password to have full access rights to the Bugzilla
 database. For these reasons this access mode is now considered
 deprecated, and will not be updated for new Bugzilla versions going
-forward. Only adding comments is supported in this access mode.
+forward.
 .sp
 Access via XMLRPC needs a Bugzilla username and password to be specified
 in the configuration. Comments are added under that username. Since the
 configuration must be readable by all Mercurial users, it is recommended
 that the rights of that user are restricted in Bugzilla to the minimum
-necessary to add comments. Marking bugs fixed requires Bugzilla 4.0 and later.
+necessary to add comments.
 .sp
 Access via XMLRPC/email uses XMLRPC to query Bugzilla, but sends
 email to the Bugzilla email interface to submit comments to bugs.
@@ -6839,8 +5626,7 @@ The From: address in the email is set to the email address of the Mercurial
 user, so the comment appears to come from the Mercurial user. In the event
 that the Mercurial user email is not recognised by Bugzilla as a Bugzilla
 user, the email associated with the Bugzilla username used to log into
-Bugzilla is used instead as the source of the comment. Marking bugs fixed
-works on all supported Bugzilla versions.
+Bugzilla is used instead as the source of the comment.
 .sp
 Configuration items common to all access modes:
 .INDENT 0.0
@@ -6875,37 +5661,11 @@ including 2.18.
 .TP
 .B bugzilla.regexp
 .
-Regular expression to match bug IDs for update in changeset commit message.
-It must contain one "()" named group \fB<ids>\fP containing the bug
-IDs separated by non\-digit characters. It may also contain
-a named group \fB<hours>\fP with a floating\-point number giving the
-hours worked on the bug. If no named groups are present, the first
-"()" group is assumed to contain the bug IDs, and work time is not
-updated. The default expression matches \fBBug 1234\fP, \fBBug no. 1234\fP,
-\fBBug number 1234\fP, \fBBugs 1234,5678\fP, \fBBug 1234 and 5678\fP and
-variations thereof, followed by an hours number prefixed by \fBh\fP or
-\fBhours\fP, e.g. \fBhours 1.5\fP. Matching is case insensitive.
-.TP
-.B bugzilla.fixregexp
-.
-Regular expression to match bug IDs for marking fixed in changeset
-commit message. This must contain a "()" named group \fB<ids>\(ga containing
-the bug IDs separated by non\-digit characters. It may also contain
-a named group \(ga\(ga<hours>\fP with a floating\-point number giving the
-hours worked on the bug. If no named groups are present, the first
-"()" group is assumed to contain the bug IDs, and work time is not
-updated. The default expression matches \fBFixes 1234\fP, \fBFixes bug 1234\fP,
-\fBFixes bugs 1234,5678\fP, \fBFixes 1234 and 5678\fP and
-variations thereof, followed by an hours number prefixed by \fBh\fP or
-\fBhours\fP, e.g. \fBhours 1.5\fP. Matching is case insensitive.
-.TP
-.B bugzilla.fixstatus
-.
-The status to set a bug to when marking fixed. Default \fBRESOLVED\fP.
-.TP
-.B bugzilla.fixresolution
-.
-The resolution to set a bug to when marking fixed. Default \fBFIXED\fP.
+Regular expression to match bug IDs in changeset commit message.
+Must contain one "()" group. The default expression matches \fBBug
+1234\fP, \fBBug no. 1234\fP, \fBBug number 1234\fP, \fBBugs 1234,5678\fP,
+\fBBug 1234 and 5678\fP and variations thereof. Matching is case
+insensitive.
 .TP
 .B bugzilla.style
 .
@@ -7154,10 +5914,7 @@ Changeset commit comment. Bug 1234.
 .fi
 .SS children
 .sp
-command to display child changesets (DEPRECATED)
-.sp
-This extension is deprecated. You should use \%\fBhg log \-r
-"children(REV)"\fP\: instead.
+command to display child changesets
 .SS Commands
 .SS children
 .sp
@@ -7338,9 +6095,6 @@ branches.active = none
 branches.closed = black bold
 branches.current = green
 branches.inactive = none
-
-tags.normal = green
-tags.local = black bold
 .ft P
 .fi
 .sp
@@ -7585,8 +6339,8 @@ converting from and to Mercurial. Default is False.
 .B convert.hg.saverev
 .
 store original revision ID in changeset
-(forces target IDs to change). It takes a boolean argument and
-defaults to False.
+(forces target IDs to change). It takes and boolean argument
+and defaults to False.
 .TP
 .B convert.hg.startrev
 .
@@ -7648,7 +6402,7 @@ delete them.
 .B hook.cvschangesets
 .
 Specify a Python function to be called after
-the changesets are calculated from the CVS log. The
+the changesets are calculated from the the CVS log. The
 function is passed a list with the changeset entries, and can
 modify the changesets in\-place, or add or delete them.
 .UNINDENT
@@ -7846,10 +6600,9 @@ The rules will first apply when files are touched in the working
 copy, e.g. by updating to null and back to tip to touch all files.
 .RE
 .sp
-The extension uses an optional \fB[eol]\fP section read from both the
-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:
+The extension uses an optional \fB[eol]\fP section in your hgrc file
+(not the \fB.hgeol\fP file) for settings that control the overall
+behavior. There are two settings:
 .INDENT 0.0
 .IP \(bu 2
 .
@@ -7864,11 +6617,6 @@ the extension convert files with inconsistent EOLs. Inconsistent
 means that there is both \fBCRLF\fP and \fBLF\fP present in the file.
 Such files are normally not touched under the assumption that they
 have mixed EOLs on purpose.
-.IP \(bu 2
-.
-\fBeol.fix\-trailing\-newline\fP (default False) can be set to True to
-ensure that converted files end with a EOL character (either \fB\en\fP
-or \fB\er\en\fP as per the configured patterns).
 .UNINDENT
 .sp
 The extension provides \fBcleverencode:\fP and \fBcleverdecode:\fP filters
@@ -7919,8 +6667,7 @@ meld =
 # (see http://www.vim.org/scripts/script.php?script_id=102) Non
 # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in
 # your .vimrc
-vimdiff = gvim \-f "+next" \e
-          "+execute \(aqDirDiff\(aq fnameescape(argv(0)) fnameescape(argv(1))"
+vimdiff = gvim \-f \(aq+next\(aq \(aq+execute "DirDiff" argv(0) argv(1)\(aq
 .ft P
 .fi
 .sp
@@ -8004,45 +6751,9 @@ include names matching the given patterns
 .
 exclude names matching the given patterns
 .UNINDENT
-.SS factotum
-.sp
-http authentication with factotum
-.sp
-This extension allows the factotum(4) facility on Plan 9 from Bell Labs
-platforms to provide authentication information for HTTP access. Configuration
-entries specified in the auth section as well as authentication information
-provided in the repository URL are fully supported. If no prefix is specified,
-a value of "*" will be assumed.
-.sp
-By default, keys are specified as:
-.sp
-.nf
-.ft C
-proto=pass service=hg prefix=<prefix> user=<username> !password=<password>
-.ft P
-.fi
-.sp
-If the factotum extension is unable to read the required key, one will be
-requested interactively.
-.sp
-A configuration section is available to customize runtime behavior. By
-default, these entries are:
-.sp
-.nf
-.ft C
-[factotum]
-executable = /bin/auth/factotum
-mountpoint = /mnt/factotum
-service = hg
-.ft P
-.fi
-.sp
-The executable entry defines the full path to the factotum binary. The
-mountpoint entry defines the path to the factotum file service. Lastly, the
-service entry controls the service name used when reading keys.
 .SS fetch
 .sp
-pull, update and merge in one command (DEPRECATED)
+pull, update and merge in one command
 .SS Commands
 .SS fetch
 .sp
@@ -8060,9 +6771,10 @@ automatically merged, and the result of the merge is committed.
 Otherwise, the working directory is updated to include the new
 changes.
 .sp
-When a merge is needed, the working directory is first updated to
-the newly pulled changes. Local changes are then merged into the
-pulled changes. To switch the merge order, use \-\-switch\-parent.
+When a merge occurs, the newly pulled changes are assumed to be
+"authoritative". The head of the new changes is used as the first
+parent, with local changes as the second. To switch the merge
+order, use \-\-switch\-parent.
 .sp
 See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
 .sp
@@ -8123,7 +6835,7 @@ commands to sign and verify changesets
 .sp
 .nf
 .ft C
-hg sigcheck REV
+hg sigcheck REVISION
 .ft P
 .fi
 .sp
@@ -8132,7 +6844,7 @@ verify all the signatures there may be for a particular revision
 .sp
 .nf
 .ft C
-hg sign [OPTION]... [REV]...
+hg sign [OPTION]... [REVISION]...
 .ft P
 .fi
 .sp
@@ -8206,81 +6918,17 @@ directory.
 Options:
 .INDENT 0.0
 .TP
-.B \-f,  \-\-follow
-.
-follow changeset history, or file history across copies and renames
-.TP
-.B \-\-follow\-first
-.
-only follow the first parent of merge changesets (DEPRECATED)
-.TP
-.B \-d,  \-\-date
-.
-show revisions matching date spec
-.TP
-.B \-C,  \-\-copies
-.
-show copied files
-.TP
-.B \-k,  \-\-keyword
-.
-do case\-insensitive search for a given text
-.TP
-.B \-r,  \-\-rev
-.
-show the specified revision or range
-.TP
-.B \-\-removed
-.
-include revisions where files were removed
-.TP
-.B \-m,  \-\-only\-merges
-.
-show only merges (DEPRECATED)
-.TP
-.B \-u,  \-\-user
-.
-revisions committed by user
-.TP
-.B \-\-only\-branch
-.
-show only changesets within the given named branch (DEPRECATED)
-.TP
-.B \-b,  \-\-branch
-.
-show changesets within the given named branch
-.TP
-.B \-P,  \-\-prune
-.
-do not display revision or any of its ancestors
-.TP
-.B \-\-hidden
-.
-show hidden changesets (DEPRECATED)
-.TP
-.B \-p,  \-\-patch
-.
-show patch
-.TP
-.B \-g,  \-\-git
-.
-use git extended diff format
-.TP
 .B \-l,  \-\-limit
 .
 limit number of changes displayed
 .TP
-.B \-M,  \-\-no\-merges
-.
-do not show merges
-.TP
-.B \-\-stat
+.B \-p,  \-\-patch
 .
-output diffstat\-style summary of changes
+show patch
 .TP
-.B \-G,  \-\-graph
+.B \-r,  \-\-rev
 .
-show the revision DAG
+show the specified revision or range
 .TP
 .B \-\-style
 .
@@ -8289,14 +6937,6 @@ display using template map file
 .B \-\-template
 .
 display with template
-.TP
-.B \-I,  \-\-include
-.
-include names matching the given patterns
-.TP
-.B \-X,  \-\-exclude
-.
-exclude names matching the given patterns
 .UNINDENT
 .SS hgcia
 .sp
@@ -8412,206 +7052,6 @@ pygments_style = <style>
 .fi
 .sp
 The default is \(aqcolorful\(aq.
-.SS histedit
-.sp
-interactive history editing
-.sp
-With this extension installed, Mercurial gains one new command: histedit. Usage
-is as follows, assuming the following history:
-.sp
-.nf
-.ft C
-@  3[tip]   7c2fd3b9020c   2009\-04\-27 18:04 \-0500   durin42
-|    Add delta
-|
-o  2   030b686bedc4   2009\-04\-27 18:04 \-0500   durin42
-|    Add gamma
-|
-o  1   c561b4e977df   2009\-04\-27 18:04 \-0500   durin42
-|    Add beta
-|
-o  0   d8d2fcd0e319   2009\-04\-27 18:04 \-0500   durin42
-     Add alpha
-.ft P
-.fi
-.sp
-If you were to run \fBhg histedit c561b4e977df\fP, you would see the following
-file open in your editor:
-.sp
-.nf
-.ft C
-pick c561b4e977df Add beta
-pick 030b686bedc4 Add gamma
-pick 7c2fd3b9020c Add delta
-
-# Edit history between 633536316234 and 7c2fd3b9020c
-#
-# Commands:
-#  p, pick = use commit
-#  e, edit = use commit, but stop for amending
-#  f, fold = use commit, but fold into previous commit
-#  d, drop = remove commit from history
-#  m, mess = edit message without changing commit content
-#
-.ft P
-.fi
-.sp
-In this file, lines beginning with \fB#\fP are ignored. You must specify a rule
-for each revision in your history. For example, if you had meant to add gamma
-before beta, and then wanted to add delta in the same revision as beta, you
-would reorganize the file to look like this:
-.sp
-.nf
-.ft C
-pick 030b686bedc4 Add gamma
-pick c561b4e977df Add beta
-fold 7c2fd3b9020c Add delta
-
-# Edit history between 633536316234 and 7c2fd3b9020c
-#
-# Commands:
-#  p, pick = use commit
-#  e, edit = use commit, but stop for amending
-#  f, fold = use commit, but fold into previous commit
-#  d, drop = remove commit from history
-#  m, mess = edit message without changing commit content
-#
-.ft P
-.fi
-.sp
-At which point you close the editor and \fBhistedit\fP starts working. When you
-specify a \fBfold\fP operation, \fBhistedit\fP will open an editor when it folds
-those revisions together, offering you a chance to clean up the commit message:
-.sp
-.nf
-.ft C
-Add beta
-***
-Add delta
-.ft P
-.fi
-.sp
-Edit the commit message to your liking, then close the editor. For
-this example, let\(aqs assume that the commit message was changed to
-\fBAdd beta and delta.\fP After histedit has run and had a chance to
-remove any old or temporary revisions it needed, the history looks
-like this:
-.sp
-.nf
-.ft C
-@  2[tip]   989b4d060121   2009\-04\-27 18:04 \-0500   durin42
-|    Add beta and delta.
-|
-o  1   081603921c3f   2009\-04\-27 18:04 \-0500   durin42
-|    Add gamma
-|
-o  0   d8d2fcd0e319   2009\-04\-27 18:04 \-0500   durin42
-     Add alpha
-.ft P
-.fi
-.sp
-Note that \fBhistedit\fP does \fInot\fP remove any revisions (even its own temporary
-ones) until after it has completed all the editing operations, so it will
-probably perform several strip operations when it\(aqs done. For the above example,
-it had to run strip twice. Strip can be slow depending on a variety of factors,
-so you might need to be a little patient. You can choose to keep the original
-revisions by passing the \fB\-\-keep\fP flag.
-.sp
-The \fBedit\fP operation will drop you back to a command prompt,
-allowing you to edit files freely, or even use \fBhg record\fP to commit
-some changes as a separate commit. When you\(aqre done, any remaining
-uncommitted changes will be committed as well. When done, run \fBhg
-histedit \-\-continue\fP to finish this step. You\(aqll be prompted for a
-new commit message, but the default commit message will be the
-original message for the \fBedit\fP ed revision.
-.sp
-The \fBmessage\fP operation will give you a chance to revise a commit
-message without changing the contents. It\(aqs a shortcut for doing
-\fBedit\fP immediately followed by \fIhg histedit \-\-continue\(ga\fP.
-.sp
-If \fBhistedit\fP encounters a conflict when moving a revision (while
-handling \fBpick\fP or \fBfold\fP), it\(aqll stop in a similar manner to
-\fBedit\fP with the difference that it won\(aqt prompt you for a commit
-message when done. If you decide at this point that you don\(aqt like how
-much work it will be to rearrange history, or that you made a mistake,
-you can use \fBhg histedit \-\-abort\fP to abandon the new changes you
-have made and return to the state before you attempted to edit your
-history.
-.sp
-If we clone the example repository above and add three more changes, such that
-we have the following history:
-.sp
-.nf
-.ft C
-@  6[tip]   038383181893   2009\-04\-27 18:04 \-0500   stefan
-|    Add theta
-|
-o  5   140988835471   2009\-04\-27 18:04 \-0500   stefan
-|    Add eta
-|
-o  4   122930637314   2009\-04\-27 18:04 \-0500   stefan
-|    Add zeta
-|
-o  3   836302820282   2009\-04\-27 18:04 \-0500   stefan
-|    Add epsilon
-|
-o  2   989b4d060121   2009\-04\-27 18:04 \-0500   durin42
-|    Add beta and delta.
-|
-o  1   081603921c3f   2009\-04\-27 18:04 \-0500   durin42
-|    Add gamma
-|
-o  0   d8d2fcd0e319   2009\-04\-27 18:04 \-0500   durin42
-     Add alpha
-.ft P
-.fi
-.sp
-If you run \fBhg histedit \-\-outgoing\fP on the clone then it is the same
-as running \fBhg histedit 836302820282\fP. If you need plan to push to a
-repository that Mercurial does not detect to be related to the source
-repo, you can add a \fB\-\-force\fP option.
-.SS Commands
-.SS histedit
-.sp
-.nf
-.ft C
-hg histedit [PARENT]
-.ft P
-.fi
-.sp
-interactively edit changeset history
-.sp
-Options:
-.INDENT 0.0
-.TP
-.B \-\-commands
-.
-Read history edits from the specified file.
-.TP
-.B \-c,  \-\-continue
-.
-continue an edit already in progress
-.TP
-.B \-k,  \-\-keep
-.
-don\(aqt strip old nodes after edit is complete
-.TP
-.B \-\-abort
-.
-abort an edit in progress
-.TP
-.B \-o,  \-\-outgoing
-.
-changesets not found in destination
-.TP
-.B \-f,  \-\-force
-.
-force outgoing even for unrelated repositories
-.TP
-.B \-r,  \-\-rev
-.
-first revision to be edited
-.UNINDENT
 .SS inotify
 .sp
 accelerate status report using Linux\(aqs inotify service
@@ -8863,138 +7303,6 @@ include names matching the given patterns
 .
 exclude names matching the given patterns
 .UNINDENT
-.SS largefiles
-.sp
-track large binary files
-.sp
-Large binary files tend to be not very compressible, not very
-diffable, and not at all mergeable. Such files are not handled
-efficiently by Mercurial\(aqs storage format (revlog), which is based on
-compressed binary deltas; storing large binary files as regular
-Mercurial files wastes bandwidth and disk space and increases
-Mercurial\(aqs memory usage. The largefiles extension addresses these
-problems by adding a centralized client\-server layer on top of
-Mercurial: largefiles live in a \fIcentral store\fP out on the network
-somewhere, and you only fetch the revisions that you need when you
-need them.
-.sp
-largefiles works by maintaining a "standin file" in .hglf/ for each
-largefile. The standins are small (41 bytes: an SHA\-1 hash plus
-newline) and are tracked by Mercurial. Largefile revisions are
-identified by the SHA\-1 hash of their contents, which is written to
-the standin. largefiles uses that revision ID to get/put largefile
-revisions from/to the central store. This saves both disk space and
-bandwidth, since you don\(aqt need to retrieve all historical revisions
-of large files when you clone or pull.
-.sp
-To start a new repository or add new large binary files, just add
-\-\-large to your \%\fBhg add\fP\: command. For example:
-.sp
-.nf
-.ft C
-$ dd if=/dev/urandom of=randomdata count=2000
-$ hg add \-\-large randomdata
-$ hg commit \-m \(aqadd randomdata as a largefile\(aq
-.ft P
-.fi
-.sp
-When you push a changeset that adds/modifies largefiles to a remote
-repository, its largefile revisions will be uploaded along with it.
-Note that the remote Mercurial must also have the largefiles extension
-enabled for this to work.
-.sp
-When you pull a changeset that affects largefiles from a remote
-repository, Mercurial behaves as normal. However, when you update to
-such a revision, any largefiles needed by that revision are downloaded
-and cached (if they have never been downloaded before). This means
-that network access may be required to update to changesets you have
-not previously updated to.
-.sp
-If you already have large files tracked by Mercurial without the
-largefiles extension, you will need to convert your repository in
-order to benefit from largefiles. This is done with the
-\%\fBhg lfconvert\fP\: command:
-.sp
-.nf
-.ft C
-$ hg lfconvert \-\-size 10 oldrepo newrepo
-.ft P
-.fi
-.sp
-In repositories that already have largefiles in them, any new file
-over 10MB will automatically be added as a largefile. To change this
-threshold, set \fBlargefiles.minsize\fP in your Mercurial config file
-to the minimum size in megabytes to track as a largefile, or use the
-\-\-lfsize option to the add command (also in megabytes):
-.sp
-.nf
-.ft C
-[largefiles]
-minsize = 2
-
-$ hg add \-\-lfsize 2
-.ft P
-.fi
-.sp
-The \fBlargefiles.patterns\fP config option allows you to specify a list
-of filename patterns (see \%\fBhg help patterns\fP\:) that should always be
-tracked as largefiles:
-.sp
-.nf
-.ft C
-[largefiles]
-patterns =
-  *.jpg
-  re:.*\e.(png|bmp)$
-  library.zip
-  content/audio/*
-.ft P
-.fi
-.sp
-Files that match one of these patterns will be added as largefiles
-regardless of their size.
-.sp
-The \fBlargefiles.minsize\fP and \fBlargefiles.patterns\fP config options
-will be ignored for any repositories not already containing a
-largefile. To add the first largefile to a repository, you must
-explicitly do so with the \-\-large flag passed to the \%\fBhg add\fP\:
-command.
-.SS Commands
-.SS lfconvert
-.sp
-.nf
-.ft C
-hg lfconvert SOURCE DEST [FILE ...]
-.ft P
-.fi
-.sp
-Convert repository SOURCE to a new repository DEST, identical to
-SOURCE except that certain files will be converted as largefiles:
-specifically, any file that matches any PATTERN \fIor\fP whose size is
-above the minimum size threshold is converted as a largefile. The
-size used to determine whether or not to track a file as a
-largefile is the size of the first version of the file. The
-minimum size can be specified either with \-\-size or in
-configuration as \fBlargefiles.size\fP.
-.sp
-After running this command you will need to make sure that
-largefiles is enabled anywhere you intend to push the new
-repository.
-.sp
-Use \-\-to\-normal to convert largefiles back to normal files; after
-this, the DEST repository can be used without largefiles at all.
-.sp
-Options:
-.INDENT 0.0
-.TP
-.B \-s,  \-\-size
-.
-minimum size (MB) for files to be converted as largefiles
-.TP
-.B \-\-to\-normal
-.
-convert from a largefiles repo to a normal repo
-.UNINDENT
 .SS mq
 .sp
 manage a stack of patches
@@ -9038,33 +7346,8 @@ preserving existing git patches upon qrefresh. If set to \(aqyes\(aq or
 \(aqno\(aq, mq will override the [diff] section and always generate git or
 regular patches, possibly losing data in the second case.
 .sp
-It may be desirable for mq changesets to be kept in the secret phase (see
-\%\fBhg help phases\fP\:), which can be enabled with the following setting:
-.sp
-.nf
-.ft C
-[mq]
-secret = True
-.ft P
-.fi
-.sp
 You will by default be managing a patch queue named "patches". You can
 create other, independent patch queues with the \%\fBhg qqueue\fP\: command.
-.sp
-If the working directory contains uncommitted files, qpush, qpop and
-qgoto abort immediately. If \-f/\-\-force is used, the changes are
-discarded. Setting:
-.sp
-.nf
-.ft C
-[mq]
-keepchanges = True
-.ft P
-.fi
-.sp
-make them behave as if \-\-keep\-changes were passed, and non\-conflicting
-local changes will be tolerated and preserved. If incompatible options
-such as \-f/\-\-force or \-\-exact are passed, this setting is ignored.
 .SS Commands
 .SS qapplied
 .sp
@@ -9081,7 +7364,7 @@ Options:
 .TP
 .B \-1,  \-\-last
 .
-show only the preceding applied patch
+show only the last patch
 .TP
 .B \-s,  \-\-summary
 .
@@ -9161,10 +7444,6 @@ mark new/missing files as added/removed before committing
 .
 mark a branch as closed, hiding it from the branch list
 .TP
-.B \-\-amend
-.
-amend the parent of the working dir
-.TP
 .B \-I,  \-\-include
 .
 include names matching the given patterns
@@ -9188,10 +7467,6 @@ record the specified date as commit date
 .B \-u,  \-\-user
 .
 record the specified user as committer
-.TP
-.B \-S,  \-\-subrepos
-.
-recurse into subrepositories
 .sp
 aliases: qci
 .UNINDENT
@@ -9203,9 +7478,8 @@ hg qdelete [\-k] [PATCH]...
 .ft P
 .fi
 .sp
-The patches must not be applied, and at least one patch is required. Exact
-patch identifiers must be given. With \-k/\-\-keep, the patch files are
-preserved in the patch directory.
+The patches must not be applied, and at least one patch is required. With
+\-k/\-\-keep, the patch files are preserved in the patch directory.
 .sp
 To stop managing a patch and move it into permanent history,
 use the \%\fBhg qfinish\fP\: command.
@@ -9376,17 +7650,9 @@ Returns 0 on success.
 Options:
 .INDENT 0.0
 .TP
-.B \-\-keep\-changes
-.
-tolerate non\-conflicting local changes
-.TP
 .B \-f,  \-\-force
 .
 overwrite any local changes
-.TP
-.B \-\-no\-backup
-.
-do not save backup copies of files
 .UNINDENT
 .SS qguard
 .sp
@@ -9443,7 +7709,7 @@ Returns 0 on success.
 .sp
 .nf
 .ft C
-hg qimport [\-e] [\-n NAME] [\-f] [\-g] [\-P] [\-r REV]... [FILE]...
+hg qimport [\-e] [\-n NAME] [\-f] [\-g] [\-P] [\-r REV]... FILE...
 .ft P
 .fi
 .sp
@@ -9634,14 +7900,9 @@ hg qpop [\-a] [\-f] [PATCH | INDEX]
 .ft P
 .fi
 .sp
-Without argument, pops off the top of the patch stack. If given a
-patch name, keeps popping off patches until the named patch is at
-the top of the stack.
-.sp
-By default, abort if the working directory contains uncommitted
-changes. With \-\-keep\-changes, abort only if the uncommitted files
-overlap with patched files. With \-f/\-\-force, backup and discard
-changes made to such files.
+By default, pops off the top of the patch stack. If given a patch
+name, keeps popping off patches until the named patch is at the
+top of the stack.
 .sp
 Return 0 on success.
 .sp
@@ -9656,17 +7917,9 @@ pop all patches
 .
 queue name to pop (DEPRECATED)
 .TP
-.B \-\-keep\-changes
-.
-tolerate non\-conflicting local changes
-.TP
 .B \-f,  \-\-force
 .
 forget any local changes to patched files
-.TP
-.B \-\-no\-backup
-.
-do not save backup copies of files
 .UNINDENT
 .SS qprev
 .sp
@@ -9693,20 +7946,14 @@ hg qpush [\-f] [\-l] [\-a] [\-\-move] [PATCH | INDEX]
 .ft P
 .fi
 .sp
-By default, abort if the working directory contains uncommitted
-changes. With \-\-keep\-changes, abort only if the uncommitted files
-overlap with patched files. With \-f/\-\-force, backup and patch over
-uncommitted changes.
+When \-f/\-\-force is applied, all local changes in patched files
+will be lost.
 .sp
 Return 0 on success.
 .sp
 Options:
 .INDENT 0.0
 .TP
-.B \-\-keep\-changes
-.
-tolerate non\-conflicting local changes
-.TP
 .B \-f,  \-\-force
 .
 apply on top of local changes
@@ -9734,10 +7981,6 @@ merge queue name (DEPRECATED)
 .B \-\-move
 .
 reorder patch series and apply only the patch
-.TP
-.B \-\-no\-backup
-.
-do not save backup copies of files
 .UNINDENT
 .SS qqueue
 .sp
@@ -9752,8 +7995,7 @@ new patch queues and deleting existing ones.
 .sp
 Omitting a queue name or specifying \-l/\-\-list will show you the registered
 queues \- by default the "normal" patches queue is registered. The currently
-active queue will be marked with "(active)". Specifying \-\-active will print
-only the name of the active queue.
+active queue will be marked with "(active)".
 .sp
 To create a new queue, use \-c/\-\-create. The queue is automatically made
 active, except in the case where there are applied patches from the
@@ -9772,10 +8014,6 @@ Options:
 .
 list all available queues
 .TP
-.B \-\-active
-.
-print name of active queue
-.TP
 .B \-c,  \-\-create
 .
 create new queue
@@ -10067,7 +8305,7 @@ print first line of patch header
 .sp
 .nf
 .ft C
-hg strip [\-k] [\-f] [\-n] [\-B bookmark] [\-r] REV...
+hg strip [\-k] [\-f] [\-n] REV...
 .ft P
 .fi
 .sp
@@ -10091,19 +8329,11 @@ restore.
 Use the \-\-no\-backup option to discard the backup bundle once the
 operation completes.
 .sp
-Strip is not a history\-rewriting operation and can be used on
-changesets in the public phase. But if the stripped changesets have
-been pushed to a remote repository you will likely pull them again.
-.sp
 Return 0 on success.
 .sp
 Options:
 .INDENT 0.0
 .TP
-.B \-r,  \-\-rev
-.
-strip specified revision (optional, can specify revisions without this option)
-.TP
 .B \-f,  \-\-force
 .
 force removal of changesets, discard uncommitted changes (no backup)
@@ -10112,7 +8342,7 @@ force removal of changesets, discard uncommitted changes (no backup)
 .
 bundle only changesets with local revision number greater than REV which are not descendants of REV (DEPRECATED)
 .TP
-.B \-\-no\-backup
+.B \-n,  \-\-no\-backup
 .
 no backups
 .TP
@@ -10120,189 +8350,91 @@ no backups
 .
 no backups (DEPRECATED)
 .TP
-.B \-n
-.
-ignored  (DEPRECATED)
-.TP
 .B \-k,  \-\-keep
 .
 do not modify working copy during strip
-.TP
-.B \-B,  \-\-bookmark
-.
-remove revs only reachable from given bookmark
 .UNINDENT
 .SS notify
 .sp
-hooks for sending email push notifications
+hooks for sending email notifications at commit/push time
 .sp
-This extension implements hooks to send email notifications when
-changesets are sent from or received by the local repository.
+Subscriptions can be managed through a hgrc file. Default mode is to
+print messages to stdout, for testing and configuring.
 .sp
-First, enable the extension as explained in \%\fBhg help extensions\fP\:, and
-register the hook you want to run. \fBincoming\fP and \fBchangegroup\fP hooks
-are run when changesets are received, while \fBoutgoing\fP hooks are for
-changesets sent to another repository:
+To use, configure the notify extension and enable it in hgrc like
+this:
 .sp
 .nf
 .ft C
+[extensions]
+notify =
+
 [hooks]
 # one email for each incoming changeset
 incoming.notify = python:hgext.notify.hook
-# one email for all incoming changesets
+# batch emails when many changesets incoming at one time
 changegroup.notify = python:hgext.notify.hook
-
-# one email for all outgoing changesets
+# batch emails when many changesets outgoing at one time (client side)
 outgoing.notify = python:hgext.notify.hook
+
+[notify]
+# config items go here
 .ft P
 .fi
 .sp
-This registers the hooks. To enable notification, subscribers must
-be assigned to repositories. The \fB[usersubs]\fP section maps multiple
-repositories to a given recipient. The \fB[reposubs]\fP section maps
-multiple recipients to a single repository:
+Required configuration items:
 .sp
 .nf
 .ft C
-[usersubs]
-# key is subscriber email, value is a comma\-separated list of repo glob
-# patterns
-user@host = pattern
-
-[reposubs]
-# key is glob pattern, value is a comma\-separated list of subscriber
-# emails
-pattern = user@host
+config = /path/to/file # file containing subscriptions
 .ft P
 .fi
 .sp
-Glob patterns are matched against absolute path to repository
-root.
-.sp
-In order to place them under direct user management, \fB[usersubs]\fP and
-\fB[reposubs]\fP sections may be placed in a separate \fBhgrc\fP file and
-incorporated by reference:
+Optional configuration items:
 .sp
 .nf
 .ft C
-[notify]
-config = /path/to/subscriptionsfile
+test = True            # print messages to stdout for testing
+strip = 3              # number of slashes to strip for url paths
+domain = example.com   # domain to use if committer missing domain
+style = ...            # style file to use when formatting email
+template = ...         # template to use when formatting email
+incoming = ...         # template to use when run as incoming hook
+outgoing = ...         # template to use when run as outgoing hook
+changegroup = ...      # template to use when run as changegroup hook
+maxdiff = 300          # max lines of diffs to include (0=none, \-1=all)
+maxsubject = 67        # truncate subject line longer than this
+diffstat = True        # add a diffstat before the diff content
+sources = serve        # notify if source of incoming changes in this list
+                       # (serve == ssh or http, push, pull, bundle)
+merge = False          # send notification for merges (default True)
+[email]
+from = user@host.com   # email address to send as if none given
+[web]
+baseurl = http://hgserver/... # root of hg web site for browsing commits
 .ft P
 .fi
 .sp
-Notifications will not be sent until the \fBnotify.test\fP value is set
-to \fBFalse\fP; see below.
-.sp
-Notifications content can be tweaked with the following configuration entries:
-.INDENT 0.0
-.TP
-.B notify.test
-.
-If \fBTrue\fP, print messages to stdout instead of sending them. Default: True.
-.TP
-.B notify.sources
-.
-Space\-separated list of change sources. Notifications are activated only
-when a changeset\(aqs source is in this list. Sources may be:
-.INDENT 7.0
-.TP
-.B \fBserve\fP
-.sp
-changesets received via http or ssh
-.TP
-.B \fBpull\fP
-.sp
-changesets received via \fBhg pull\fP
-.TP
-.B \fBunbundle\fP
-.sp
-changesets received via \fBhg unbundle\fP
-.TP
-.B \fBpush\fP
+The notify config file has same format as a regular hgrc file. It has
+two sections so you can express subscriptions in whatever way is
+handier for you.
 .sp
-changesets sent or received via \fBhg push\fP
-.TP
-.B \fBbundle\fP
-.sp
-changesets sent via \fBhg unbundle\fP
-.UNINDENT
+.nf
+.ft C
+[usersubs]
+# key is subscriber email, value is ","\-separated list of glob patterns
+user@host = pattern
+
+[reposubs]
+# key is glob pattern, value is ","\-separated list of subscriber emails
+pattern = user@host
+.ft P
+.fi
 .sp
-Default: serve.
-.TP
-.B notify.strip
-.
-Number of leading slashes to strip from url paths. By default, notifications
-reference repositories with their absolute path. \fBnotify.strip\fP lets you
-turn them into relative paths. For example, \fBnotify.strip=3\fP will change
-\fB/long/path/repository\fP into \fBrepository\fP. Default: 0.
-.TP
-.B notify.domain
-.
-Default email domain for sender or recipients with no explicit domain.
-.TP
-.B notify.style
-.
-Style file to use when formatting emails.
-.TP
-.B notify.template
-.
-Template to use when formatting emails.
-.TP
-.B notify.incoming
-.
-Template to use when run as an incoming hook, overriding \fBnotify.template\fP.
-.TP
-.B notify.outgoing
-.
-Template to use when run as an outgoing hook, overriding \fBnotify.template\fP.
-.TP
-.B notify.changegroup
-.
-Template to use when running as a changegroup hook, overriding
-\fBnotify.template\fP.
-.TP
-.B notify.maxdiff
-.
-Maximum number of diff lines to include in notification email. Set to 0
-to disable the diff, or \-1 to include all of it. Default: 300.
-.TP
-.B notify.maxsubject
-.
-Maximum number of characters in email\(aqs subject line. Default: 67.
-.TP
-.B notify.diffstat
-.
-Set to True to include a diffstat before diff content. Default: True.
-.TP
-.B notify.merge
-.
-If True, send notifications for merge changesets. Default: True.
-.TP
-.B notify.mbox
-.
-If set, append mails to this mbox file instead of sending. Default: None.
-.TP
-.B notify.fromauthor
-.
-If set, use the committer of the first changeset in a changegroup for
-the "From" field of the notification mail. If not set, take the user
-from the pushing repo.  Default: False.
-.UNINDENT
+Glob patterns are matched against path to repository root.
 .sp
-If set, the following entries will also be used to customize the
-notifications:
-.INDENT 0.0
-.TP
-.B email.from
-.
-Email \fBFrom\fP address to use if none can be found in the generated
-email content.
-.TP
-.B web.baseurl
-.
-Root repository URL to combine with repository paths when making
-references. See also \fBnotify.strip\fP.
-.UNINDENT
+If you like, you can put notify config file in repository that users
+can push changes to, they can manage their own subscriptions.
 .SS pager
 .sp
 browse command output with an external pager
@@ -10312,13 +8444,23 @@ To set the pager that should be used, set the application variable:
 .nf
 .ft C
 [pager]
-pager = less \-FRX
+pager = less \-FRSX
 .ft P
 .fi
 .sp
 If no pager is set, the pager extensions uses the environment variable
 $PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.
 .sp
+If you notice "BROKEN PIPE" error messages, you can disable them by
+setting:
+.sp
+.nf
+.ft C
+[pager]
+quiet = True
+.ft P
+.fi
+.sp
 You can disable the pager for certain commands by adding them to the
 pager.ignore list:
 .sp
@@ -10431,9 +8573,7 @@ the messages are sent.
 By default the patch is included as text in the email body for
 easy reviewing. Using the \-a/\-\-attach option will instead create
 an attachment for the patch. With \-i/\-\-inline an inline attachment
-will be created. You can include a patch both as text in the email
-body and as a regular or an inline attachment by combining the
-\-a/\-\-attach or \-i/\-\-inline with the \-\-body option.
+will be created.
 .sp
 With \-o/\-\-outgoing, emails will be generated for patches not found
 in the destination repository (or only those which are ancestors
@@ -10528,10 +8668,6 @@ a base changeset to specify instead of a destination (with \-b/\-\-bundle)
 .
 send an introduction email for a single patch
 .TP
-.B \-\-body
-.
-send patches as inline message text (default)
-.TP
 .B \-a,  \-\-attach
 .
 send patches as attachments
@@ -10623,9 +8759,6 @@ The following settings are available:
 .ft C
 [progress]
 delay = 3 # number of seconds (float) before showing the progress bar
-changedelay = 1 # changedelay: minimum delay before showing a new topic.
-                # If set to less than 3 * refresh, that value will
-                # be used instead.
 refresh = 0.1 # time in seconds between refreshes of the progress bar
 format = topic bar number estimate # format of the progress bar
 width = <none> # if set, the maximum width of the progress information
@@ -10732,7 +8865,8 @@ For more information:
 .sp
 .nf
 .ft C
-hg rebase [\-s REV | \-b REV] [\-d REV] [OPTION]
+hg rebase [\-s REV | \-b REV] [\-d REV] [options]
+hg rebase {\-a|\-c}
 .ft P
 .fi
 .sp
@@ -10792,10 +8926,6 @@ rebase from the specified changeset
 .
 rebase from the base of the specified changeset (up to greatest common ancestor of base and dest)
 .TP
-.B \-r,  \-\-rev
-.
-rebase these revisions
-.TP
 .B \-d,  \-\-dest
 .
 rebase onto the specified changeset
@@ -10808,10 +8938,6 @@ collapse the rebased changesets
 .
 use text as collapse commit message
 .TP
-.B \-e,  \-\-edit
-.
-invoke editor on commit messages
-.TP
 .B \-l,  \-\-logfile
 .
 read collapse commit message from file
@@ -10824,9 +8950,9 @@ keep original changesets
 .
 keep original branch names
 .TP
-.B \-D,  \-\-detach
+.B \-\-detach
 .
-(DEPRECATED)
+force detaching of source from its original branch
 .TP
 .B \-t,  \-\-tool
 .
@@ -10884,7 +9010,6 @@ possible:
 .ft C
 y \- record this change
 n \- skip this change
-e \- edit this change manually
 
 s \- skip remaining changes to this file
 f \- record remaining changes to this file
@@ -10910,10 +9035,6 @@ mark new/missing files as added/removed before committing
 .
 mark a branch as closed, hiding it from the branch list
 .TP
-.B \-\-amend
-.
-amend the parent of the working dir
-.TP
 .B \-I,  \-\-include
 .
 include names matching the given patterns
@@ -10938,10 +9059,6 @@ record the specified date as commit date
 .
 record the specified user as committer
 .TP
-.B \-S,  \-\-subrepos
-.
-recurse into subrepositories
-.TP
 .B \-w,  \-\-ignore\-all\-space
 .
 ignore white space when comparing lines
@@ -11074,15 +9191,6 @@ Options:
 .
 do not create a working copy
 .UNINDENT
-.SS unshare
-.sp
-.nf
-.ft C
-hg unshare
-.ft P
-.fi
-.sp
-Copy the store data to the repo and remove the sharedpath data.
 .SS transplant
 .sp
 command to transplant changesets from another branch
@@ -11126,7 +9234,7 @@ the branch holding the named revision, up to that revision. If
 transplanted, otherwise you will be prompted to select the
 changesets you want.
 .sp
-\%\fBhg transplant \-\-branch REV \-\-all\fP\: will transplant the
+\%\fBhg transplant \-\-branch REVISION \-\-all\fP\: will transplant the
 selected branch (up to the named revision) onto your current
 working directory.
 .sp
@@ -11135,9 +9243,6 @@ changesets. You will not be prompted to transplant any ancestors
 of a merged transplant, and you can merge descendants of them
 normally instead of transplanting them.
 .sp
-Merge changesets may be transplanted directly by specifying the
-proper parent changeset by calling \%\fBhg transplant \-\-parent\fP\:.
-.sp
 If no merges or revisions are provided, \%\fBhg transplant\fP\: will
 start an interactive changeset browser.
 .sp
@@ -11168,14 +9273,6 @@ skip over REV
 .
 merge at REV
 .TP
-.B \-\-parent
-.
-parent to choose when transplanting merge
-.TP
-.B \-e,  \-\-edit
-.
-invoke editor on commit messages
-.TP
 .B \-\-log
 .
 append transplant info to log message
@@ -11329,47 +9426,25 @@ zc\-test = http://example.com:8000/test
 .SH FILES
 .INDENT 0.0
 .TP
-.B \fB/etc/mercurial/hgrc\fP, \fB$HOME/.hgrc\fP, \fB.hg/hgrc\fP
-.sp
-This file contains defaults and configuration. Values in
-\fB.hg/hgrc\fP override those in \fB$HOME/.hgrc\fP, and these override
-settings made in the global \fB/etc/mercurial/hgrc\fP configuration.
-See \%\fBhgrc\fP(5)\: for details of the contents and format of these
-files.
-.TP
 .B \fB.hgignore\fP
 .sp
 This file contains regular expressions (one per line) that
 describe file names that should be ignored by \fBhg\fP. For details,
 see \%\fBhgignore\fP(5)\:.
 .TP
-.B \fB.hgsub\fP
-.sp
-This file defines the locations of all subrepositories, and
-tells where the subrepository checkouts came from. For details, see
-\%\fBhg help subrepos\fP\:.
-.TP
-.B \fB.hgsubstate\fP
-.sp
-This file is where Mercurial stores all nested repository states. \fINB: This
-file should not be edited manually.\fP
-.TP
 .B \fB.hgtags\fP
 .sp
 This file contains changeset hash values and text tag names (one
 of each separated by spaces) that correspond to tagged versions of
-the repository contents. The file content is encoded using UTF\-8.
-.TP
-.B \fB.hg/last\-message.txt\fP
-.sp
-This file is used by \%\fBhg commit\fP\: to store a backup of the commit message
-in case the commit fails.
+the repository contents.
 .TP
-.B \fB.hg/localtags\fP
+.B \fB/etc/mercurial/hgrc\fP, \fB$HOME/.hgrc\fP, \fB.hg/hgrc\fP
 .sp
-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.
+This file contains defaults and configuration. Values in
+\fB.hg/hgrc\fP override those in \fB$HOME/.hgrc\fP, and these override
+settings made in the global \fB/etc/mercurial/hgrc\fP configuration.
+See \%\fBhgrc\fP(5)\: for details of the contents and format of these
+files.
 .UNINDENT
 .sp
 Some commands (e.g. revert) produce backup files ending in \fB.orig\fP,
@@ -11394,7 +9469,7 @@ Source code repository: \%http://selenic.com/hg\:
 Mailing list: \%http://selenic.com/mailman/listinfo/mercurial\:
 .SH COPYING
 .sp
-Copyright (C) 2005\-2012 Matt Mackall.
+Copyright (C) 2005\-2010 Matt Mackall.
 Free use of this software is granted under the terms of the GNU General
 Public License version 2 or any later version.
 .\" Common link and substitution definitions.
diff --git a/doc/hg.1.html b/doc/hg.1.html
index 9a0a22f..381787f 100644
--- a/doc/hg.1.html
+++ b/doc/hg.1.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.8.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.7: http://docutils.sourceforge.net/" />
 <title>hg</title>
 <meta name="author" content="Matt Mackall &lt;mpm&#64;selenic.com&gt;" />
 <meta name="organization" content="Mercurial" />
@@ -30,35 +30,43 @@
 <div class="contents htmlonly topic" id="contents">
 <p class="topic-title first">Contents</p>
 <ul class="simple">
-<li><a class="reference internal" href="#synopsis" id="id39">Synopsis</a></li>
-<li><a class="reference internal" href="#description" id="id40">Description</a></li>
-<li><a class="reference internal" href="#command-elements" id="id41">Command Elements</a></li>
-<li><a class="reference internal" href="#options" id="id42">Options</a></li>
-<li><a class="reference internal" href="#commands" id="id43">Commands</a></li>
-<li><a class="reference internal" href="#date-formats" id="id44">Date Formats</a></li>
-<li><a class="reference internal" href="#diff-formats" id="id45">Diff Formats</a></li>
-<li><a class="reference internal" href="#environment-variables" id="id46">Environment Variables</a></li>
-<li><a class="reference internal" href="#using-additional-features" id="id47">Using Additional Features</a></li>
-<li><a class="reference internal" href="#specifying-file-sets" id="id48">Specifying File Sets</a></li>
-<li><a class="reference internal" href="#id1" id="id49">Glossary</a></li>
-<li><a class="reference internal" href="#syntax-for-mercurial-ignore-files" id="id50">Syntax for Mercurial Ignore Files</a></li>
-<li><a class="reference internal" href="#configuring-hgweb" id="id51">Configuring hgweb</a></li>
-<li><a class="reference internal" href="#id4" id="id52">Merge Tools</a></li>
-<li><a class="reference internal" href="#specifying-multiple-revisions" id="id53">Specifying Multiple Revisions</a></li>
-<li><a class="reference internal" href="#file-name-patterns" id="id54">File Name Patterns</a></li>
-<li><a class="reference internal" href="#working-with-phases" id="id55">Working with Phases</a></li>
+<li><a class="reference internal" href="#synopsis" id="id36">Synopsis</a></li>
+<li><a class="reference internal" href="#description" id="id37">Description</a></li>
+<li><a class="reference internal" href="#command-elements" id="id38">Command Elements</a></li>
+<li><a class="reference internal" href="#options" id="id39">Options</a></li>
+<li><a class="reference internal" href="#commands" id="id40">Commands</a></li>
+<li><a class="reference internal" href="#date-formats" id="id41">Date Formats</a></li>
+<li><a class="reference internal" href="#diff-formats" id="id42">Diff Formats</a></li>
+<li><a class="reference internal" href="#environment-variables" id="id43">Environment Variables</a></li>
+<li><a class="reference internal" href="#using-additional-features" id="id44">Using additional features</a></li>
+<li><a class="reference internal" href="#specifying-file-sets" id="id45">Specifying File Sets</a></li>
+<li><a class="reference internal" href="#id1" id="id46">Glossary</a></li>
+<li><a class="reference internal" href="#syntax-for-mercurial-ignore-files" id="id47">syntax for Mercurial ignore files</a></li>
+<li><a class="reference internal" href="#id2" id="id48">Synopsis</a></li>
+<li><a class="reference internal" href="#id3" id="id49">Description</a></li>
+<li><a class="reference internal" href="#syntax" id="id50">Syntax</a></li>
+<li><a class="reference internal" href="#example" id="id51">Example</a></li>
+<li><a class="reference internal" href="#configuring-hgweb" id="id52">Configuring hgweb</a></li>
+<li><a class="reference internal" href="#id4" id="id53">Merge Tools</a></li>
+<li><a class="reference internal" href="#specifying-multiple-revisions" id="id54">Specifying Multiple Revisions</a></li>
+<li><a class="reference internal" href="#file-name-patterns" id="id55">File Name Patterns</a></li>
 <li><a class="reference internal" href="#specifying-single-revisions" id="id56">Specifying Single Revisions</a></li>
 <li><a class="reference internal" href="#specifying-revision-sets" id="id57">Specifying Revision Sets</a></li>
 <li><a class="reference internal" href="#subrepositories" id="id58">Subrepositories</a></li>
-<li><a class="reference internal" href="#template-usage" id="id59">Template Usage</a></li>
-<li><a class="reference internal" href="#url-paths" id="id60">URL Paths</a></li>
-<li><a class="reference internal" href="#id5" id="id61">Extensions</a></li>
-<li><a class="reference internal" href="#files" id="id62">Files</a></li>
-<li><a class="reference internal" href="#bugs" id="id63">Bugs</a></li>
-<li><a class="reference internal" href="#see-also" id="id64">See Also</a></li>
-<li><a class="reference internal" href="#author" id="id65">Author</a></li>
-<li><a class="reference internal" href="#resources" id="id66">Resources</a></li>
-<li><a class="reference internal" href="#copying" id="id67">Copying</a></li>
+<li><a class="reference internal" href="#adding-a-subrepository" id="id59">Adding a Subrepository</a></li>
+<li><a class="reference internal" href="#synchronizing-a-subrepository" id="id60">Synchronizing a Subrepository</a></li>
+<li><a class="reference internal" href="#deleting-a-subrepository" id="id61">Deleting a Subrepository</a></li>
+<li><a class="reference internal" href="#interaction-with-mercurial-commands" id="id62">Interaction with Mercurial Commands</a></li>
+<li><a class="reference internal" href="#remapping-subrepositories-sources" id="id63">Remapping Subrepositories Sources</a></li>
+<li><a class="reference internal" href="#template-usage" id="id64">Template Usage</a></li>
+<li><a class="reference internal" href="#url-paths" id="id65">URL Paths</a></li>
+<li><a class="reference internal" href="#id5" id="id66">Extensions</a></li>
+<li><a class="reference internal" href="#files" id="id67">Files</a></li>
+<li><a class="reference internal" href="#bugs" id="id68">Bugs</a></li>
+<li><a class="reference internal" href="#see-also" id="id69">See Also</a></li>
+<li><a class="reference internal" href="#author" id="id70">Author</a></li>
+<li><a class="reference internal" href="#resources" id="id71">Resources</a></li>
+<li><a class="reference internal" href="#copying" id="id72">Copying</a></li>
 </ul>
 </div>
 <div class="section" id="synopsis">
@@ -200,15 +208,13 @@ repository.</p>
 <p>New files are ignored if they match any of the patterns in
 <tt class="docutils literal">.hgignore</tt>. As with add, these changes take effect at the next
 commit.</p>
-<p>Use the -s/--similarity option to detect renamed files. This
+<p>Use the -s/--similarity option to detect renamed files. With a
+parameter greater than 0, this compares every removed file with
+every added file and records those similar enough as renames. This
 option takes a percentage between 0 (disabled) and 100 (files must
-be identical) as its parameter. 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
+be identical) as its parameter. Detecting renamed files this way
 can be expensive. After using this option, <a class="reference external" href="hg.1.html#status"><tt class="docutils literal">hg status <span class="pre">-C</span></tt></a> can be
-used to check which files were identified as moved or renamed. If
-not specified, -s/--similarity defaults to 100 and only renames of
-identical files are detected.</p>
+used to check which files were identified as moved or renamed.</p>
 <p>Returns 0 if all files are successfully added.</p>
 <p>Options:</p>
 <table class="docutils option-list" frame="void" rules="none">
@@ -282,18 +288,6 @@ nor desirable.</p>
 <kbd><span class="option">-l</span>, <span class="option">--line-number</span></kbd></td>
 </tr>
 <tr><td>&nbsp;</td><td>show line number at the first appearance</td></tr>
-<tr><td class="option-group" colspan="2">
-<kbd><span class="option">-w</span>, <span class="option">--ignore-all-space</span></kbd></td>
-</tr>
-<tr><td>&nbsp;</td><td>ignore white space when comparing lines</td></tr>
-<tr><td class="option-group" colspan="2">
-<kbd><span class="option">-b</span>, <span class="option">--ignore-space-change</span></kbd></td>
-</tr>
-<tr><td>&nbsp;</td><td>ignore changes in the amount of white space</td></tr>
-<tr><td class="option-group" colspan="2">
-<kbd><span class="option">-B</span>, <span class="option">--ignore-blank-lines</span></kbd></td>
-</tr>
-<tr><td>&nbsp;</td><td>ignore changes whose lines are all blank</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-I</span>, <span class="option">--include</span></kbd></td>
 <td>include names matching the given patterns</td></tr>
@@ -314,21 +308,6 @@ hg archive [OPTION]... DEST
 directory; use -r/--rev to specify a different revision.</p>
 <p>The archive type is automatically detected based on file
 extension (or override using -t/--type).</p>
-<div class="verbose container">
-<p>Examples:</p>
-<ul>
-<li><p class="first">create a zip file containing the 1.0 release:</p>
-<pre class="literal-block">
-hg archive -r 1.0 project-1.0.zip
-</pre>
-</li>
-<li><p class="first">create a tarball excluding .hg files:</p>
-<pre class="literal-block">
-hg archive project.tar.gz -X &quot;.hg*&quot;
-</pre>
-</li>
-</ul>
-</div>
 <p>Valid types are:</p>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
@@ -394,21 +373,14 @@ current working directory.</p>
 <p>If REV is the parent of the working directory, then this new changeset
 is committed automatically. Otherwise, hg needs to merge the
 changes and the merged result is left uncommitted.</p>
-<div class="note">
-<p class="first admonition-title">Note</p>
-<p class="last">backout cannot be used to fix either an unwanted or
-incorrect merge.</p>
-</div>
-<div class="verbose container">
 <p>By default, the pending changeset will have one parent,
-maintaining a linear history. With --merge, the pending
-changeset will instead have two parents: the old parent of the
-working directory and a new child of REV that simply undoes REV.</p>
-<p>Before version 1.7, the behavior without --merge was equivalent
-to specifying --merge followed by <a class="reference external" href="hg.1.html#update"><tt class="docutils literal">hg update <span class="pre">--clean</span> .</tt></a> to
-cancel the merge and leave the child of REV as a head to be
-merged separately.</p>
-</div>
+maintaining a linear history. With --merge, the pending changeset
+will instead have two parents: the old parent of the working
+directory and a new child of REV that simply undoes REV.</p>
+<p>Before version 1.7, the behavior without --merge was equivalent to
+specifying --merge followed by <a class="reference external" href="hg.1.html#update"><tt class="docutils literal">hg update <span class="pre">--clean</span> .</tt></a> to cancel
+the merge and leave the child of REV as a head to be merged
+separately.</p>
 <p>See <a class="reference external" href="hg.1.html#dates"><tt class="docutils literal">hg help dates</tt></a> for a list of formats valid for -d/--date.</p>
 <p>Returns 0 on success.</p>
 <p>Options:</p>
@@ -421,14 +393,14 @@ merged separately.</p>
 <td>merge with old dirstate parent after backout</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">--parent</span></kbd></td>
-<td>parent to choose when backing out merge (DEPRECATED)</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-r</span>, <span class="option">--rev</span></kbd></td>
-<td>revision to backout</td></tr>
+<td>parent to choose when backing out merge</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-t</span>, <span class="option">--tool</span></kbd></td>
 <td>specify merge tool</td></tr>
 <tr><td class="option-group">
+<kbd><span class="option">-r</span>, <span class="option">--rev</span></kbd></td>
+<td>revision to backout</td></tr>
+<tr><td class="option-group">
 <kbd><span class="option">-I</span>, <span class="option">--include</span></kbd></td>
 <td>include names matching the given patterns</td></tr>
 <tr><td class="option-group">
@@ -465,74 +437,10 @@ or announce that it has found the bad revision.</p>
 <p>As a shortcut, you can also use the revision argument to mark a
 revision as good or bad without checking it out first.</p>
 <p>If you supply a command, it will be used for automatic bisection.
-The environment variable HG_NODE will contain the ID of the
-changeset being tested. The exit status of the command will be
-used to mark revisions as good or bad: status 0 means good, 125
-means to skip the revision, 127 (command not found) will abort the
-bisection, and any other non-zero exit status means the revision
-is bad.</p>
-<div class="verbose container">
-<p>Some examples:</p>
-<ul>
-<li><p class="first">start a bisection with known bad revision 12, and good revision 34:</p>
-<pre class="literal-block">
-hg bisect --bad 34
-hg bisect --good 12
-</pre>
-</li>
-<li><p class="first">advance the current bisection by marking current revision as good or
-bad:</p>
-<pre class="literal-block">
-hg bisect --good
-hg bisect --bad
-</pre>
-</li>
-<li><p class="first">mark the current revision, or a known revision, to be skipped (eg. if
-that revision is not usable because of another issue):</p>
-<pre class="literal-block">
-hg bisect --skip
-hg bisect --skip 23
-</pre>
-</li>
-<li><p class="first">forget the current bisection:</p>
-<pre class="literal-block">
-hg bisect --reset
-</pre>
-</li>
-<li><p class="first">use 'make &amp;&amp; make tests' to automatically find the first broken
-revision:</p>
-<pre class="literal-block">
-hg bisect --reset
-hg bisect --bad 34
-hg bisect --good 12
-hg bisect --command 'make &amp;&amp; make tests'
-</pre>
-</li>
-<li><p class="first">see all changesets whose states are already known in the current
-bisection:</p>
-<pre class="literal-block">
-hg log -r &quot;bisect(pruned)&quot;
-</pre>
-</li>
-<li><p class="first">see the changeset currently being bisected (especially useful
-if running with -U/--noupdate):</p>
-<pre class="literal-block">
-hg log -r &quot;bisect(current)&quot;
-</pre>
-</li>
-<li><p class="first">see all changesets that took part in the current bisection:</p>
-<pre class="literal-block">
-hg log -r &quot;bisect(range)&quot;
-</pre>
-</li>
-<li><p class="first">with the graphlog extension, you can even get a nice graph:</p>
-<pre class="literal-block">
-hg log --graph -r &quot;bisect(range)&quot;
-</pre>
-</li>
-</ul>
-<p>See <a class="reference external" href="hg.1.html#revsets"><tt class="docutils literal">hg help revsets</tt></a> for more about the <cite>bisect()</cite> keyword.</p>
-</div>
+Its exit status will be used to mark revisions as good or bad:
+status 0 means good, 125 means to skip the revision, 127
+(command not found) will abort the bisection, and any other
+non-zero exit status means the revision is bad.</p>
 <p>Returns 0 on success.</p>
 <p>Options:</p>
 <table class="docutils option-list" frame="void" rules="none">
@@ -568,10 +476,10 @@ hg log --graph -r &quot;bisect(range)&quot;
 <pre class="literal-block">
 hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]
 </pre>
-<p>Bookmarks are pointers to certain commits that move when committing.
-Bookmarks are local. They can be renamed, copied and deleted. It is
-possible to use <a class="reference external" href="hg.1.html#merge"><tt class="docutils literal">hg merge NAME</tt></a> to merge from a given bookmark, and
-<a class="reference external" href="hg.1.html#update"><tt class="docutils literal">hg update NAME</tt></a> to update to a given bookmark.</p>
+<p>Bookmarks are pointers to certain commits that move when
+committing. Bookmarks are local. They can be renamed, copied and
+deleted. It is possible to use bookmark names in <a class="reference external" href="hg.1.html#merge"><tt class="docutils literal">hg merge</tt></a> and
+<a class="reference external" href="hg.1.html#update"><tt class="docutils literal">hg update</tt></a> to merge and update respectively to a given bookmark.</p>
 <p>You can use <a class="reference external" href="hg.1.html#bookmark"><tt class="docutils literal">hg bookmark NAME</tt></a> to set a bookmark on the working
 directory's parent revision with the given name. If you specify
 a revision using -r REV (where REV may be an existing bookmark),
@@ -580,10 +488,6 @@ the bookmark is assigned to that revision.</p>
 push</tt></a> and <a class="reference external" href="hg.1.html#pull"><tt class="docutils literal">hg help pull</tt></a>). This requires both the local and remote
 repositories to support bookmarks. For versions prior to 1.8, this means
 the bookmarks extension must be enabled.</p>
-<p>With -i/--inactive, the new bookmark will not be made the active
-bookmark. If -r/--rev is given, the new bookmark will not be made
-active even if -i/--inactive is not given. If no NAME is given, the
-current active bookmark will be marked inactive.</p>
 <p>Options:</p>
 <table class="docutils option-list" frame="void" rules="none">
 <col class="option" />
@@ -603,7 +507,7 @@ current active bookmark will be marked inactive.</p>
 <td>rename a given bookmark</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-i</span>, <span class="option">--inactive</span></kbd></td>
-<td>mark a bookmark inactive</td></tr>
+<td>do not mark a new bookmark active</td></tr>
 </tbody>
 </table>
 </div>
@@ -612,12 +516,6 @@ current active bookmark will be marked inactive.</p>
 <pre class="literal-block">
 hg branch [-fC] [NAME]
 </pre>
-<div class="note">
-<p class="first admonition-title">Note</p>
-<p class="last">Branch names are permanent and global. Use <a class="reference external" href="hg.1.html#bookmark"><tt class="docutils literal">hg bookmark</tt></a> to create a
-light-weight bookmark instead. See <a class="reference external" href="hg.1.html#glossary"><tt class="docutils literal">hg help glossary</tt></a> for more
-information about named branches and bookmarks.</p>
-</div>
 <p>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
@@ -630,6 +528,12 @@ the parent of the working directory, negating a previous branch
 change.</p>
 <p>Use the command <a class="reference external" href="hg.1.html#update"><tt class="docutils literal">hg update</tt></a> to switch to an existing branch. Use
 <a class="reference external" href="hg.1.html#commit"><tt class="docutils literal">hg commit <span class="pre">--close-branch</span></tt></a> to mark this branch as closed.</p>
+<div class="note">
+<p class="first admonition-title">Note</p>
+<p class="last">Branch names are permanent. Use <a class="reference external" href="hg.1.html#bookmark"><tt class="docutils literal">hg bookmark</tt></a> to create a
+light-weight bookmark instead. See <a class="reference external" href="hg.1.html#glossary"><tt class="docutils literal">hg help glossary</tt></a> for more
+information about named branches and bookmarks.</p>
+</div>
 <p>Returns 0 on success.</p>
 <p>Options:</p>
 <table class="docutils option-list" frame="void" rules="none">
@@ -784,36 +688,37 @@ hg clone [OPTION]... SOURCE [DEST]
 basename of the source.</p>
 <p>The location of the source is added to the new repository's
 <tt class="docutils literal">.hg/hgrc</tt> file, as the default to be used for future pulls.</p>
-<p>Only local paths and <tt class="docutils literal"><span class="pre">ssh://</span></tt> URLs are supported as
-destinations. For <tt class="docutils literal"><span class="pre">ssh://</span></tt> destinations, no working directory or
-<tt class="docutils literal">.hg/hgrc</tt> will be created on the remote side.</p>
-<p>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 '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.</p>
-<p>To check out a particular version, use -u/--update, or
--U/--noupdate to create a clone with no working directory.</p>
-<div class="verbose container">
-<p>For efficiency, hardlinks are used for cloning whenever the
-source and destination are on the same filesystem (note this
-applies only to the repository data, not to the working
-directory). Some filesystems, such as AFS, implement hardlinking
-incorrectly, but do not report errors. In these cases, use the
---pull option to avoid hardlinking.</p>
-<p>In some cases, you can clone repositories and the working
-directory using full hardlinks with</p>
+<p>See <a class="reference external" href="hg.1.html#urls"><tt class="docutils literal">hg help urls</tt></a> for valid source format details.</p>
+<p>It is possible to specify an <tt class="docutils literal"><span class="pre">ssh://</span></tt> URL as the destination, but no
+<tt class="docutils literal">.hg/hgrc</tt> and working directory will be created on the remote side.
+Please see <a class="reference external" href="hg.1.html#urls"><tt class="docutils literal">hg help urls</tt></a> for important details about <tt class="docutils literal"><span class="pre">ssh://</span></tt> URLs.</p>
+<p>A set of changesets (tags, or branch names) to pull may be specified
+by listing each changeset (tag, or branch name) with -r/--rev.
+If -r/--rev is used, the cloned repository will contain only a subset
+of the changesets of the source repository. Only the set of changesets
+defined by all -r/--rev options (including all their ancestors)
+will be pulled into the destination repository.
+No subsequent changesets (including subsequent tags) will be present
+in the destination.</p>
+<p>Using -r/--rev (or 'clone src#rev dest') implies --pull, even for
+local source repositories.</p>
+<p>For efficiency, hardlinks are used for cloning whenever the source
+and destination are on the same filesystem (note this applies only
+to the repository data, not to the working directory). Some
+filesystems, such as AFS, implement hardlinking incorrectly, but
+do not report errors. In these cases, use the --pull option to
+avoid hardlinking.</p>
+<p>In some cases, you can clone repositories and the working directory
+using full hardlinks with</p>
 <pre class="literal-block">
 $ cp -al REPO REPOCLONE
 </pre>
 <p>This is the fastest way to clone, but it is not always safe. The
 operation is not atomic (making sure REPO is not modified during
-the operation is up to you) and you have to make sure your
-editor breaks hardlinks (Emacs and most Linux Kernel tools do
-so). Also, this is not compatible with certain extensions that
-place their metadata under the .hg directory, such as mq.</p>
+the operation is up to you) and you have to make sure your editor
+breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,
+this is not compatible with certain extensions that place their
+metadata under the .hg directory, such as mq.</p>
 <p>Mercurial will update the working directory to the first applicable
 revision from this list:</p>
 <ol class="loweralpha simple">
@@ -828,42 +733,6 @@ latest head of that branch)</li>
 <li>the tipmost head of the default branch</li>
 <li>tip</li>
 </ol>
-<p>Examples:</p>
-<ul>
-<li><p class="first">clone a remote repository to a new directory named hg/:</p>
-<pre class="literal-block">
-hg clone http://selenic.com/hg
-</pre>
-</li>
-<li><p class="first">create a lightweight local clone:</p>
-<pre class="literal-block">
-hg clone project/ project-feature/
-</pre>
-</li>
-<li><p class="first">clone from an absolute path on an ssh server (note double-slash):</p>
-<pre class="literal-block">
-hg clone ssh://user&#64;server//home/projects/alpha/
-</pre>
-</li>
-<li><p class="first">do a high-speed clone over a LAN while checking out a
-specified version:</p>
-<pre class="literal-block">
-hg clone --uncompressed http://server/repo -u 1.5
-</pre>
-</li>
-<li><p class="first">create a repository without changesets after a particular revision:</p>
-<pre class="literal-block">
-hg clone -r 04e544 experimental/ good/
-</pre>
-</li>
-<li><p class="first">clone (and track) a particular named branch:</p>
-<pre class="literal-block">
-hg clone http://selenic.com/hg#stable
-</pre>
-</li>
-</ul>
-</div>
-<p>See <a class="reference external" href="hg.1.html#urls"><tt class="docutils literal">hg help urls</tt></a> for details on specifying URLs.</p>
 <p>Returns 0 on success.</p>
 <p>Options:</p>
 <table class="docutils option-list" frame="void" rules="none">
@@ -917,17 +786,6 @@ filenames or -I/-X filters.</p>
 configured editor where you can enter a message. In case your
 commit fails, you will find a backup of your message in
 <tt class="docutils literal"><span class="pre">.hg/last-message.txt</span></tt>.</p>
-<p>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 <a class="reference external" href="hg.1.html#status"><tt class="docutils literal">hg status</tt></a>,
-if there are any. The old commit is stored in a backup bundle in
-<tt class="docutils literal"><span class="pre">.hg/strip-backup</span></tt> (see <a class="reference external" href="hg.1.html#bundle"><tt class="docutils literal">hg help bundle</tt></a> and <a class="reference external" href="hg.1.html#unbundle"><tt class="docutils literal">hg help unbundle</tt></a>
-on how to restore it).</p>
-<p>Message, user and date are taken from the amended commit unless
-specified. When a message isn't specified on the command line,
-the editor will open with the message of the amended commit.</p>
-<p>It is not possible to amend public changesets (see <a class="reference external" href="hg.1.html#phases"><tt class="docutils literal">hg help phases</tt></a>)
-or changesets that have children.</p>
 <p>See <a class="reference external" href="hg.1.html#dates"><tt class="docutils literal">hg help dates</tt></a> for a list of formats valid for -d/--date.</p>
 <p>Returns 0 on success, 1 if nothing changed.</p>
 <p>Options:</p>
@@ -943,9 +801,6 @@ or changesets that have children.</p>
 <kbd><span class="option">--close-branch</span></kbd></td>
 <td>mark a branch as closed, hiding it from the branch list</td></tr>
 <tr><td class="option-group">
-<kbd><span class="option">--amend</span></kbd></td>
-<td>amend the parent of the working dir</td></tr>
-<tr><td class="option-group">
 <kbd><span class="option">-I</span>, <span class="option">--include</span></kbd></td>
 <td>include names matching the given patterns</td></tr>
 <tr><td class="option-group">
@@ -962,10 +817,7 @@ or changesets that have children.</p>
 <td>record the specified date as commit date</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-u</span>, <span class="option">--user</span></kbd></td>
-<td>record the specified user as committer</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-S</span>, <span class="option">--subrepos</span></kbd></td>
-<td><p class="first">recurse into subrepositories</p>
+<td><p class="first">record the specified user as committer</p>
 <p class="last">aliases: ci</p>
 </td></tr>
 </tbody>
@@ -1035,38 +887,6 @@ files it detects as binary. With -a, diff will generate a diff
 anyway, probably with undesirable results.</p>
 <p>Use the -g/--git option to generate diffs in the git extended diff
 format. For more information, read <a class="reference external" href="hg.1.html#diffs"><tt class="docutils literal">hg help diffs</tt></a>.</p>
-<div class="verbose container">
-<p>Examples:</p>
-<ul>
-<li><p class="first">compare a file in the current working directory to its parent:</p>
-<pre class="literal-block">
-hg diff foo.c
-</pre>
-</li>
-<li><p class="first">compare two historical versions of a directory, with rename info:</p>
-<pre class="literal-block">
-hg diff --git -r 1.0:1.2 lib/
-</pre>
-</li>
-<li><p class="first">get change stats relative to the last change on some date:</p>
-<pre class="literal-block">
-hg diff --stat -r &quot;date('may 2')&quot;
-</pre>
-</li>
-<li><p class="first">diff all newly-added files that contain a keyword:</p>
-<pre class="literal-block">
-hg diff &quot;set:added() and grep(GNU)&quot;
-</pre>
-</li>
-<li><p class="first">compare a revision and its parents:</p>
-<pre class="literal-block">
-hg diff -c 9353         # compare against first parent
-hg diff -r 9353^:9353   # same using revset syntax
-hg diff -r 9353^2:9353  # compare against the second parent
-</pre>
-</li>
-</ul>
-</div>
 <p>Returns 0 on success.</p>
 <p>Options:</p>
 <table class="docutils option-list" frame="void" rules="none">
@@ -1128,7 +948,7 @@ hg diff -r 9353^2:9353  # compare against the second parent
 <div class="section" id="export">
 <h2>export</h2>
 <pre class="literal-block">
-hg export [OPTION]... [-o OUTFILESPEC] [-r] REV...
+hg export [OPTION]... [-o OUTFILESPEC] REV...
 </pre>
 <p>Print the changeset header and diffs for one or more revisions.</p>
 <p>The information shown in the changeset header is: author, date,
@@ -1158,8 +978,6 @@ given using a format string. The formatting rules are as follows:</p>
 </tr>
 <tr class="field"><th class="field-name"><tt class="docutils literal">%h</tt>:</th><td class="field-body">short-form changeset hash (12 hexadecimal digits)</td>
 </tr>
-<tr class="field"><th class="field-name"><tt class="docutils literal">%m</tt>:</th><td class="field-body">first line of the commit message (only alphanumeric characters)</td>
-</tr>
 <tr class="field"><th class="field-name"><tt class="docutils literal">%n</tt>:</th><td class="field-body">zero-padded sequence number, starting at 1</td>
 </tr>
 <tr class="field"><th class="field-name"><tt class="docutils literal">%r</tt>:</th><td class="field-body">zero-padded changeset revision number</td>
@@ -1173,29 +991,6 @@ diff anyway, probably with undesirable results.</p>
 format. See <a class="reference external" href="hg.1.html#diffs"><tt class="docutils literal">hg help diffs</tt></a> for more information.</p>
 <p>With the --switch-parent option, the diff will be against the
 second parent. It can be useful to review a merge.</p>
-<div class="verbose container">
-<p>Examples:</p>
-<ul>
-<li><p class="first">use export and import to transplant a bugfix to the current
-branch:</p>
-<pre class="literal-block">
-hg export -r 9353 | hg import -
-</pre>
-</li>
-<li><p class="first">export all the changesets between two revisions to a file with
-rename information:</p>
-<pre class="literal-block">
-hg export --git -r 123:150 &gt; changes.txt
-</pre>
-</li>
-<li><p class="first">split outgoing changes into a series of patches with
-descriptive names:</p>
-<pre class="literal-block">
-hg export -r &quot;outgoing()&quot; -o &quot;%n-%m.patch&quot;
-</pre>
-</li>
-</ul>
-</div>
 <p>Returns 0 on success.</p>
 <p>Options:</p>
 <table class="docutils option-list" frame="void" rules="none">
@@ -1235,21 +1030,6 @@ after the next commit.</p>
 entire project history, and it does not delete them from the
 working directory.</p>
 <p>To undo a forget before the next commit, see <a class="reference external" href="hg.1.html#add"><tt class="docutils literal">hg add</tt></a>.</p>
-<div class="verbose container">
-<p>Examples:</p>
-<ul>
-<li><p class="first">forget newly-added binary files:</p>
-<pre class="literal-block">
-hg forget &quot;set:added() and binary()&quot;
-</pre>
-</li>
-<li><p class="first">forget files that would be excluded by .hgignore:</p>
-<pre class="literal-block">
-hg forget &quot;set:hgignore()&quot;
-</pre>
-</li>
-</ul>
-</div>
 <p>Returns 0 on success.</p>
 <p>Options:</p>
 <table class="docutils option-list" frame="void" rules="none">
@@ -1265,98 +1045,6 @@ hg forget &quot;set:hgignore()&quot;
 </tbody>
 </table>
 </div>
-<div class="section" id="graft">
-<h2>graft</h2>
-<pre class="literal-block">
-hg graft [OPTION]... [-r] REV...
-</pre>
-<p>This command uses Mercurial's merge logic to copy individual
-changes from other branches without merging branches in the
-history graph. This is sometimes known as 'backporting' or
-'cherry-picking'. By default, graft will copy user, date, and
-description from the source changesets.</p>
-<p>Changesets that are ancestors of the current revision, that have
-already been grafted, or that are merges will be skipped.</p>
-<p>If --log is specified, log messages will have a comment appended
-of the form:</p>
-<pre class="literal-block">
-(grafted from CHANGESETHASH)
-</pre>
-<p>If a graft merge results in conflicts, the graft process is
-interrupted so that the current merge can be manually resolved.
-Once all conflicts are addressed, the graft process can be
-continued with the -c/--continue option.</p>
-<div class="note">
-<p class="first admonition-title">Note</p>
-<p class="last">The -c/--continue option does not reapply earlier options.</p>
-</div>
-<div class="verbose container">
-<p>Examples:</p>
-<ul>
-<li><p class="first">copy a single change to the stable branch and edit its description:</p>
-<pre class="literal-block">
-hg update stable
-hg graft --edit 9393
-</pre>
-</li>
-<li><p class="first">graft a range of changesets with one exception, updating dates:</p>
-<pre class="literal-block">
-hg graft -D &quot;2085::2093 and not 2091&quot;
-</pre>
-</li>
-<li><p class="first">continue a graft after resolving conflicts:</p>
-<pre class="literal-block">
-hg graft -c
-</pre>
-</li>
-<li><p class="first">show the source of a grafted changeset:</p>
-<pre class="literal-block">
-hg log --debug -r tip
-</pre>
-</li>
-</ul>
-</div>
-<p>Returns 0 on successful completion.</p>
-<p>Options:</p>
-<table class="docutils option-list" frame="void" rules="none">
-<col class="option" />
-<col class="description" />
-<tbody valign="top">
-<tr><td class="option-group">
-<kbd><span class="option">-r</span>, <span class="option">--rev</span></kbd></td>
-<td>revisions to graft</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-c</span>, <span class="option">--continue</span></kbd></td>
-<td>resume interrupted graft</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-e</span>, <span class="option">--edit</span></kbd></td>
-<td>invoke editor on commit messages</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--log</span></kbd></td>
-<td>append graft info to log message</td></tr>
-<tr><td class="option-group" colspan="2">
-<kbd><span class="option">-D</span>, <span class="option">--currentdate</span></kbd></td>
-</tr>
-<tr><td>&nbsp;</td><td>record the current date as commit date</td></tr>
-<tr><td class="option-group" colspan="2">
-<kbd><span class="option">-U</span>, <span class="option">--currentuser</span></kbd></td>
-</tr>
-<tr><td>&nbsp;</td><td>record the current user as committer</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-d</span>, <span class="option">--date</span></kbd></td>
-<td>record the specified date as commit date</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-u</span>, <span class="option">--user</span></kbd></td>
-<td>record the specified user as committer</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-t</span>, <span class="option">--tool</span></kbd></td>
-<td>specify merge tool</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-n</span>, <span class="option">--dry-run</span></kbd></td>
-<td>do not perform actions, just print output</td></tr>
-</tbody>
-</table>
-</div>
 <div class="section" id="grep">
 <h2>grep</h2>
 <pre class="literal-block">
@@ -1423,7 +1111,7 @@ use the --all flag.</p>
 <div class="section" id="heads">
 <h2>heads</h2>
 <pre class="literal-block">
-hg heads [-ct] [-r STARTREV] [REV]...
+hg heads [-ac] [-r STARTREV] [REV]...
 </pre>
 <p>With no arguments, show all repository branch heads.</p>
 <p>Repository &quot;heads&quot; are changesets with no child changesets. They are
@@ -1488,9 +1176,6 @@ topic.</p>
 <tr><td class="option-group">
 <kbd><span class="option">-c</span>, <span class="option">--command</span></kbd></td>
 <td>show only help for commands</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-k</span>, <span class="option">--keyword</span></kbd></td>
-<td>show topics matching keyword</td></tr>
 </tbody>
 </table>
 </div>
@@ -1507,26 +1192,6 @@ a list of tags, and a list of bookmarks.</p>
 repository.</p>
 <p>Specifying a path to a repository root or Mercurial bundle will
 cause lookup to operate on that repository/bundle.</p>
-<div class="verbose container">
-<p>Examples:</p>
-<ul>
-<li><p class="first">generate a build identifier for the working directory:</p>
-<pre class="literal-block">
-hg id --id &gt; build-id.dat
-</pre>
-</li>
-<li><p class="first">find the revision corresponding to a tag:</p>
-<pre class="literal-block">
-hg id -n -r 1.3
-</pre>
-</li>
-<li><p class="first">check the most recent revision of a remote repository:</p>
-<pre class="literal-block">
-hg id -r tip http://selenic.com/hg/
-</pre>
-</li>
-</ul>
-</div>
 <p>Returns 0 if successful.</p>
 <p>Options:</p>
 <table class="docutils option-list" frame="void" rules="none">
@@ -1551,16 +1216,7 @@ hg id -r tip http://selenic.com/hg/
 <tr><td class="option-group" colspan="2">
 <kbd><span class="option">-B</span>, <span class="option">--bookmarks</span></kbd></td>
 </tr>
-<tr><td>&nbsp;</td><td>show bookmarks</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-e</span>, <span class="option">--ssh</span></kbd></td>
-<td>specify ssh command to use</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--remotecmd</span></kbd></td>
-<td>specify hg command to run on the remote side</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--insecure</span></kbd></td>
-<td><p class="first">do not verify server certificate (ignoring web.cacerts config)</p>
+<tr><td>&nbsp;</td><td><p class="first">show bookmarks</p>
 <p class="last">aliases: id</p>
 </td></tr>
 </tbody>
@@ -1595,36 +1251,10 @@ repository, not touching the working directory. Without --exact,
 patches will be applied on top of the working directory parent
 revision.</p>
 <p>With -s/--similarity, hg will attempt to discover renames and
-copies in the patch in the same way as <a class="reference external" href="hg.1.html#addremove"><tt class="docutils literal">hg addremove</tt></a>.</p>
+copies in the patch in the same way as 'addremove'.</p>
 <p>To read a patch from standard input, use &quot;-&quot; as the patch name. If
 a URL is specified, the patch will be downloaded from it.
 See <a class="reference external" href="hg.1.html#dates"><tt class="docutils literal">hg help dates</tt></a> for a list of formats valid for -d/--date.</p>
-<div class="verbose container">
-<p>Examples:</p>
-<ul>
-<li><p class="first">import a traditional patch from a website and detect renames:</p>
-<pre class="literal-block">
-hg import -s 80 http://example.com/bugfix.patch
-</pre>
-</li>
-<li><p class="first">import a changeset from an hgweb server:</p>
-<pre class="literal-block">
-hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
-</pre>
-</li>
-<li><p class="first">import all the patches in an Unix-style mbox:</p>
-<pre class="literal-block">
-hg import incoming-patches.mbox
-</pre>
-</li>
-<li><p class="first">attempt to exactly restore an exported changeset (not always
-possible):</p>
-<pre class="literal-block">
-hg import --exact proposed-fix.patch
-</pre>
-</li>
-</ul>
-</div>
 <p>Returns 0 on success.</p>
 <p>Options:</p>
 <table class="docutils option-list" frame="void" rules="none">
@@ -1638,9 +1268,6 @@ hg import --exact proposed-fix.patch
 <kbd><span class="option">-b</span>, <span class="option">--base</span></kbd></td>
 <td>base path (DEPRECATED)</td></tr>
 <tr><td class="option-group">
-<kbd><span class="option">-e</span>, <span class="option">--edit</span></kbd></td>
-<td>invoke editor on commit messages</td></tr>
-<tr><td class="option-group">
 <kbd><span class="option">-f</span>, <span class="option">--force</span></kbd></td>
 <td>skip check for outstanding uncommitted changes</td></tr>
 <tr><td class="option-group">
@@ -1731,9 +1358,6 @@ changesets twice if the incoming is followed by a pull.</p>
 <kbd><span class="option">--stat</span></kbd></td>
 <td>output diffstat-style summary of changes</td></tr>
 <tr><td class="option-group">
-<kbd><span class="option">-G</span>, <span class="option">--graph</span></kbd></td>
-<td>show the revision DAG</td></tr>
-<tr><td class="option-group">
 <kbd><span class="option">--style</span></kbd></td>
 <td>display using template map file</td></tr>
 <tr><td class="option-group">
@@ -1831,13 +1455,16 @@ hg log [OPTION]... [FILE]
 </pre>
 <p>Print the revision history of the specified files or the entire
 project.</p>
-<p>If no revision range is specified, the default is <tt class="docutils literal">tip:0</tt> unless
---follow is set, in which case the working directory parent is
-used as the starting revision.</p>
 <p>File history is shown without following rename or copy history of
 files. Use -f/--follow with a filename to follow history across
 renames and copies. --follow without a filename will only show
-ancestors or descendants of the starting revision.</p>
+ancestors or descendants of the starting revision. --follow-first
+only follows the first parent of merge revisions.</p>
+<p>If no revision range is specified, the default is <tt class="docutils literal">tip:0</tt> unless
+--follow is set, in which case the working directory parent is
+used as the starting revision. You can specify a revision set for
+log, see <a class="reference external" href="hg.1.html#revsets"><tt class="docutils literal">hg help revsets</tt></a> for more information.</p>
+<p>See <a class="reference external" href="hg.1.html#dates"><tt class="docutils literal">hg help dates</tt></a> for a list of formats valid for -d/--date.</p>
 <p>By default this command prints revision number and changeset id,
 tags, non-trivial parents, user, date and time, and a summary for
 each commit. When the -v/--verbose switch is used, the list of
@@ -1849,68 +1476,6 @@ changesets, as it will only compare the merge changeset against
 its first parent. Also, only files different from BOTH parents
 will appear in files:.</p>
 </div>
-<div class="note">
-<p class="first admonition-title">Note</p>
-<p class="last">for performance reasons, log FILE may omit duplicate changes
-made on branches and will not show deletions. To see all
-changes including duplicates and deletions, use the --removed
-switch.</p>
-</div>
-<div class="verbose container">
-<p>Some examples:</p>
-<ul>
-<li><p class="first">changesets with full descriptions and file lists:</p>
-<pre class="literal-block">
-hg log -v
-</pre>
-</li>
-<li><p class="first">changesets ancestral to the working directory:</p>
-<pre class="literal-block">
-hg log -f
-</pre>
-</li>
-<li><p class="first">last 10 commits on the current branch:</p>
-<pre class="literal-block">
-hg log -l 10 -b .
-</pre>
-</li>
-<li><p class="first">changesets showing all modifications of a file, including removals:</p>
-<pre class="literal-block">
-hg log --removed file.c
-</pre>
-</li>
-<li><p class="first">all changesets that touch a directory, with diffs, excluding merges:</p>
-<pre class="literal-block">
-hg log -Mp lib/
-</pre>
-</li>
-<li><p class="first">all revision numbers that match a keyword:</p>
-<pre class="literal-block">
-hg log -k bug --template &quot;{rev}\n&quot;
-</pre>
-</li>
-<li><p class="first">check if a given changeset is included is a tagged release:</p>
-<pre class="literal-block">
-hg log -r &quot;a21ccf and ancestor(1.9)&quot;
-</pre>
-</li>
-<li><p class="first">find all changesets by some user in a date range:</p>
-<pre class="literal-block">
-hg log -k alice -d &quot;may 2008 to jul 2008&quot;
-</pre>
-</li>
-<li><p class="first">summary of all changesets after the last tag:</p>
-<pre class="literal-block">
-hg log -r &quot;last(tagged())::&quot; --template &quot;{desc|firstline}\n&quot;
-</pre>
-</li>
-</ul>
-</div>
-<p>See <a class="reference external" href="hg.1.html#dates"><tt class="docutils literal">hg help dates</tt></a> for a list of formats valid for -d/--date.</p>
-<p>See <a class="reference external" href="hg.1.html#revisions"><tt class="docutils literal">hg help revisions</tt></a> and <a class="reference external" href="hg.1.html#revsets"><tt class="docutils literal">hg help revsets</tt></a> for more about
-specifying revisions.</p>
-<p>See <a class="reference external" href="hg.1.html#templates"><tt class="docutils literal">hg help templates</tt></a> for more about pre-packaged styles and
-specifying custom templates.</p>
 <p>Returns 0 on success.</p>
 <p>Options:</p>
 <table class="docutils option-list" frame="void" rules="none">
@@ -1922,7 +1487,7 @@ specifying custom templates.</p>
 <td>follow changeset history, or file history across copies and renames</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">--follow-first</span></kbd></td>
-<td>only follow the first parent of merge changesets (DEPRECATED)</td></tr>
+<td>only follow the first parent of merge changesets</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-d</span>, <span class="option">--date</span></kbd></td>
 <td>show revisions matching date spec</td></tr>
@@ -1941,7 +1506,7 @@ specifying custom templates.</p>
 <tr><td class="option-group" colspan="2">
 <kbd><span class="option">-m</span>, <span class="option">--only-merges</span></kbd></td>
 </tr>
-<tr><td>&nbsp;</td><td>show only merges (DEPRECATED)</td></tr>
+<tr><td>&nbsp;</td><td>show only merges</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-u</span>, <span class="option">--user</span></kbd></td>
 <td>revisions committed by user</td></tr>
@@ -1956,7 +1521,7 @@ specifying custom templates.</p>
 <td>do not display revision or any of its ancestors</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">--hidden</span></kbd></td>
-<td>show hidden changesets (DEPRECATED)</td></tr>
+<td>show hidden changesets</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-p</span>, <span class="option">--patch</span></kbd></td>
 <td>show patch</td></tr>
@@ -1974,9 +1539,6 @@ specifying custom templates.</p>
 <kbd><span class="option">--stat</span></kbd></td>
 <td>output diffstat-style summary of changes</td></tr>
 <tr><td class="option-group">
-<kbd><span class="option">-G</span>, <span class="option">--graph</span></kbd></td>
-<td>show the revision DAG</td></tr>
-<tr><td class="option-group">
 <kbd><span class="option">--style</span></kbd></td>
 <td>display using template map file</td></tr>
 <tr><td class="option-group">
@@ -2052,14 +1614,14 @@ all changes.</p>
 <kbd><span class="option">-f</span>, <span class="option">--force</span></kbd></td>
 <td>force a merge with outstanding changes</td></tr>
 <tr><td class="option-group">
+<kbd><span class="option">-t</span>, <span class="option">--tool</span></kbd></td>
+<td>specify merge tool</td></tr>
+<tr><td class="option-group">
 <kbd><span class="option">-r</span>, <span class="option">--rev</span></kbd></td>
 <td>revision to merge</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-P</span>, <span class="option">--preview</span></kbd></td>
 <td>review revisions to merge (no merge is performed)</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-t</span>, <span class="option">--tool</span></kbd></td>
-<td>specify merge tool</td></tr>
 </tbody>
 </table>
 </div>
@@ -2112,9 +1674,6 @@ be pushed if a push was requested.</p>
 <kbd><span class="option">--stat</span></kbd></td>
 <td>output diffstat-style summary of changes</td></tr>
 <tr><td class="option-group">
-<kbd><span class="option">-G</span>, <span class="option">--graph</span></kbd></td>
-<td>show the revision DAG</td></tr>
-<tr><td class="option-group">
 <kbd><span class="option">--style</span></kbd></td>
 <td>display using template map file</td></tr>
 <tr><td class="option-group">
@@ -2190,44 +1749,6 @@ source is written as <tt class="docutils literal">default</tt> in <tt class="doc
 <p>See <a class="reference external" href="hg.1.html#urls"><tt class="docutils literal">hg help urls</tt></a> for more information.</p>
 <p>Returns 0 on success.</p>
 </div>
-<div class="section" id="phase">
-<h2>phase</h2>
-<pre class="literal-block">
-hg phase [-p|-d|-s] [-f] [-r] REV...
-</pre>
-<p>With no argument, show the phase name of specified revisions.</p>
-<p>With one of -p/--public, -d/--draft or -s/--secret, change the
-phase value of the specified revisions.</p>
-<p>Unless -f/--force is specified, <a class="reference external" href="hg.1.html#phase"><tt class="docutils literal">hg phase</tt></a> won't move changeset from a
-lower phase to an higher phase. Phases are ordered as follows:</p>
-<pre class="literal-block">
-public &lt; draft &lt; secret
-</pre>
-<p>Return 0 on success, 1 if no phases were changed or some could not
-be changed.</p>
-<p>Options:</p>
-<table class="docutils option-list" frame="void" rules="none">
-<col class="option" />
-<col class="description" />
-<tbody valign="top">
-<tr><td class="option-group">
-<kbd><span class="option">-p</span>, <span class="option">--public</span></kbd></td>
-<td>set changeset phase to public</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-d</span>, <span class="option">--draft</span></kbd></td>
-<td>set changeset phase to draft</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-s</span>, <span class="option">--secret</span></kbd></td>
-<td>set changeset phase to secret</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-f</span>, <span class="option">--force</span></kbd></td>
-<td>allow to move boundary backward</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-r</span>, <span class="option">--rev</span></kbd></td>
-<td>target revision</td></tr>
-</tbody>
-</table>
-</div>
 <div class="section" id="pull">
 <h2>pull</h2>
 <pre class="literal-block">
@@ -2297,9 +1818,6 @@ only create a new branch without forcing other changes.</p>
 changesets on all branches.</p>
 <p>If -r/--rev is used, the specified revision and all its ancestors
 will be pushed to the remote repository.</p>
-<p>If -B/--bookmark is used, the specified bookmarked revision, its
-ancestors, and the bookmark will be pushed to the remote
-repository.</p>
 <p>Please see <a class="reference external" href="hg.1.html#urls"><tt class="docutils literal">hg help urls</tt></a> for important details about <tt class="docutils literal"><span class="pre">ssh://</span></tt>
 URLs. If DESTINATION is omitted, a default path will be used.</p>
 <p>Returns 0 if push was successful, 1 if nothing to push.</p>
@@ -2351,66 +1869,28 @@ suggests it.</p>
 <pre class="literal-block">
 hg remove [OPTION]... FILE...
 </pre>
-<p>Schedule the indicated files for removal from the current branch.</p>
-<p>This command schedules the files to be removed at the next commit.
-To undo a remove before that, see <a class="reference external" href="hg.1.html#revert"><tt class="docutils literal">hg revert</tt></a>. To undo added
-files, see <a class="reference external" href="hg.1.html#forget"><tt class="docutils literal">hg forget</tt></a>.</p>
-<div class="verbose container">
-<p>-A/--after can be used to remove only files that have already
-been deleted, -f/--force can be used to force deletion, and -Af
-can be used to remove files from the next revision without
-deleting them from the working directory.</p>
+<p>Schedule the indicated files for removal from the repository.</p>
+<p>This only removes files from the current branch, not from the
+entire project history. -A/--after can be used to remove only
+files that have already been deleted, -f/--force can be used to
+force deletion, and -Af can be used to remove files from the next
+revision without deleting them from the working directory.</p>
 <p>The following table details the behavior of remove for different
 file states (columns) and option combinations (rows). The file
-states are Added [A], Clean [C], Modified [M] and Missing [!]
-(as reported by <a class="reference external" href="hg.1.html#status"><tt class="docutils literal">hg status</tt></a>). The actions are Warn, Remove
-(from branch) and Delete (from disk):</p>
-<table border="1" class="docutils">
-<colgroup>
-<col width="47%" />
-<col width="13%" />
-<col width="13%" />
-<col width="13%" />
-<col width="13%" />
-</colgroup>
-<thead valign="bottom">
-<tr><th class="head">&nbsp;</th>
-<th class="head">&nbsp;</th>
-<th class="head">&nbsp;</th>
-<th class="head">&nbsp;</th>
-<th class="head">&nbsp;</th>
-</tr>
-</thead>
-<tbody valign="top">
-<tr><td>none</td>
-<td>W</td>
-<td>RD</td>
-<td>W</td>
-<td>R</td>
-</tr>
-<tr><td>-f</td>
-<td>R</td>
-<td>RD</td>
-<td>RD</td>
-<td>R</td>
-</tr>
-<tr><td>-A</td>
-<td>W</td>
-<td>W</td>
-<td>W</td>
-<td>R</td>
-</tr>
-<tr><td>-Af</td>
-<td>R</td>
-<td>R</td>
-<td>R</td>
-<td>R</td>
-</tr>
-</tbody>
-</table>
+states are Added [A], Clean [C], Modified [M] and Missing [!] (as
+reported by <a class="reference external" href="hg.1.html#status"><tt class="docutils literal">hg status</tt></a>). The actions are Warn, Remove (from
+branch) and Delete (from disk):</p>
+<pre class="literal-block">
+       A  C  M  !
+none   W  RD W  R
+-f     R  RD RD R
+-A     W  W  W  R
+-Af    R  R  R  R
+</pre>
 <p>Note that remove never deletes files in Added [A] state from the
 working directory, not even if option --force is specified.</p>
-</div>
+<p>This command schedules the files to be removed at the next commit.
+To undo a remove before that, see <a class="reference external" href="hg.1.html#revert"><tt class="docutils literal">hg revert</tt></a>.</p>
 <p>Returns 0 on success, 1 if any warnings encountered.</p>
 <p>Options:</p>
 <table class="docutils option-list" frame="void" rules="none">
@@ -2483,8 +1963,7 @@ non-interactive merging using the <tt class="docutils literal">internal:merge</t
 setting, or a command-line merge tool like <tt class="docutils literal">diff3</tt>. The resolve
 command is used to manage the files involved in a merge, after
 <a class="reference external" href="hg.1.html#merge"><tt class="docutils literal">hg merge</tt></a> has been run, and before <a class="reference external" href="hg.1.html#commit"><tt class="docutils literal">hg commit</tt></a> is run (i.e. the
-working directory must have two parents). See <a class="reference external" href="hg.1.html#merge-tools"><tt class="docutils literal">hg help
-<span class="pre">merge-tools</span></tt></a> for information on configuring merge tools.</p>
+working directory must have two parents).</p>
 <p>The resolve command can be used in the following ways:</p>
 <ul class="simple">
 <li><a class="reference external" href="hg.1.html#resolve"><tt class="docutils literal">hg resolve <span class="pre">[--tool</span> TOOL] <span class="pre">FILE...</span></tt></a>: attempt to re-merge the specified
@@ -2492,8 +1971,7 @@ files, discarding any previous merge attempts. Re-merging is not
 performed for files already marked as resolved. Use <tt class="docutils literal"><span class="pre">--all/-a</span></tt>
 to select all unresolved files. <tt class="docutils literal"><span class="pre">--tool</span></tt> can be used to specify
 the merge tool used for the given files. It overrides the HGMERGE
-environment variable and your configuration files.  Previous file
-contents are saved with a <tt class="docutils literal">.orig</tt> suffix.</li>
+environment variable and your configuration files.</li>
 <li><a class="reference external" href="hg.1.html#resolve"><tt class="docutils literal">hg resolve <span class="pre">-m</span> [FILE]</tt></a>: mark a file as having been resolved
 (e.g. after having manually fixed-up the files). The default is
 to mark all unresolved files.</li>
@@ -2523,14 +2001,14 @@ commit after a conflicting merge.</p>
 <tr><td class="option-group">
 <kbd><span class="option">-u</span>, <span class="option">--unmark</span></kbd></td>
 <td>mark files as unresolved</td></tr>
+<tr><td class="option-group">
+<kbd><span class="option">-t</span>, <span class="option">--tool</span></kbd></td>
+<td>specify merge tool</td></tr>
 <tr><td class="option-group" colspan="2">
 <kbd><span class="option">-n</span>, <span class="option">--no-status</span></kbd></td>
 </tr>
 <tr><td>&nbsp;</td><td>hide status prefix</td></tr>
 <tr><td class="option-group">
-<kbd><span class="option">-t</span>, <span class="option">--tool</span></kbd></td>
-<td>specify merge tool</td></tr>
-<tr><td class="option-group">
 <kbd><span class="option">-I</span>, <span class="option">--include</span></kbd></td>
 <td>include names matching the given patterns</td></tr>
 <tr><td class="option-group">
@@ -2547,8 +2025,7 @@ hg revert [OPTION]... [-r REV] [NAME]...
 <div class="note">
 <p class="first admonition-title">Note</p>
 <p class="last">To check out earlier revisions, you should use <a class="reference external" href="hg.1.html#update"><tt class="docutils literal">hg update REV</tt></a>.
-To cancel an uncommitted merge (and lose your changes), use
-<a class="reference external" href="hg.1.html#update"><tt class="docutils literal">hg update <span class="pre">--clean</span> .</tt></a>.</p>
+To cancel a merge (and lose your changes), use <a class="reference external" href="hg.1.html#update"><tt class="docutils literal">hg update <span class="pre">--clean</span> .</tt></a>.</p>
 </div>
 <p>With no revision specified, revert the specified files or directories
 to the contents they had in the parent of the working directory.
@@ -2580,10 +2057,9 @@ To disable these backups, use --no-backup.</p>
 <tr><td class="option-group">
 <kbd><span class="option">-r</span>, <span class="option">--rev</span></kbd></td>
 <td>revert to the specified revision</td></tr>
-<tr><td class="option-group" colspan="2">
-<kbd><span class="option">-C</span>, <span class="option">--no-backup</span></kbd></td>
-</tr>
-<tr><td>&nbsp;</td><td>do not save backup copies of files</td></tr>
+<tr><td class="option-group">
+<kbd><span class="option">--no-backup</span></kbd></td>
+<td>do not save backup copies of files</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-I</span>, <span class="option">--include</span></kbd></td>
 <td>include names matching the given patterns</td></tr>
@@ -2608,10 +2084,8 @@ any dirstate changes since that time. This command does not alter
 the working directory.</p>
 <p>Transactions are used to encapsulate the effects of all commands
 that create new changesets or propagate existing changesets into a
-repository.</p>
-<div class="verbose container">
-<p>For example, the following commands are transactional, and their
-effects can be rolled back:</p>
+repository. For example, the following commands are transactional,
+and their effects can be rolled back:</p>
 <ul class="simple">
 <li>commit</li>
 <li>import</li>
@@ -2619,10 +2093,6 @@ effects can be rolled back:</p>
 <li>push (with this repository as the destination)</li>
 <li>unbundle</li>
 </ul>
-<p>To avoid permanent data loss, rollback will refuse to rollback a
-commit transaction if it isn't checked out. Use --force to
-override this protection.</p>
-</div>
 <p>This command is not intended for use on public repositories. Once
 changes are visible for pull by other users, rolling a transaction
 back locally is ineffective (someone else may already have pulled
@@ -2638,9 +2108,6 @@ may fail if a rollback is performed.</p>
 <tr><td class="option-group">
 <kbd><span class="option">-n</span>, <span class="option">--dry-run</span></kbd></td>
 <td>do not perform actions, just print output</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-f</span>, <span class="option">--force</span></kbd></td>
-<td>ignore safety measures</td></tr>
 </tbody>
 </table>
 </div>
@@ -2797,27 +2264,6 @@ C = clean
 I = ignored
   = origin of the previous file listed as A (added)
 </pre>
-<div class="verbose container">
-<p>Examples:</p>
-<ul>
-<li><p class="first">show changes in the working directory relative to a
-changeset:</p>
-<pre class="literal-block">
-hg status --rev 9353
-</pre>
-</li>
-<li><p class="first">show all changes including copies in an existing changeset:</p>
-<pre class="literal-block">
-hg status --copies --change 9353
-</pre>
-</li>
-<li><p class="first">get a NUL separated list of added files, suitable for xargs:</p>
-<pre class="literal-block">
-hg status -an0
-</pre>
-</li>
-</ul>
-</div>
 <p>Returns 0 on success.</p>
 <p>Options:</p>
 <table class="docutils option-list" frame="void" rules="none">
@@ -3027,16 +2473,14 @@ hg update [-c] [-C] [-d DATE] [[-r] REV]
 </pre>
 <p>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 <a class="reference external" href="hg.1.html#bookmarks"><tt class="docutils literal">hg help
-bookmarks</tt></a>).</p>
+current named branch.</p>
+<p>If the changeset is not a descendant of the working directory's
+parent, the update is aborted. With the -c/--check option, the
+working directory is checked for uncommitted changes; if none are
+found, the working directory is updated to the specified
+changeset.</p>
 <p>Update sets the working directory's parent revison to the specified
 changeset (see <a class="reference external" href="hg.1.html#parents"><tt class="docutils literal">hg help parents</tt></a>).</p>
-<p>If the changeset is not a descendant or ancestor of the working
-directory's parent, the update is aborted. With the -c/--check
-option, the working directory is checked for uncommitted changes; if
-none are found, the working directory is updated to the specified
-changeset.</p>
-<div class="verbose container">
 <p>The following rules apply when the working directory contains
 uncommitted changes:</p>
 <ol class="arabic simple">
@@ -3053,9 +2497,6 @@ uncommitted changes are preserved.</li>
 <li>With the -C/--clean option, uncommitted changes are discarded and
 the working directory is updated to the requested changeset.</li>
 </ol>
-</div>
-<p>To cancel an uncommitted merge (and lose your changes), use
-<a class="reference external" href="hg.1.html#update"><tt class="docutils literal">hg update <span class="pre">--clean</span> .</tt></a>.</p>
 <p>Use null as the changeset to remove the working directory (like
 <a class="reference external" href="hg.1.html#clone"><tt class="docutils literal">hg clone <span class="pre">-U</span></tt></a>).</p>
 <p>If you want to revert just one file to an older revision, use
@@ -3267,7 +2708,7 @@ set appropriately if this Mercurial is not installed system-wide.</dd>
 </dl>
 </div>
 <div class="section" id="using-additional-features">
-<span id="extensions"></span><h1><a class="toc-backref" href="#contents">Using Additional Features</a></h1>
+<span id="extensions"></span><h1><a class="toc-backref" href="#contents">Using additional features</a></h1>
 <p>Mercurial has the ability to add new features through the use of
 extensions. Extensions may add new commands, add options to
 existing commands, change the default behavior of commands, or
@@ -3310,7 +2751,7 @@ baz = !
 </tr>
 <tr class="field"><th class="field-name">bugzilla:</th><td class="field-body">hooks for integrating with the Bugzilla bug tracker</td>
 </tr>
-<tr class="field"><th class="field-name">children:</th><td class="field-body">command to display child changesets (DEPRECATED)</td>
+<tr class="field"><th class="field-name">children:</th><td class="field-body">command to display child changesets</td>
 </tr>
 <tr class="field"><th class="field-name">churn:</th><td class="field-body">command to display statistics about repository history</td>
 </tr>
@@ -3322,9 +2763,7 @@ baz = !
 </tr>
 <tr class="field"><th class="field-name">extdiff:</th><td class="field-body">command to allow external programs to compare revisions</td>
 </tr>
-<tr class="field"><th class="field-name">factotum:</th><td class="field-body">http authentication with factotum</td>
-</tr>
-<tr class="field"><th class="field-name">fetch:</th><td class="field-body">pull, update and merge in one command (DEPRECATED)</td>
+<tr class="field"><th class="field-name">fetch:</th><td class="field-body">pull, update and merge in one command</td>
 </tr>
 <tr class="field"><th class="field-name">gpg:</th><td class="field-body">commands to sign and verify changesets</td>
 </tr>
@@ -3336,19 +2775,15 @@ baz = !
 </tr>
 <tr class="field"><th class="field-name">highlight:</th><td class="field-body">syntax highlighting for hgweb (requires Pygments)</td>
 </tr>
-<tr class="field"><th class="field-name">histedit:</th><td class="field-body">interactive history editing</td>
-</tr>
 <tr class="field"><th class="field-name">inotify:</th><td class="field-body">accelerate status report using Linux's inotify service</td>
 </tr>
 <tr class="field"><th class="field-name">interhg:</th><td class="field-body">expand expressions into changelog and summaries</td>
 </tr>
 <tr class="field"><th class="field-name">keyword:</th><td class="field-body">expand keywords in tracked files</td>
 </tr>
-<tr class="field"><th class="field-name">largefiles:</th><td class="field-body">track large binary files</td>
-</tr>
 <tr class="field"><th class="field-name">mq:</th><td class="field-body">manage a stack of patches</td>
 </tr>
-<tr class="field"><th class="field-name">notify:</th><td class="field-body">hooks for sending email push notifications</td>
+<tr class="field"><th class="field-name">notify:</th><td class="field-body">hooks for sending email notifications at commit/push time</td>
 </tr>
 <tr class="field"><th class="field-name">pager:</th><td class="field-body">browse command output with an external pager</td>
 </tr>
@@ -3381,7 +2816,7 @@ baz = !
 </blockquote>
 </div>
 <div class="section" id="specifying-file-sets">
-<span id="fileset"></span><span id="filesets"></span><h1><a class="toc-backref" href="#contents">Specifying File Sets</a></h1>
+<span id="filesets"></span><span id="fileset"></span><h1><a class="toc-backref" href="#contents">Specifying File Sets</a></h1>
 <p>Mercurial supports a functional language for selecting a set of
 files.</p>
 <p>Like other file patterns, this pattern type is indicated by a prefix,
@@ -3450,8 +2885,6 @@ considered if this predicate is used.</dd>
 <li>4k - 1MB (files from 4096 bytes to 1048576 bytes)</li>
 </ul>
 </dd>
-<dt><tt class="docutils literal"><span class="pre">subrepo([pattern])</span></tt></dt>
-<dd>Subrepositories whose paths match the given pattern.</dd>
 <dt><tt class="docutils literal">symlink()</tt></dt>
 <dd>File that is marked as a symlink.</dd>
 <dt><tt class="docutils literal">unknown()</tt></dt>
@@ -3479,7 +2912,7 @@ hg locate &quot;set:grep(magic) and not binary()&quot;
 </li>
 <li><p class="first">Find C files in a non-standard encoding:</p>
 <pre class="literal-block">
-hg locate &quot;set:**.c and not encoding('UTF-8')&quot;
+hg locate &quot;set:**.c and not encoding(ascii)&quot;
 </pre>
 </li>
 <li><p class="first">Revert copies of large binary files:</p>
@@ -3611,7 +3044,7 @@ changeset is much more appropriate than checkout in this context.</p>
 <dt>Child changeset</dt>
 <dd>See 'Changeset, child'.</dd>
 <dt>Close changeset</dt>
-<dd>See 'Head, closed branch'</dd>
+<dd>See 'Changeset, close'.</dd>
 <dt>Closed branch</dt>
 <dd>See 'Branch, closed'.</dd>
 <dt>Clone</dt>
@@ -3671,10 +3104,6 @@ changeset, known as the parent of the working directory. See
 'Parent, working directory'. The state may be modified by changes
 to the files introduced manually or by a merge. The repository
 metadata exists in the .hg directory inside the working directory.</dd>
-<dt>Draft</dt>
-<dd>Changesets in the draft phase have not been shared with publishing
-repositories and may thus be safely changed by history-modifying
-extensions. See <a class="reference external" href="hg.1.html#phases"><tt class="docutils literal">hg help phases</tt></a>.</dd>
 <dt>Graph</dt>
 <dd>See DAG and <a class="reference external" href="hg.1.html#graphlog"><tt class="docutils literal">hg help graphlog</tt></a>.</dd>
 <dt>Head</dt>
@@ -3687,13 +3116,10 @@ usual targets for update and merge operations.</p>
 <dt>Head, branch</dt>
 <dd>A changeset with no descendants on the same named branch.</dd>
 <dt>Head, closed branch</dt>
-<dd><p class="first">A changeset that marks a head as no longer interesting. The closed
+<dd>A changeset that marks a head as no longer interesting. The closed
 head is no longer listed by <a class="reference external" href="hg.1.html#heads"><tt class="docutils literal">hg heads</tt></a>. A branch is considered
 closed when all its heads are closed and consequently is not
-listed by <a class="reference external" href="hg.1.html#branches"><tt class="docutils literal">hg branches</tt></a>.</p>
-<p class="last">Closed heads can be re-opened by committing new changeset as the
-child of the changeset that marks a head as closed.</p>
-</dd>
+listed by <a class="reference external" href="hg.1.html#branches"><tt class="docutils literal">hg branches</tt></a>.</dd>
 <dt>Head, repository</dt>
 <dd>A topological head which has not been closed.</dd>
 <dt>Head, topological</dt>
@@ -3746,13 +3172,6 @@ are <a class="reference external" href="hg.1.html#summary"><tt class="docutils l
 changeset into another.</p>
 <p class="last">Example: &quot;You will need to patch that revision.&quot;</p>
 </dd>
-<dt>Phase</dt>
-<dd>A per-changeset state tracking how the changeset has been or
-should be shared. See <a class="reference external" href="hg.1.html#phases"><tt class="docutils literal">hg help phases</tt></a>.</dd>
-<dt>Public</dt>
-<dd>Changesets in the public phase have been shared with publishing
-repositories and are therefore considered immutable. See <a class="reference external" href="hg.1.html#phases"><tt class="docutils literal">hg help
-phases</tt></a>.</dd>
 <dt>Pull</dt>
 <dd>An operation in which changesets in a remote repository which are
 not in the local repository are brought into the local
@@ -3795,9 +3214,6 @@ pointing to the data.</dd>
 <dt>Root</dt>
 <dd>A changeset that has only the null changeset as its parent. Most
 repositories have only a single root changeset.</dd>
-<dt>Secret</dt>
-<dd>Changesets in the secret phase may not be shared via push, pull,
-or clone. See <a class="reference external" href="hg.1.html#phases"><tt class="docutils literal">hg help phases</tt></a>.</dd>
 <dt>Tag</dt>
 <dd>An alternative name given to a changeset. Tags can be used in all
 places where Mercurial expects a changeset ID, e.g., with
@@ -3827,15 +3243,16 @@ the working directory to that of a specific changeset. See
 </dl>
 </div>
 <div class="section" id="syntax-for-mercurial-ignore-files">
-<span id="ignore"></span><span id="hgignore"></span><h1><a class="toc-backref" href="#contents">Syntax for Mercurial Ignore Files</a></h1>
+<span id="ignore"></span><span id="hgignore"></span><h1><a class="toc-backref" href="#contents">syntax for Mercurial ignore files</a></h1>
+</div>
 <div class="section" id="id2">
-<h2>Synopsis</h2>
+<h1><a class="toc-backref" href="#contents">Synopsis</a></h1>
 <p>The Mercurial system uses a file called <tt class="docutils literal">.hgignore</tt> in the root
 directory of a repository to control its behavior when it searches
 for files that it is not currently tracking.</p>
 </div>
 <div class="section" id="id3">
-<h2>Description</h2>
+<h1><a class="toc-backref" href="#contents">Description</a></h1>
 <p>The working directory of a Mercurial repository will often contain
 files that should not be tracked by Mercurial. These include backup
 files created by editors and build products created by compilers.
@@ -3856,13 +3273,9 @@ configure these files.</p>
 <p>To control Mercurial's handling of files that it manages, many
 commands support the <tt class="docutils literal"><span class="pre">-I</span></tt> and <tt class="docutils literal"><span class="pre">-X</span></tt> options; see
 <a class="reference external" href="hg.1.html#&lt;command&gt;"><tt class="docutils literal">hg help &lt;command&gt;</tt></a> and <a class="reference external" href="hg.1.html#patterns"><tt class="docutils literal">hg help patterns</tt></a> for details.</p>
-<p>Files that are already tracked are not affected by .hgignore, even
-if they appear in .hgignore. An untracked file X can be explicitly
-added with <a class="reference external" href="hg.1.html#add"><tt class="docutils literal">hg add X</tt></a>, even if X would be excluded by a pattern
-in .hgignore.</p>
 </div>
 <div class="section" id="syntax">
-<h2>Syntax</h2>
+<h1><a class="toc-backref" href="#contents">Syntax</a></h1>
 <p>An ignore file is a plain text file consisting of a list of patterns,
 with one pattern per line. Empty lines are skipped. The <tt class="docutils literal">#</tt>
 character is treated as a comment character, and the <tt class="docutils literal">\</tt> character
@@ -3886,14 +3299,9 @@ follow, until another syntax is selected.</p>
 the form <tt class="docutils literal">*.c</tt> will match a file ending in <tt class="docutils literal">.c</tt> in any directory,
 and a regexp pattern of the form <tt class="docutils literal">\.c$</tt> will do the same. To root a
 regexp pattern, start it with <tt class="docutils literal">^</tt>.</p>
-<div class="note">
-<p class="first admonition-title">Note</p>
-<p class="last">Patterns specified in other than <tt class="docutils literal">.hgignore</tt> are always rooted.
-Please see <a class="reference external" href="hg.1.html#patterns"><tt class="docutils literal">hg help patterns</tt></a> for details.</p>
-</div>
 </div>
 <div class="section" id="example">
-<h2>Example</h2>
+<h1><a class="toc-backref" href="#contents">Example</a></h1>
 <p>Here is an example ignore file.</p>
 <pre class="literal-block">
 # use glob syntax.
@@ -3908,16 +3316,14 @@ syntax: regexp
 ^\.pc/
 </pre>
 </div>
-</div>
 <div class="section" id="configuring-hgweb">
 <span id="hgweb"></span><h1><a class="toc-backref" href="#contents">Configuring hgweb</a></h1>
 <p>Mercurial's internal web server, hgweb, can serve either a single
-repository, or a tree of repositories. In the second case, repository
-paths and global options can be defined using a dedicated
-configuration file common to <a class="reference external" href="hg.1.html#serve"><tt class="docutils literal">hg serve</tt></a>, <tt class="docutils literal">hgweb.wsgi</tt>,
-<tt class="docutils literal">hgweb.cgi</tt> and <tt class="docutils literal">hgweb.fcgi</tt>.</p>
-<p>This file uses the same syntax as other Mercurial configuration files
-but recognizes only the following sections:</p>
+repository, or a collection of them. In the latter case, a special
+configuration file can be used to specify the repository paths to use
+and global web configuration options.</p>
+<p>This file uses the same syntax as other Mercurial configuration files,
+but only the following sections are recognized:</p>
 <blockquote>
 <ul class="simple">
 <li>web</li>
@@ -3925,43 +3331,44 @@ but recognizes only the following sections:</p>
 <li>collections</li>
 </ul>
 </blockquote>
-<p>The <tt class="docutils literal">web</tt> options are thorougly described in <a class="reference external" href="hg.1.html#config"><tt class="docutils literal">hg help config</tt></a>.</p>
-<p>The <tt class="docutils literal">paths</tt> section maps URL paths to paths of repositories in the
-filesystem. hgweb will not expose the filesystem directly - only
-Mercurial repositories can be published and only according to the
-configuration.</p>
-<p>The left hand side is the path in the URL. Note that hgweb reserves
-subpaths like <tt class="docutils literal">rev</tt> or <tt class="docutils literal">file</tt>, try using different names for
-nested repositories to avoid confusing effects.</p>
-<p>The right hand side is the path in the filesystem. If the specified
-path ends with <tt class="docutils literal">*</tt> or <tt class="docutils literal">**</tt> the filesystem will be searched
-recursively for repositories below that point.
-With <tt class="docutils literal">*</tt> it will not recurse into the repositories it finds (except for
-<tt class="docutils literal">.hg/patches</tt>).
-With <tt class="docutils literal">**</tt> it will also search inside repository working directories
-and possibly find subrepositories.</p>
-<p>In this example:</p>
+<p>The <tt class="docutils literal">web</tt> section can specify all the settings described in the web
+section of the hgrc(5) documentation. See <a class="reference external" href="hg.1.html#config"><tt class="docutils literal">hg help config</tt></a> for
+information on where to find the manual page.</p>
+<p>The <tt class="docutils literal">paths</tt> section provides mappings of physical repository
+paths to virtual ones. For instance:</p>
 <pre class="literal-block">
 [paths]
-/projects/a = /srv/tmprepos/a
-/projects/b = c:/repos/b
-/ = /srv/repos/*
-/user/bob = /home/bob/repos/**
+projects/a = /foo/bar
+projects/b = /baz/quux
+web/root = /real/root/*
+/ = /real/root2/*
+virtual/root2 = /real/root2/**
 </pre>
 <ul class="simple">
 <li>The first two entries make two repositories in different directories
 appear under the same directory in the web interface</li>
-<li>The third entry will publish every Mercurial repository found in
-<tt class="docutils literal">/srv/repos/</tt>, for instance the repository <tt class="docutils literal">/srv/repos/quux/</tt>
-will appear as <tt class="docutils literal"><span class="pre">http://server/quux/</span></tt></li>
-<li>The fourth entry will publish both <tt class="docutils literal"><span class="pre">http://server/user/bob/quux/</span></tt>
-and <tt class="docutils literal"><span class="pre">http://server/user/bob/quux/testsubrepo/</span></tt></li>
+<li>The third entry maps every Mercurial repository found in '/real/root'
+into 'web/root'. This format is preferred over the [collections] one,
+since using absolute paths as configuration keys is not supported on every
+platform (especially on Windows).</li>
+<li>The fourth entry is a special case mapping all repositories in
+'/real/root2' in the root of the virtual directory.</li>
+<li>The fifth entry recursively finds all repositories under the real
+root, and maps their relative paths under the virtual root.</li>
 </ul>
-<p>The <tt class="docutils literal">collections</tt> section is deprecated and has been superseeded by
-<tt class="docutils literal">paths</tt>.</p>
+<p>The <tt class="docutils literal">collections</tt> section provides mappings of trees of physical
+repositories paths to virtual ones, though the paths syntax is generally
+preferred. For instance:</p>
+<pre class="literal-block">
+[collections]
+/foo = /foo
+</pre>
+<p>Here, the left side will be stripped off all repositories found in the
+right side. Thus <tt class="docutils literal">/foo/bar</tt> and <tt class="docutils literal">foo/quux/baz</tt> will be listed as
+<tt class="docutils literal">bar</tt> and <tt class="docutils literal">quux/baz</tt> respectively.</p>
 </div>
 <div class="section" id="id4">
-<span id="mergetools"></span><span id="merge-tools"></span><h1><a class="toc-backref" href="#contents">Merge Tools</a></h1>
+<span id="merge-tools"></span><h1><a class="toc-backref" href="#contents">Merge Tools</a></h1>
 <p>To merge files Mercurial uses merge tools.</p>
 <p>A merge tool combines two different versions of a file into a merged
 file. Merge tools are given the two files and the greatest common
@@ -3991,28 +3398,28 @@ GUI is available if the tool requires a GUI.</p>
 <p>There are some internal merge tools which can be used. The internal
 merge tools are:</p>
 <dl class="docutils">
-<dt><tt class="docutils literal">internal:dump</tt></dt>
-<dd>Creates three versions of the files to merge, containing the
-contents of local, other and base. These files can then be used to
-perform a merge manually. If the file to be merged is named
-<tt class="docutils literal">a.txt</tt>, these files will accordingly be named <tt class="docutils literal">a.txt.local</tt>,
-<tt class="docutils literal">a.txt.other</tt> and <tt class="docutils literal">a.txt.base</tt> and they will be placed in the
-same directory as <tt class="docutils literal">a.txt</tt>.</dd>
+<dt><tt class="docutils literal">internal:merge</tt></dt>
+<dd>Uses the internal non-interactive simple merge algorithm for merging
+files. It will fail if there are any conflicts and leave markers in
+the partially merged file.</dd>
 <dt><tt class="docutils literal">internal:fail</tt></dt>
 <dd>Rather than attempting to merge files that were modified on both
 branches, it marks them as unresolved. The resolve command must be
 used to resolve these conflicts.</dd>
 <dt><tt class="docutils literal">internal:local</tt></dt>
 <dd>Uses the local version of files as the merged version.</dd>
-<dt><tt class="docutils literal">internal:merge</tt></dt>
-<dd>Uses the internal non-interactive simple merge algorithm for merging
-files. It will fail if there are any conflicts and leave markers in
-the partially merged file.</dd>
 <dt><tt class="docutils literal">internal:other</tt></dt>
 <dd>Uses the other version of files as the merged version.</dd>
 <dt><tt class="docutils literal">internal:prompt</tt></dt>
 <dd>Asks the user which of the local or the other version to keep as
 the merged version.</dd>
+<dt><tt class="docutils literal">internal:dump</tt></dt>
+<dd>Creates three versions of the files to merge, containing the
+contents of local, other and base. These files can then be used to
+perform a merge manually. If the file to be merged is named
+<tt class="docutils literal">a.txt</tt>, these files will accordingly be named <tt class="docutils literal">a.txt.local</tt>,
+<tt class="docutils literal">a.txt.other</tt> and <tt class="docutils literal">a.txt.base</tt> and they will be placed in the
+same directory as <tt class="docutils literal">a.txt</tt>.</dd>
 </dl>
 <p>Internal tools are always available and do not require a GUI but will by default
 not handle symlinks or binary files.</p>
@@ -4056,7 +3463,7 @@ configuration of merge tools.</p>
 </div>
 </div>
 <div class="section" id="specifying-multiple-revisions">
-<span id="mrevs"></span><span id="multirevs"></span><h1><a class="toc-backref" href="#contents">Specifying Multiple Revisions</a></h1>
+<span id="multirevs"></span><span id="mrevs"></span><h1><a class="toc-backref" href="#contents">Specifying Multiple Revisions</a></h1>
 <p>When Mercurial accepts more than one revision, they may be specified
 individually, or provided as a topologically continuous range,
 separated by the &quot;:&quot; character.</p>
@@ -4075,11 +3482,6 @@ at a time.</p>
 <p>By default, Mercurial treats filenames as shell-style extended glob
 patterns.</p>
 <p>Alternate pattern notations must be specified explicitly.</p>
-<div class="note">
-<p class="first admonition-title">Note</p>
-<p class="last">Patterns specified in <tt class="docutils literal">.hgignore</tt> are not rooted.
-Please see <a class="reference external" href="hg.1.html#hgignore"><tt class="docutils literal">hg help hgignore</tt></a> for details.</p>
-</div>
 <p>To use a plain path name without any pattern matching, start it with
 <tt class="docutils literal">path:</tt>. These path names must completely match starting at the
 current repository root.</p>
@@ -4121,103 +3523,8 @@ listfile0:list.txt read list from list.txt with null byte delimiters
 </pre>
 <p>See also <a class="reference external" href="hg.1.html#filesets"><tt class="docutils literal">hg help filesets</tt></a>.</p>
 </div>
-<div class="section" id="working-with-phases">
-<span id="phases"></span><h1><a class="toc-backref" href="#contents">Working with Phases</a></h1>
-<div class="section" id="what-are-phases">
-<h2>What are phases?</h2>
-<p>Phases are a system for tracking which changesets have been or should
-be shared. This helps prevent common mistakes when modifying history
-(for instance, with the mq or rebase extensions).</p>
-<p>Each changeset in a repository is in one of the following phases:</p>
-<blockquote>
-<ul class="simple">
-<li>public : changeset is visible on a public server</li>
-<li>draft : changeset is not yet published</li>
-<li>secret : changeset should not be pushed, pulled, or cloned</li>
-</ul>
-</blockquote>
-<p>These phases are ordered (public &lt; draft &lt; secret) and no changeset
-can be in a lower phase than its ancestors. For instance, if a
-changeset is public, all its ancestors are also public. Lastly,
-changeset phases should only be changed towards the public phase.</p>
-</div>
-<div class="section" id="how-are-phases-managed">
-<h2>How are phases managed?</h2>
-<p>For the most part, phases should work transparently. By default, a
-changeset is created in the draft phase and is moved into the public
-phase when it is pushed to another repository.</p>
-<p>Once changesets become public, extensions like mq and rebase will
-refuse to operate on them to prevent creating duplicate changesets.
-Phases can also be manually manipulated with the <a class="reference external" href="hg.1.html#phase"><tt class="docutils literal">hg phase</tt></a> command
-if needed. See <a class="reference external" href="hg.1.html#-v"><tt class="docutils literal">hg help <span class="pre">-v</span> phase</tt></a> for examples.</p>
-</div>
-<div class="section" id="phases-and-servers">
-<h2>Phases and servers</h2>
-<p>Normally, all servers are <tt class="docutils literal">publishing</tt> by default. This means:</p>
-<pre class="literal-block">
-- all draft changesets that are pulled or cloned appear in phase
-public on the client
-
-- all draft changesets that are pushed appear as public on both
-client and server
-
-- secret changesets are neither pushed, pulled, or cloned
-</pre>
-<div class="note">
-<p class="first admonition-title">Note</p>
-<p class="last">Pulling a draft changeset from a publishing server does not mark it
-as public on the server side due to the read-only nature of pull.</p>
-</div>
-<p>Sometimes it may be desirable to push and pull changesets in the draft
-phase to share unfinished work. This can be done by setting a
-repository to disable publishing in its configuration file:</p>
-<pre class="literal-block">
-[phases]
-publish = False
-</pre>
-<p>See <a class="reference external" href="hg.1.html#config"><tt class="docutils literal">hg help config</tt></a> for more information on config files.</p>
-<div class="note">
-<p class="first admonition-title">Note</p>
-<p class="last">Servers running older versions of Mercurial are treated as
-publishing.</p>
-</div>
-</div>
-<div class="section" id="examples">
-<h2>Examples</h2>
-<blockquote>
-<ul>
-<li><p class="first">list changesets in draft or secret phase:</p>
-<pre class="literal-block">
-hg log -r &quot;not public()&quot;
-</pre>
-</li>
-<li><p class="first">change all secret changesets to draft:</p>
-<pre class="literal-block">
-hg phase --draft &quot;secret()&quot;
-</pre>
-</li>
-<li><p class="first">forcibly move the current changeset and descendants from public to draft:</p>
-<pre class="literal-block">
-hg phase --force --draft .
-</pre>
-</li>
-<li><p class="first">show a list of changeset revision and phase:</p>
-<pre class="literal-block">
-hg log --template &quot;{rev} {phase}\n&quot;
-</pre>
-</li>
-<li><p class="first">resynchronize draft changesets relative to a remote repository:</p>
-<pre class="literal-block">
-hg phase -fd 'outgoing(URL)'
-</pre>
-</li>
-</ul>
-</blockquote>
-<p>See <a class="reference external" href="hg.1.html#phase"><tt class="docutils literal">hg help phase</tt></a> for more information on manually manipulating phases.</p>
-</div>
-</div>
 <div class="section" id="specifying-single-revisions">
-<span id="revs"></span><span id="revisions"></span><h1><a class="toc-backref" href="#contents">Specifying Single Revisions</a></h1>
+<span id="revisions"></span><span id="revs"></span><h1><a class="toc-backref" href="#contents">Specifying Single Revisions</a></h1>
 <p>Mercurial supports several ways to specify individual revisions.</p>
 <p>A plain integer is treated as a revision number. Negative integers are
 treated as sequential offsets from the tip, with -1 denoting the tip,
@@ -4228,12 +3535,12 @@ identifier.</p>
 unique revision identifier and is referred to as a short-form
 identifier. A short-form identifier is only valid if it is the prefix
 of exactly one full-length identifier.</p>
-<p>Any other string is treated as a bookmark, tag, or branch name. A
-bookmark is a movable pointer to a revision. A tag is a permanent name
-associated with a revision. A branch name denotes the tipmost revision
-of that branch. Bookmark, tag, and branch names must not contain the &quot;:&quot;
-character.</p>
-<p>The reserved name &quot;tip&quot; always identifies the most recent revision.</p>
+<p>Any other string is treated as a tag or branch name. A tag name is a
+symbolic name associated with a revision identifier. A branch name
+denotes the tipmost revision of that branch. Tag and branch names must
+not contain the &quot;:&quot; character.</p>
+<p>The reserved name &quot;tip&quot; is a special tag that always identifies the
+most recent revision.</p>
 <p>The reserved name &quot;null&quot; indicates the null revision. This is the
 revision of an empty repository, and the parent of revision 0.</p>
 <p>The reserved name &quot;.&quot; indicates the working directory parent. If no
@@ -4242,14 +3549,15 @@ uncommitted merge is in progress, &quot;.&quot; is the revision of the first
 parent.</p>
 </div>
 <div class="section" id="specifying-revision-sets">
-<span id="revset"></span><span id="revsets"></span><h1><a class="toc-backref" href="#contents">Specifying Revision Sets</a></h1>
+<span id="revsets"></span><span id="revset"></span><h1><a class="toc-backref" href="#contents">Specifying Revision Sets</a></h1>
 <p>Mercurial supports a functional language for selecting a set of
 revisions.</p>
 <p>The language supports a number of predicates which are joined by infix
 operators. Parenthesis can be used for grouping.</p>
-<p>Identifiers such as branch names may need quoting with single or
-double quotes if they contain characters like <tt class="docutils literal">-</tt> or if they match
-one of the predefined predicates.</p>
+<p>Identifiers such as branch names must be quoted with single or double
+quotes if they contain characters outside of
+<tt class="docutils literal"><span class="pre">[._a-zA-Z0-9\x80-\xff]</span></tt> or if they match one of the predefined
+predicates.</p>
 <p>Special characters can be used in quoted identifiers by escaping them,
 e.g., <tt class="docutils literal">\n</tt> is interpreted as a newline. To prevent them from being
 interpreted, strings can be prefixed with <tt class="docutils literal">r</tt>, e.g. <tt class="docutils literal"><span class="pre">r'...'</span></tt>.</p>
@@ -4302,31 +3610,13 @@ for n == 2, the second parent of changeset in x.</dd>
 <dd>Changesets that are ancestors of a changeset in set.</dd>
 <dt><tt class="docutils literal">author(string)</tt></dt>
 <dd>Alias for <tt class="docutils literal">user(string)</tt>.</dd>
-<dt><tt class="docutils literal">bisect(string)</tt></dt>
-<dd><p class="first">Changesets marked in the specified bisect status:</p>
-<ul class="last simple">
-<li><tt class="docutils literal">good</tt>, <tt class="docutils literal">bad</tt>, <tt class="docutils literal">skip</tt>: csets explicitly marked as good/bad/skip</li>
-<li><tt class="docutils literal">goods</tt>, <tt class="docutils literal">bads</tt>      : csets topologicaly good/bad</li>
-<li><tt class="docutils literal">range</tt>              : csets taking part in the bisection</li>
-<li><tt class="docutils literal">pruned</tt>             : csets that are goods, bads or skipped</li>
-<li><tt class="docutils literal">untested</tt>           : csets whose fate is yet unknown</li>
-<li><tt class="docutils literal">ignored</tt>            : csets ignored due to DAG topology</li>
-<li><tt class="docutils literal">current</tt>            : the cset currently being bisected</li>
-</ul>
-</dd>
+<dt><tt class="docutils literal">bisected(string)</tt></dt>
+<dd>Changesets marked in the specified bisect state (good, bad, skip).</dd>
 <dt><tt class="docutils literal"><span class="pre">bookmark([name])</span></tt></dt>
-<dd><p class="first">The named bookmark or all bookmarks.</p>
-<p class="last">If <cite>name</cite> starts with <cite>re:</cite>, the remainder of the name is treated as
-a regular expression. To match a bookmark that actually starts with <cite>re:</cite>,
-use the prefix <cite>literal:</cite>.</p>
-</dd>
+<dd>The named bookmark or all bookmarks.</dd>
 <dt><tt class="docutils literal">branch(string or set)</tt></dt>
-<dd><p class="first">All changesets belonging to the given branch or the branches of the given
-changesets.</p>
-<p class="last">If <cite>string</cite> starts with <cite>re:</cite>, the remainder of the name is treated as
-a regular expression. To match a branch that actually starts with <cite>re:</cite>,
-use the prefix <cite>literal:</cite>.</p>
-</dd>
+<dd>All changesets belonging to the given branch or the branches of the given
+changesets.</dd>
 <dt><tt class="docutils literal">children(set)</tt></dt>
 <dd>Child changesets of changesets in set.</dd>
 <dt><tt class="docutils literal">closed()</tt></dt>
@@ -4334,43 +3624,16 @@ use the prefix <cite>literal:</cite>.</p>
 <dt><tt class="docutils literal">contains(pattern)</tt></dt>
 <dd>Revision contains a file matching pattern. See <a class="reference external" href="hg.1.html#patterns"><tt class="docutils literal">hg help patterns</tt></a>
 for information about file patterns.</dd>
-<dt><tt class="docutils literal"><span class="pre">converted([id])</span></tt></dt>
-<dd>Changesets converted from the given identifier in the old repository if
-present, or all converted changesets if no identifier is specified.</dd>
 <dt><tt class="docutils literal">date(interval)</tt></dt>
 <dd>Changesets within the interval, see <a class="reference external" href="hg.1.html#dates"><tt class="docutils literal">hg help dates</tt></a>.</dd>
 <dt><tt class="docutils literal">desc(string)</tt></dt>
 <dd>Search commit message for string. The match is case-insensitive.</dd>
 <dt><tt class="docutils literal">descendants(set)</tt></dt>
 <dd>Changesets which are descendants of changesets in set.</dd>
-<dt><tt class="docutils literal"><span class="pre">destination([set])</span></tt></dt>
-<dd>Changesets that were created by a graft, transplant or rebase operation,
-with the given revisions specified as the source.  Omitting the optional set
-is the same as passing all().</dd>
-<dt><tt class="docutils literal">draft()</tt></dt>
-<dd>Changeset in draft phase.</dd>
-<dt><tt class="docutils literal">extinct()</tt></dt>
-<dd>Obsolete changesets with obsolete descendants only.</dd>
-<dt><tt class="docutils literal">extra(label, [value])</tt></dt>
-<dd><p class="first">Changesets with the given label in the extra metadata, with the given
-optional value.</p>
-<p class="last">If <cite>value</cite> starts with <cite>re:</cite>, the remainder of the value is treated as
-a regular expression. To match a value that actually starts with <cite>re:</cite>,
-use the prefix <cite>literal:</cite>.</p>
-</dd>
 <dt><tt class="docutils literal">file(pattern)</tt></dt>
-<dd><p class="first">Changesets affecting files matched by pattern.</p>
-<p class="last">For a faster but less accurate result, consider using <tt class="docutils literal">filelog()</tt>
-instead.</p>
-</dd>
+<dd>Changesets affecting files matched by pattern.</dd>
 <dt><tt class="docutils literal">filelog(pattern)</tt></dt>
-<dd><p class="first">Changesets connected to the specified filelog.</p>
-<p class="last">For performance reasons, <tt class="docutils literal">filelog()</tt> does not show every changeset
-that affects the requested file(s). See <a class="reference external" href="hg.1.html#log"><tt class="docutils literal">hg help log</tt></a> for details. For
-a slower, more accurate result, use <tt class="docutils literal">file()</tt>.</p>
-</dd>
-<dt><tt class="docutils literal">first(set, [n])</tt></dt>
-<dd>An alias for limit().</dd>
+<dd>Changesets connected to the specified filelog.</dd>
 <dt><tt class="docutils literal"><span class="pre">follow([file])</span></tt></dt>
 <dd>An alias for <tt class="docutils literal">::.</tt> (ancestors of the working copy's first parent).
 If a filename is specified, the history of the given file is followed,
@@ -4388,29 +3651,10 @@ to ensure special escape characters are handled correctly. Unlike
 <dt><tt class="docutils literal">keyword(string)</tt></dt>
 <dd>Search commit message, user name, and names of changed files for
 string. The match is case-insensitive.</dd>
-<dt><tt class="docutils literal">last(set, [n])</tt></dt>
-<dd>Last n members of set, defaulting to 1.</dd>
-<dt><tt class="docutils literal">limit(set, [n])</tt></dt>
-<dd>First n members of set, defaulting to 1.</dd>
-<dt><tt class="docutils literal">matching(revision [, field])</tt></dt>
-<dd><p class="first">Changesets in which a given set of fields match the set of fields in the
-selected revision or set.</p>
-<p>To match more than one field pass the list of fields to match separated
-by spaces (e.g. <tt class="docutils literal">author description</tt>).</p>
-<p>Valid fields are most regular revision fields and some special fields.</p>
-<p>Regular revision fields are <tt class="docutils literal">description</tt>, <tt class="docutils literal">author</tt>, <tt class="docutils literal">branch</tt>,
-<tt class="docutils literal">date</tt>, <tt class="docutils literal">files</tt>, <tt class="docutils literal">phase</tt>, <tt class="docutils literal">parents</tt>, <tt class="docutils literal">substate</tt>, <tt class="docutils literal">user</tt>
-and <tt class="docutils literal">diff</tt>.
-Note that <tt class="docutils literal">author</tt> and <tt class="docutils literal">user</tt> are synonyms. <tt class="docutils literal">diff</tt> refers to the
-contents of the revision. Two revisions matching their <tt class="docutils literal">diff</tt> will
-also match their <tt class="docutils literal">files</tt>.</p>
-<p>Special fields are <tt class="docutils literal">summary</tt> and <tt class="docutils literal">metadata</tt>:
-<tt class="docutils literal">summary</tt> matches the first line of the description.
-<tt class="docutils literal">metadata</tt> is equivalent to matching <tt class="docutils literal">description user date</tt>
-(i.e. it matches the main metadata fields).</p>
-<p class="last"><tt class="docutils literal">metadata</tt> is the default field which is used when no fields are
-specified. You can match more than one field at a time.</p>
-</dd>
+<dt><tt class="docutils literal">last(set, n)</tt></dt>
+<dd>Last n members of set.</dd>
+<dt><tt class="docutils literal">limit(set, n)</tt></dt>
+<dd>First n members of set.</dd>
 <dt><tt class="docutils literal">max(set)</tt></dt>
 <dd>Changeset with highest revision number in set.</dd>
 <dt><tt class="docutils literal">merge()</tt></dt>
@@ -4419,14 +3663,6 @@ specified. You can match more than one field at a time.</p>
 <dd>Changeset with lowest revision number in set.</dd>
 <dt><tt class="docutils literal">modifies(pattern)</tt></dt>
 <dd>Changesets modifying files matched by pattern.</dd>
-<dt><tt class="docutils literal">obsolete()</tt></dt>
-<dd>Mutable changeset with a newer version.</dd>
-<dt><tt class="docutils literal"><span class="pre">origin([set])</span></tt></dt>
-<dd>Changesets that were specified as a source for the grafts, transplants or
-rebases that created the given revisions.  Omitting the optional set is the
-same as passing all().  If a changeset created by these operations is itself
-specified as a source for one of these operations, only the source changeset
-for the first operation is selected.</dd>
 <dt><tt class="docutils literal"><span class="pre">outgoing([path])</span></tt></dt>
 <dd>Changesets not found in the specified destination repository, or the
 default push location.</dd>
@@ -4437,18 +3673,8 @@ default push location.</dd>
 <dt><tt class="docutils literal"><span class="pre">parents([set])</span></tt></dt>
 <dd>The set of all parents for all changesets in set, or the working directory.</dd>
 <dt><tt class="docutils literal">present(set)</tt></dt>
-<dd><p class="first">An empty set, if any revision in set isn't found; otherwise,
-all revisions in set.</p>
-<p class="last">If any of specified revisions is not present in the local repository,
-the query is normally aborted. But this predicate allows the query
-to continue even in such cases.</p>
-</dd>
-<dt><tt class="docutils literal">public()</tt></dt>
-<dd>Changeset in public phase.</dd>
-<dt><tt class="docutils literal"><span class="pre">remote([id</span> <span class="pre">[,path]])</span></tt></dt>
-<dd>Local revision that corresponds to the given identifier in a
-remote repository, if present. Here, the '.' identifier is a
-synonym for the current local branch.</dd>
+<dd>An empty set, if any revision in set isn't found; otherwise,
+all revisions in set.</dd>
 <dt><tt class="docutils literal">removes(pattern)</tt></dt>
 <dd>Changesets which remove files matching pattern.</dd>
 <dt><tt class="docutils literal">rev(number)</tt></dt>
@@ -4456,9 +3682,7 @@ synonym for the current local branch.</dd>
 <dt><tt class="docutils literal">reverse(set)</tt></dt>
 <dd>Reverse order of set.</dd>
 <dt><tt class="docutils literal">roots(set)</tt></dt>
-<dd>Changesets in set with no parent changeset in set.</dd>
-<dt><tt class="docutils literal">secret()</tt></dt>
-<dd>Changeset in secret phase.</dd>
+<dd>Changesets with no parent changeset in set.</dd>
 <dt><tt class="docutils literal">sort(set[, <span class="pre">[-]key...])</span></tt></dt>
 <dd><p class="first">Sort set by keys. The default sort order is ascending, specify a key
 as <tt class="docutils literal"><span class="pre">-key</span></tt> to sort in descending order.</p>
@@ -4473,14 +3697,8 @@ as <tt class="docutils literal"><span class="pre">-key</span></tt> to sort in de
 </dd>
 <dt><tt class="docutils literal"><span class="pre">tag([name])</span></tt></dt>
 <dd>The specified tag by name, or all tagged revisions if no name is given.</dd>
-<dt><tt class="docutils literal">unstable()</tt></dt>
-<dd>Non-obsolete changesets with obsolete ancestors.</dd>
 <dt><tt class="docutils literal">user(string)</tt></dt>
-<dd><p class="first">User name contains string. The match is case-insensitive.</p>
-<p class="last">If <cite>string</cite> starts with <cite>re:</cite>, the remainder of the string is treated as
-a regular expression. To match a user that actually contains <cite>re:</cite>, use
-the prefix <cite>literal:</cite>.</p>
-</dd>
+<dd>User name contains string. The match is case-insensitive.</dd>
 </dl>
 <p>New predicates (known as &quot;aliases&quot;) can be defined, using any combination of
 existing predicates or other aliases. An alias definition looks like:</p>
@@ -4547,39 +3765,35 @@ hg log -r &quot;(keyword(bug) or keyword(issue)) and not ancestors(tagged())&quo
 </ul>
 </div>
 <div class="section" id="subrepositories">
-<span id="subrepo"></span><span id="subrepos"></span><h1><a class="toc-backref" href="#contents">Subrepositories</a></h1>
+<span id="subrepos"></span><span id="subrepo"></span><h1><a class="toc-backref" href="#contents">Subrepositories</a></h1>
 <p>Subrepositories let you nest external repositories or projects into a
 parent Mercurial repository, and make commands operate on them as a
-group.</p>
-<p>Mercurial currently supports Mercurial, Git, and Subversion
-subrepositories.</p>
+group. External Mercurial and Subversion projects are currently
+supported.</p>
 <p>Subrepositories are made of three components:</p>
 <ol class="arabic">
 <li><p class="first">Nested repository checkouts. They can appear anywhere in the
-parent working directory.</p>
+parent working directory, and are Mercurial clones or Subversion
+checkouts.</p>
 </li>
-<li><p class="first">Nested repository references. They are defined in <tt class="docutils literal">.hgsub</tt>, which
-should be placed in the root of working directory, and
+<li><p class="first">Nested repository references. They are defined in <tt class="docutils literal">.hgsub</tt> and
 tell where the subrepository checkouts come from. Mercurial
 subrepositories are referenced like:</p>
 <blockquote>
 <p>path/to/nested = <a class="reference external" href="https://example.com/nested/repo/path">https://example.com/nested/repo/path</a></p>
 </blockquote>
-<p>Git and Subversion subrepos are also supported:</p>
-<blockquote>
-<p>path/to/nested = [git]git://example.com/nested/repo/path
-path/to/nested = [svn]https://example.com/nested/trunk/path</p>
-</blockquote>
 <p>where <tt class="docutils literal">path/to/nested</tt> is the checkout location relatively to the
 parent Mercurial root, and <tt class="docutils literal"><span class="pre">https://example.com/nested/repo/path</span></tt>
 is the source repository path. The source can also reference a
-filesystem path.</p>
+filesystem path. Subversion repositories are defined with:</p>
+<blockquote>
+<p>path/to/nested = [svn]https://example.com/nested/trunk/path</p>
+</blockquote>
 <p>Note that <tt class="docutils literal">.hgsub</tt> does not exist by default in Mercurial
 repositories, you have to create and add it to the parent
 repository before using subrepositories.</p>
 </li>
-<li><p class="first">Nested repository states. They are defined in <tt class="docutils literal">.hgsubstate</tt>, which
-is placed in the root of working directory, and
+<li><p class="first">Nested repository states. They are defined in <tt class="docutils literal">.hgsubstate</tt> and
 capture whatever information is required to restore the
 subrepositories to the state they were committed in a parent
 repository changeset. Mercurial automatically record the nested
@@ -4590,8 +3804,9 @@ repositories states when committing in the parent repository.</p>
 </div>
 </li>
 </ol>
+</div>
 <div class="section" id="adding-a-subrepository">
-<h2>Adding a Subrepository</h2>
+<h1><a class="toc-backref" href="#contents">Adding a Subrepository</a></h1>
 <p>If <tt class="docutils literal">.hgsub</tt> does not exist, create it and add it to the parent
 repository. Clone or checkout the external projects where you want it
 to live in the parent repository. Edit <tt class="docutils literal">.hgsub</tt> and add the
@@ -4600,7 +3815,7 @@ subrepository is tracked and the next commit will record its state in
 <tt class="docutils literal">.hgsubstate</tt> and bind it to the committed changeset.</p>
 </div>
 <div class="section" id="synchronizing-a-subrepository">
-<h2>Synchronizing a Subrepository</h2>
+<h1><a class="toc-backref" href="#contents">Synchronizing a Subrepository</a></h1>
 <p>Subrepos do not automatically track the latest changeset of their
 sources. Instead, they are updated to the changeset that corresponds
 with the changeset checked out in the top-level changeset. This is so
@@ -4611,49 +3826,43 @@ subrepo at the desired revision, test in the top-level repo, then
 commit in the parent repository to record the new combination.</p>
 </div>
 <div class="section" id="deleting-a-subrepository">
-<h2>Deleting a Subrepository</h2>
+<h1><a class="toc-backref" href="#contents">Deleting a Subrepository</a></h1>
 <p>To remove a subrepository from the parent repository, delete its
 reference from <tt class="docutils literal">.hgsub</tt>, then remove its files.</p>
 </div>
 <div class="section" id="interaction-with-mercurial-commands">
-<h2>Interaction with Mercurial Commands</h2>
+<h1><a class="toc-backref" href="#contents">Interaction with Mercurial Commands</a></h1>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field"><th class="field-name">add:</th><td class="field-body">add does not recurse in subrepos unless -S/--subrepos is
-specified.  However, if you specify the full path of a file in a
-subrepo, it will be added even without -S/--subrepos specified.
-Git and Subversion subrepositories are currently silently
+specified. Subversion subrepositories are currently silently
 ignored.</td>
 </tr>
 <tr class="field"><th class="field-name">archive:</th><td class="field-body">archive does not recurse in subrepositories unless
 -S/--subrepos is specified.</td>
 </tr>
 <tr class="field"><th class="field-name">commit:</th><td class="field-body">commit creates a consistent snapshot of the state of the
-entire project and its subrepositories. If any subrepositories
-have been modified, Mercurial will abort.  Mercurial can be made
-to instead commit all modified subrepositories by specifying
--S/--subrepos, or setting &quot;ui.commitsubrepos=True&quot; in a
-configuration file (see <a class="reference external" href="hg.1.html#config"><tt class="docutils literal">hg help config</tt></a>).  After there are no
-longer any modified subrepositories, it records their state and
-finally commits it in the parent repository.</td>
+entire project and its subrepositories. It does this by first
+attempting to commit all modified subrepositories, then recording
+their state and finally committing it in the parent
+repository. Mercurial can be made to abort if any subrepository
+content is modified by setting &quot;ui.commitsubrepos=no&quot; in a
+configuration file (see <a class="reference external" href="hg.1.html#config"><tt class="docutils literal">hg help config</tt></a>).</td>
 </tr>
 <tr class="field"><th class="field-name">diff:</th><td class="field-body">diff does not recurse in subrepos unless -S/--subrepos is
 specified. Changes are displayed as usual, on the subrepositories
-elements. Git and Subversion subrepositories are currently
-silently ignored.</td>
-</tr>
-<tr class="field"><th class="field-name">forget:</th><td class="field-body">forget currently only handles exact file matches in subrepos.
-Git and Subversion subrepositories are currently silently ignored.</td>
+elements. Subversion subrepositories are currently silently
+ignored.</td>
 </tr>
 <tr class="field"><th class="field-name">incoming:</th><td class="field-body">incoming does not recurse in subrepos unless -S/--subrepos
-is specified. Git and Subversion subrepositories are currently
-silently ignored.</td>
+is specified. Subversion subrepositories are currently silently
+ignored.</td>
 </tr>
 <tr class="field"><th class="field-name">outgoing:</th><td class="field-body">outgoing does not recurse in subrepos unless -S/--subrepos
-is specified. Git and Subversion subrepositories are currently
-silently ignored.</td>
+is specified. Subversion subrepositories are currently silently
+ignored.</td>
 </tr>
 <tr class="field"><th class="field-name">pull:</th><td class="field-body">pull is not recursive since it is not clear what to pull prior
 to running <a class="reference external" href="hg.1.html#update"><tt class="docutils literal">hg update</tt></a>. Listing and retrieving all
@@ -4664,7 +3873,7 @@ case.</td>
 <tr class="field"><th class="field-name">push:</th><td class="field-body">Mercurial will automatically push all subrepositories first
 when the parent repository is being pushed. This ensures new
 subrepository changes are available when referenced by top-level
-repositories.  Push is a no-op for Subversion subrepositories.</td>
+repositories.</td>
 </tr>
 <tr class="field"><th class="field-name">status:</th><td class="field-body">status does not recurse into subrepositories unless
 -S/--subrepos is specified. Subrepository changes are displayed as
@@ -4682,16 +3891,15 @@ can require network access when using subrepositories.</td>
 </table>
 </div>
 <div class="section" id="remapping-subrepositories-sources">
-<h2>Remapping Subrepositories Sources</h2>
+<h1><a class="toc-backref" href="#contents">Remapping Subrepositories Sources</a></h1>
 <p>A subrepository source location may change during a project life,
 invalidating references stored in the parent repository history. To
 fix this, rewriting rules can be defined in parent repository <tt class="docutils literal">hgrc</tt>
 file or in Mercurial configuration. See the <tt class="docutils literal">[subpaths]</tt> section in
 hgrc(5) for more details.</p>
 </div>
-</div>
 <div class="section" id="template-usage">
-<span id="style"></span><span id="template"></span><span id="templates"></span><span id="templating"></span><h1><a class="toc-backref" href="#contents">Template Usage</a></h1>
+<span id="templates"></span><span id="templating"></span><h1><a class="toc-backref" href="#contents">Template Usage</a></h1>
 <p>Mercurial allows you to customize output of commands through
 templates. You can either pass in a template from the command
 line, via the --template option, or select an existing
@@ -4720,8 +3928,6 @@ keywords are usually available for templating a log-like command:</p>
 <tbody valign="top">
 <tr class="field"><th class="field-name">author:</th><td class="field-body">String. The unmodified author of the changeset.</td>
 </tr>
-<tr class="field"><th class="field-name">bisect:</th><td class="field-body">String. The changeset bisection status.</td>
-</tr>
 <tr class="field"><th class="field-name">bookmarks:</th><td class="field-body">List of strings. Any bookmarks associated with the
 changeset.</td>
 </tr>
@@ -4747,7 +3953,7 @@ default.</td>
 their sources.</td>
 </tr>
 <tr class="field"><th class="field-name" colspan="2">file_copies_switch:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">List of strings. Like &quot;file_copies&quot; but displayed
+<tr><td>&nbsp;</td><td class="field-body">List of strings. Like &quot;file_copies&quot; but displayed
 only if the --copied switch is set.</td>
 </tr>
 <tr class="field"><th class="field-name">file_dels:</th><td class="field-body">List of strings. Files removed by this changeset.</td>
@@ -4761,19 +3967,11 @@ changeset.</td>
 changeset.</td>
 </tr>
 <tr class="field"><th class="field-name" colspan="2">latesttagdistance:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">Integer. Longest path to the latest tag.</td>
+<tr><td>&nbsp;</td><td class="field-body">Integer. Longest path to the latest tag.</td>
 </tr>
 <tr class="field"><th class="field-name">node:</th><td class="field-body">String. The changeset identification hash, as a 40 hexadecimal
 digit string.</td>
 </tr>
-<tr class="field"><th class="field-name">parents:</th><td class="field-body">List of strings. The parents of the changeset in &quot;rev:node&quot;
-format. If the changeset has only one &quot;natural&quot; parent (the predecessor
-revision) nothing is shown.</td>
-</tr>
-<tr class="field"><th class="field-name">phase:</th><td class="field-body">String. The changeset phase name.</td>
-</tr>
-<tr class="field"><th class="field-name">phaseidx:</th><td class="field-body">Integer. The changeset phase index.</td>
-</tr>
 <tr class="field"><th class="field-name">rev:</th><td class="field-body">Integer. The repository-local changeset revision number.</td>
 </tr>
 <tr class="field"><th class="field-name">tags:</th><td class="field-body">List of strings. Any tags associated with the changeset.</td>
@@ -4817,8 +4015,6 @@ address, and extracts just the domain component. Example: <tt class="docutils li
 address. Example: <tt class="docutils literal">User &lt;user&#64;example.com&gt;</tt> becomes
 <tt class="docutils literal">user&#64;example.com</tt>.</td>
 </tr>
-<tr class="field"><th class="field-name">emailuser:</th><td class="field-body">Any text. Returns the user portion of an email address.</td>
-</tr>
 <tr class="field"><th class="field-name">escape:</th><td class="field-body">Any text. Replaces the special XML/XHTML characters &quot;&amp;&quot;, &quot;&lt;&quot;
 and &quot;&gt;&quot; with XML entities.</td>
 </tr>
@@ -4848,8 +4044,7 @@ filter.</td>
 <tr class="field"><th class="field-name">obfuscate:</th><td class="field-body">Any text. Returns the input text rendered as a sequence of
 XML entities.</td>
 </tr>
-<tr class="field"><th class="field-name">person:</th><td class="field-body">Any text. Returns the name before an email address,
-interpreting it as per RFC 5322.</td>
+<tr class="field"><th class="field-name">person:</th><td class="field-body">Any text. Returns the text before an email address.</td>
 </tr>
 <tr class="field"><th class="field-name">rfc3339date:</th><td class="field-body">Date. Returns a date using the Internet date format
 specified in RFC 3339: &quot;2009-08-18T13:00:13+02:00&quot;.</td>
@@ -4860,11 +4055,6 @@ headers: &quot;Tue, 18 Aug 2009 13:00:13 +0200&quot;.</td>
 <tr class="field"><th class="field-name">short:</th><td class="field-body">Changeset hash. Returns the short form of a changeset hash,
 i.e. a 12 hexadecimal digit string.</td>
 </tr>
-<tr class="field"><th class="field-name">shortbisect:</th><td class="field-body">Any text. Treats <cite>text</cite> as a bisection status, and
-returns a single-character representing the status (G: good, B: bad,
-S: skipped, U: untested, I: ignored). Returns single space if <cite>text</cite>
-is not a valid bisection status.</td>
-</tr>
 <tr class="field"><th class="field-name">shortdate:</th><td class="field-body">Date. Returns a date like &quot;2006-09-18&quot;.</td>
 </tr>
 <tr class="field"><th class="field-name">stringify:</th><td class="field-body">Any type. Turns the value into text by converting values into
@@ -4881,8 +4071,7 @@ first starting with a tab character.</td>
 <tr class="field"><th class="field-name">urlescape:</th><td class="field-body">Any text. Escapes all &quot;special&quot; characters. For example,
 &quot;foo bar&quot; becomes &quot;foo%20bar&quot;.</td>
 </tr>
-<tr class="field"><th class="field-name">user:</th><td class="field-body">Any text. Returns a short representation of a user name or email
-address.</td>
+<tr class="field"><th class="field-name">user:</th><td class="field-body">Any text. Returns the user portion of an email address.</td>
 </tr>
 </tbody>
 </table>
@@ -4959,45 +4148,42 @@ prefer it over 'default' if both are defined.</dd>
 <p>This section contains help for extensions that are distributed together with Mercurial. Help for other extensions is available in the help system.</p>
 <div class="contents htmlonly local topic" id="id6">
 <ul class="simple">
-<li><a class="reference internal" href="#acl" id="id68">acl</a></li>
-<li><a class="reference internal" href="#bugzilla" id="id69">bugzilla</a></li>
-<li><a class="reference internal" href="#children" id="id70">children</a></li>
-<li><a class="reference internal" href="#churn" id="id71">churn</a></li>
-<li><a class="reference internal" href="#color" id="id72">color</a></li>
-<li><a class="reference internal" href="#convert" id="id73">convert</a></li>
-<li><a class="reference internal" href="#eol" id="id74">eol</a></li>
-<li><a class="reference internal" href="#extdiff" id="id75">extdiff</a></li>
-<li><a class="reference internal" href="#factotum" id="id76">factotum</a></li>
-<li><a class="reference internal" href="#fetch" id="id77">fetch</a></li>
-<li><a class="reference internal" href="#gpg" id="id78">gpg</a></li>
-<li><a class="reference internal" href="#graphlog" id="id79">graphlog</a></li>
-<li><a class="reference internal" href="#hgcia" id="id80">hgcia</a></li>
-<li><a class="reference internal" href="#hgk" id="id81">hgk</a></li>
-<li><a class="reference internal" href="#highlight" id="id82">highlight</a></li>
-<li><a class="reference internal" href="#histedit" id="id83">histedit</a></li>
-<li><a class="reference internal" href="#inotify" id="id84">inotify</a></li>
-<li><a class="reference internal" href="#interhg" id="id85">interhg</a></li>
-<li><a class="reference internal" href="#keyword" id="id86">keyword</a></li>
-<li><a class="reference internal" href="#largefiles" id="id87">largefiles</a></li>
-<li><a class="reference internal" href="#mq" id="id88">mq</a></li>
-<li><a class="reference internal" href="#notify" id="id89">notify</a></li>
-<li><a class="reference internal" href="#pager" id="id90">pager</a></li>
-<li><a class="reference internal" href="#patchbomb" id="id91">patchbomb</a></li>
-<li><a class="reference internal" href="#progress" id="id92">progress</a></li>
-<li><a class="reference internal" href="#purge" id="id93">purge</a></li>
-<li><a class="reference internal" href="#rebase" id="id94">rebase</a></li>
-<li><a class="reference internal" href="#record" id="id95">record</a></li>
-<li><a class="reference internal" href="#relink" id="id96">relink</a></li>
-<li><a class="reference internal" href="#schemes" id="id97">schemes</a></li>
-<li><a class="reference internal" href="#share" id="id98">share</a></li>
-<li><a class="reference internal" href="#transplant" id="id99">transplant</a></li>
-<li><a class="reference internal" href="#win32mbcs" id="id100">win32mbcs</a></li>
-<li><a class="reference internal" href="#win32text" id="id101">win32text</a></li>
-<li><a class="reference internal" href="#zeroconf" id="id102">zeroconf</a></li>
+<li><a class="reference internal" href="#acl" id="id73">acl</a></li>
+<li><a class="reference internal" href="#bugzilla" id="id74">bugzilla</a></li>
+<li><a class="reference internal" href="#children" id="id75">children</a></li>
+<li><a class="reference internal" href="#churn" id="id76">churn</a></li>
+<li><a class="reference internal" href="#color" id="id77">color</a></li>
+<li><a class="reference internal" href="#convert" id="id78">convert</a></li>
+<li><a class="reference internal" href="#eol" id="id79">eol</a></li>
+<li><a class="reference internal" href="#extdiff" id="id80">extdiff</a></li>
+<li><a class="reference internal" href="#fetch" id="id81">fetch</a></li>
+<li><a class="reference internal" href="#gpg" id="id82">gpg</a></li>
+<li><a class="reference internal" href="#graphlog" id="id83">graphlog</a></li>
+<li><a class="reference internal" href="#hgcia" id="id84">hgcia</a></li>
+<li><a class="reference internal" href="#hgk" id="id85">hgk</a></li>
+<li><a class="reference internal" href="#highlight" id="id86">highlight</a></li>
+<li><a class="reference internal" href="#inotify" id="id87">inotify</a></li>
+<li><a class="reference internal" href="#interhg" id="id88">interhg</a></li>
+<li><a class="reference internal" href="#keyword" id="id89">keyword</a></li>
+<li><a class="reference internal" href="#mq" id="id90">mq</a></li>
+<li><a class="reference internal" href="#notify" id="id91">notify</a></li>
+<li><a class="reference internal" href="#pager" id="id92">pager</a></li>
+<li><a class="reference internal" href="#patchbomb" id="id93">patchbomb</a></li>
+<li><a class="reference internal" href="#progress" id="id94">progress</a></li>
+<li><a class="reference internal" href="#purge" id="id95">purge</a></li>
+<li><a class="reference internal" href="#rebase" id="id96">rebase</a></li>
+<li><a class="reference internal" href="#record" id="id97">record</a></li>
+<li><a class="reference internal" href="#relink" id="id98">relink</a></li>
+<li><a class="reference internal" href="#schemes" id="id99">schemes</a></li>
+<li><a class="reference internal" href="#share" id="id100">share</a></li>
+<li><a class="reference internal" href="#transplant" id="id101">transplant</a></li>
+<li><a class="reference internal" href="#win32mbcs" id="id102">win32mbcs</a></li>
+<li><a class="reference internal" href="#win32text" id="id103">win32text</a></li>
+<li><a class="reference internal" href="#zeroconf" id="id104">zeroconf</a></li>
 </ul>
 </div>
 <div class="section" id="acl">
-<h2><a class="toc-backref" href="#id68">acl</a></h2>
+<h2><a class="toc-backref" href="#id73">acl</a></h2>
 <p>hooks for controlling repository access</p>
 <p>This hook makes it possible to allow or deny write access to given
 branches and paths of a repository when receiving incoming changesets
@@ -5033,8 +4219,6 @@ either:</p>
 <li>a comma-separated list containing users and groups, or</li>
 <li>an asterisk, to match anyone;</li>
 </ul>
-<p>You can add the &quot;!&quot; prefix to a user or group name to invert the sense
-of the match.</p>
 </div>
 <div class="section" id="path-based-access-control">
 <h3>Path-based Access Control</h3>
@@ -5124,59 +4308,22 @@ docs/** = doc_writer
 # under the &quot;images&quot; folder:
 images/** = jack, &#64;designers
 
-# Everyone (except for &quot;user6&quot; and &quot;&#64;hg-denied&quot; - see acl.deny above)
-# will have write access to any file under the &quot;resources&quot; folder
-# (except for 1 file. See acl.deny):
+# Everyone (except for &quot;user6&quot; - see acl.deny above) will have write
+# access to any file under the &quot;resources&quot; folder (except for 1
+# file. See acl.deny):
 src/main/resources/** = *
 
 .hgtags = release_engineer
 </pre>
-<div class="section" id="examples-using-the-prefix">
-<h4>Examples using the &quot;!&quot; prefix</h4>
-<p>Suppose there's a branch that only a given user (or group) should be able to
-push to, and you don't want to restrict access to any other branch that may
-be created.</p>
-<p>The &quot;!&quot; prefix allows you to prevent anyone except a given user or group to
-push changesets in a given branch or path.</p>
-<p>In the examples below, we will:
-1) Deny access to branch &quot;ring&quot; to anyone but user &quot;gollum&quot;
-2) Deny access to branch &quot;lake&quot; to anyone but members of the group &quot;hobbit&quot;
-3) Deny access to a file to anyone but user &quot;gollum&quot;</p>
-<pre class="literal-block">
-[acl.allow.branches]
-# Empty
-
-[acl.deny.branches]
-
-# 1) only 'gollum' can commit to branch 'ring';
-# 'gollum' and anyone else can still commit to any other branch.
-ring = !gollum
-
-# 2) only members of the group 'hobbit' can commit to branch 'lake';
-# 'hobbit' members and anyone else can still commit to any other branch.
-lake = !&#64;hobbit
-
-# You can also deny access based on file paths:
-
-[acl.allow]
-# Empty
-
-[acl.deny]
-# 3) only 'gollum' can change the file below;
-# 'gollum' and anyone else can still change any other file.
-/misty/mountains/cave/ring = !gollum
-</pre>
-</div>
 </div>
 </div>
 <div class="section" id="bugzilla">
-<h2><a class="toc-backref" href="#id69">bugzilla</a></h2>
+<h2><a class="toc-backref" href="#id74">bugzilla</a></h2>
 <p>hooks for integrating with the Bugzilla bug tracker</p>
 <p>This hook extension adds comments on bugs in Bugzilla when changesets
 that refer to bugs by Bugzilla ID are seen. The comment is formatted using
 the Mercurial template mechanism.</p>
-<p>The bug references can optionally include an update for Bugzilla of the
-hours spent working on the bug. Bugs can also be marked fixed.</p>
+<p>The hook does not change bug status.</p>
 <p>Three basic modes of access to Bugzilla are provided:</p>
 <ol class="arabic simple">
 <li>Access via the Bugzilla XMLRPC interface. Requires Bugzilla 3.4 or later.</li>
@@ -5193,20 +4340,19 @@ permission to read Bugzilla configuration details and the necessary
 MySQL user and password to have full access rights to the Bugzilla
 database. For these reasons this access mode is now considered
 deprecated, and will not be updated for new Bugzilla versions going
-forward. Only adding comments is supported in this access mode.</p>
+forward.</p>
 <p>Access via XMLRPC needs a Bugzilla username and password to be specified
 in the configuration. Comments are added under that username. Since the
 configuration must be readable by all Mercurial users, it is recommended
 that the rights of that user are restricted in Bugzilla to the minimum
-necessary to add comments. Marking bugs fixed requires Bugzilla 4.0 and later.</p>
+necessary to add comments.</p>
 <p>Access via XMLRPC/email uses XMLRPC to query Bugzilla, but sends
 email to the Bugzilla email interface to submit comments to bugs.
 The From: address in the email is set to the email address of the Mercurial
 user, so the comment appears to come from the Mercurial user. In the event
 that the Mercurial user email is not recognised by Bugzilla as a Bugzilla
 user, the email associated with the Bugzilla username used to log into
-Bugzilla is used instead as the source of the comment. Marking bugs fixed
-works on all supported Bugzilla versions.</p>
+Bugzilla is used instead as the source of the comment.</p>
 <p>Configuration items common to all access modes:</p>
 <dl class="docutils">
 <dt>bugzilla.version</dt>
@@ -5231,31 +4377,11 @@ including 2.18.</td>
 </table>
 </dd>
 <dt>bugzilla.regexp</dt>
-<dd>Regular expression to match bug IDs for update in changeset commit message.
-It must contain one &quot;()&quot; named group <tt class="docutils literal">&lt;ids&gt;</tt> containing the bug
-IDs separated by non-digit characters. It may also contain
-a named group <tt class="docutils literal">&lt;hours&gt;</tt> with a floating-point number giving the
-hours worked on the bug. If no named groups are present, the first
-&quot;()&quot; group is assumed to contain the bug IDs, and work time is not
-updated. The default expression matches <tt class="docutils literal">Bug 1234</tt>, <tt class="docutils literal">Bug no. 1234</tt>,
-<tt class="docutils literal">Bug number 1234</tt>, <tt class="docutils literal">Bugs 1234,5678</tt>, <tt class="docutils literal">Bug 1234 and 5678</tt> and
-variations thereof, followed by an hours number prefixed by <tt class="docutils literal">h</tt> or
-<tt class="docutils literal">hours</tt>, e.g. <tt class="docutils literal">hours 1.5</tt>. Matching is case insensitive.</dd>
-<dt>bugzilla.fixregexp</dt>
-<dd>Regular expression to match bug IDs for marking fixed in changeset
-commit message. This must contain a &quot;()&quot; named group <tt class="docutils literal">&lt;ids&gt;` containing
-the bug IDs separated by <span class="pre">non-digit</span> characters. It may also contain
-a named group <span class="pre">``&lt;hours&gt;</span></tt> with a floating-point number giving the
-hours worked on the bug. If no named groups are present, the first
-&quot;()&quot; group is assumed to contain the bug IDs, and work time is not
-updated. The default expression matches <tt class="docutils literal">Fixes 1234</tt>, <tt class="docutils literal">Fixes bug 1234</tt>,
-<tt class="docutils literal">Fixes bugs 1234,5678</tt>, <tt class="docutils literal">Fixes 1234 and 5678</tt> and
-variations thereof, followed by an hours number prefixed by <tt class="docutils literal">h</tt> or
-<tt class="docutils literal">hours</tt>, e.g. <tt class="docutils literal">hours 1.5</tt>. Matching is case insensitive.</dd>
-<dt>bugzilla.fixstatus</dt>
-<dd>The status to set a bug to when marking fixed. Default <tt class="docutils literal">RESOLVED</tt>.</dd>
-<dt>bugzilla.fixresolution</dt>
-<dd>The resolution to set a bug to when marking fixed. Default <tt class="docutils literal">FIXED</tt>.</dd>
+<dd>Regular expression to match bug IDs in changeset commit message.
+Must contain one &quot;()&quot; group. The default expression matches <tt class="docutils literal">Bug
+1234</tt>, <tt class="docutils literal">Bug no. 1234</tt>, <tt class="docutils literal">Bug number 1234</tt>, <tt class="docutils literal">Bugs 1234,5678</tt>,
+<tt class="docutils literal">Bug 1234 and 5678</tt> and variations thereof. Matching is case
+insensitive.</dd>
 <dt>bugzilla.style</dt>
 <dd>The style file to use when formatting comments.</dd>
 <dt>bugzilla.template</dt>
@@ -5436,10 +4562,8 @@ Changeset commit comment. Bug 1234.
 </pre>
 </div>
 <div class="section" id="children">
-<h2><a class="toc-backref" href="#id70">children</a></h2>
-<p>command to display child changesets (DEPRECATED)</p>
-<p>This extension is deprecated. You should use <a class="reference external" href="hg.1.html#log"><tt class="docutils literal">hg log <span class="pre">-r</span>
-&quot;children(REV)&quot;</tt></a> instead.</p>
+<h2><a class="toc-backref" href="#id75">children</a></h2>
+<p>command to display child changesets</p>
 <div class="section" id="id7">
 <h3>Commands</h3>
 <div class="section" id="id8">
@@ -5472,7 +4596,7 @@ argument to --rev if given) is printed.</p>
 </div>
 </div>
 <div class="section" id="churn">
-<h2><a class="toc-backref" href="#id71">churn</a></h2>
+<h2><a class="toc-backref" href="#id76">churn</a></h2>
 <p>command to display statistics about repository history</p>
 <div class="section" id="id9">
 <h3>Commands</h3>
@@ -5553,7 +4677,7 @@ a .hgchurn file will be looked for in the working directory root.</p>
 </div>
 </div>
 <div class="section" id="color">
-<h2><a class="toc-backref" href="#id72">color</a></h2>
+<h2><a class="toc-backref" href="#id77">color</a></h2>
 <p>colorize output from some commands</p>
 <p>This extension modifies the status and resolve commands to add color
 to their output to reflect file status, the qseries command to add
@@ -5602,9 +4726,6 @@ branches.active = none
 branches.closed = black bold
 branches.current = green
 branches.inactive = none
-
-tags.normal = green
-tags.local = black bold
 </pre>
 <p>The available effects in terminfo mode are 'blink', 'bold', 'dim',
 'inverse', 'invisible', 'italic', 'standout', and 'underline'; in
@@ -5643,7 +4764,7 @@ mode = terminfo
 disable color.</p>
 </div>
 <div class="section" id="convert">
-<h2><a class="toc-backref" href="#id73">convert</a></h2>
+<h2><a class="toc-backref" href="#id78">convert</a></h2>
 <p>import revisions from foreign VCS repositories into Mercurial</p>
 <div class="section" id="id11">
 <h3>Commands</h3>
@@ -5778,17 +4899,17 @@ options, which you can set on the command line with <tt class="docutils literal"
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field"><th class="field-name" colspan="2">convert.hg.ignoreerrors:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">ignore integrity errors when reading.
+<tr><td>&nbsp;</td><td class="field-body">ignore integrity errors when reading.
 Use it to fix Mercurial repositories with missing revlogs, by
 converting from and to Mercurial. Default is False.</td>
 </tr>
 <tr class="field"><th class="field-name" colspan="2">convert.hg.saverev:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">store original revision ID in changeset
-(forces target IDs to change). It takes a boolean argument and
-defaults to False.</td>
+<tr><td>&nbsp;</td><td class="field-body">store original revision ID in changeset
+(forces target IDs to change). It takes and boolean argument
+and defaults to False.</td>
 </tr>
 <tr class="field"><th class="field-name" colspan="2">convert.hg.startrev:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">convert start revision and its descendants.
+<tr><td>&nbsp;</td><td class="field-body">convert start revision and its descendants.
 It takes a hg revision identifier and defaults to 0.</td>
 </tr>
 </tbody>
@@ -5811,18 +4932,18 @@ sandbox is ignored.</p>
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field"><th class="field-name" colspan="2">convert.cvsps.cache:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">Set to False to disable remote log caching,
+<tr><td>&nbsp;</td><td class="field-body">Set to False to disable remote log caching,
 for testing and debugging purposes. Default is True.</td>
 </tr>
 <tr class="field"><th class="field-name" colspan="2">convert.cvsps.fuzz:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">Specify the maximum time (in seconds) that is
+<tr><td>&nbsp;</td><td class="field-body">Specify the maximum time (in seconds) that is
 allowed between commits with identical user and log message in
 a single changeset. When very large files were checked in as
 part of a changeset then the default may not be long enough.
 The default is 60.</td>
 </tr>
 <tr class="field"><th class="field-name" colspan="2">convert.cvsps.mergeto:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">Specify a regular expression to which
+<tr><td>&nbsp;</td><td class="field-body">Specify a regular expression to which
 commit log messages are matched. If a match occurs, then the
 conversion process will insert a dummy revision merging the
 branch on which this log message occurs to the branch
@@ -5830,7 +4951,7 @@ indicated in the regex. Default is <tt class="docutils literal">{{mergetobranch
 <span class="pre">([-\w]+)}}</span></tt></td>
 </tr>
 <tr class="field"><th class="field-name" colspan="2">convert.cvsps.mergefrom:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">Specify a regular expression to which
+<tr><td>&nbsp;</td><td class="field-body">Specify a regular expression to which
 commit log messages are matched. If a match occurs, then the
 conversion process will add the most recent revision on the
 branch indicated in the regex as the second parent of the
@@ -5842,8 +4963,8 @@ log entries, and can modify the entries in-place, or add or
 delete them.</td>
 </tr>
 <tr class="field"><th class="field-name" colspan="2">hook.cvschangesets:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">Specify a Python function to be called after
-the changesets are calculated from the CVS log. The
+<tr><td>&nbsp;</td><td class="field-body">Specify a Python function to be called after
+the changesets are calculated from the 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.</td>
 </tr>
@@ -5872,15 +4993,15 @@ detection.</p>
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field"><th class="field-name" colspan="2">convert.svn.branches:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">specify the directory containing branches.
+<tr><td>&nbsp;</td><td class="field-body">specify the directory containing branches.
 The default is <tt class="docutils literal">branches</tt>.</td>
 </tr>
 <tr class="field"><th class="field-name" colspan="2">convert.svn.tags:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">specify the directory containing tags. The
+<tr><td>&nbsp;</td><td class="field-body">specify the directory containing tags. The
 default is <tt class="docutils literal">tags</tt>.</td>
 </tr>
 <tr class="field"><th class="field-name" colspan="2">convert.svn.trunk:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">specify the name of the trunk branch. The
+<tr><td>&nbsp;</td><td class="field-body">specify the name of the trunk branch. The
 default is <tt class="docutils literal">trunk</tt>.</td>
 </tr>
 </tbody>
@@ -5893,7 +5014,7 @@ conversions are supported.</p>
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field"><th class="field-name" colspan="2">convert.svn.startrev:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">specify start Subversion revision number.
+<tr><td>&nbsp;</td><td class="field-body">specify start Subversion revision number.
 The default is 0.</td>
 </tr>
 </tbody>
@@ -5914,7 +5035,7 @@ converted by specifying an initial Perforce revision:</p>
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field"><th class="field-name" colspan="2">convert.p4.startrev:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">specify initial Perforce revision (a
+<tr><td>&nbsp;</td><td class="field-body">specify initial Perforce revision (a
 Perforce changelist number).</td>
 </tr>
 </tbody>
@@ -5928,15 +5049,15 @@ Perforce changelist number).</td>
 <col class="field-body" />
 <tbody valign="top">
 <tr class="field"><th class="field-name" colspan="2">convert.hg.clonebranches:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">dispatch source branches in separate
+<tr><td>&nbsp;</td><td class="field-body">dispatch source branches in separate
 clones. The default is False.</td>
 </tr>
 <tr class="field"><th class="field-name" colspan="2">convert.hg.tagsbranch:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">branch name for tag revisions, defaults to
+<tr><td>&nbsp;</td><td class="field-body">branch name for tag revisions, defaults to
 <tt class="docutils literal">default</tt>.</td>
 </tr>
 <tr class="field"><th class="field-name" colspan="2">convert.hg.usebranchnames:</th></tr>
-<tr class="field"><td>&nbsp;</td><td class="field-body">preserve branch names. The default is
+<tr><td>&nbsp;</td><td class="field-body">preserve branch names. The default is
 True.</td>
 </tr>
 </tbody>
@@ -5989,7 +5110,7 @@ True.</td>
 </div>
 </div>
 <div class="section" id="eol">
-<h2><a class="toc-backref" href="#id74">eol</a></h2>
+<h2><a class="toc-backref" href="#id79">eol</a></h2>
 <p>automatically manage newlines in repository files</p>
 <p>This extension allows you to manage the type of line endings (CRLF or
 LF) that are used in the repository and in the local working
@@ -6039,10 +5160,9 @@ native = LF
 <p class="last">The rules will first apply when files are touched in the working
 copy, e.g. by updating to null and back to tip to touch all files.</p>
 </div>
-<p>The extension uses an optional <tt class="docutils literal">[eol]</tt> section read from both the
-normal Mercurial configuration files and the <tt class="docutils literal">.hgeol</tt> file, with the
-latter overriding the former. You can use that section to control the
-overall behavior. There are three settings:</p>
+<p>The extension uses an optional <tt class="docutils literal">[eol]</tt> section in your hgrc file
+(not the <tt class="docutils literal">.hgeol</tt> file) for settings that control the overall
+behavior. There are two settings:</p>
 <ul class="simple">
 <li><tt class="docutils literal">eol.native</tt> (default <tt class="docutils literal">os.linesep</tt>) can be set to <tt class="docutils literal">LF</tt> or
 <tt class="docutils literal">CRLF</tt> to override the default interpretation of <tt class="docutils literal">native</tt> for
@@ -6053,9 +5173,6 @@ the extension convert files with inconsistent EOLs. Inconsistent
 means that there is both <tt class="docutils literal">CRLF</tt> and <tt class="docutils literal">LF</tt> present in the file.
 Such files are normally not touched under the assumption that they
 have mixed EOLs on purpose.</li>
-<li><tt class="docutils literal"><span class="pre">eol.fix-trailing-newline</span></tt> (default False) can be set to True to
-ensure that converted files end with a EOL character (either <tt class="docutils literal">\n</tt>
-or <tt class="docutils literal">\r\n</tt> as per the configured patterns).</li>
 </ul>
 <p>The extension provides <tt class="docutils literal">cleverencode:</tt> and <tt class="docutils literal">cleverdecode:</tt> filters
 like the deprecated win32text extension does. This means that you can
@@ -6073,7 +5190,7 @@ invalid revisions will be pushed. To forbid them completely, use the
 used.</p>
 </div>
 <div class="section" id="extdiff">
-<h2><a class="toc-backref" href="#id75">extdiff</a></h2>
+<h2><a class="toc-backref" href="#id80">extdiff</a></h2>
 <p>command to allow external programs to compare revisions</p>
 <p>The extdiff Mercurial extension allows you to use external programs
 to compare revisions, or revision with working directory. The external
@@ -6100,8 +5217,7 @@ meld =
 # (see http://www.vim.org/scripts/script.php?script_id=102) Non
 # English user, be sure to put &quot;let g:DirDiffDynamicDiffText = 1&quot; in
 # your .vimrc
-vimdiff = gvim -f &quot;+next&quot; \
-          &quot;+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))&quot;
+vimdiff = gvim -f '+next' '+execute &quot;DirDiff&quot; argv(0) argv(1)'
 </pre>
 <p>Tool arguments can include variables that are expanded at runtime:</p>
 <pre class="literal-block">
@@ -6171,35 +5287,9 @@ to its parent.</p>
 </div>
 </div>
 </div>
-<div class="section" id="factotum">
-<h2><a class="toc-backref" href="#id76">factotum</a></h2>
-<p>http authentication with factotum</p>
-<p>This extension allows the factotum(4) facility on Plan 9 from Bell Labs
-platforms to provide authentication information for HTTP access. Configuration
-entries specified in the auth section as well as authentication information
-provided in the repository URL are fully supported. If no prefix is specified,
-a value of &quot;*&quot; will be assumed.</p>
-<p>By default, keys are specified as:</p>
-<pre class="literal-block">
-proto=pass service=hg prefix=&lt;prefix&gt; user=&lt;username&gt; !password=&lt;password&gt;
-</pre>
-<p>If the factotum extension is unable to read the required key, one will be
-requested interactively.</p>
-<p>A configuration section is available to customize runtime behavior. By
-default, these entries are:</p>
-<pre class="literal-block">
-[factotum]
-executable = /bin/auth/factotum
-mountpoint = /mnt/factotum
-service = hg
-</pre>
-<p>The executable entry defines the full path to the factotum binary. The
-mountpoint entry defines the path to the factotum file service. Lastly, the
-service entry controls the service name used when reading keys.</p>
-</div>
 <div class="section" id="fetch">
-<h2><a class="toc-backref" href="#id77">fetch</a></h2>
-<p>pull, update and merge in one command (DEPRECATED)</p>
+<h2><a class="toc-backref" href="#id81">fetch</a></h2>
+<p>pull, update and merge in one command</p>
 <div class="section" id="id15">
 <h3>Commands</h3>
 <div class="section" id="id16">
@@ -6213,9 +5303,10 @@ or URL and adds them to the local repository.</p>
 automatically merged, and the result of the merge is committed.
 Otherwise, the working directory is updated to include the new
 changes.</p>
-<p>When a merge is needed, the working directory is first updated to
-the newly pulled changes. Local changes are then merged into the
-pulled changes. To switch the merge order, use --switch-parent.</p>
+<p>When a merge occurs, the newly pulled changes are assumed to be
+&quot;authoritative&quot;. The head of the new changes is used as the first
+parent, with local changes as the second. To switch the merge
+order, use --switch-parent.</p>
 <p>See <a class="reference external" href="hg.1.html#dates"><tt class="docutils literal">hg help dates</tt></a> for a list of formats valid for -d/--date.</p>
 <p>Returns 0 on success.</p>
 <p>Options:</p>
@@ -6263,21 +5354,21 @@ pulled changes. To switch the merge order, use --switch-parent.</p>
 </div>
 </div>
 <div class="section" id="gpg">
-<h2><a class="toc-backref" href="#id78">gpg</a></h2>
+<h2><a class="toc-backref" href="#id82">gpg</a></h2>
 <p>commands to sign and verify changesets</p>
 <div class="section" id="id17">
 <h3>Commands</h3>
 <div class="section" id="sigcheck">
 <h4>sigcheck</h4>
 <pre class="literal-block">
-hg sigcheck REV
+hg sigcheck REVISION
 </pre>
 <p>verify all the signatures there may be for a particular revision</p>
 </div>
 <div class="section" id="sign">
 <h4>sign</h4>
 <pre class="literal-block">
-hg sign [OPTION]... [REV]...
+hg sign [OPTION]... [REVISION]...
 </pre>
 <p>If no revision is given, the parent of the working directory is used,
 or tip if no revision is checked out.</p>
@@ -6321,7 +5412,7 @@ hg sigs
 </div>
 </div>
 <div class="section" id="graphlog">
-<h2><a class="toc-backref" href="#id79">graphlog</a></h2>
+<h2><a class="toc-backref" href="#id83">graphlog</a></h2>
 <p>command to view revision graphs from a shell</p>
 <p>This extension adds a --graph option to the incoming, outgoing and log
 commands. When this options is given, an ASCII representation of the
@@ -6343,83 +5434,27 @@ directory.</p>
 <col class="description" />
 <tbody valign="top">
 <tr><td class="option-group">
-<kbd><span class="option">-f</span>, <span class="option">--follow</span></kbd></td>
-<td>follow changeset history, or file history across copies and renames</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--follow-first</span></kbd></td>
-<td>only follow the first parent of merge changesets (DEPRECATED)</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-d</span>, <span class="option">--date</span></kbd></td>
-<td>show revisions matching date spec</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-C</span>, <span class="option">--copies</span></kbd></td>
-<td>show copied files</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-k</span>, <span class="option">--keyword</span></kbd></td>
-<td>do case-insensitive search for a given text</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-r</span>, <span class="option">--rev</span></kbd></td>
-<td>show the specified revision or range</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--removed</span></kbd></td>
-<td>include revisions where files were removed</td></tr>
-<tr><td class="option-group" colspan="2">
-<kbd><span class="option">-m</span>, <span class="option">--only-merges</span></kbd></td>
-</tr>
-<tr><td>&nbsp;</td><td>show only merges (DEPRECATED)</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-u</span>, <span class="option">--user</span></kbd></td>
-<td>revisions committed by user</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--only-branch</span></kbd></td>
-<td>show only changesets within the given named branch (DEPRECATED)</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-b</span>, <span class="option">--branch</span></kbd></td>
-<td>show changesets within the given named branch</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-P</span>, <span class="option">--prune</span></kbd></td>
-<td>do not display revision or any of its ancestors</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--hidden</span></kbd></td>
-<td>show hidden changesets (DEPRECATED)</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-p</span>, <span class="option">--patch</span></kbd></td>
-<td>show patch</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-g</span>, <span class="option">--git</span></kbd></td>
-<td>use git extended diff format</td></tr>
-<tr><td class="option-group">
 <kbd><span class="option">-l</span>, <span class="option">--limit</span></kbd></td>
 <td>limit number of changes displayed</td></tr>
-<tr><td class="option-group" colspan="2">
-<kbd><span class="option">-M</span>, <span class="option">--no-merges</span></kbd></td>
-</tr>
-<tr><td>&nbsp;</td><td>do not show merges</td></tr>
 <tr><td class="option-group">
-<kbd><span class="option">--stat</span></kbd></td>
-<td>output diffstat-style summary of changes</td></tr>
+<kbd><span class="option">-p</span>, <span class="option">--patch</span></kbd></td>
+<td>show patch</td></tr>
 <tr><td class="option-group">
-<kbd><span class="option">-G</span>, <span class="option">--graph</span></kbd></td>
-<td>show the revision DAG</td></tr>
+<kbd><span class="option">-r</span>, <span class="option">--rev</span></kbd></td>
+<td>show the specified revision or range</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">--style</span></kbd></td>
 <td>display using template map file</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">--template</span></kbd></td>
 <td>display with template</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-I</span>, <span class="option">--include</span></kbd></td>
-<td>include names matching the given patterns</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-X</span>, <span class="option">--exclude</span></kbd></td>
-<td>exclude names matching the given patterns</td></tr>
 </tbody>
 </table>
 </div>
 </div>
 </div>
 <div class="section" id="hgcia">
-<h2><a class="toc-backref" href="#id80">hgcia</a></h2>
+<h2><a class="toc-backref" href="#id84">hgcia</a></h2>
 <p>hooks for integrating with the CIA.vc notification service</p>
 <p>This is meant to be run as a changegroup or incoming hook. To
 configure it, set the following options in your hgrc:</p>
@@ -6458,7 +5493,7 @@ baseurl = http://server/path/to/repo
 </pre>
 </div>
 <div class="section" id="hgk">
-<h2><a class="toc-backref" href="#id81">hgk</a></h2>
+<h2><a class="toc-backref" href="#id85">hgk</a></h2>
 <p>browse the repository in a graphical way</p>
 <p>The hgk extension allows browsing the history of a repository in a
 graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not
@@ -6505,7 +5540,7 @@ hg view [-l LIMIT] [REVRANGE]
 </div>
 </div>
 <div class="section" id="highlight">
-<h2><a class="toc-backref" href="#id82">highlight</a></h2>
+<h2><a class="toc-backref" href="#id86">highlight</a></h2>
 <p>syntax highlighting for hgweb (requires Pygments)</p>
 <p>It depends on the Pygments syntax highlighting library:
 <a class="reference external" href="http://pygments.org/">http://pygments.org/</a></p>
@@ -6516,178 +5551,10 @@ pygments_style = &lt;style&gt;
 </pre>
 <p>The default is 'colorful'.</p>
 </div>
-<div class="section" id="histedit">
-<h2><a class="toc-backref" href="#id83">histedit</a></h2>
-<p>interactive history editing</p>
-<p>With this extension installed, Mercurial gains one new command: histedit. Usage
-is as follows, assuming the following history:</p>
-<pre class="literal-block">
-&#64;  3[tip]   7c2fd3b9020c   2009-04-27 18:04 -0500   durin42
-|    Add delta
-|
-o  2   030b686bedc4   2009-04-27 18:04 -0500   durin42
-|    Add gamma
-|
-o  1   c561b4e977df   2009-04-27 18:04 -0500   durin42
-|    Add beta
-|
-o  0   d8d2fcd0e319   2009-04-27 18:04 -0500   durin42
-     Add alpha
-</pre>
-<p>If you were to run <tt class="docutils literal">hg histedit c561b4e977df</tt>, you would see the following
-file open in your editor:</p>
-<pre class="literal-block">
-pick c561b4e977df Add beta
-pick 030b686bedc4 Add gamma
-pick 7c2fd3b9020c Add delta
-
-# Edit history between 633536316234 and 7c2fd3b9020c
-#
-# Commands:
-#  p, pick = use commit
-#  e, edit = use commit, but stop for amending
-#  f, fold = use commit, but fold into previous commit
-#  d, drop = remove commit from history
-#  m, mess = edit message without changing commit content
-#
-</pre>
-<p>In this file, lines beginning with <tt class="docutils literal">#</tt> are ignored. You must specify a rule
-for each revision in your history. For example, if you had meant to add gamma
-before beta, and then wanted to add delta in the same revision as beta, you
-would reorganize the file to look like this:</p>
-<pre class="literal-block">
-pick 030b686bedc4 Add gamma
-pick c561b4e977df Add beta
-fold 7c2fd3b9020c Add delta
-
-# Edit history between 633536316234 and 7c2fd3b9020c
-#
-# Commands:
-#  p, pick = use commit
-#  e, edit = use commit, but stop for amending
-#  f, fold = use commit, but fold into previous commit
-#  d, drop = remove commit from history
-#  m, mess = edit message without changing commit content
-#
-</pre>
-<p>At which point you close the editor and <tt class="docutils literal">histedit</tt> starts working. When you
-specify a <tt class="docutils literal">fold</tt> operation, <tt class="docutils literal">histedit</tt> will open an editor when it folds
-those revisions together, offering you a chance to clean up the commit message:</p>
-<pre class="literal-block">
-Add beta
-***
-Add delta
-</pre>
-<p>Edit the commit message to your liking, then close the editor. For
-this example, let's assume that the commit message was changed to
-<tt class="docutils literal">Add beta and delta.</tt> After histedit has run and had a chance to
-remove any old or temporary revisions it needed, the history looks
-like this:</p>
-<pre class="literal-block">
-&#64;  2[tip]   989b4d060121   2009-04-27 18:04 -0500   durin42
-|    Add beta and delta.
-|
-o  1   081603921c3f   2009-04-27 18:04 -0500   durin42
-|    Add gamma
-|
-o  0   d8d2fcd0e319   2009-04-27 18:04 -0500   durin42
-     Add alpha
-</pre>
-<p>Note that <tt class="docutils literal">histedit</tt> does <em>not</em> remove any revisions (even its own temporary
-ones) until after it has completed all the editing operations, so it will
-probably perform several strip operations when it's done. For the above example,
-it had to run strip twice. Strip can be slow depending on a variety of factors,
-so you might need to be a little patient. You can choose to keep the original
-revisions by passing the <tt class="docutils literal"><span class="pre">--keep</span></tt> flag.</p>
-<p>The <tt class="docutils literal">edit</tt> operation will drop you back to a command prompt,
-allowing you to edit files freely, or even use <tt class="docutils literal">hg record</tt> to commit
-some changes as a separate commit. When you're done, any remaining
-uncommitted changes will be committed as well. When done, run <tt class="docutils literal">hg
-histedit <span class="pre">--continue</span></tt> to finish this step. You'll be prompted for a
-new commit message, but the default commit message will be the
-original message for the <tt class="docutils literal">edit</tt> ed revision.</p>
-<p>The <tt class="docutils literal">message</tt> operation will give you a chance to revise a commit
-message without changing the contents. It's a shortcut for doing
-<tt class="docutils literal">edit</tt> immediately followed by <cite>hg histedit --continue`</cite>.</p>
-<p>If <tt class="docutils literal">histedit</tt> encounters a conflict when moving a revision (while
-handling <tt class="docutils literal">pick</tt> or <tt class="docutils literal">fold</tt>), it'll stop in a similar manner to
-<tt class="docutils literal">edit</tt> with the difference that it won't prompt you for a commit
-message when done. If you decide at this point that you don't like how
-much work it will be to rearrange history, or that you made a mistake,
-you can use <tt class="docutils literal">hg histedit <span class="pre">--abort</span></tt> to abandon the new changes you
-have made and return to the state before you attempted to edit your
-history.</p>
-<p>If we clone the example repository above and add three more changes, such that
-we have the following history:</p>
-<pre class="literal-block">
-&#64;  6[tip]   038383181893   2009-04-27 18:04 -0500   stefan
-|    Add theta
-|
-o  5   140988835471   2009-04-27 18:04 -0500   stefan
-|    Add eta
-|
-o  4   122930637314   2009-04-27 18:04 -0500   stefan
-|    Add zeta
-|
-o  3   836302820282   2009-04-27 18:04 -0500   stefan
-|    Add epsilon
-|
-o  2   989b4d060121   2009-04-27 18:04 -0500   durin42
-|    Add beta and delta.
-|
-o  1   081603921c3f   2009-04-27 18:04 -0500   durin42
-|    Add gamma
-|
-o  0   d8d2fcd0e319   2009-04-27 18:04 -0500   durin42
-     Add alpha
-</pre>
-<p>If you run <tt class="docutils literal">hg histedit <span class="pre">--outgoing</span></tt> on the clone then it is the same
-as running <tt class="docutils literal">hg histedit 836302820282</tt>. If you need plan to push to a
-repository that Mercurial does not detect to be related to the source
-repo, you can add a <tt class="docutils literal"><span class="pre">--force</span></tt> option.</p>
-<div class="section" id="id20">
-<h3>Commands</h3>
-<div class="section" id="id21">
-<h4>histedit</h4>
-<pre class="literal-block">
-hg histedit [PARENT]
-</pre>
-<p>interactively edit changeset history</p>
-<p>Options:</p>
-<table class="docutils option-list" frame="void" rules="none">
-<col class="option" />
-<col class="description" />
-<tbody valign="top">
-<tr><td class="option-group">
-<kbd><span class="option">--commands</span></kbd></td>
-<td>Read history edits from the specified file.</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-c</span>, <span class="option">--continue</span></kbd></td>
-<td>continue an edit already in progress</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-k</span>, <span class="option">--keep</span></kbd></td>
-<td>don't strip old nodes after edit is complete</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--abort</span></kbd></td>
-<td>abort an edit in progress</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-o</span>, <span class="option">--outgoing</span></kbd></td>
-<td>changesets not found in destination</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-f</span>, <span class="option">--force</span></kbd></td>
-<td>force outgoing even for unrelated repositories</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-r</span>, <span class="option">--rev</span></kbd></td>
-<td>first revision to be edited</td></tr>
-</tbody>
-</table>
-</div>
-</div>
-</div>
 <div class="section" id="inotify">
-<h2><a class="toc-backref" href="#id84">inotify</a></h2>
+<h2><a class="toc-backref" href="#id87">inotify</a></h2>
 <p>accelerate status report using Linux's inotify service</p>
-<div class="section" id="id22">
+<div class="section" id="id20">
 <h3>Commands</h3>
 <div class="section" id="inserve">
 <h4>inserve</h4>
@@ -6720,7 +5587,7 @@ hg inserve [OPTION]...
 </div>
 </div>
 <div class="section" id="interhg">
-<h2><a class="toc-backref" href="#id85">interhg</a></h2>
+<h2><a class="toc-backref" href="#id88">interhg</a></h2>
 <p>expand expressions into changelog and summaries</p>
 <p>This extension allows the use of a special syntax in summaries, which
 will be automatically expanded into links or any other arbitrary
@@ -6735,7 +5602,7 @@ boldify = s!(^|\s)#(\d+)\b! &lt;b&gt;#\2&lt;/b&gt;!
 </pre>
 </div>
 <div class="section" id="keyword">
-<h2><a class="toc-backref" href="#id86">keyword</a></h2>
+<h2><a class="toc-backref" href="#id89">keyword</a></h2>
 <p>expand keywords in tracked files</p>
 <p>This extension expands RCS/CVS-like or self-customized $Keywords$ in
 tracked text files selected by your configuration.</p>
@@ -6788,7 +5655,7 @@ to avoid storing expanded keywords in the change history.</p>
 <p>Expansions spanning more than one line and incremental expansions,
 like CVS' $Log$, are not supported. A keyword template map &quot;Log =
 {desc}&quot; expands to the first line of the changeset description.</p>
-<div class="section" id="id23">
+<div class="section" id="id21">
 <h3>Commands</h3>
 <div class="section" id="kwdemo">
 <h4>kwdemo</h4>
@@ -6902,118 +5769,8 @@ hg kwshrink [OPTION]... [FILE]...
 </div>
 </div>
 </div>
-<div class="section" id="largefiles">
-<h2><a class="toc-backref" href="#id87">largefiles</a></h2>
-<p>track large binary files</p>
-<p>Large binary files tend to be not very compressible, not very
-diffable, and not at all mergeable. Such files are not handled
-efficiently by Mercurial's storage format (revlog), which is based on
-compressed binary deltas; storing large binary files as regular
-Mercurial files wastes bandwidth and disk space and increases
-Mercurial's memory usage. The largefiles extension addresses these
-problems by adding a centralized client-server layer on top of
-Mercurial: largefiles live in a <em>central store</em> out on the network
-somewhere, and you only fetch the revisions that you need when you
-need them.</p>
-<p>largefiles works by maintaining a &quot;standin file&quot; in .hglf/ for each
-largefile. The standins are small (41 bytes: an SHA-1 hash plus
-newline) and are tracked by Mercurial. Largefile revisions are
-identified by the SHA-1 hash of their contents, which is written to
-the standin. largefiles uses that revision ID to get/put largefile
-revisions from/to the central store. This saves both disk space and
-bandwidth, since you don't need to retrieve all historical revisions
-of large files when you clone or pull.</p>
-<p>To start a new repository or add new large binary files, just add
---large to your <a class="reference external" href="hg.1.html#add"><tt class="docutils literal">hg add</tt></a> command. For example:</p>
-<pre class="literal-block">
-$ dd if=/dev/urandom of=randomdata count=2000
-$ hg add --large randomdata
-$ hg commit -m 'add randomdata as a largefile'
-</pre>
-<p>When you push a changeset that adds/modifies largefiles to a remote
-repository, its largefile revisions will be uploaded along with it.
-Note that the remote Mercurial must also have the largefiles extension
-enabled for this to work.</p>
-<p>When you pull a changeset that affects largefiles from a remote
-repository, Mercurial behaves as normal. However, when you update to
-such a revision, any largefiles needed by that revision are downloaded
-and cached (if they have never been downloaded before). This means
-that network access may be required to update to changesets you have
-not previously updated to.</p>
-<p>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
-<a class="reference external" href="hg.1.html#lfconvert"><tt class="docutils literal">hg lfconvert</tt></a> command:</p>
-<pre class="literal-block">
-$ hg lfconvert --size 10 oldrepo newrepo
-</pre>
-<p>In repositories that already have largefiles in them, any new file
-over 10MB will automatically be added as a largefile. To change this
-threshold, set <tt class="docutils literal">largefiles.minsize</tt> in your Mercurial config file
-to the minimum size in megabytes to track as a largefile, or use the
---lfsize option to the add command (also in megabytes):</p>
-<pre class="literal-block">
-[largefiles]
-minsize = 2
-
-$ hg add --lfsize 2
-</pre>
-<p>The <tt class="docutils literal">largefiles.patterns</tt> config option allows you to specify a list
-of filename patterns (see <a class="reference external" href="hg.1.html#patterns"><tt class="docutils literal">hg help patterns</tt></a>) that should always be
-tracked as largefiles:</p>
-<pre class="literal-block">
-[largefiles]
-patterns =
-  *.jpg
-  re:.*\.(png|bmp)$
-  library.zip
-  content/audio/*
-</pre>
-<p>Files that match one of these patterns will be added as largefiles
-regardless of their size.</p>
-<p>The <tt class="docutils literal">largefiles.minsize</tt> and <tt class="docutils literal">largefiles.patterns</tt> config options
-will be ignored for any repositories not already containing a
-largefile. To add the first largefile to a repository, you must
-explicitly do so with the --large flag passed to the <a class="reference external" href="hg.1.html#add"><tt class="docutils literal">hg add</tt></a>
-command.</p>
-<div class="section" id="id24">
-<h3>Commands</h3>
-<div class="section" id="lfconvert">
-<h4>lfconvert</h4>
-<pre class="literal-block">
-hg lfconvert SOURCE DEST [FILE ...]
-</pre>
-<p>Convert repository SOURCE to a new repository DEST, identical to
-SOURCE except that certain files will be converted as largefiles:
-specifically, any file that matches any PATTERN <em>or</em> whose size is
-above the minimum size threshold is converted as a largefile. The
-size used to determine whether or not to track a file as a
-largefile is the size of the first version of the file. The
-minimum size can be specified either with --size or in
-configuration as <tt class="docutils literal">largefiles.size</tt>.</p>
-<p>After running this command you will need to make sure that
-largefiles is enabled anywhere you intend to push the new
-repository.</p>
-<p>Use --to-normal to convert largefiles back to normal files; after
-this, the DEST repository can be used without largefiles at all.</p>
-<p>Options:</p>
-<table class="docutils option-list" frame="void" rules="none">
-<col class="option" />
-<col class="description" />
-<tbody valign="top">
-<tr><td class="option-group">
-<kbd><span class="option">-s</span>, <span class="option">--size</span></kbd></td>
-<td>minimum size (MB) for files to be converted as largefiles</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--to-normal</span></kbd></td>
-<td>convert from a largefiles repo to a normal repo</td></tr>
-</tbody>
-</table>
-</div>
-</div>
-</div>
 <div class="section" id="mq">
-<h2><a class="toc-backref" href="#id88">mq</a></h2>
+<h2><a class="toc-backref" href="#id90">mq</a></h2>
 <p>manage a stack of patches</p>
 <p>This extension lets you work with a stack of patches in a Mercurial
 repository. It manages two stacks of patches - all known patches, and
@@ -7043,25 +5800,9 @@ git = auto/keep/yes/no
 preserving existing git patches upon qrefresh. If set to 'yes' or
 'no', mq will override the [diff] section and always generate git or
 regular patches, possibly losing data in the second case.</p>
-<p>It may be desirable for mq changesets to be kept in the secret phase (see
-<a class="reference external" href="hg.1.html#phases"><tt class="docutils literal">hg help phases</tt></a>), which can be enabled with the following setting:</p>
-<pre class="literal-block">
-[mq]
-secret = True
-</pre>
 <p>You will by default be managing a patch queue named &quot;patches&quot;. You can
 create other, independent patch queues with the <a class="reference external" href="hg.1.html#qqueue"><tt class="docutils literal">hg qqueue</tt></a> command.</p>
-<p>If the working directory contains uncommitted files, qpush, qpop and
-qgoto abort immediately. If -f/--force is used, the changes are
-discarded. Setting:</p>
-<pre class="literal-block">
-[mq]
-keepchanges = True
-</pre>
-<p>make them behave as if --keep-changes were passed, and non-conflicting
-local changes will be tolerated and preserved. If incompatible options
-such as -f/--force or --exact are passed, this setting is ignored.</p>
-<div class="section" id="id25">
+<div class="section" id="id22">
 <h3>Commands</h3>
 <div class="section" id="qapplied">
 <h4>qapplied</h4>
@@ -7076,7 +5817,7 @@ hg qapplied [-1] [-s] [PATCH]
 <tbody valign="top">
 <tr><td class="option-group">
 <kbd><span class="option">-1</span>, <span class="option">--last</span></kbd></td>
-<td>show only the preceding applied patch</td></tr>
+<td>show only the last patch</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-s</span>, <span class="option">--summary</span></kbd></td>
 <td>print first line of patch header</td></tr>
@@ -7146,9 +5887,6 @@ hg qcommit [OPTION]... [FILE]...
 <kbd><span class="option">--close-branch</span></kbd></td>
 <td>mark a branch as closed, hiding it from the branch list</td></tr>
 <tr><td class="option-group">
-<kbd><span class="option">--amend</span></kbd></td>
-<td>amend the parent of the working dir</td></tr>
-<tr><td class="option-group">
 <kbd><span class="option">-I</span>, <span class="option">--include</span></kbd></td>
 <td>include names matching the given patterns</td></tr>
 <tr><td class="option-group">
@@ -7165,10 +5903,7 @@ hg qcommit [OPTION]... [FILE]...
 <td>record the specified date as commit date</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-u</span>, <span class="option">--user</span></kbd></td>
-<td>record the specified user as committer</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-S</span>, <span class="option">--subrepos</span></kbd></td>
-<td><p class="first">recurse into subrepositories</p>
+<td><p class="first">record the specified user as committer</p>
 <p class="last">aliases: qci</p>
 </td></tr>
 </tbody>
@@ -7179,9 +5914,8 @@ hg qcommit [OPTION]... [FILE]...
 <pre class="literal-block">
 hg qdelete [-k] [PATCH]...
 </pre>
-<p>The patches must not be applied, and at least one patch is required. Exact
-patch identifiers must be given. With -k/--keep, the patch files are
-preserved in the patch directory.</p>
+<p>The patches must not be applied, and at least one patch is required. With
+-k/--keep, the patch files are preserved in the patch directory.</p>
 <p>To stop managing a patch and move it into permanent history,
 use the <a class="reference external" href="hg.1.html#qfinish"><tt class="docutils literal">hg qfinish</tt></a> command.</p>
 <p>Options:</p>
@@ -7335,14 +6069,8 @@ hg qgoto [OPTION]... PATCH
 <col class="description" />
 <tbody valign="top">
 <tr><td class="option-group">
-<kbd><span class="option">--keep-changes</span></kbd></td>
-<td>tolerate non-conflicting local changes</td></tr>
-<tr><td class="option-group">
 <kbd><span class="option">-f</span>, <span class="option">--force</span></kbd></td>
 <td>overwrite any local changes</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--no-backup</span></kbd></td>
-<td>do not save backup copies of files</td></tr>
 </tbody>
 </table>
 </div>
@@ -7391,7 +6119,7 @@ hg qheader [PATCH]
 <div class="section" id="qimport">
 <h4>qimport</h4>
 <pre class="literal-block">
-hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... [FILE]...
+hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE...
 </pre>
 <p>The patch is inserted into the series after the last applied
 patch. If no patches have been applied, qimport prepends the patch
@@ -7553,13 +6281,9 @@ hg qnext [-s]
 <pre class="literal-block">
 hg qpop [-a] [-f] [PATCH | INDEX]
 </pre>
-<p>Without argument, pops off the top of the patch stack. If given a
-patch name, keeps popping off patches until the named patch is at
-the top of the stack.</p>
-<p>By default, abort if the working directory contains uncommitted
-changes. With --keep-changes, abort only if the uncommitted files
-overlap with patched files. With -f/--force, backup and discard
-changes made to such files.</p>
+<p>By default, pops off the top of the patch stack. If given a patch
+name, keeps popping off patches until the named patch is at the
+top of the stack.</p>
 <p>Return 0 on success.</p>
 <p>Options:</p>
 <table class="docutils option-list" frame="void" rules="none">
@@ -7573,14 +6297,8 @@ changes made to such files.</p>
 <kbd><span class="option">-n</span>, <span class="option">--name</span></kbd></td>
 <td>queue name to pop (DEPRECATED)</td></tr>
 <tr><td class="option-group">
-<kbd><span class="option">--keep-changes</span></kbd></td>
-<td>tolerate non-conflicting local changes</td></tr>
-<tr><td class="option-group">
 <kbd><span class="option">-f</span>, <span class="option">--force</span></kbd></td>
 <td>forget any local changes to patched files</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--no-backup</span></kbd></td>
-<td>do not save backup copies of files</td></tr>
 </tbody>
 </table>
 </div>
@@ -7606,10 +6324,8 @@ hg qprev [-s]
 <pre class="literal-block">
 hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]
 </pre>
-<p>By default, abort if the working directory contains uncommitted
-changes. With --keep-changes, abort only if the uncommitted files
-overlap with patched files. With -f/--force, backup and patch over
-uncommitted changes.</p>
+<p>When -f/--force is applied, all local changes in patched files
+will be lost.</p>
 <p>Return 0 on success.</p>
 <p>Options:</p>
 <table class="docutils option-list" frame="void" rules="none">
@@ -7617,9 +6333,6 @@ uncommitted changes.</p>
 <col class="description" />
 <tbody valign="top">
 <tr><td class="option-group">
-<kbd><span class="option">--keep-changes</span></kbd></td>
-<td>tolerate non-conflicting local changes</td></tr>
-<tr><td class="option-group">
 <kbd><span class="option">-f</span>, <span class="option">--force</span></kbd></td>
 <td>apply on top of local changes</td></tr>
 <tr><td class="option-group">
@@ -7640,9 +6353,6 @@ uncommitted changes.</p>
 <tr><td class="option-group">
 <kbd><span class="option">--move</span></kbd></td>
 <td>reorder patch series and apply only the patch</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--no-backup</span></kbd></td>
-<td>do not save backup copies of files</td></tr>
 </tbody>
 </table>
 </div>
@@ -7655,8 +6365,7 @@ hg qqueue [OPTION] [QUEUE]
 new patch queues and deleting existing ones.</p>
 <p>Omitting a queue name or specifying -l/--list will show you the registered
 queues - by default the &quot;normal&quot; patches queue is registered. The currently
-active queue will be marked with &quot;(active)&quot;. Specifying --active will print
-only the name of the active queue.</p>
+active queue will be marked with &quot;(active)&quot;.</p>
 <p>To create a new queue, use -c/--create. The queue is automatically made
 active, except in the case where there are applied patches from the
 currently active queue in the repository. Then the queue will only be
@@ -7673,9 +6382,6 @@ active queue.</p>
 <kbd><span class="option">-l</span>, <span class="option">--list</span></kbd></td>
 <td>list all available queues</td></tr>
 <tr><td class="option-group">
-<kbd><span class="option">--active</span></kbd></td>
-<td>print name of active queue</td></tr>
-<tr><td class="option-group">
 <kbd><span class="option">-c</span>, <span class="option">--create</span></kbd></td>
 <td>create new queue</td></tr>
 <tr><td class="option-group">
@@ -7925,7 +6631,7 @@ hg qunapplied [-1] [-s] [PATCH]
 <div class="section" id="strip">
 <h4>strip</h4>
 <pre class="literal-block">
-hg strip [-k] [-f] [-n] [-B bookmark] [-r] REV...
+hg strip [-k] [-f] [-n] REV...
 </pre>
 <p>The strip command removes the specified changesets and all their
 descendants. If the working directory has uncommitted changes, the
@@ -7943,9 +6649,6 @@ the local revision numbers will in general be different after the
 restore.</p>
 <p>Use the --no-backup option to discard the backup bundle once the
 operation completes.</p>
-<p>Strip is not a history-rewriting operation and can be used on
-changesets in the public phase. But if the stripped changesets have
-been pushed to a remote repository you will likely pull them again.</p>
 <p>Return 0 on success.</p>
 <p>Options:</p>
 <table class="docutils option-list" frame="void" rules="none">
@@ -7953,159 +6656,105 @@ been pushed to a remote repository you will likely pull them again.</p>
 <col class="description" />
 <tbody valign="top">
 <tr><td class="option-group">
-<kbd><span class="option">-r</span>, <span class="option">--rev</span></kbd></td>
-<td>strip specified revision (optional, can specify revisions without this option)</td></tr>
-<tr><td class="option-group">
 <kbd><span class="option">-f</span>, <span class="option">--force</span></kbd></td>
 <td>force removal of changesets, discard uncommitted changes (no backup)</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-b</span>, <span class="option">--backup</span></kbd></td>
 <td>bundle only changesets with local revision number greater than REV which are not descendants of REV (DEPRECATED)</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">--no-backup</span></kbd></td>
-<td>no backups</td></tr>
+<tr><td class="option-group" colspan="2">
+<kbd><span class="option">-n</span>, <span class="option">--no-backup</span></kbd></td>
+</tr>
+<tr><td>&nbsp;</td><td>no backups</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">--nobackup</span></kbd></td>
 <td>no backups (DEPRECATED)</td></tr>
 <tr><td class="option-group">
-<kbd><span class="option">-n</span></kbd></td>
-<td>ignored  (DEPRECATED)</td></tr>
-<tr><td class="option-group">
 <kbd><span class="option">-k</span>, <span class="option">--keep</span></kbd></td>
 <td>do not modify working copy during strip</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-B</span>, <span class="option">--bookmark</span></kbd></td>
-<td>remove revs only reachable from given bookmark</td></tr>
 </tbody>
 </table>
 </div>
 </div>
 </div>
 <div class="section" id="notify">
-<h2><a class="toc-backref" href="#id89">notify</a></h2>
-<p>hooks for sending email push notifications</p>
-<p>This extension implements hooks to send email notifications when
-changesets are sent from or received by the local repository.</p>
-<p>First, enable the extension as explained in <a class="reference external" href="hg.1.html#extensions"><tt class="docutils literal">hg help extensions</tt></a>, and
-register the hook you want to run. <tt class="docutils literal">incoming</tt> and <tt class="docutils literal">changegroup</tt> hooks
-are run when changesets are received, while <tt class="docutils literal">outgoing</tt> hooks are for
-changesets sent to another repository:</p>
+<h2><a class="toc-backref" href="#id91">notify</a></h2>
+<p>hooks for sending email notifications at commit/push time</p>
+<p>Subscriptions can be managed through a hgrc file. Default mode is to
+print messages to stdout, for testing and configuring.</p>
+<p>To use, configure the notify extension and enable it in hgrc like
+this:</p>
 <pre class="literal-block">
+[extensions]
+notify =
+
 [hooks]
 # one email for each incoming changeset
 incoming.notify = python:hgext.notify.hook
-# one email for all incoming changesets
+# batch emails when many changesets incoming at one time
 changegroup.notify = python:hgext.notify.hook
-
-# one email for all outgoing changesets
+# batch emails when many changesets outgoing at one time (client side)
 outgoing.notify = python:hgext.notify.hook
+
+[notify]
+# config items go here
+</pre>
+<p>Required configuration items:</p>
+<pre class="literal-block">
+config = /path/to/file # file containing subscriptions
+</pre>
+<p>Optional configuration items:</p>
+<pre class="literal-block">
+test = True            # print messages to stdout for testing
+strip = 3              # number of slashes to strip for url paths
+domain = example.com   # domain to use if committer missing domain
+style = ...            # style file to use when formatting email
+template = ...         # template to use when formatting email
+incoming = ...         # template to use when run as incoming hook
+outgoing = ...         # template to use when run as outgoing hook
+changegroup = ...      # template to use when run as changegroup hook
+maxdiff = 300          # max lines of diffs to include (0=none, -1=all)
+maxsubject = 67        # truncate subject line longer than this
+diffstat = True        # add a diffstat before the diff content
+sources = serve        # notify if source of incoming changes in this list
+                       # (serve == ssh or http, push, pull, bundle)
+merge = False          # send notification for merges (default True)
+[email]
+from = user&#64;host.com   # email address to send as if none given
+[web]
+baseurl = http://hgserver/... # root of hg web site for browsing commits
 </pre>
-<p>This registers the hooks. To enable notification, subscribers must
-be assigned to repositories. The <tt class="docutils literal">[usersubs]</tt> section maps multiple
-repositories to a given recipient. The <tt class="docutils literal">[reposubs]</tt> section maps
-multiple recipients to a single repository:</p>
+<p>The notify config file has same format as a regular hgrc file. It has
+two sections so you can express subscriptions in whatever way is
+handier for you.</p>
 <pre class="literal-block">
 [usersubs]
-# key is subscriber email, value is a comma-separated list of repo glob
-# patterns
+# key is subscriber email, value is &quot;,&quot;-separated list of glob patterns
 user&#64;host = pattern
 
 [reposubs]
-# key is glob pattern, value is a comma-separated list of subscriber
-# emails
+# key is glob pattern, value is &quot;,&quot;-separated list of subscriber emails
 pattern = user&#64;host
 </pre>
-<p>Glob patterns are matched against absolute path to repository
-root.</p>
-<p>In order to place them under direct user management, <tt class="docutils literal">[usersubs]</tt> and
-<tt class="docutils literal">[reposubs]</tt> sections may be placed in a separate <tt class="docutils literal">hgrc</tt> file and
-incorporated by reference:</p>
-<pre class="literal-block">
-[notify]
-config = /path/to/subscriptionsfile
-</pre>
-<p>Notifications will not be sent until the <tt class="docutils literal">notify.test</tt> value is set
-to <tt class="docutils literal">False</tt>; see below.</p>
-<p>Notifications content can be tweaked with the following configuration entries:</p>
-<dl class="docutils">
-<dt>notify.test</dt>
-<dd>If <tt class="docutils literal">True</tt>, print messages to stdout instead of sending them. Default: True.</dd>
-<dt>notify.sources</dt>
-<dd><p class="first">Space-separated list of change sources. Notifications are activated only
-when a changeset's source is in this list. Sources may be:</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field"><th class="field-name"><tt class="docutils literal">serve</tt>:</th><td class="field-body">changesets received via http or ssh</td>
-</tr>
-<tr class="field"><th class="field-name"><tt class="docutils literal">pull</tt>:</th><td class="field-body">changesets received via <tt class="docutils literal">hg pull</tt></td>
-</tr>
-<tr class="field"><th class="field-name"><tt class="docutils literal">unbundle</tt>:</th><td class="field-body">changesets received via <tt class="docutils literal">hg unbundle</tt></td>
-</tr>
-<tr class="field"><th class="field-name"><tt class="docutils literal">push</tt>:</th><td class="field-body">changesets sent or received via <tt class="docutils literal">hg push</tt></td>
-</tr>
-<tr class="field"><th class="field-name"><tt class="docutils literal">bundle</tt>:</th><td class="field-body">changesets sent via <tt class="docutils literal">hg unbundle</tt></td>
-</tr>
-</tbody>
-</table>
-<p class="last">Default: serve.</p>
-</dd>
-<dt>notify.strip</dt>
-<dd>Number of leading slashes to strip from url paths. By default, notifications
-reference repositories with their absolute path. <tt class="docutils literal">notify.strip</tt> lets you
-turn them into relative paths. For example, <tt class="docutils literal">notify.strip=3</tt> will change
-<tt class="docutils literal">/long/path/repository</tt> into <tt class="docutils literal">repository</tt>. Default: 0.</dd>
-<dt>notify.domain</dt>
-<dd>Default email domain for sender or recipients with no explicit domain.</dd>
-<dt>notify.style</dt>
-<dd>Style file to use when formatting emails.</dd>
-<dt>notify.template</dt>
-<dd>Template to use when formatting emails.</dd>
-<dt>notify.incoming</dt>
-<dd>Template to use when run as an incoming hook, overriding <tt class="docutils literal">notify.template</tt>.</dd>
-<dt>notify.outgoing</dt>
-<dd>Template to use when run as an outgoing hook, overriding <tt class="docutils literal">notify.template</tt>.</dd>
-<dt>notify.changegroup</dt>
-<dd>Template to use when running as a changegroup hook, overriding
-<tt class="docutils literal">notify.template</tt>.</dd>
-<dt>notify.maxdiff</dt>
-<dd>Maximum number of diff lines to include in notification email. Set to 0
-to disable the diff, or -1 to include all of it. Default: 300.</dd>
-<dt>notify.maxsubject</dt>
-<dd>Maximum number of characters in email's subject line. Default: 67.</dd>
-<dt>notify.diffstat</dt>
-<dd>Set to True to include a diffstat before diff content. Default: True.</dd>
-<dt>notify.merge</dt>
-<dd>If True, send notifications for merge changesets. Default: True.</dd>
-<dt>notify.mbox</dt>
-<dd>If set, append mails to this mbox file instead of sending. Default: None.</dd>
-<dt>notify.fromauthor</dt>
-<dd>If set, use the committer of the first changeset in a changegroup for
-the &quot;From&quot; field of the notification mail. If not set, take the user
-from the pushing repo.  Default: False.</dd>
-</dl>
-<p>If set, the following entries will also be used to customize the
-notifications:</p>
-<dl class="docutils">
-<dt>email.from</dt>
-<dd>Email <tt class="docutils literal">From</tt> address to use if none can be found in the generated
-email content.</dd>
-<dt>web.baseurl</dt>
-<dd>Root repository URL to combine with repository paths when making
-references. See also <tt class="docutils literal">notify.strip</tt>.</dd>
-</dl>
+<p>Glob patterns are matched against path to repository root.</p>
+<p>If you like, you can put notify config file in repository that users
+can push changes to, they can manage their own subscriptions.</p>
 </div>
 <div class="section" id="pager">
-<h2><a class="toc-backref" href="#id90">pager</a></h2>
+<h2><a class="toc-backref" href="#id92">pager</a></h2>
 <p>browse command output with an external pager</p>
 <p>To set the pager that should be used, set the application variable:</p>
 <pre class="literal-block">
 [pager]
-pager = less -FRX
+pager = less -FRSX
 </pre>
 <p>If no pager is set, the pager extensions uses the environment variable
 $PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.</p>
+<p>If you notice &quot;BROKEN PIPE&quot; error messages, you can disable them by
+setting:</p>
+<pre class="literal-block">
+[pager]
+quiet = True
+</pre>
 <p>You can disable the pager for certain commands by adding them to the
 pager.ignore list:</p>
 <pre class="literal-block">
@@ -8128,7 +6777,7 @@ used. Use a boolean value like yes, no, on, off, or use auto for
 normal behavior.</p>
 </div>
 <div class="section" id="patchbomb">
-<h2><a class="toc-backref" href="#id91">patchbomb</a></h2>
+<h2><a class="toc-backref" href="#id93">patchbomb</a></h2>
 <p>command to send changesets as (a series of) patch emails</p>
 <p>The series is started off with a &quot;[PATCH 0 of N]&quot; introduction, which
 describes the series as a whole.</p>
@@ -8162,7 +6811,7 @@ to be a sendmail compatible mailer or fill out the [smtp] section so
 that the patchbomb extension can automatically send patchbombs
 directly from the commandline. See the [email] and [smtp] sections in
 hgrc(5) for details.</p>
-<div class="section" id="id26">
+<div class="section" id="id23">
 <h3>Commands</h3>
 <div class="section" id="email">
 <h4>email</h4>
@@ -8185,9 +6834,7 @@ the messages are sent.</p>
 <p>By default the patch is included as text in the email body for
 easy reviewing. Using the -a/--attach option will instead create
 an attachment for the patch. With -i/--inline an inline attachment
-will be created. You can include a patch both as text in the email
-body and as a regular or an inline attachment by combining the
--a/--attach or -i/--inline with the --body option.</p>
+will be created.</p>
 <p>With -o/--outgoing, emails will be generated for patches not found
 in the destination repository (or only those which are ancestors
 of the specified revisions if any are provided)</p>
@@ -8265,9 +6912,6 @@ hgrc. See the [email] section in hgrc(5) for details.</p>
 <kbd><span class="option">--intro</span></kbd></td>
 <td>send an introduction email for a single patch</td></tr>
 <tr><td class="option-group">
-<kbd><span class="option">--body</span></kbd></td>
-<td>send patches as inline message text (default)</td></tr>
-<tr><td class="option-group">
 <kbd><span class="option">-a</span>, <span class="option">--attach</span></kbd></td>
 <td>send patches as attachments</td></tr>
 <tr><td class="option-group">
@@ -8330,7 +6974,7 @@ hgrc. See the [email] section in hgrc(5) for details.</p>
 </div>
 </div>
 <div class="section" id="progress">
-<h2><a class="toc-backref" href="#id92">progress</a></h2>
+<h2><a class="toc-backref" href="#id94">progress</a></h2>
 <p>show progress bars for some actions</p>
 <p>This extension uses the progress information logged by hg commands
 to draw progress bars that are as informative as possible. Some progress
@@ -8340,9 +6984,6 @@ end point.</p>
 <pre class="literal-block">
 [progress]
 delay = 3 # number of seconds (float) before showing the progress bar
-changedelay = 1 # changedelay: minimum delay before showing a new topic.
-                # If set to less than 3 * refresh, that value will
-                # be used instead.
 refresh = 0.1 # time in seconds between refreshes of the progress bar
 format = topic bar number estimate # format of the progress bar
 width = &lt;none&gt; # if set, the maximum width of the progress information
@@ -8359,11 +7000,11 @@ would take the last num characters, or <tt class="docutils literal">+&lt;num&gt;
 characters.</p>
 </div>
 <div class="section" id="purge">
-<h2><a class="toc-backref" href="#id93">purge</a></h2>
+<h2><a class="toc-backref" href="#id95">purge</a></h2>
 <p>command to delete untracked files from the working directory</p>
-<div class="section" id="id27">
+<div class="section" id="id24">
 <h3>Commands</h3>
-<div class="section" id="id28">
+<div class="section" id="id25">
 <h4>purge</h4>
 <pre class="literal-block">
 hg purge [OPTION]... [DIR]...
@@ -8420,18 +7061,19 @@ option.</p>
 </div>
 </div>
 <div class="section" id="rebase">
-<h2><a class="toc-backref" href="#id94">rebase</a></h2>
+<h2><a class="toc-backref" href="#id96">rebase</a></h2>
 <p>command to move sets of revisions to a different ancestor</p>
 <p>This extension lets you rebase changesets in an existing Mercurial
 repository.</p>
 <p>For more information:
 <a class="reference external" href="http://mercurial.selenic.com/wiki/RebaseExtension">http://mercurial.selenic.com/wiki/RebaseExtension</a></p>
-<div class="section" id="id29">
+<div class="section" id="id26">
 <h3>Commands</h3>
-<div class="section" id="id30">
+<div class="section" id="id27">
 <h4>rebase</h4>
 <pre class="literal-block">
-hg rebase [-s REV | -b REV] [-d REV] [OPTION]
+hg rebase [-s REV | -b REV] [-d REV] [options]
+hg rebase {-a|-c}
 </pre>
 <p>Rebase uses repeated merging to graft changesets from one part of
 history (the source) onto another (the destination). This can be
@@ -8482,9 +7124,6 @@ continued with --continue/-c or aborted with --abort/-a.</p>
 <kbd><span class="option">-b</span>, <span class="option">--base</span></kbd></td>
 <td>rebase from the base of the specified changeset (up to greatest common ancestor of base and dest)</td></tr>
 <tr><td class="option-group">
-<kbd><span class="option">-r</span>, <span class="option">--rev</span></kbd></td>
-<td>rebase these revisions</td></tr>
-<tr><td class="option-group">
 <kbd><span class="option">-d</span>, <span class="option">--dest</span></kbd></td>
 <td>rebase onto the specified changeset</td></tr>
 <tr><td class="option-group">
@@ -8494,9 +7133,6 @@ continued with --continue/-c or aborted with --abort/-a.</p>
 <kbd><span class="option">-m</span>, <span class="option">--message</span></kbd></td>
 <td>use text as collapse commit message</td></tr>
 <tr><td class="option-group">
-<kbd><span class="option">-e</span>, <span class="option">--edit</span></kbd></td>
-<td>invoke editor on commit messages</td></tr>
-<tr><td class="option-group">
 <kbd><span class="option">-l</span>, <span class="option">--logfile</span></kbd></td>
 <td>read collapse commit message from file</td></tr>
 <tr><td class="option-group">
@@ -8506,8 +7142,8 @@ continued with --continue/-c or aborted with --abort/-a.</p>
 <kbd><span class="option">--keepbranches</span></kbd></td>
 <td>keep original branch names</td></tr>
 <tr><td class="option-group">
-<kbd><span class="option">-D</span>, <span class="option">--detach</span></kbd></td>
-<td>(DEPRECATED)</td></tr>
+<kbd><span class="option">--detach</span></kbd></td>
+<td>force detaching of source from its original branch</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-t</span>, <span class="option">--tool</span></kbd></td>
 <td>specify merge tool</td></tr>
@@ -8529,9 +7165,9 @@ continued with --continue/-c or aborted with --abort/-a.</p>
 </div>
 </div>
 <div class="section" id="record">
-<h2><a class="toc-backref" href="#id95">record</a></h2>
+<h2><a class="toc-backref" href="#id97">record</a></h2>
 <p>commands to interactively select changes for commit/qrefresh</p>
-<div class="section" id="id31">
+<div class="section" id="id28">
 <h3>Commands</h3>
 <div class="section" id="qrecord">
 <h4>qrecord</h4>
@@ -8541,7 +7177,7 @@ hg qrecord [OPTION]... PATCH [FILE]...
 <p>See <a class="reference external" href="hg.1.html#qnew"><tt class="docutils literal">hg help qnew</tt></a> &amp; <a class="reference external" href="hg.1.html#record"><tt class="docutils literal">hg help record</tt></a> for more information and
 usage.</p>
 </div>
-<div class="section" id="id32">
+<div class="section" id="id29">
 <h4>record</h4>
 <pre class="literal-block">
 hg record [OPTION]... [FILE]...
@@ -8556,7 +7192,6 @@ possible:</p>
 <pre class="literal-block">
 y - record this change
 n - skip this change
-e - edit this change manually
 
 s - skip remaining changes to this file
 f - record remaining changes to this file
@@ -8581,9 +7216,6 @@ q - quit, recording no changes
 <kbd><span class="option">--close-branch</span></kbd></td>
 <td>mark a branch as closed, hiding it from the branch list</td></tr>
 <tr><td class="option-group">
-<kbd><span class="option">--amend</span></kbd></td>
-<td>amend the parent of the working dir</td></tr>
-<tr><td class="option-group">
 <kbd><span class="option">-I</span>, <span class="option">--include</span></kbd></td>
 <td>include names matching the given patterns</td></tr>
 <tr><td class="option-group">
@@ -8601,9 +7233,6 @@ q - quit, recording no changes
 <tr><td class="option-group">
 <kbd><span class="option">-u</span>, <span class="option">--user</span></kbd></td>
 <td>record the specified user as committer</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-S</span>, <span class="option">--subrepos</span></kbd></td>
-<td>recurse into subrepositories</td></tr>
 <tr><td class="option-group" colspan="2">
 <kbd><span class="option">-w</span>, <span class="option">--ignore-all-space</span></kbd></td>
 </tr>
@@ -8622,11 +7251,11 @@ q - quit, recording no changes
 </div>
 </div>
 <div class="section" id="relink">
-<h2><a class="toc-backref" href="#id96">relink</a></h2>
+<h2><a class="toc-backref" href="#id98">relink</a></h2>
 <p>recreates hardlinks between repository clones</p>
-<div class="section" id="id33">
+<div class="section" id="id30">
 <h3>Commands</h3>
-<div class="section" id="id34">
+<div class="section" id="id31">
 <h4>relink</h4>
 <pre class="literal-block">
 hg relink [ORIGIN]
@@ -8651,7 +7280,7 @@ writes.)</p>
 </div>
 </div>
 <div class="section" id="schemes">
-<h2><a class="toc-backref" href="#id97">schemes</a></h2>
+<h2><a class="toc-backref" href="#id99">schemes</a></h2>
 <p>extend schemes with shortcuts to repository swarms</p>
 <p>This extension allows you to specify shortcuts for parent URLs with a
 lot of repositories to act like a scheme, for example:</p>
@@ -8687,11 +7316,11 @@ kiln = https://{1}.kilnhg.com/Repo/
 same name.</p>
 </div>
 <div class="section" id="share">
-<h2><a class="toc-backref" href="#id98">share</a></h2>
+<h2><a class="toc-backref" href="#id100">share</a></h2>
 <p>share a common history between several working directories</p>
-<div class="section" id="id35">
+<div class="section" id="id32">
 <h3>Commands</h3>
-<div class="section" id="id36">
+<div class="section" id="id33">
 <h4>share</h4>
 <pre class="literal-block">
 hg share [-U] SOURCE [DEST]
@@ -8721,24 +7350,17 @@ the broken clone to reset it to a changeset that still exists
 </tbody>
 </table>
 </div>
-<div class="section" id="unshare">
-<h4>unshare</h4>
-<pre class="literal-block">
-hg unshare
-</pre>
-<p>Copy the store data to the repo and remove the sharedpath data.</p>
-</div>
 </div>
 </div>
 <div class="section" id="transplant">
-<h2><a class="toc-backref" href="#id99">transplant</a></h2>
+<h2><a class="toc-backref" href="#id101">transplant</a></h2>
 <p>command to transplant changesets from another branch</p>
 <p>This extension allows you to transplant patches from another branch.</p>
 <p>Transplanted patches are recorded in .hg/transplant/transplants, as a
 map from a changeset hash to its hash in the source repository.</p>
-<div class="section" id="id37">
+<div class="section" id="id34">
 <h3>Commands</h3>
-<div class="section" id="id38">
+<div class="section" id="id35">
 <h4>transplant</h4>
 <pre class="literal-block">
 hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]...
@@ -8762,15 +7384,13 @@ the branch holding the named revision, up to that revision. If
 --all/-a is specified, all changesets on the branch will be
 transplanted, otherwise you will be prompted to select the
 changesets you want.</p>
-<p><a class="reference external" href="hg.1.html#transplant"><tt class="docutils literal">hg transplant <span class="pre">--branch</span> REV <span class="pre">--all</span></tt></a> will transplant the
+<p><a class="reference external" href="hg.1.html#transplant"><tt class="docutils literal">hg transplant <span class="pre">--branch</span> REVISION <span class="pre">--all</span></tt></a> will transplant the
 selected branch (up to the named revision) onto your current
 working directory.</p>
 <p>You can optionally mark selected transplanted changesets as merge
 changesets. You will not be prompted to transplant any ancestors
 of a merged transplant, and you can merge descendants of them
 normally instead of transplanting them.</p>
-<p>Merge changesets may be transplanted directly by specifying the
-proper parent changeset by calling <a class="reference external" href="hg.1.html#transplant"><tt class="docutils literal">hg transplant <span class="pre">--parent</span></tt></a>.</p>
 <p>If no merges or revisions are provided, <a class="reference external" href="hg.1.html#transplant"><tt class="docutils literal">hg transplant</tt></a> will
 start an interactive changeset browser.</p>
 <p>If a changeset application fails, you can fix the merge by hand
@@ -8797,12 +7417,6 @@ and then resume where you left off by calling <a class="reference external" href
 <kbd><span class="option">-m</span>, <span class="option">--merge</span></kbd></td>
 <td>merge at REV</td></tr>
 <tr><td class="option-group">
-<kbd><span class="option">--parent</span></kbd></td>
-<td>parent to choose when transplanting merge</td></tr>
-<tr><td class="option-group">
-<kbd><span class="option">-e</span>, <span class="option">--edit</span></kbd></td>
-<td>invoke editor on commit messages</td></tr>
-<tr><td class="option-group">
 <kbd><span class="option">--log</span></kbd></td>
 <td>append transplant info to log message</td></tr>
 <tr><td class="option-group">
@@ -8817,7 +7431,7 @@ and then resume where you left off by calling <a class="reference external" href
 </div>
 </div>
 <div class="section" id="win32mbcs">
-<h2><a class="toc-backref" href="#id100">win32mbcs</a></h2>
+<h2><a class="toc-backref" href="#id102">win32mbcs</a></h2>
 <p>allow the use of MBCS paths with problematic encodings</p>
 <p>Some MBCS encodings are not good for some path operations (i.e.
 splitting path, case conversion, etc.) with its encoded bytes. We call
@@ -8852,7 +7466,7 @@ encoding = sjis
 <p>It is useful for the users who want to commit with UTF-8 log message.</p>
 </div>
 <div class="section" id="win32text">
-<h2><a class="toc-backref" href="#id101">win32text</a></h2>
+<h2><a class="toc-backref" href="#id103">win32text</a></h2>
 <p>perform automatic newline conversion</p>
 <blockquote>
 <p>Deprecation: The win32text extension requires each user to configure
@@ -8889,7 +7503,7 @@ pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf
 </pre>
 </div>
 <div class="section" id="zeroconf">
-<h2><a class="toc-backref" href="#id102">zeroconf</a></h2>
+<h2><a class="toc-backref" href="#id104">zeroconf</a></h2>
 <p>discover and advertise repositories on the local network</p>
 <p>Zeroconf-enabled repositories will be announced in a network without
 the need to configure a server or a service. They can be discovered
@@ -8911,34 +7525,20 @@ zc-test = http://example.com:8000/test
 <div class="section" id="files">
 <h1><a class="toc-backref" href="#contents">Files</a></h1>
 <dl class="docutils">
-<dt><tt class="docutils literal">/etc/mercurial/hgrc</tt>, <tt class="docutils literal"><span class="pre">$HOME/.hgrc</span></tt>, <tt class="docutils literal">.hg/hgrc</tt></dt>
-<dd>This file contains defaults and configuration. Values in
-<tt class="docutils literal">.hg/hgrc</tt> override those in <tt class="docutils literal"><span class="pre">$HOME/.hgrc</span></tt>, and these override
-settings made in the global <tt class="docutils literal">/etc/mercurial/hgrc</tt> configuration.
-See <a class="reference external" href="hgrc.5.html"><strong>hgrc</strong>(5)</a> for details of the contents and format of these
-files.</dd>
 <dt><tt class="docutils literal">.hgignore</tt></dt>
 <dd>This file contains regular expressions (one per line) that
 describe file names that should be ignored by <strong>hg</strong>. For details,
 see <a class="reference external" href="hgignore.5.html"><strong>hgignore</strong>(5)</a>.</dd>
-<dt><tt class="docutils literal">.hgsub</tt></dt>
-<dd>This file defines the locations of all subrepositories, and
-tells where the subrepository checkouts came from. For details, see
-<a class="reference external" href="hg.1.html#subrepos"><tt class="docutils literal">hg help subrepos</tt></a>.</dd>
-<dt><tt class="docutils literal">.hgsubstate</tt></dt>
-<dd>This file is where Mercurial stores all nested repository states. <em>NB: This
-file should not be edited manually.</em></dd>
 <dt><tt class="docutils literal">.hgtags</tt></dt>
 <dd>This file contains changeset hash values and text tag names (one
 of each separated by spaces) that correspond to tagged versions of
-the repository contents. The file content is encoded using UTF-8.</dd>
-<dt><tt class="docutils literal"><span class="pre">.hg/last-message.txt</span></tt></dt>
-<dd>This file is used by <a class="reference external" href="hg.1.html#commit"><tt class="docutils literal">hg commit</tt></a> to store a backup of the commit message
-in case the commit fails.</dd>
-<dt><tt class="docutils literal">.hg/localtags</tt></dt>
-<dd>This file can be used to define local tags which are not shared among
-repositories. The file format is the same as for <tt class="docutils literal">.hgtags</tt>, but it is
-encoded using the local system encoding.</dd>
+the repository contents.</dd>
+<dt><tt class="docutils literal">/etc/mercurial/hgrc</tt>, <tt class="docutils literal"><span class="pre">$HOME/.hgrc</span></tt>, <tt class="docutils literal">.hg/hgrc</tt></dt>
+<dd>This file contains defaults and configuration. Values in
+<tt class="docutils literal">.hg/hgrc</tt> override those in <tt class="docutils literal"><span class="pre">$HOME/.hgrc</span></tt>, and these override
+settings made in the global <tt class="docutils literal">/etc/mercurial/hgrc</tt> configuration.
+See <a class="reference external" href="hgrc.5.html"><strong>hgrc</strong>(5)</a> for details of the contents and format of these
+files.</dd>
 </dl>
 <p>Some commands (e.g. revert) produce backup files ending in <tt class="docutils literal">.orig</tt>,
 if the <tt class="docutils literal">.orig</tt> file already exists and is not tracked by Mercurial,
@@ -8965,7 +7565,7 @@ below) when you find them.</p>
 </div>
 <div class="section" id="copying">
 <h1><a class="toc-backref" href="#contents">Copying</a></h1>
-<p>Copyright (C) 2005-2012 Matt Mackall.
+<p>Copyright (C) 2005-2010 Matt Mackall.
 Free use of this software is granted under the terms of the GNU General
 Public License version 2 or any later version.</p>
 <!-- Common link and substitution definitions. -->
diff --git a/doc/hg.1.txt b/doc/hg.1.txt
index f88ce38..e0bb82f 100644
--- a/doc/hg.1.txt
+++ b/doc/hg.1.txt
@@ -18,16 +18,16 @@ Mercurial source code management system
 
 
 Synopsis
-""""""""
+--------
 **hg** *command* [*option*]... [*argument*]...
 
 Description
-"""""""""""
+-----------
 The **hg** command provides a command line interface to the Mercurial
 system.
 
 Command Elements
-""""""""""""""""
+----------------
 
 files...
     indicates one or more filename or relative path filenames; see
@@ -48,62 +48,44 @@ repository path
 .. include:: hg.1.gendoc.txt
 
 Files
-"""""
-
-``/etc/mercurial/hgrc``, ``$HOME/.hgrc``, ``.hg/hgrc``
-    This file contains defaults and configuration. Values in
-    ``.hg/hgrc`` override those in ``$HOME/.hgrc``, and these override
-    settings made in the global ``/etc/mercurial/hgrc`` configuration.
-    See |hgrc(5)|_ for details of the contents and format of these
-    files.
+-----
 
 ``.hgignore``
     This file contains regular expressions (one per line) that
     describe file names that should be ignored by **hg**. For details,
     see |hgignore(5)|_.
 
-``.hgsub``
-    This file defines the locations of all subrepositories, and
-    tells where the subrepository checkouts came from. For details, see
-    :hg:`help subrepos`.
-
-``.hgsubstate``
-    This file is where Mercurial stores all nested repository states. *NB: This
-    file should not be edited manually.*
-
 ``.hgtags``
     This file contains changeset hash values and text tag names (one
     of each separated by spaces) that correspond to tagged versions of
-    the repository contents. The file content is encoded using UTF-8.
+    the repository contents.
 
-``.hg/last-message.txt``
-    This file is used by :hg:`commit` to store a backup of the commit message
-    in case the commit fails.
+``/etc/mercurial/hgrc``, ``$HOME/.hgrc``, ``.hg/hgrc``
+    This file contains defaults and configuration. Values in
+    ``.hg/hgrc`` override those in ``$HOME/.hgrc``, and these override
+    settings made in the global ``/etc/mercurial/hgrc`` configuration.
+    See |hgrc(5)|_ for details of the contents and format of these
+    files.
 
-``.hg/localtags``
-    This file can be used to define local tags which are not shared among
-    repositories. The file format is the same as for ``.hgtags``, but it is
-    encoded using the local system encoding.
-    
 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.
 
 Bugs
-""""
+----
 Probably lots, please post them to the mailing list (see Resources_
 below) when you find them.
 
 See Also
-""""""""
+--------
 |hgignore(5)|_, |hgrc(5)|_
 
 Author
-""""""
+------
 Written by Matt Mackall <mpm@selenic.com>
 
 Resources
-"""""""""
+---------
 Main Web Site: http://mercurial.selenic.com/
 
 Source code repository: http://selenic.com/hg
@@ -111,8 +93,8 @@ Source code repository: http://selenic.com/hg
 Mailing list: http://selenic.com/mailman/listinfo/mercurial
 
 Copying
-"""""""
-Copyright (C) 2005-2012 Matt Mackall.
+-------
+Copyright (C) 2005-2010 Matt Mackall.
 Free use of this software is granted under the terms of the GNU General
 Public License version 2 or any later version.
 
diff --git a/doc/hgignore.5 b/doc/hgignore.5
index 3535da7..66af0c9 100644
--- a/doc/hgignore.5
+++ b/doc/hgignore.5
@@ -61,11 +61,6 @@ configure these files.
 To control Mercurial\(aqs handling of files that it manages, many
 commands support the \fB\-I\fP and \fB\-X\fP options; see
 \%\fBhg help <command>\fP\: and \%\fBhg help patterns\fP\: for details.
-.sp
-Files that are already tracked are not affected by .hgignore, even
-if they appear in .hgignore. An untracked file X can be explicitly
-added with \%\fBhg add X\fP\:, even if X would be excluded by a pattern
-in .hgignore.
 .SH SYNTAX
 .sp
 An ignore file is a plain text file consisting of a list of patterns,
@@ -103,11 +98,6 @@ Neither glob nor regexp patterns are rooted. A glob\-syntax pattern of
 the form \fB*.c\fP will match a file ending in \fB.c\fP in any directory,
 and a regexp pattern of the form \fB\e.c$\fP will do the same. To root a
 regexp pattern, start it with \fB^\fP.
-.IP Note
-.
-Patterns specified in other than \fB.hgignore\fP are always rooted.
-Please see \%\fBhg help patterns\fP\: for details.
-.RE
 .SH EXAMPLE
 .sp
 Here is an example ignore file.
@@ -137,7 +127,7 @@ Mercurial was written by Matt Mackall <\%mpm@selenic.com\:>.
 .SH COPYING
 .sp
 This manual page is copyright 2006 Vadim Gelfer.
-Mercurial is copyright 2005\-2012 Matt Mackall.
+Mercurial is copyright 2005\-2010 Matt Mackall.
 Free use of this software is granted under the terms of the GNU General
 Public License version 2 or any later version.
 .\" Common link and substitution definitions.
diff --git a/doc/hgignore.5.html b/doc/hgignore.5.html
index d760dba..dca5696 100644
--- a/doc/hgignore.5.html
+++ b/doc/hgignore.5.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.8.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.7: http://docutils.sourceforge.net/" />
 <title>hgignore</title>
 <meta name="author" content="Vadim Gelfer &lt;vadim.gelfer&#64;gmail.com&gt;" />
 <meta name="organization" content="Mercurial" />
@@ -55,10 +55,6 @@ configure these files.</p>
 <p>To control Mercurial's handling of files that it manages, many
 commands support the <tt class="docutils literal"><span class="pre">-I</span></tt> and <tt class="docutils literal"><span class="pre">-X</span></tt> options; see
 <a class="reference external" href="hg.1.html#&lt;command&gt;"><tt class="docutils literal">hg help &lt;command&gt;</tt></a> and <a class="reference external" href="hg.1.html#patterns"><tt class="docutils literal">hg help patterns</tt></a> for details.</p>
-<p>Files that are already tracked are not affected by .hgignore, even
-if they appear in .hgignore. An untracked file X can be explicitly
-added with <a class="reference external" href="hg.1.html#add"><tt class="docutils literal">hg add X</tt></a>, even if X would be excluded by a pattern
-in .hgignore.</p>
 </div>
 <div class="section" id="syntax">
 <h1>Syntax</h1>
@@ -85,11 +81,6 @@ follow, until another syntax is selected.</p>
 the form <tt class="docutils literal">*.c</tt> will match a file ending in <tt class="docutils literal">.c</tt> in any directory,
 and a regexp pattern of the form <tt class="docutils literal">\.c$</tt> will do the same. To root a
 regexp pattern, start it with <tt class="docutils literal">^</tt>.</p>
-<div class="note">
-<p class="first admonition-title">Note</p>
-<p class="last">Patterns specified in other than <tt class="docutils literal">.hgignore</tt> are always rooted.
-Please see <a class="reference external" href="hg.1.html#patterns"><tt class="docutils literal">hg help patterns</tt></a> for details.</p>
-</div>
 </div>
 <div class="section" id="example">
 <h1>Example</h1>
@@ -119,7 +110,7 @@ syntax: regexp
 <div class="section" id="copying">
 <h1>Copying</h1>
 <p>This manual page is copyright 2006 Vadim Gelfer.
-Mercurial is copyright 2005-2012 Matt Mackall.
+Mercurial is copyright 2005-2010 Matt Mackall.
 Free use of this software is granted under the terms of the GNU General
 Public License version 2 or any later version.</p>
 <!-- Common link and substitution definitions. -->
diff --git a/doc/hgignore.5.txt b/doc/hgignore.5.txt
index 7e39f3e..5c2900c 100644
--- a/doc/hgignore.5.txt
+++ b/doc/hgignore.5.txt
@@ -14,19 +14,19 @@ syntax for Mercurial ignore files
 .. include:: ../mercurial/help/hgignore.txt
 
 Author
-======
+------
 Vadim Gelfer <vadim.gelfer@gmail.com>
 
 Mercurial was written by Matt Mackall <mpm@selenic.com>.
 
 See Also
-========
+--------
 |hg(1)|_, |hgrc(5)|_
 
 Copying
-=======
+-------
 This manual page is copyright 2006 Vadim Gelfer.
-Mercurial is copyright 2005-2012 Matt Mackall.
+Mercurial is copyright 2005-2010 Matt Mackall.
 Free use of this software is granted under the terms of the GNU General
 Public License version 2 or any later version.
 
diff --git a/doc/hgmanpage.py b/doc/hgmanpage.py
index 1d824b1..94045c0 100644
--- a/doc/hgmanpage.py
+++ b/doc/hgmanpage.py
@@ -47,10 +47,7 @@ __docformat__ = 'reStructuredText'
 import re
 
 from docutils import nodes, writers, languages
-try:
-    import roman
-except ImportError:
-    from docutils.utils import roman
+import roman
 import inspect
 
 FIELD_LIST_INDENT = 7
@@ -582,7 +579,7 @@ class Translator(nodes.NodeVisitor):
                                     self._docinfo[name],
                                     self.defs['indent'][1],
                                     self.defs['indent'][1]))
-            elif name not in skip:
+            elif not name in skip:
                 if name in self._docinfo_names:
                     label = self._docinfo_names[name]
                 else:
diff --git a/doc/hgrc.5 b/doc/hgrc.5
index 8d17bef..8fd0013 100644
--- a/doc/hgrc.5
+++ b/doc/hgrc.5
@@ -65,7 +65,7 @@ paths are given below, settings from earlier paths override later
 ones.
 .sp
 .nf
-(All) \fB<repo>/.hg/hgrc\fP
+(Unix, Windows) \fB<repo>/.hg/hgrc\fP
 .fi
 .sp
 .INDENT 0.0
@@ -75,14 +75,13 @@ Per\-repository configuration options that only apply in a
 particular repository. This file is not version\-controlled, and
 will not get transferred during a "clone" operation. Options in
 this file override options in all other configuration files. On
-Plan 9 and Unix, most of this file will be ignored if it doesn\(aqt
-belong to a trusted user or to a trusted group. See the documentation
-for the \fB[trusted]\fP section below for more details.
+Unix, most of this file will be ignored if it doesn\(aqt belong to a
+trusted user or to a trusted group. See the documentation for the
+\fB[trusted]\fP section below for more details.
 .UNINDENT
 .UNINDENT
 .sp
 .nf
-(Plan 9) \fB$home/lib/hgrc\fP
 (Unix) \fB$HOME/.hgrc\fP
 (Windows) \fB%USERPROFILE%\e.hgrc\fP
 (Windows) \fB%USERPROFILE%\eMercurial.ini\fP
@@ -102,8 +101,6 @@ options.
 .UNINDENT
 .sp
 .nf
-(Plan 9) \fB/lib/mercurial/hgrc\fP
-(Plan 9) \fB/lib/mercurial/hgrc.d/*.rc\fP
 (Unix) \fB/etc/mercurial/hgrc\fP
 (Unix) \fB/etc/mercurial/hgrc.d/*.rc\fP
 .fi
@@ -119,8 +116,6 @@ override per\-installation options.
 .UNINDENT
 .sp
 .nf
-(Plan 9) \fB<install\-root>/lib/mercurial/hgrc\fP
-(Plan 9) \fB<install\-root>/lib/mercurial/hgrc.d/*.rc\fP
 (Unix) \fB<install\-root>/etc/mercurial/hgrc\fP
 (Unix) \fB<install\-root>/etc/mercurial/hgrc.d/*.rc\fP
 .fi
@@ -152,7 +147,9 @@ Mercurial commands executed by any user in any directory. Registry
 keys contain PATH\-like strings, every part of which must reference
 a \fBMercurial.ini\fP file or be a directory where \fB*.rc\fP files will
 be read.  Mercurial checks each of these locations in the specified
-order until one or more configuration files are detected.
+order until one or more configuration files are detected.  If the
+pywin32 extensions are not installed, Mercurial will only look for
+site\-wide configuration in \fBC:\eMercurial\eMercurial.ini\fP.
 .UNINDENT
 .UNINDENT
 .SH SYNTAX
@@ -310,7 +307,7 @@ run arbitrary commands. As an example,
 .sp
 .nf
 .ft C
-echo = !echo $@
+echo = !echo
 .ft P
 .fi
 .sp
@@ -326,43 +323,12 @@ purge = !$HG status \-\-no\-status \-\-unknown \-0 | xargs \-0 rm
 which will make \fBhg purge\fP delete all unknown files in the
 repository in the same manner as the purge extension.
 .sp
-Positional arguments like \fB$1\fP, \fB$2\fP, etc. in the alias definition
-expand to the command arguments. Unmatched arguments are
-removed. \fB$0\fP expands to the alias name and \fB$@\fP expands to all
-arguments separated by a space. These expansions happen before the
-command is passed to the shell.
-.sp
-Shell aliases are executed in an environment where \fB$HG\fP expands to
+Shell aliases are executed in an environment where \fB$HG\fP expand to
 the path of the Mercurial that was used to execute the alias. This is
 useful when you want to call further Mercurial commands in a shell
 alias, as was done above for the purge alias. In addition,
-\fB$HG_ARGS\fP expands to the arguments given to Mercurial. In the \fBhg
+\fB$HG_ARGS\fP expand to the arguments given to Mercurial. In the \fBhg
 echo foo\fP call above, \fB$HG_ARGS\fP would expand to \fBecho foo\fP.
-.IP Note
-.
-Some global configuration options such as \fB\-R\fP are
-processed before shell aliases and will thus not be passed to
-aliases.
-.RE
-.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.
-.INDENT 0.0
-.TP
-.B \fBignorews\fP
-.sp
-Ignore white space when comparing lines.
-.TP
-.B \fBignorewsamount\fP
-.sp
-Ignore changes in the amount of white space.
-.TP
-.B \fBignoreblanklines\fP
-.sp
-Ignore changes whose lines are all blank.
-.UNINDENT
 .SS \fBauth\fP
 .sp
 Authentication credentials for HTTP authentication. This section
@@ -516,9 +482,8 @@ defining command defaults. The command defaults will also be applied
 to the aliases of the commands defined.
 .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.
+Settings used when displaying diffs. Everything except for \fBunified\fP is a
+Boolean and defaults to False.
 .INDENT 0.0
 .TP
 .B \fBgit\fP
@@ -652,6 +617,25 @@ mq =
 myfeature = ~/.hgext/myfeature.py
 .ft P
 .fi
+.SS \fBhostfingerprints\fP
+.sp
+Fingerprints of the certificates of known HTTPS servers.
+A HTTPS connection to a server with a fingerprint configured here will
+only succeed if the servers certificate matches the fingerprint.
+This is very similar to how ssh known hosts works.
+The fingerprint is the SHA\-1 hash value of the DER encoded certificate.
+The CA chain and web.cacerts is not used for servers with a fingerprint.
+.sp
+For example:
+.sp
+.nf
+.ft C
+[hostfingerprints]
+hg.intevation.org = 38:76:52:7c:87:26:9a:8f:4a:f8:d3:de:08:45:3b:ea:d6:4b:ee:cc
+.ft P
+.fi
+.sp
+This feature is only supported when using Python 2.6 or later.
 .SS \fBformat\fP
 .INDENT 0.0
 .TP
@@ -682,43 +666,146 @@ Mac OS X and spaces on Windows. Enabled by default. Disabling this
 option ensures that the on\-disk format of newly created
 repositories will be compatible with Mercurial before version 1.7.
 .UNINDENT
-.SS \fBgraph\fP
+.SS \fBmerge\-patterns\fP
 .sp
-Web graph view configuration. This section let you change graph
-elements display properties by branches, for instance to make the
-\fBdefault\fP branch stand out.
+This section specifies merge tools to associate with particular file
+patterns. Tools matched here will take precedence over the default
+merge tool. Patterns are globs by default, rooted at the repository
+root.
 .sp
-Each line has the following format:
+Example:
 .sp
 .nf
 .ft C
-<branch>.<argument> = <value>
+[merge\-patterns]
+**.c = kdiff3
+**.jpg = myimgmerge
 .ft P
 .fi
+.SS \fBmerge\-tools\fP
 .sp
-where \fB<branch>\fP is the name of the branch being
-customized. Example:
+This section configures external merge tools to use for file\-level
+merges.
+.sp
+Example \fB~/.hgrc\fP:
 .sp
 .nf
 .ft C
-[graph]
-# 2px width
-default.width = 2
-# red color
-default.color = FF0000
+[merge\-tools]
+# Override stock tool location
+kdiff3.executable = ~/bin/kdiff3
+# Specify command line
+kdiff3.args = $base $local $other \-o $output
+# Give higher priority
+kdiff3.priority = 1
+
+# Define new tool
+myHtmlTool.args = \-m $local $other $base $output
+myHtmlTool.regkey = Software\eFooSoftware\eHtmlMerge
+myHtmlTool.priority = 1
 .ft P
 .fi
 .sp
 Supported arguments:
 .INDENT 0.0
 .TP
-.B \fBwidth\fP
+.B \fBpriority\fP
+.sp
+The priority in which to evaluate this tool.
+Default: 0.
+.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.
+.TP
+.B \fBargs\fP
+.sp
+The arguments to pass to the tool executable. You can refer to the
+files being merged as well as the output file through these
+variables: \fB$base\fP, \fB$local\fP, \fB$other\fP, \fB$output\fP.
+Default: \fB$local $base $other\fP
+.TP
+.B \fBpremerge\fP
+.sp
+Attempt to run internal non\-interactive 3\-way merge tool before
+launching external tool.  Options are \fBtrue\fP, \fBfalse\fP, or \fBkeep\fP
+to leave markers in the file if the premerge fails.
+Default: True
+.TP
+.B \fBbinary\fP
 .sp
-Set branch edges width in pixels.
+This tool can merge binary files. Defaults to False, unless tool
+was selected by file pattern match.
 .TP
-.B \fBcolor\fP
+.B \fBsymlink\fP
 .sp
-Set branch edges color in hexadecimal RGB notation.
+This tool can merge symlinks. Defaults to False, even if tool was
+selected by file pattern match.
+.TP
+.B \fBcheck\fP
+.sp
+A list of merge success\-checking options:
+.INDENT 7.0
+.TP
+.B \fBchanged\fP
+.sp
+Ask whether merge was successful when the merged file shows no changes.
+.TP
+.B \fBconflicts\fP
+.sp
+Check whether there are conflicts even though the tool reported success.
+.TP
+.B \fBprompt\fP
+.sp
+Always prompt for merge success, regardless of success reported by tool.
+.UNINDENT
+.TP
+.B \fBcheckchanged\fP
+.sp
+True is equivalent to \fBcheck = changed\fP.
+Default: False
+.TP
+.B \fBcheckconflicts\fP
+.sp
+True is equivalent to \fBcheck = conflicts\fP.
+Default: False
+.TP
+.B \fBfixeol\fP
+.sp
+Attempt to fix up EOL changes caused by the merge tool.
+Default: False
+.TP
+.B \fBgui\fP
+.sp
+This tool requires a graphical interface to run. Default: False
+.TP
+.B \fBregkey\fP
+.sp
+Windows registry key which describes install location of this
+tool. Mercurial will search for this key first under
+\fBHKEY_CURRENT_USER\fP and then under \fBHKEY_LOCAL_MACHINE\fP.
+Default: None
+.TP
+.B \fBregkeyalt\fP
+.sp
+An alternate Windows registry key to try if the first key is not
+found.  The alternate key uses the same \fBregname\fP and \fBregappend\fP
+semantics of the primary key.  The most common use for this key
+is to search for 32bit applications on 64bit operating systems.
+Default: None
+.TP
+.B \fBregname\fP
+.sp
+Name of value to read from specified registry key. Defaults to the
+unnamed (default) value.
+.TP
+.B \fBregappend\fP
+.sp
+String to append to the value read from the registry, typically
+the executable name of the tool.
+Default: None
 .UNINDENT
 .SS \fBhooks\fP
 .sp
@@ -726,10 +813,7 @@ Commands or Python functions that get automatically executed by
 various actions such as starting or finishing a commit. Multiple
 hooks can be run for the same action by appending a suffix to the
 action. Overriding a site\-wide hook can be done by changing its
-value or setting it to an empty string.  Hooks can be prioritized
-by adding a prefix of \fBpriority\fP to the hook name on a new line
-and setting the priority.  The default priority is 0 if
-not specified.
+value or setting it to an empty string.
 .sp
 Example \fB.hg/hgrc\fP:
 .sp
@@ -742,8 +826,6 @@ changegroup.update = hg update
 incoming =
 incoming.email = /my/email/hook
 incoming.autobuild = /my/build/hook
-# force autobuild hook to run before other incoming hooks
-priority.incoming.autobuild = 1
 .ft P
 .fi
 .sp
@@ -929,25 +1011,6 @@ environment variables above are passed as keyword arguments, with no
 .sp
 If a Python hook returns a "true" value or raises an exception, this
 is treated as a failure.
-.SS \fBhostfingerprints\fP
-.sp
-Fingerprints of the certificates of known HTTPS servers.
-A HTTPS connection to a server with a fingerprint configured here will
-only succeed if the servers certificate matches the fingerprint.
-This is very similar to how ssh known hosts works.
-The fingerprint is the SHA\-1 hash value of the DER encoded certificate.
-The CA chain and web.cacerts is not used for servers with a fingerprint.
-.sp
-For example:
-.sp
-.nf
-.ft C
-[hostfingerprints]
-hg.intevation.org = 38:76:52:7c:87:26:9a:8f:4a:f8:d3:de:08:45:3b:ea:d6:4b:ee:cc
-.ft P
-.fi
-.sp
-This feature is only supported when using Python 2.6 or later.
 .SS \fBhttp_proxy\fP
 .sp
 Used to access web\-based Mercurial repositories through a HTTP
@@ -977,146 +1040,39 @@ Optional. User name to authenticate with at the proxy server.
 Optional. Always use the proxy, even for localhost and any entries
 in \fBhttp_proxy.no\fP. True or False. Default: False.
 .UNINDENT
-.SS \fBmerge\-patterns\fP
-.sp
-This section specifies merge tools to associate with particular file
-patterns. Tools matched here will take precedence over the default
-merge tool. Patterns are globs by default, rooted at the repository
-root.
-.sp
-Example:
-.sp
-.nf
-.ft C
-[merge\-patterns]
-**.c = kdiff3
-**.jpg = myimgmerge
-.ft P
-.fi
-.SS \fBmerge\-tools\fP
-.sp
-This section configures external merge tools to use for file\-level
-merges.
-.sp
-Example \fB~/.hgrc\fP:
-.sp
-.nf
-.ft C
-[merge\-tools]
-# Override stock tool location
-kdiff3.executable = ~/bin/kdiff3
-# Specify command line
-kdiff3.args = $base $local $other \-o $output
-# Give higher priority
-kdiff3.priority = 1
-
-# Define new tool
-myHtmlTool.args = \-m $local $other $base $output
-myHtmlTool.regkey = Software\eFooSoftware\eHtmlMerge
-myHtmlTool.priority = 1
-.ft P
-.fi
+.SS \fBsmtp\fP
 .sp
-Supported arguments:
+Configuration for extensions that need to send email messages.
 .INDENT 0.0
 .TP
-.B \fBpriority\fP
-.sp
-The priority in which to evaluate this tool.
-Default: 0.
-.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.
-.TP
-.B \fBargs\fP
-.sp
-The arguments to pass to the tool executable. You can refer to the
-files being merged as well as the output file through these
-variables: \fB$base\fP, \fB$local\fP, \fB$other\fP, \fB$output\fP.
-Default: \fB$local $base $other\fP
-.TP
-.B \fBpremerge\fP
-.sp
-Attempt to run internal non\-interactive 3\-way merge tool before
-launching external tool.  Options are \fBtrue\fP, \fBfalse\fP, or \fBkeep\fP
-to leave markers in the file if the premerge fails.
-Default: True
-.TP
-.B \fBbinary\fP
-.sp
-This tool can merge binary files. Defaults to False, unless tool
-was selected by file pattern match.
-.TP
-.B \fBsymlink\fP
-.sp
-This tool can merge symlinks. Defaults to False, even if tool was
-selected by file pattern match.
-.TP
-.B \fBcheck\fP
-.sp
-A list of merge success\-checking options:
-.INDENT 7.0
-.TP
-.B \fBchanged\fP
-.sp
-Ask whether merge was successful when the merged file shows no changes.
-.TP
-.B \fBconflicts\fP
-.sp
-Check whether there are conflicts even though the tool reported success.
-.TP
-.B \fBprompt\fP
-.sp
-Always prompt for merge success, regardless of success reported by tool.
-.UNINDENT
-.TP
-.B \fBcheckchanged\fP
-.sp
-True is equivalent to \fBcheck = changed\fP.
-Default: False
-.TP
-.B \fBcheckconflicts\fP
-.sp
-True is equivalent to \fBcheck = conflicts\fP.
-Default: False
-.TP
-.B \fBfixeol\fP
+.B \fBhost\fP
 .sp
-Attempt to fix up EOL changes caused by the merge tool.
-Default: False
+Host name of mail server, e.g. "mail.example.com".
 .TP
-.B \fBgui\fP
+.B \fBport\fP
 .sp
-This tool requires a graphical interface to run. Default: False
+Optional. Port to connect to on mail server. Default: 25.
 .TP
-.B \fBregkey\fP
+.B \fBtls\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
+Optional. Method to enable TLS when connecting to mail server: starttls,
+smtps or none. Default: none.
 .TP
-.B \fBregkeyalt\fP
+.B \fBusername\fP
 .sp
-An alternate Windows registry key to try if the first key is not
-found.  The alternate key uses the same \fBregname\fP and \fBregappend\fP
-semantics of the primary key.  The most common use for this key
-is to search for 32bit applications on 64bit operating systems.
-Default: None
+Optional. User name for authenticating with the SMTP server.
+Default: none.
 .TP
-.B \fBregname\fP
+.B \fBpassword\fP
 .sp
-Name of value to read from specified registry key. Defaults to the
-unnamed (default) value.
+Optional. Password for authenticating with the SMTP server. If not
+specified, interactive sessions will prompt the user for a
+password; non\-interactive sessions will fail. Default: none.
 .TP
-.B \fBregappend\fP
+.B \fBlocal_hostname\fP
 .sp
-String to append to the value read from the registry, typically
-the executable name of the tool.
-Default: None
+Optional. It\(aqs the hostname that the sender can use to identify
+itself to the MTA.
 .UNINDENT
 .SS \fBpatch\fP
 .sp
@@ -1155,59 +1111,18 @@ cloned.
 Optional. Directory or URL to use when pushing if no destination
 is specified.
 .UNINDENT
-.SS \fBphases\fP
-.sp
-Specifies default handling of phases. See \%\fBhg help phases\fP\: for more
-information about working with phases.
-.INDENT 0.0
-.TP
-.B \fBpublish\fP
-.sp
-Controls draft phase behavior when working as a server. When true,
-pushed changesets are set to public in both client and server and
-pulled or cloned changesets are set to public in the client.
-Default: True
-.TP
-.B \fBnew\-commit\fP
-.sp
-Phase of newly\-created commits.
-Default: draft
-.UNINDENT
 .SS \fBprofiling\fP
 .sp
-Specifies profiling type, format, and file output. Two profilers are
-supported: an instrumenting profiler (named \fBls\fP), and a sampling
-profiler (named \fBstat\fP).
-.sp
-In this section description, \(aqprofiling data\(aq stands for the raw data
-collected during profiling, while \(aqprofiling report\(aq stands for a
-statistical text report generated from the profiling data. The
-profiling is done using lsprof.
+Specifies profiling format and file output. In this section
+description, \(aqprofiling data\(aq stands for the raw data collected
+during profiling, while \(aqprofiling report\(aq stands for a statistical
+text report generated from the profiling data. The profiling is done
+using lsprof.
 .INDENT 0.0
 .TP
-.B \fBtype\fP
-.sp
-The type of profiler to use.
-Default: ls.
-.INDENT 7.0
-.TP
-.B \fBls\fP
-.sp
-Use Python\(aqs built\-in instrumenting profiler. This profiler
-works on all platforms, but each line number it reports is the
-first line of a function. This restriction makes it difficult to
-identify the expensive parts of a non\-trivial function.
-.TP
-.B \fBstat\fP
-.sp
-Use a third\-party statistical profiler, statprof. This profiler
-currently runs only on Unix systems, and is most useful for
-profiling commands that run for longer than about 0.1 seconds.
-.UNINDENT
-.TP
 .B \fBformat\fP
 .sp
-Profiling format.  Specific to the \fBls\fP instrumenting profiler.
+Profiling format.
 Default: text.
 .INDENT 7.0
 .TP
@@ -1224,11 +1139,6 @@ file, the generated file can directly be loaded into
 kcachegrind.
 .UNINDENT
 .TP
-.B \fBfrequency\fP
-.sp
-Sampling frequency.  Specific to the \fBstat\fP sampling profiler.
-Default: 1000.
-.TP
 .B \fBoutput\fP
 .sp
 File path where profiling data or report should be saved. If the
@@ -1256,56 +1166,15 @@ extra data transfer overhead. This mode will also temporarily hold
 the write lock while determining what data to transfer.
 Default is True.
 .TP
-.B \fBpreferuncompressed\fP
-.sp
-When set, clients will try to use the uncompressed streaming
-protocol. Default is False.
-.TP
 .B \fBvalidate\fP
 .sp
 Whether to validate the completeness of pushed changesets by
 checking that all new file revisions specified in manifests are
 present. Default is False.
 .UNINDENT
-.SS \fBsmtp\fP
-.sp
-Configuration for extensions that need to send email messages.
-.INDENT 0.0
-.TP
-.B \fBhost\fP
-.sp
-Host name of mail server, e.g. "mail.example.com".
-.TP
-.B \fBport\fP
-.sp
-Optional. Port to connect to on mail server. Default: 25.
-.TP
-.B \fBtls\fP
-.sp
-Optional. Method to enable TLS when connecting to mail server: starttls,
-smtps or none. Default: none.
-.TP
-.B \fBusername\fP
-.sp
-Optional. User name for authenticating with the SMTP server.
-Default: none.
-.TP
-.B \fBpassword\fP
-.sp
-Optional. Password for authenticating with the SMTP server. If not
-specified, interactive sessions will prompt the user for a
-password; non\-interactive sessions will fail. Default: none.
-.TP
-.B \fBlocal_hostname\fP
-.sp
-Optional. It\(aqs the hostname that the sender can use to identify
-itself to the MTA.
-.UNINDENT
 .SS \fBsubpaths\fP
 .sp
-Subrepository source URLs can go stale if a remote server changes name
-or becomes temporarily unavailable. This section lets you define
-rewrite rules of the form:
+Defines subrepositories source locations rewriting rules of the form:
 .sp
 .nf
 .ft C
@@ -1313,10 +1182,10 @@ rewrite rules of the form:
 .ft P
 .fi
 .sp
-where \fBpattern\fP is a regular expression matching a subrepository
-source URL and \fBreplacement\fP is the replacement string used to
-rewrite it. Groups can be matched in \fBpattern\fP and referenced in
-\fBreplacements\fP. For instance:
+Where \fBpattern\fP is a regular expression matching the source and
+\fBreplacement\fP is the replacement string used to rewrite it. Groups
+can be matched in \fBpattern\fP and referenced in \fBreplacements\fP. For
+instance:
 .sp
 .nf
 .ft C
@@ -1326,9 +1195,7 @@ http://server/(.*)\-hg/ = http://hg.server/\e1/
 .sp
 rewrites \fBhttp://server/foo\-hg/\fP into \fBhttp://hg.server/foo/\fP.
 .sp
-Relative subrepository paths are first made absolute, and the
-rewrite rules are then applied on the full (absolute) path. The rules
-are applied in definition order.
+All patterns are applied in definition order.
 .SS \fBtrusted\fP
 .sp
 Mercurial will not use the settings in the
@@ -1379,7 +1246,7 @@ Default is False.
 Whether to commit modified subrepositories when committing the
 parent repository. If False and one subrepository has uncommitted
 changes, abort the commit.
-Default is False.
+Default is True.
 .TP
 .B \fBdebug\fP
 .sp
@@ -1438,11 +1305,6 @@ Reduce the amount of output printed. True or False. Default is False.
 .sp
 remote command to use for clone/push/pull operations. Default is \fBhg\fP.
 .TP
-.B \fBreportoldssl\fP
-.sp
-Warn if an SSL certificate is unable to be due to using Python
-2.5 or earlier. True or False. Default is True.
-.TP
 .B \fBreport_untrusted\fP
 .sp
 Warn if a \fB.hg/hgrc\fP file is ignored due to not being owned by a
@@ -1563,6 +1425,14 @@ must have been authenticated, and the authenticated user name must
 be present in this list. The contents of the allow_push list are
 examined after the deny_push list.
 .TP
+.B \fBguessmime\fP
+.sp
+Control MIME types for raw download of file content.
+Set to True to let hgweb guess the content type from the file
+extension. This will serve HTML files as \fBtext/html\fP and might
+allow cross\-site scripting attacks when serving untrusted
+repositories. Default is False.
+.TP
 .B \fBallow_read\fP
 .sp
 If the user has not already been denied repository access due to
@@ -1592,20 +1462,7 @@ Path to file containing a list of PEM encoded certificate
 authority certificates. Environment variables and \fB~user\fP
 constructs are expanded in the filename. If specified on the
 client, then it will verify the identity of remote HTTPS servers
-with these certificates.
-.sp
-This feature is only supported when using Python 2.6 or later. If you wish
-to use it with earlier versions of Python, install the backported
-version of the ssl library that is available from
-\fBhttp://pypi.python.org\fP.
-.sp
-To disable SSL verification temporarily, specify \fB\-\-insecure\fP from
-command line.
-.sp
-You can use OpenSSL\(aqs CA certificate file if your platform has
-one. On most Linux systems this will be
-\fB/etc/ssl/certs/ca\-certificates.crt\fP. Otherwise you will have to
-generate this file manually. The form must be as follows:
+with these certificates. The form must be as follows:
 .sp
 .nf
 .ft C
@@ -1617,27 +1474,22 @@ generate this file manually. The form must be as follows:
 \-\-\-\-\-END CERTIFICATE\-\-\-\-\-
 .ft P
 .fi
-.TP
-.B \fBcache\fP
 .sp
-Whether to support caching in hgweb. Defaults to True.
-.TP
-.B \fBcollapse\fP
+This feature is only supported when using Python 2.6 or later. If you wish
+to use it with earlier versions of Python, install the backported
+version of the ssl library that is available from
+\fBhttp://pypi.python.org\fP.
 .sp
-With \fBdescend\fP enabled, repositories in subdirectories are shown at
-a single level alongside repositories in the current path. With
-\fBcollapse\fP also enabled, repositories residing at a deeper level than
-the current path are grouped behind navigable directory entries that
-lead to the locations of these repositories. In effect, this setting
-collapses each collection of repositories found within a subdirectory
-into a single entry for that subdirectory. Default is False.
+You can use OpenSSL\(aqs CA certificate file if your platform has one.
+On most Linux systems this will be \fB/etc/ssl/certs/ca\-certificates.crt\fP.
+Otherwise you will have to generate this file manually.
+.sp
+To disable SSL verification temporarily, specify \fB\-\-insecure\fP from
+command line.
 .TP
-.B \fBcomparisoncontext\fP
+.B \fBcache\fP
 .sp
-Number of lines of context to show in side\-by\-side file comparison. If
-negative or the value \fBfull\fP, whole files are shown. Default is 5.
-This setting can be overridden by a \fBcontext\fP request parameter to the
-\fBcomparison\fP command, taking the same values.
+Whether to support caching in hgweb. Defaults to True.
 .TP
 .B \fBcontact\fP
 .sp
@@ -1688,14 +1540,6 @@ Example: "UTF\-8"
 .sp
 Where to output the error log. Default is stderr.
 .TP
-.B \fBguessmime\fP
-.sp
-Control MIME types for raw download of file content.
-Set to True to let hgweb guess the content type from the file
-extension. This will serve HTML files as \fBtext/html\fP and might
-allow cross\-site scripting attacks when serving untrusted
-repositories. Default is False.
-.TP
 .B \fBhidden\fP
 .sp
 Whether to hide the repository in the hgwebdir index.
@@ -1705,18 +1549,16 @@ Default is False.
 .sp
 Whether to use IPv6. Default is False.
 .TP
-.B \fBlogoimg\fP
-.sp
-File name of the logo image that some templates display on each page.
-The file name is relative to \fBstaticurl\fP. That is, the full path to
-the logo image is "staticurl/logoimg".
-If unset, \fBhglogo.png\fP will be used.
-.TP
 .B \fBlogourl\fP
 .sp
 Base URL to use for logos. If unset, \fBhttp://mercurial.selenic.com/\fP
 will be used.
 .TP
+.B \fBname\fP
+.sp
+Repository name to use in the web interface. Default is current
+working directory.
+.TP
 .B \fBmaxchanges\fP
 .sp
 Maximum number of changes to list on the changelog. Default is 10.
@@ -1725,16 +1567,6 @@ Maximum number of changes to list on the changelog. Default is 10.
 .sp
 Maximum number of files to list per changeset. Default is 10.
 .TP
-.B \fBmaxshortchanges\fP
-.sp
-Maximum number of changes to list on the shortlog, graph or filelog
-pages. Default is 60.
-.TP
-.B \fBname\fP
-.sp
-Repository name to use in the web interface. Default is current
-working directory.
-.TP
 .B \fBport\fP
 .sp
 Port to listen on. Default is 8000.
@@ -1779,7 +1611,7 @@ Mercurial was written by Matt Mackall <\%mpm@selenic.com\:>.
 .SH COPYING
 .sp
 This manual page is copyright 2005 Bryan O\(aqSullivan.
-Mercurial is copyright 2005\-2012 Matt Mackall.
+Mercurial is copyright 2005\-2010 Matt Mackall.
 Free use of this software is granted under the terms of the GNU General
 Public License version 2 or any later version.
 .\" Common link and substitution definitions.
diff --git a/doc/hgrc.5.html b/doc/hgrc.5.html
index c9c0222..42fbacb 100644
--- a/doc/hgrc.5.html
+++ b/doc/hgrc.5.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.8.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.7: http://docutils.sourceforge.net/" />
 <title>hgrc</title>
 <meta name="author" content="Bryan O'Sullivan &lt;bos&#64;serpentine.com&gt;" />
 <meta name="organization" content="Mercurial" />
@@ -35,36 +35,33 @@
 <li><a class="reference internal" href="#syntax" id="id3">Syntax</a></li>
 <li><a class="reference internal" href="#sections" id="id4">Sections</a><ul>
 <li><a class="reference internal" href="#alias" id="id5"><tt class="docutils literal">alias</tt></a></li>
-<li><a class="reference internal" href="#annotate" id="id6"><tt class="docutils literal">annotate</tt></a></li>
-<li><a class="reference internal" href="#auth" id="id7"><tt class="docutils literal">auth</tt></a></li>
-<li><a class="reference internal" href="#decode-encode" id="id8"><tt class="docutils literal">decode/encode</tt></a></li>
-<li><a class="reference internal" href="#defaults" id="id9"><tt class="docutils literal">defaults</tt></a></li>
-<li><a class="reference internal" href="#diff" id="id10"><tt class="docutils literal">diff</tt></a></li>
-<li><a class="reference internal" href="#email" id="id11"><tt class="docutils literal">email</tt></a></li>
-<li><a class="reference internal" href="#extensions" id="id12"><tt class="docutils literal">extensions</tt></a></li>
+<li><a class="reference internal" href="#auth" id="id6"><tt class="docutils literal">auth</tt></a></li>
+<li><a class="reference internal" href="#decode-encode" id="id7"><tt class="docutils literal">decode/encode</tt></a></li>
+<li><a class="reference internal" href="#defaults" id="id8"><tt class="docutils literal">defaults</tt></a></li>
+<li><a class="reference internal" href="#diff" id="id9"><tt class="docutils literal">diff</tt></a></li>
+<li><a class="reference internal" href="#email" id="id10"><tt class="docutils literal">email</tt></a></li>
+<li><a class="reference internal" href="#extensions" id="id11"><tt class="docutils literal">extensions</tt></a></li>
+<li><a class="reference internal" href="#hostfingerprints" id="id12"><tt class="docutils literal">hostfingerprints</tt></a></li>
 <li><a class="reference internal" href="#format" id="id13"><tt class="docutils literal">format</tt></a></li>
-<li><a class="reference internal" href="#graph" id="id14"><tt class="docutils literal">graph</tt></a></li>
-<li><a class="reference internal" href="#hooks" id="id15"><tt class="docutils literal">hooks</tt></a></li>
-<li><a class="reference internal" href="#hostfingerprints" id="id16"><tt class="docutils literal">hostfingerprints</tt></a></li>
+<li><a class="reference internal" href="#merge-patterns" id="id14"><tt class="docutils literal"><span class="pre">merge-patterns</span></tt></a></li>
+<li><a class="reference internal" href="#merge-tools" id="id15"><tt class="docutils literal"><span class="pre">merge-tools</span></tt></a></li>
+<li><a class="reference internal" href="#hooks" id="id16"><tt class="docutils literal">hooks</tt></a></li>
 <li><a class="reference internal" href="#http-proxy" id="id17"><tt class="docutils literal">http_proxy</tt></a></li>
-<li><a class="reference internal" href="#merge-patterns" id="id18"><tt class="docutils literal"><span class="pre">merge-patterns</span></tt></a></li>
-<li><a class="reference internal" href="#merge-tools" id="id19"><tt class="docutils literal"><span class="pre">merge-tools</span></tt></a></li>
-<li><a class="reference internal" href="#patch" id="id20"><tt class="docutils literal">patch</tt></a></li>
-<li><a class="reference internal" href="#paths" id="id21"><tt class="docutils literal">paths</tt></a></li>
-<li><a class="reference internal" href="#phases" id="id22"><tt class="docutils literal">phases</tt></a></li>
-<li><a class="reference internal" href="#profiling" id="id23"><tt class="docutils literal">profiling</tt></a></li>
-<li><a class="reference internal" href="#revsetalias" id="id24"><tt class="docutils literal">revsetalias</tt></a></li>
-<li><a class="reference internal" href="#server" id="id25"><tt class="docutils literal">server</tt></a></li>
-<li><a class="reference internal" href="#smtp" id="id26"><tt class="docutils literal">smtp</tt></a></li>
-<li><a class="reference internal" href="#subpaths" id="id27"><tt class="docutils literal">subpaths</tt></a></li>
-<li><a class="reference internal" href="#trusted" id="id28"><tt class="docutils literal">trusted</tt></a></li>
-<li><a class="reference internal" href="#ui" id="id29"><tt class="docutils literal">ui</tt></a></li>
-<li><a class="reference internal" href="#web" id="id30"><tt class="docutils literal">web</tt></a></li>
+<li><a class="reference internal" href="#smtp" id="id18"><tt class="docutils literal">smtp</tt></a></li>
+<li><a class="reference internal" href="#patch" id="id19"><tt class="docutils literal">patch</tt></a></li>
+<li><a class="reference internal" href="#paths" id="id20"><tt class="docutils literal">paths</tt></a></li>
+<li><a class="reference internal" href="#profiling" id="id21"><tt class="docutils literal">profiling</tt></a></li>
+<li><a class="reference internal" href="#revsetalias" id="id22"><tt class="docutils literal">revsetalias</tt></a></li>
+<li><a class="reference internal" href="#server" id="id23"><tt class="docutils literal">server</tt></a></li>
+<li><a class="reference internal" href="#subpaths" id="id24"><tt class="docutils literal">subpaths</tt></a></li>
+<li><a class="reference internal" href="#trusted" id="id25"><tt class="docutils literal">trusted</tt></a></li>
+<li><a class="reference internal" href="#ui" id="id26"><tt class="docutils literal">ui</tt></a></li>
+<li><a class="reference internal" href="#web" id="id27"><tt class="docutils literal">web</tt></a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#author" id="id31">Author</a></li>
-<li><a class="reference internal" href="#see-also" id="id32">See Also</a></li>
-<li><a class="reference internal" href="#copying" id="id33">Copying</a></li>
+<li><a class="reference internal" href="#author" id="id28">Author</a></li>
+<li><a class="reference internal" href="#see-also" id="id29">See Also</a></li>
+<li><a class="reference internal" href="#copying" id="id30">Copying</a></li>
 </ul>
 </div>
 <div class="section" id="synopsis">
@@ -96,18 +93,17 @@ alphabetical order, later ones overriding earlier ones. Where multiple
 paths are given below, settings from earlier paths override later
 ones.</p>
 <div class="line-block">
-<div class="line">(All) <tt class="docutils literal"><span class="pre">&lt;repo&gt;/.hg/hgrc</span></tt></div>
+<div class="line">(Unix, Windows) <tt class="docutils literal"><span class="pre">&lt;repo&gt;/.hg/hgrc</span></tt></div>
 </div>
 <blockquote>
 Per-repository configuration options that only apply in a
 particular repository. This file is not version-controlled, and
 will not get transferred during a &quot;clone&quot; 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
-belong to a trusted user or to a trusted group. See the documentation
-for the <tt class="docutils literal">[trusted]</tt> section below for more details.</blockquote>
+Unix, 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
+<tt class="docutils literal">[trusted]</tt> section below for more details.</blockquote>
 <div class="line-block">
-<div class="line">(Plan 9) <tt class="docutils literal">$home/lib/hgrc</tt></div>
 <div class="line">(Unix) <tt class="docutils literal"><span class="pre">$HOME/.hgrc</span></tt></div>
 <div class="line">(Windows) <tt class="docutils literal"><span class="pre">%USERPROFILE%\.hgrc</span></tt></div>
 <div class="line">(Windows) <tt class="docutils literal"><span class="pre">%USERPROFILE%\Mercurial.ini</span></tt></div>
@@ -121,8 +117,6 @@ files apply to all Mercurial commands executed by this user in any
 directory. Options in these files override per-system and per-installation
 options.</blockquote>
 <div class="line-block">
-<div class="line">(Plan 9) <tt class="docutils literal">/lib/mercurial/hgrc</tt></div>
-<div class="line">(Plan 9) <tt class="docutils literal"><span class="pre">/lib/mercurial/hgrc.d/*.rc</span></tt></div>
 <div class="line">(Unix) <tt class="docutils literal">/etc/mercurial/hgrc</tt></div>
 <div class="line">(Unix) <tt class="docutils literal"><span class="pre">/etc/mercurial/hgrc.d/*.rc</span></tt></div>
 </div>
@@ -132,8 +126,6 @@ is running. Options in these files apply to all Mercurial commands
 executed by any user in any directory. Options in these files
 override per-installation options.</blockquote>
 <div class="line-block">
-<div class="line">(Plan 9) <tt class="docutils literal"><span class="pre">&lt;install-root&gt;/lib/mercurial/hgrc</span></tt></div>
-<div class="line">(Plan 9) <tt class="docutils literal"><span class="pre">&lt;install-root&gt;/lib/mercurial/hgrc.d/*.rc</span></tt></div>
 <div class="line">(Unix) <tt class="docutils literal"><span class="pre">&lt;install-root&gt;/etc/mercurial/hgrc</span></tt></div>
 <div class="line">(Unix) <tt class="docutils literal"><span class="pre">&lt;install-root&gt;/etc/mercurial/hgrc.d/*.rc</span></tt></div>
 </div>
@@ -156,7 +148,9 @@ Mercurial commands executed by any user in any directory. Registry
 keys contain PATH-like strings, every part of which must reference
 a <tt class="docutils literal">Mercurial.ini</tt> file or be a directory where <tt class="docutils literal">*.rc</tt> files will
 be read.  Mercurial checks each of these locations in the specified
-order until one or more configuration files are detected.</blockquote>
+order until one or more configuration files are detected.  If the
+pywin32 extensions are not installed, Mercurial will only look for
+site-wide configuration in <tt class="docutils literal"><span class="pre">C:\Mercurial\Mercurial.ini</span></tt>.</blockquote>
 </div>
 <div class="section" id="syntax">
 <h1><a class="toc-backref" href="#contents">Syntax</a></h1>
@@ -272,7 +266,7 @@ definitions. This is almost always a bad idea!</p>
 shell alias. A shell alias is executed with the shell and will let you
 run arbitrary commands. As an example,</p>
 <pre class="literal-block">
-echo = !echo $&#64;
+echo = !echo
 </pre>
 <p>will let you do <tt class="docutils literal">hg echo foo</tt> to have <tt class="docutils literal">foo</tt> printed in your
 terminal. A better example might be:</p>
@@ -281,37 +275,12 @@ purge = !$HG status --no-status --unknown -0 | xargs -0 rm
 </pre>
 <p>which will make <tt class="docutils literal">hg purge</tt> delete all unknown files in the
 repository in the same manner as the purge extension.</p>
-<p>Positional arguments like <tt class="docutils literal">$1</tt>, <tt class="docutils literal">$2</tt>, etc. in the alias definition
-expand to the command arguments. Unmatched arguments are
-removed. <tt class="docutils literal">$0</tt> expands to the alias name and <tt class="docutils literal">$&#64;</tt> expands to all
-arguments separated by a space. These expansions happen before the
-command is passed to the shell.</p>
-<p>Shell aliases are executed in an environment where <tt class="docutils literal">$HG</tt> expands to
+<p>Shell aliases are executed in an environment where <tt class="docutils literal">$HG</tt> expand to
 the path of the Mercurial that was used to execute the alias. This is
 useful when you want to call further Mercurial commands in a shell
 alias, as was done above for the purge alias. In addition,
-<tt class="docutils literal">$HG_ARGS</tt> expands to the arguments given to Mercurial. In the <tt class="docutils literal">hg
+<tt class="docutils literal">$HG_ARGS</tt> expand to the arguments given to Mercurial. In the <tt class="docutils literal">hg
 echo foo</tt> call above, <tt class="docutils literal">$HG_ARGS</tt> would expand to <tt class="docutils literal">echo foo</tt>.</p>
-<div class="note">
-<p class="first admonition-title">Note</p>
-<p class="last">Some global configuration options such as <tt class="docutils literal"><span class="pre">-R</span></tt> are
-processed before shell aliases and will thus not be passed to
-aliases.</p>
-</div>
-</div>
-<div class="section" id="annotate">
-<h2><a class="toc-backref" href="#contents"><tt class="docutils literal">annotate</tt></a></h2>
-<p>Settings used when displaying file annotations. All values are
-Booleans and default to False. See <tt class="docutils literal">diff</tt> section for related
-options for the diff command.</p>
-<dl class="docutils">
-<dt><tt class="docutils literal">ignorews</tt></dt>
-<dd>Ignore white space when comparing lines.</dd>
-<dt><tt class="docutils literal">ignorewsamount</tt></dt>
-<dd>Ignore changes in the amount of white space.</dd>
-<dt><tt class="docutils literal">ignoreblanklines</tt></dt>
-<dd>Ignore changes whose lines are all blank.</dd>
-</dl>
 </div>
 <div class="section" id="auth">
 <h2><a class="toc-backref" href="#contents"><tt class="docutils literal">auth</tt></a></h2>
@@ -432,9 +401,8 @@ to the aliases of the commands defined.</p>
 </div>
 <div class="section" id="diff">
 <h2><a class="toc-backref" href="#contents"><tt class="docutils literal">diff</tt></a></h2>
-<p>Settings used when displaying diffs. Everything except for <tt class="docutils literal">unified</tt>
-is a Boolean and defaults to False. See <tt class="docutils literal">annotate</tt> section for
-related options for the annotate command.</p>
+<p>Settings used when displaying diffs. Everything except for <tt class="docutils literal">unified</tt> is a
+Boolean and defaults to False.</p>
 <dl class="docutils">
 <dt><tt class="docutils literal">git</tt></dt>
 <dd>Use git extended diff format.</dd>
@@ -524,6 +492,21 @@ mq =
 myfeature = ~/.hgext/myfeature.py
 </pre>
 </div>
+<div class="section" id="hostfingerprints">
+<h2><a class="toc-backref" href="#contents"><tt class="docutils literal">hostfingerprints</tt></a></h2>
+<p>Fingerprints of the certificates of known HTTPS servers.
+A HTTPS connection to a server with a fingerprint configured here will
+only succeed if the servers certificate matches the fingerprint.
+This is very similar to how ssh known hosts works.
+The fingerprint is the SHA-1 hash value of the DER encoded certificate.
+The CA chain and web.cacerts is not used for servers with a fingerprint.</p>
+<p>For example:</p>
+<pre class="literal-block">
+[hostfingerprints]
+hg.intevation.org = 38:76:52:7c:87:26:9a:8f:4a:f8:d3:de:08:45:3b:ea:d6:4b:ee:cc
+</pre>
+<p>This feature is only supported when using Python 2.6 or later.</p>
+</div>
 <div class="section" id="format">
 <h2><a class="toc-backref" href="#contents"><tt class="docutils literal">format</tt></a></h2>
 <dl class="docutils">
@@ -550,30 +533,103 @@ option ensures that the on-disk format of newly created
 repositories will be compatible with Mercurial before version 1.7.</dd>
 </dl>
 </div>
-<div class="section" id="graph">
-<h2><a class="toc-backref" href="#contents"><tt class="docutils literal">graph</tt></a></h2>
-<p>Web graph view configuration. This section let you change graph
-elements display properties by branches, for instance to make the
-<tt class="docutils literal">default</tt> branch stand out.</p>
-<p>Each line has the following format:</p>
+<div class="section" id="merge-patterns">
+<h2><a class="toc-backref" href="#contents"><tt class="docutils literal"><span class="pre">merge-patterns</span></tt></a></h2>
+<p>This section specifies merge tools to associate with particular file
+patterns. Tools matched here will take precedence over the default
+merge tool. Patterns are globs by default, rooted at the repository
+root.</p>
+<p>Example:</p>
 <pre class="literal-block">
-&lt;branch&gt;.&lt;argument&gt; = &lt;value&gt;
+[merge-patterns]
+**.c = kdiff3
+**.jpg = myimgmerge
 </pre>
-<p>where <tt class="docutils literal">&lt;branch&gt;</tt> is the name of the branch being
-customized. Example:</p>
+</div>
+<div class="section" id="merge-tools">
+<h2><a class="toc-backref" href="#contents"><tt class="docutils literal"><span class="pre">merge-tools</span></tt></a></h2>
+<p>This section configures external merge tools to use for file-level
+merges.</p>
+<p>Example <tt class="docutils literal"><span class="pre">~/.hgrc</span></tt>:</p>
 <pre class="literal-block">
-[graph]
-# 2px width
-default.width = 2
-# red color
-default.color = FF0000
+[merge-tools]
+# Override stock tool location
+kdiff3.executable = ~/bin/kdiff3
+# Specify command line
+kdiff3.args = $base $local $other -o $output
+# Give higher priority
+kdiff3.priority = 1
+
+# Define new tool
+myHtmlTool.args = -m $local $other $base $output
+myHtmlTool.regkey = Software\FooSoftware\HtmlMerge
+myHtmlTool.priority = 1
 </pre>
 <p>Supported arguments:</p>
 <dl class="docutils">
-<dt><tt class="docutils literal">width</tt></dt>
-<dd>Set branch edges width in pixels.</dd>
-<dt><tt class="docutils literal">color</tt></dt>
-<dd>Set branch edges color in hexadecimal RGB notation.</dd>
+<dt><tt class="docutils literal">priority</tt></dt>
+<dd>The priority in which to evaluate this tool.
+Default: 0.</dd>
+<dt><tt class="docutils literal">executable</tt></dt>
+<dd>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.</dd>
+<dt><tt class="docutils literal">args</tt></dt>
+<dd>The arguments to pass to the tool executable. You can refer to the
+files being merged as well as the output file through these
+variables: <tt class="docutils literal">$base</tt>, <tt class="docutils literal">$local</tt>, <tt class="docutils literal">$other</tt>, <tt class="docutils literal">$output</tt>.
+Default: <tt class="docutils literal">$local $base $other</tt></dd>
+<dt><tt class="docutils literal">premerge</tt></dt>
+<dd>Attempt to run internal non-interactive 3-way merge tool before
+launching external tool.  Options are <tt class="docutils literal">true</tt>, <tt class="docutils literal">false</tt>, or <tt class="docutils literal">keep</tt>
+to leave markers in the file if the premerge fails.
+Default: True</dd>
+<dt><tt class="docutils literal">binary</tt></dt>
+<dd>This tool can merge binary files. Defaults to False, unless tool
+was selected by file pattern match.</dd>
+<dt><tt class="docutils literal">symlink</tt></dt>
+<dd>This tool can merge symlinks. Defaults to False, even if tool was
+selected by file pattern match.</dd>
+<dt><tt class="docutils literal">check</tt></dt>
+<dd><p class="first">A list of merge success-checking options:</p>
+<dl class="last docutils">
+<dt><tt class="docutils literal">changed</tt></dt>
+<dd>Ask whether merge was successful when the merged file shows no changes.</dd>
+<dt><tt class="docutils literal">conflicts</tt></dt>
+<dd>Check whether there are conflicts even though the tool reported success.</dd>
+<dt><tt class="docutils literal">prompt</tt></dt>
+<dd>Always prompt for merge success, regardless of success reported by tool.</dd>
+</dl>
+</dd>
+<dt><tt class="docutils literal">checkchanged</tt></dt>
+<dd>True is equivalent to <tt class="docutils literal">check = changed</tt>.
+Default: False</dd>
+<dt><tt class="docutils literal">checkconflicts</tt></dt>
+<dd>True is equivalent to <tt class="docutils literal">check = conflicts</tt>.
+Default: False</dd>
+<dt><tt class="docutils literal">fixeol</tt></dt>
+<dd>Attempt to fix up EOL changes caused by the merge tool.
+Default: False</dd>
+<dt><tt class="docutils literal">gui</tt></dt>
+<dd>This tool requires a graphical interface to run. Default: False</dd>
+<dt><tt class="docutils literal">regkey</tt></dt>
+<dd>Windows registry key which describes install location of this
+tool. Mercurial will search for this key first under
+<tt class="docutils literal">HKEY_CURRENT_USER</tt> and then under <tt class="docutils literal">HKEY_LOCAL_MACHINE</tt>.
+Default: None</dd>
+<dt><tt class="docutils literal">regkeyalt</tt></dt>
+<dd>An alternate Windows registry key to try if the first key is not
+found.  The alternate key uses the same <tt class="docutils literal">regname</tt> and <tt class="docutils literal">regappend</tt>
+semantics of the primary key.  The most common use for this key
+is to search for 32bit applications on 64bit operating systems.
+Default: None</dd>
+<dt><tt class="docutils literal">regname</tt></dt>
+<dd>Name of value to read from specified registry key. Defaults to the
+unnamed (default) value.</dd>
+<dt><tt class="docutils literal">regappend</tt></dt>
+<dd>String to append to the value read from the registry, typically
+the executable name of the tool.
+Default: None</dd>
 </dl>
 </div>
 <div class="section" id="hooks">
@@ -582,10 +638,7 @@ default.color = FF0000
 various actions such as starting or finishing a commit. Multiple
 hooks can be run for the same action by appending a suffix to the
 action. Overriding a site-wide hook can be done by changing its
-value or setting it to an empty string.  Hooks can be prioritized
-by adding a prefix of <tt class="docutils literal">priority</tt> to the hook name on a new line
-and setting the priority.  The default priority is 0 if
-not specified.</p>
+value or setting it to an empty string.</p>
 <p>Example <tt class="docutils literal">.hg/hgrc</tt>:</p>
 <pre class="literal-block">
 [hooks]
@@ -595,8 +648,6 @@ changegroup.update = hg update
 incoming =
 incoming.email = /my/email/hook
 incoming.autobuild = /my/build/hook
-# force autobuild hook to run before other incoming hooks
-priority.incoming.autobuild = 1
 </pre>
 <p>Most hooks are run with environment variables set that give useful
 additional information. For each hook below, the environment
@@ -737,21 +788,6 @@ environment variables above are passed as keyword arguments, with no
 <p>If a Python hook returns a &quot;true&quot; value or raises an exception, this
 is treated as a failure.</p>
 </div>
-<div class="section" id="hostfingerprints">
-<h2><a class="toc-backref" href="#contents"><tt class="docutils literal">hostfingerprints</tt></a></h2>
-<p>Fingerprints of the certificates of known HTTPS servers.
-A HTTPS connection to a server with a fingerprint configured here will
-only succeed if the servers certificate matches the fingerprint.
-This is very similar to how ssh known hosts works.
-The fingerprint is the SHA-1 hash value of the DER encoded certificate.
-The CA chain and web.cacerts is not used for servers with a fingerprint.</p>
-<p>For example:</p>
-<pre class="literal-block">
-[hostfingerprints]
-hg.intevation.org = 38:76:52:7c:87:26:9a:8f:4a:f8:d3:de:08:45:3b:ea:d6:4b:ee:cc
-</pre>
-<p>This feature is only supported when using Python 2.6 or later.</p>
-</div>
 <div class="section" id="http-proxy">
 <h2><a class="toc-backref" href="#contents"><tt class="docutils literal">http_proxy</tt></a></h2>
 <p>Used to access web-based Mercurial repositories through a HTTP
@@ -772,103 +808,27 @@ the proxy.</dd>
 in <tt class="docutils literal">http_proxy.no</tt>. True or False. Default: False.</dd>
 </dl>
 </div>
-<div class="section" id="merge-patterns">
-<h2><a class="toc-backref" href="#contents"><tt class="docutils literal"><span class="pre">merge-patterns</span></tt></a></h2>
-<p>This section specifies merge tools to associate with particular file
-patterns. Tools matched here will take precedence over the default
-merge tool. Patterns are globs by default, rooted at the repository
-root.</p>
-<p>Example:</p>
-<pre class="literal-block">
-[merge-patterns]
-**.c = kdiff3
-**.jpg = myimgmerge
-</pre>
-</div>
-<div class="section" id="merge-tools">
-<h2><a class="toc-backref" href="#contents"><tt class="docutils literal"><span class="pre">merge-tools</span></tt></a></h2>
-<p>This section configures external merge tools to use for file-level
-merges.</p>
-<p>Example <tt class="docutils literal"><span class="pre">~/.hgrc</span></tt>:</p>
-<pre class="literal-block">
-[merge-tools]
-# Override stock tool location
-kdiff3.executable = ~/bin/kdiff3
-# Specify command line
-kdiff3.args = $base $local $other -o $output
-# Give higher priority
-kdiff3.priority = 1
-
-# Define new tool
-myHtmlTool.args = -m $local $other $base $output
-myHtmlTool.regkey = Software\FooSoftware\HtmlMerge
-myHtmlTool.priority = 1
-</pre>
-<p>Supported arguments:</p>
+<div class="section" id="smtp">
+<h2><a class="toc-backref" href="#contents"><tt class="docutils literal">smtp</tt></a></h2>
+<p>Configuration for extensions that need to send email messages.</p>
 <dl class="docutils">
-<dt><tt class="docutils literal">priority</tt></dt>
-<dd>The priority in which to evaluate this tool.
-Default: 0.</dd>
-<dt><tt class="docutils literal">executable</tt></dt>
-<dd>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.</dd>
-<dt><tt class="docutils literal">args</tt></dt>
-<dd>The arguments to pass to the tool executable. You can refer to the
-files being merged as well as the output file through these
-variables: <tt class="docutils literal">$base</tt>, <tt class="docutils literal">$local</tt>, <tt class="docutils literal">$other</tt>, <tt class="docutils literal">$output</tt>.
-Default: <tt class="docutils literal">$local $base $other</tt></dd>
-<dt><tt class="docutils literal">premerge</tt></dt>
-<dd>Attempt to run internal non-interactive 3-way merge tool before
-launching external tool.  Options are <tt class="docutils literal">true</tt>, <tt class="docutils literal">false</tt>, or <tt class="docutils literal">keep</tt>
-to leave markers in the file if the premerge fails.
-Default: True</dd>
-<dt><tt class="docutils literal">binary</tt></dt>
-<dd>This tool can merge binary files. Defaults to False, unless tool
-was selected by file pattern match.</dd>
-<dt><tt class="docutils literal">symlink</tt></dt>
-<dd>This tool can merge symlinks. Defaults to False, even if tool was
-selected by file pattern match.</dd>
-<dt><tt class="docutils literal">check</tt></dt>
-<dd><p class="first">A list of merge success-checking options:</p>
-<dl class="last docutils">
-<dt><tt class="docutils literal">changed</tt></dt>
-<dd>Ask whether merge was successful when the merged file shows no changes.</dd>
-<dt><tt class="docutils literal">conflicts</tt></dt>
-<dd>Check whether there are conflicts even though the tool reported success.</dd>
-<dt><tt class="docutils literal">prompt</tt></dt>
-<dd>Always prompt for merge success, regardless of success reported by tool.</dd>
-</dl>
-</dd>
-<dt><tt class="docutils literal">checkchanged</tt></dt>
-<dd>True is equivalent to <tt class="docutils literal">check = changed</tt>.
-Default: False</dd>
-<dt><tt class="docutils literal">checkconflicts</tt></dt>
-<dd>True is equivalent to <tt class="docutils literal">check = conflicts</tt>.
-Default: False</dd>
-<dt><tt class="docutils literal">fixeol</tt></dt>
-<dd>Attempt to fix up EOL changes caused by the merge tool.
-Default: False</dd>
-<dt><tt class="docutils literal">gui</tt></dt>
-<dd>This tool requires a graphical interface to run. Default: False</dd>
-<dt><tt class="docutils literal">regkey</tt></dt>
-<dd>Windows registry key which describes install location of this
-tool. Mercurial will search for this key first under
-<tt class="docutils literal">HKEY_CURRENT_USER</tt> and then under <tt class="docutils literal">HKEY_LOCAL_MACHINE</tt>.
-Default: None</dd>
-<dt><tt class="docutils literal">regkeyalt</tt></dt>
-<dd>An alternate Windows registry key to try if the first key is not
-found.  The alternate key uses the same <tt class="docutils literal">regname</tt> and <tt class="docutils literal">regappend</tt>
-semantics of the primary key.  The most common use for this key
-is to search for 32bit applications on 64bit operating systems.
-Default: None</dd>
-<dt><tt class="docutils literal">regname</tt></dt>
-<dd>Name of value to read from specified registry key. Defaults to the
-unnamed (default) value.</dd>
-<dt><tt class="docutils literal">regappend</tt></dt>
-<dd>String to append to the value read from the registry, typically
-the executable name of the tool.
-Default: None</dd>
+<dt><tt class="docutils literal">host</tt></dt>
+<dd>Host name of mail server, e.g. &quot;mail.example.com&quot;.</dd>
+<dt><tt class="docutils literal">port</tt></dt>
+<dd>Optional. Port to connect to on mail server. Default: 25.</dd>
+<dt><tt class="docutils literal">tls</tt></dt>
+<dd>Optional. Method to enable TLS when connecting to mail server: starttls,
+smtps or none. Default: none.</dd>
+<dt><tt class="docutils literal">username</tt></dt>
+<dd>Optional. User name for authenticating with the SMTP server.
+Default: none.</dd>
+<dt><tt class="docutils literal">password</tt></dt>
+<dd>Optional. Password for authenticating with the SMTP server. If not
+specified, interactive sessions will prompt the user for a
+password; non-interactive sessions will fail. Default: none.</dd>
+<dt><tt class="docutils literal">local_hostname</tt></dt>
+<dd>Optional. It's the hostname that the sender can use to identify
+itself to the MTA.</dd>
 </dl>
 </div>
 <div class="section" id="patch">
@@ -904,48 +864,16 @@ cloned.</dd>
 is specified.</dd>
 </dl>
 </div>
-<div class="section" id="phases">
-<h2><a class="toc-backref" href="#contents"><tt class="docutils literal">phases</tt></a></h2>
-<p>Specifies default handling of phases. See <a class="reference external" href="hg.1.html#phases"><tt class="docutils literal">hg help phases</tt></a> for more
-information about working with phases.</p>
-<dl class="docutils">
-<dt><tt class="docutils literal">publish</tt></dt>
-<dd>Controls draft phase behavior when working as a server. When true,
-pushed changesets are set to public in both client and server and
-pulled or cloned changesets are set to public in the client.
-Default: True</dd>
-<dt><tt class="docutils literal"><span class="pre">new-commit</span></tt></dt>
-<dd>Phase of newly-created commits.
-Default: draft</dd>
-</dl>
-</div>
 <div class="section" id="profiling">
 <h2><a class="toc-backref" href="#contents"><tt class="docutils literal">profiling</tt></a></h2>
-<p>Specifies profiling type, format, and file output. Two profilers are
-supported: an instrumenting profiler (named <tt class="docutils literal">ls</tt>), and a sampling
-profiler (named <tt class="docutils literal">stat</tt>).</p>
-<p>In this section description, 'profiling data' stands for the raw data
-collected during profiling, while 'profiling report' stands for a
-statistical text report generated from the profiling data. The
-profiling is done using lsprof.</p>
+<p>Specifies profiling format and file output. In this section
+description, 'profiling data' stands for the raw data collected
+during profiling, while 'profiling report' stands for a statistical
+text report generated from the profiling data. The profiling is done
+using lsprof.</p>
 <dl class="docutils">
-<dt><tt class="docutils literal">type</tt></dt>
-<dd><p class="first">The type of profiler to use.
-Default: ls.</p>
-<dl class="last docutils">
-<dt><tt class="docutils literal">ls</tt></dt>
-<dd>Use Python's built-in instrumenting profiler. This profiler
-works on all platforms, but each line number it reports is the
-first line of a function. This restriction makes it difficult to
-identify the expensive parts of a non-trivial function.</dd>
-<dt><tt class="docutils literal">stat</tt></dt>
-<dd>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.</dd>
-</dl>
-</dd>
 <dt><tt class="docutils literal">format</tt></dt>
-<dd><p class="first">Profiling format.  Specific to the <tt class="docutils literal">ls</tt> instrumenting profiler.
+<dd><p class="first">Profiling format.
 Default: text.</p>
 <dl class="last docutils">
 <dt><tt class="docutils literal">text</tt></dt>
@@ -958,9 +886,6 @@ file, the generated file can directly be loaded into
 kcachegrind.</dd>
 </dl>
 </dd>
-<dt><tt class="docutils literal">frequency</tt></dt>
-<dd>Sampling frequency.  Specific to the <tt class="docutils literal">stat</tt> sampling profiler.
-Default: 1000.</dd>
 <dt><tt class="docutils literal">output</tt></dt>
 <dd>File path where profiling data or report should be saved. If the
 file exists, it is replaced. Default: None, data is printed on
@@ -986,57 +911,27 @@ about 6 Mbps), uncompressed streaming is slower, because of the
 extra data transfer overhead. This mode will also temporarily hold
 the write lock while determining what data to transfer.
 Default is True.</dd>
-<dt><tt class="docutils literal">preferuncompressed</tt></dt>
-<dd>When set, clients will try to use the uncompressed streaming
-protocol. Default is False.</dd>
 <dt><tt class="docutils literal">validate</tt></dt>
 <dd>Whether to validate the completeness of pushed changesets by
 checking that all new file revisions specified in manifests are
 present. Default is False.</dd>
 </dl>
 </div>
-<div class="section" id="smtp">
-<h2><a class="toc-backref" href="#contents"><tt class="docutils literal">smtp</tt></a></h2>
-<p>Configuration for extensions that need to send email messages.</p>
-<dl class="docutils">
-<dt><tt class="docutils literal">host</tt></dt>
-<dd>Host name of mail server, e.g. &quot;mail.example.com&quot;.</dd>
-<dt><tt class="docutils literal">port</tt></dt>
-<dd>Optional. Port to connect to on mail server. Default: 25.</dd>
-<dt><tt class="docutils literal">tls</tt></dt>
-<dd>Optional. Method to enable TLS when connecting to mail server: starttls,
-smtps or none. Default: none.</dd>
-<dt><tt class="docutils literal">username</tt></dt>
-<dd>Optional. User name for authenticating with the SMTP server.
-Default: none.</dd>
-<dt><tt class="docutils literal">password</tt></dt>
-<dd>Optional. Password for authenticating with the SMTP server. If not
-specified, interactive sessions will prompt the user for a
-password; non-interactive sessions will fail. Default: none.</dd>
-<dt><tt class="docutils literal">local_hostname</tt></dt>
-<dd>Optional. It's the hostname that the sender can use to identify
-itself to the MTA.</dd>
-</dl>
-</div>
 <div class="section" id="subpaths">
 <h2><a class="toc-backref" href="#contents"><tt class="docutils literal">subpaths</tt></a></h2>
-<p>Subrepository source URLs can go stale if a remote server changes name
-or becomes temporarily unavailable. This section lets you define
-rewrite rules of the form:</p>
+<p>Defines subrepositories source locations rewriting rules of the form:</p>
 <pre class="literal-block">
 &lt;pattern&gt; = &lt;replacement&gt;
 </pre>
-<p>where <tt class="docutils literal">pattern</tt> is a regular expression matching a subrepository
-source URL and <tt class="docutils literal">replacement</tt> is the replacement string used to
-rewrite it. Groups can be matched in <tt class="docutils literal">pattern</tt> and referenced in
-<tt class="docutils literal">replacements</tt>. For instance:</p>
+<p>Where <tt class="docutils literal">pattern</tt> is a regular expression matching the source and
+<tt class="docutils literal">replacement</tt> is the replacement string used to rewrite it. Groups
+can be matched in <tt class="docutils literal">pattern</tt> and referenced in <tt class="docutils literal">replacements</tt>. For
+instance:</p>
 <pre class="literal-block">
 http://server/(.*)-hg/ = http://hg.server/\1/
 </pre>
 <p>rewrites <tt class="docutils literal"><span class="pre">http://server/foo-hg/</span></tt> into <tt class="docutils literal"><span class="pre">http://hg.server/foo/</span></tt>.</p>
-<p>Relative subrepository paths are first made absolute, and the
-rewrite rules are then applied on the full (absolute) path. The rules
-are applied in definition order.</p>
+<p>All patterns are applied in definition order.</p>
 </div>
 <div class="section" id="trusted">
 <h2><a class="toc-backref" href="#contents"><tt class="docutils literal">trusted</tt></a></h2>
@@ -1078,7 +973,7 @@ Default is False.</dd>
 <dd>Whether to commit modified subrepositories when committing the
 parent repository. If False and one subrepository has uncommitted
 changes, abort the commit.
-Default is False.</dd>
+Default is True.</dd>
 <dt><tt class="docutils literal">debug</tt></dt>
 <dd>Print debugging information. True or False. Default is False.</dd>
 <dt><tt class="docutils literal">editor</tt></dt>
@@ -1116,9 +1011,6 @@ On Windows, this configuration option is ignored and the command aborted.</dd>
 <dd>Reduce the amount of output printed. True or False. Default is False.</dd>
 <dt><tt class="docutils literal">remotecmd</tt></dt>
 <dd>remote command to use for clone/push/pull operations. Default is <tt class="docutils literal">hg</tt>.</dd>
-<dt><tt class="docutils literal">reportoldssl</tt></dt>
-<dd>Warn if an SSL certificate is unable to be due to using Python
-2.5 or earlier. True or False. Default is True.</dd>
 <dt><tt class="docutils literal">report_untrusted</tt></dt>
 <dd>Warn if a <tt class="docutils literal">.hg/hgrc</tt> file is ignored due to not being owned by a
 trusted user or group. True or False. Default is True.</dd>
@@ -1201,6 +1093,12 @@ push, including unauthenticated users. Otherwise, the remote user
 must have been authenticated, and the authenticated user name must
 be present in this list. The contents of the allow_push list are
 examined after the deny_push list.</dd>
+<dt><tt class="docutils literal">guessmime</tt></dt>
+<dd>Control MIME types for raw download of file content.
+Set to True to let hgweb guess the content type from the file
+extension. This will serve HTML files as <tt class="docutils literal">text/html</tt> and might
+allow cross-site scripting attacks when serving untrusted
+repositories. Default is False.</dd>
 <dt><tt class="docutils literal">allow_read</tt></dt>
 <dd>If the user has not already been denied repository access due to
 the contents of deny_read, this list determines whether to grant
@@ -1223,18 +1121,8 @@ URLs. Example: <tt class="docutils literal"><span class="pre">http://hgserver/re
 authority certificates. Environment variables and <tt class="docutils literal">~user</tt>
 constructs are expanded in the filename. If specified on the
 client, then it will verify the identity of remote HTTPS servers
-with these certificates.</p>
-<p>This feature is only supported when using Python 2.6 or later. If you wish
-to use it with earlier versions of Python, install the backported
-version of the ssl library that is available from
-<tt class="docutils literal"><span class="pre">http://pypi.python.org</span></tt>.</p>
-<p>To disable SSL verification temporarily, specify <tt class="docutils literal"><span class="pre">--insecure</span></tt> from
-command line.</p>
-<p>You can use OpenSSL's CA certificate file if your platform has
-one. On most Linux systems this will be
-<tt class="docutils literal"><span class="pre">/etc/ssl/certs/ca-certificates.crt</span></tt>. Otherwise you will have to
-generate this file manually. The form must be as follows:</p>
-<pre class="last literal-block">
+with these certificates. The form must be as follows:</p>
+<pre class="literal-block">
 -----BEGIN CERTIFICATE-----
 ... (certificate in base64 PEM encoding) ...
 -----END CERTIFICATE-----
@@ -1242,22 +1130,18 @@ generate this file manually. The form must be as follows:</p>
 ... (certificate in base64 PEM encoding) ...
 -----END CERTIFICATE-----
 </pre>
+<p>This feature is only supported when using Python 2.6 or later. If you wish
+to use it with earlier versions of Python, install the backported
+version of the ssl library that is available from
+<tt class="docutils literal"><span class="pre">http://pypi.python.org</span></tt>.</p>
+<p>You can use OpenSSL's CA certificate file if your platform has one.
+On most Linux systems this will be <tt class="docutils literal"><span class="pre">/etc/ssl/certs/ca-certificates.crt</span></tt>.
+Otherwise you will have to generate this file manually.</p>
+<p class="last">To disable SSL verification temporarily, specify <tt class="docutils literal"><span class="pre">--insecure</span></tt> from
+command line.</p>
 </dd>
 <dt><tt class="docutils literal">cache</tt></dt>
 <dd>Whether to support caching in hgweb. Defaults to True.</dd>
-<dt><tt class="docutils literal">collapse</tt></dt>
-<dd>With <tt class="docutils literal">descend</tt> enabled, repositories in subdirectories are shown at
-a single level alongside repositories in the current path. With
-<tt class="docutils literal">collapse</tt> also enabled, repositories residing at a deeper level than
-the current path are grouped behind navigable directory entries that
-lead to the locations of these repositories. In effect, this setting
-collapses each collection of repositories found within a subdirectory
-into a single entry for that subdirectory. Default is False.</dd>
-<dt><tt class="docutils literal">comparisoncontext</tt></dt>
-<dd>Number of lines of context to show in side-by-side file comparison. If
-negative or the value <tt class="docutils literal">full</tt>, whole files are shown. Default is 5.
-This setting can be overridden by a <tt class="docutils literal">context</tt> request parameter to the
-<tt class="docutils literal">comparison</tt> command, taking the same values.</dd>
 <dt><tt class="docutils literal">contact</tt></dt>
 <dd>Name or email address of the person in charge of the repository.
 Defaults to ui.username or <tt class="docutils literal">$EMAIL</tt> or &quot;unknown&quot; if unset or empty.</dd>
@@ -1293,35 +1177,21 @@ Default is &quot;unknown&quot;.</dd>
 Example: &quot;UTF-8&quot;</dd>
 <dt><tt class="docutils literal">errorlog</tt></dt>
 <dd>Where to output the error log. Default is stderr.</dd>
-<dt><tt class="docutils literal">guessmime</tt></dt>
-<dd>Control MIME types for raw download of file content.
-Set to True to let hgweb guess the content type from the file
-extension. This will serve HTML files as <tt class="docutils literal">text/html</tt> and might
-allow cross-site scripting attacks when serving untrusted
-repositories. Default is False.</dd>
 <dt><tt class="docutils literal">hidden</tt></dt>
 <dd>Whether to hide the repository in the hgwebdir index.
 Default is False.</dd>
 <dt><tt class="docutils literal">ipv6</tt></dt>
 <dd>Whether to use IPv6. Default is False.</dd>
-<dt><tt class="docutils literal">logoimg</tt></dt>
-<dd>File name of the logo image that some templates display on each page.
-The file name is relative to <tt class="docutils literal">staticurl</tt>. That is, the full path to
-the logo image is &quot;staticurl/logoimg&quot;.
-If unset, <tt class="docutils literal">hglogo.png</tt> will be used.</dd>
 <dt><tt class="docutils literal">logourl</tt></dt>
 <dd>Base URL to use for logos. If unset, <tt class="docutils literal"><span class="pre">http://mercurial.selenic.com/</span></tt>
 will be used.</dd>
+<dt><tt class="docutils literal">name</tt></dt>
+<dd>Repository name to use in the web interface. Default is current
+working directory.</dd>
 <dt><tt class="docutils literal">maxchanges</tt></dt>
 <dd>Maximum number of changes to list on the changelog. Default is 10.</dd>
 <dt><tt class="docutils literal">maxfiles</tt></dt>
 <dd>Maximum number of files to list per changeset. Default is 10.</dd>
-<dt><tt class="docutils literal">maxshortchanges</tt></dt>
-<dd>Maximum number of changes to list on the shortlog, graph or filelog
-pages. Default is 60.</dd>
-<dt><tt class="docutils literal">name</tt></dt>
-<dd>Repository name to use in the web interface. Default is current
-working directory.</dd>
 <dt><tt class="docutils literal">port</tt></dt>
 <dd>Port to listen on. Default is 8000.</dd>
 <dt><tt class="docutils literal">prefix</tt></dt>
@@ -1356,7 +1226,7 @@ Default is 1; set to 0 to disable.</dd>
 <div class="section" id="copying">
 <h1><a class="toc-backref" href="#contents">Copying</a></h1>
 <p>This manual page is copyright 2005 Bryan O'Sullivan.
-Mercurial is copyright 2005-2012 Matt Mackall.
+Mercurial is copyright 2005-2010 Matt Mackall.
 Free use of this software is granted under the terms of the GNU General
 Public License version 2 or any later version.</p>
 <!-- Common link and substitution definitions. -->
diff --git a/doc/hgrc.5.txt b/doc/hgrc.5.txt
index e6adaf3..9a93bdc 100644
--- a/doc/hgrc.5.txt
+++ b/doc/hgrc.5.txt
@@ -17,24 +17,24 @@ configuration files for Mercurial
 
 
 Synopsis
-========
+--------
 
 .. include:: ../mercurial/help/config.txt
 
 Author
-======
+------
 Bryan O'Sullivan <bos@serpentine.com>.
 
 Mercurial was written by Matt Mackall <mpm@selenic.com>.
 
 See Also
-========
+--------
 |hg(1)|_, |hgignore(5)|_
 
 Copying
-=======
+-------
 This manual page is copyright 2005 Bryan O'Sullivan.
-Mercurial is copyright 2005-2012 Matt Mackall.
+Mercurial is copyright 2005-2010 Matt Mackall.
 Free use of this software is granted under the terms of the GNU General
 Public License version 2 or any later version.
 
diff --git a/doc/runrst b/doc/runrst
index 8c9d222..fdad308 100755
--- a/doc/runrst
+++ b/doc/runrst
@@ -20,8 +20,6 @@ try:
 except ImportError:
     sys.stderr.write("abort: couldn't generate documentation: docutils "
                      "module is missing\n")
-    sys.stderr.write("please install python-docutils or see "
-                     "http://docutils.sourceforge.net/\n")
     sys.exit(-1)
 
 def role_hg(name, rawtext, text, lineno, inliner,