1.1 --- a/mercurial/help.py
     1.2 +++ b/mercurial/help.py
     1.3 @@ -52,21 +52,18 @@
     1.4  def extshelp():
     1.5      doc = _(r'''
     1.6      Mercurial has the ability to add new features through the use of
     1.7 -    extensions. Extensions may add new commands, add options to
     1.8 -    existing commands, change the default behavior of commands, or
     1.9 -    implement hooks.
    1.10 +    extensions. Extensions may add new commands, add options to existing
    1.11 +    commands, change the default behavior of commands, or implement hooks.
    1.12  
    1.13 -    Extensions are not loaded by default for a variety of reasons:
    1.14 -    they can increase startup overhead; they may be meant for
    1.15 -    advanced usage only; they may provide potentially dangerous
    1.16 -    abilities (such as letting you destroy or modify history); they
    1.17 -    might not be ready for prime time; or they may alter some
    1.18 -    usual behaviors of stock Mercurial. It is thus up to the user to
    1.19 -    activate extensions as needed.
    1.20 +    Extensions are not loaded by default for a variety of reasons: they can
    1.21 +    increase startup overhead; they may be meant for advanced usage only; they
    1.22 +    may provide potentially dangerous abilities (such as letting you destroy
    1.23 +    or modify history); they might not be ready for prime time; or they may
    1.24 +    alter some usual behaviors of stock Mercurial. It is thus up to the user
    1.25 +    to activate extensions as needed.
    1.26  
    1.27 -    To enable the "foo" extension, either shipped with Mercurial
    1.28 -    or in the Python search path, create an entry for it in your
    1.29 -    hgrc, like this:
    1.30 +    To enable the "foo" extension, either shipped with Mercurial or in the
    1.31 +    Python search path, create an entry for it in your hgrc, like this:
    1.32  
    1.33        [extensions]
    1.34        foo =
    1.35 @@ -76,8 +73,8 @@
    1.36        [extensions]
    1.37        myfeature = ~/.hgext/myfeature.py
    1.38  
    1.39 -    To explicitly disable an extension enabled in an hgrc of broader
    1.40 -    scope, prepend its path with !:
    1.41 +    To explicitly disable an extension enabled in an hgrc of broader scope,
    1.42 +    prepend its path with !:
    1.43  
    1.44        [extensions]
    1.45        # disabling extension bar residing in /path/to/extension/bar.py
    1.46 @@ -121,10 +118,10 @@
    1.47  
    1.48      "1165432709 0" (Wed Dec 6 13:18:29 2006 UTC)
    1.49  
    1.50 -    This is the internal representation format for dates. unixtime is
    1.51 -    the number of seconds since the epoch (1970-01-01 00:00 UTC).
    1.52 -    offset is the offset of the local timezone, in seconds west of UTC
    1.53 -    (negative if the timezone is east of UTC).
    1.54 +    This is the internal representation format for dates. unixtime is the
    1.55 +    number of seconds since the epoch (1970-01-01 00:00 UTC). offset is the
    1.56 +    offset of the local timezone, in seconds west of UTC (negative if the
    1.57 +    timezone is east of UTC).
    1.58  
    1.59      The log command also accepts date ranges:
    1.60  
    1.61 @@ -136,27 +133,27 @@
    1.62  
    1.63      (["patterns"], _("File Name Patterns"),
    1.64       _(r'''
    1.65 -    Mercurial accepts several notations for identifying one or more
    1.66 -    files at a time.
    1.67 +    Mercurial accepts several notations for identifying one or more files at a
    1.68 +    time.
    1.69  
    1.70 -    By default, Mercurial treats filenames as shell-style extended
    1.71 -    glob patterns.
    1.72 +    By default, Mercurial treats filenames as shell-style extended glob
    1.73 +    patterns.
    1.74  
    1.75      Alternate pattern notations must be specified explicitly.
    1.76  
    1.77 -    To use a plain path name without any pattern matching, start it
    1.78 -    with "path:". These path names must completely match starting at
    1.79 -    the current repository root.
    1.80 +    To use a plain path name without any pattern matching, start it with
    1.81 +    "path:". These path names must completely match starting at the current
    1.82 +    repository root.
    1.83  
    1.84 -    To use an extended glob, start a name with "glob:". Globs are
    1.85 -    rooted at the current directory; a glob such as "*.c" will only
    1.86 -    match files in the current directory ending with ".c".
    1.87 +    To use an extended glob, start a name with "glob:". Globs are rooted at
    1.88 +    the current directory; a glob such as "*.c" will only match files in the
    1.89 +    current directory ending with ".c".
    1.90  
    1.91 -    The supported glob syntax extensions are "**" to match any string
    1.92 -    across path separators and "{a,b}" to mean "a or b".
    1.93 +    The supported glob syntax extensions are "**" to match any string across
    1.94 +    path separators and "{a,b}" to mean "a or b".
    1.95  
    1.96 -    To use a Perl/Python regular expression, start a name with "re:".
    1.97 -    Regexp pattern matching is anchored at the root of the repository.
    1.98 +    To use a Perl/Python regular expression, start a name with "re:". Regexp
    1.99 +    pattern matching is anchored at the root of the repository.
   1.100  
   1.101      Plain examples:
   1.102  
   1.103 @@ -168,8 +165,8 @@
   1.104  
   1.105      glob:*.c       any name ending in ".c" in the current directory
   1.106      *.c            any name ending in ".c" in the current directory
   1.107 -    **.c           any name ending in ".c" in any subdirectory of the
   1.108 -                   current directory including itself.
   1.109 +    **.c           any name ending in ".c" in any subdirectory of the current
   1.110 +                   directory including itself.
   1.111      foo/*.c        any name ending in ".c" in the directory foo
   1.112      foo/**.c       any name ending in ".c" in any subdirectory of foo
   1.113                     including itself.
   1.114 @@ -183,11 +180,11 @@
   1.115      (['environment', 'env'], _('Environment Variables'),
   1.116       _(r'''
   1.117  HG::
   1.118 -    Path to the 'hg' executable, automatically passed when running
   1.119 -    hooks, extensions or external tools. If unset or empty, this is
   1.120 -    the hg executable's name if it's frozen, or an executable named
   1.121 -    'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on
   1.122 -    Windows) is searched.
   1.123 +    Path to the 'hg' executable, automatically passed when running hooks,
   1.124 +    extensions or external tools. If unset or empty, this is the hg
   1.125 +    executable's name if it's frozen, or an executable named 'hg' (with
   1.126 +    %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on Windows) is
   1.127 +    searched.
   1.128  
   1.129  HGEDITOR::
   1.130      This is the name of the editor to run when committing. See EDITOR.
   1.131 @@ -195,39 +192,37 @@
   1.132      (deprecated, use .hgrc)
   1.133  
   1.134  HGENCODING::
   1.135 -    This overrides the default locale setting detected by Mercurial.
   1.136 -    This setting is used to convert data including usernames,
   1.137 -    changeset descriptions, tag names, and branches. This setting can
   1.138 -    be overridden with the --encoding command-line option.
   1.139 +    This overrides the default locale setting detected by Mercurial. This
   1.140 +    setting is used to convert data including usernames, changeset
   1.141 +    descriptions, tag names, and branches. This setting can be overridden with
   1.142 +    the --encoding command-line option.
   1.143  
   1.144  HGENCODINGMODE::
   1.145 -    This sets Mercurial's behavior for handling unknown characters
   1.146 -    while transcoding user input. The default is "strict", which
   1.147 -    causes Mercurial to abort if it can't map a character. Other
   1.148 -    settings include "replace", which replaces unknown characters, and
   1.149 -    "ignore", which drops them. This setting can be overridden with
   1.150 -    the --encodingmode command-line option.
   1.151 +    This sets Mercurial's behavior for handling unknown characters while
   1.152 +    transcoding user input. The default is "strict", which causes Mercurial to
   1.153 +    abort if it can't map a character. Other settings include "replace", which
   1.154 +    replaces unknown characters, and "ignore", which drops them. This setting
   1.155 +    can be overridden with the --encodingmode command-line option.
   1.156  
   1.157  HGMERGE::
   1.158 -    An executable to use for resolving merge conflicts. The program
   1.159 -    will be executed with three arguments: local file, remote file,
   1.160 -    ancestor file.
   1.161 +    An executable to use for resolving merge conflicts. The program will be
   1.162 +    executed with three arguments: local file, remote file, ancestor file.
   1.163  
   1.164      (deprecated, use .hgrc)
   1.165  
   1.166  HGRCPATH::
   1.167 -    A list of files or directories to search for hgrc files. Item
   1.168 -    separator is ":" on Unix, ";" on Windows. If HGRCPATH is not set,
   1.169 -    platform default search path is used. If empty, only the .hg/hgrc
   1.170 -    from the current repository is read.
   1.171 +    A list of files or directories to search for hgrc files. Item separator is
   1.172 +    ":" on Unix, ";" on Windows. If HGRCPATH is not set, platform default
   1.173 +    search path is used. If empty, only the .hg/hgrc from the current
   1.174 +    repository is read.
   1.175  
   1.176      For each element in HGRCPATH:
   1.177      * if it's a directory, all files ending with .rc are added
   1.178      * otherwise, the file itself will be added
   1.179  
   1.180  HGUSER::
   1.181 -    This is the string used as the author of a commit. If not set,
   1.182 -    available values will be considered in this order:
   1.183 +    This is the string used as the author of a commit. If not set, available
   1.184 +    values will be considered in this order:
   1.185  
   1.186      * HGUSER (deprecated)
   1.187      * hgrc files from the HGRCPATH
   1.188 @@ -247,77 +242,71 @@
   1.189      This is the name of the editor to use when committing. See EDITOR.
   1.190  
   1.191  EDITOR::
   1.192 -    Sometimes Mercurial needs to open a text file in an editor for a
   1.193 -    user to modify, for example when writing commit messages. The
   1.194 -    editor it uses is determined by looking at the environment
   1.195 -    variables HGEDITOR, VISUAL and EDITOR, in that order. The first
   1.196 -    non-empty one is chosen. If all of them are empty, the editor
   1.197 -    defaults to 'vi'.
   1.198 +    Sometimes Mercurial needs to open a text file in an editor for a user to
   1.199 +    modify, for example when writing commit messages. The editor it uses is
   1.200 +    determined by looking at the environment variables HGEDITOR, VISUAL and
   1.201 +    EDITOR, in that order. The first non-empty one is chosen. If all of them
   1.202 +    are empty, the editor defaults to 'vi'.
   1.203  
   1.204  PYTHONPATH::
   1.205 -    This is used by Python to find imported modules and may need to be
   1.206 -    set appropriately if this Mercurial is not installed system-wide.
   1.207 +    This is used by Python to find imported modules and may need to be set
   1.208 +    appropriately if this Mercurial is not installed system-wide.
   1.209      ''')),
   1.210  
   1.211      (['revs', 'revisions'], _('Specifying Single Revisions'),
   1.212       _(r'''
   1.213      Mercurial supports several ways to specify individual revisions.
   1.214  
   1.215 -    A plain integer is treated as a revision number. Negative integers
   1.216 -    are treated as topological offsets from the tip, with -1 denoting
   1.217 -    the tip. As such, negative numbers are only useful if you've
   1.218 -    memorized your local tree numbers and want to save typing a single
   1.219 -    digit. This editor suggests copy and paste.
   1.220 +    A plain integer is treated as a revision number. Negative integers are
   1.221 +    treated as topological offsets from the tip, with -1 denoting the tip. As
   1.222 +    such, negative numbers are only useful if you've memorized your local tree
   1.223 +    numbers and want to save typing a single digit. This editor suggests copy
   1.224 +    and paste.
   1.225  
   1.226 -    A 40-digit hexadecimal string is treated as a unique revision
   1.227 -    identifier.
   1.228 +    A 40-digit hexadecimal string is treated as a unique revision identifier.
   1.229  
   1.230 -    A hexadecimal string less than 40 characters long is treated as a
   1.231 -    unique revision identifier, and referred to as a short-form
   1.232 -    identifier. A short-form identifier is only valid if it is the
   1.233 -    prefix of exactly one full-length identifier.
   1.234 +    A hexadecimal string less than 40 characters long is treated as a unique
   1.235 +    revision identifier, and referred to as a short-form identifier. A
   1.236 +    short-form identifier is only valid if it is the prefix of exactly one
   1.237 +    full-length identifier.
   1.238  
   1.239 -    Any other string is treated as a tag name, which is a symbolic
   1.240 -    name associated with a revision identifier. Tag names may not
   1.241 -    contain the ":" character.
   1.242 +    Any other string is treated as a tag name, which is a symbolic name
   1.243 +    associated with a revision identifier. Tag names may not contain the ":"
   1.244 +    character.
   1.245  
   1.246 -    The reserved name "tip" is a special tag that always identifies
   1.247 -    the most recent revision.
   1.248 +    The reserved name "tip" is a special tag that always identifies the most
   1.249 +    recent revision.
   1.250  
   1.251 -    The reserved name "null" indicates the null revision. This is the
   1.252 -    revision of an empty repository, and the parent of revision 0.
   1.253 +    The reserved name "null" indicates the null revision. This is the revision
   1.254 +    of an empty repository, and the parent of revision 0.
   1.255  
   1.256 -    The reserved name "." indicates the working directory parent. If
   1.257 -    no working directory is checked out, it is equivalent to null. If
   1.258 -    an uncommitted merge is in progress, "." is the revision of the
   1.259 -    first parent.
   1.260 +    The reserved name "." indicates the working directory parent. If no
   1.261 +    working directory is checked out, it is equivalent to null. If an
   1.262 +    uncommitted merge is in progress, "." is the revision of the first parent.
   1.263      ''')),
   1.264  
   1.265      (['mrevs', 'multirevs'], _('Specifying Multiple Revisions'),
   1.266       _(r'''
   1.267 -    When Mercurial accepts more than one revision, they may be
   1.268 -    specified individually, or provided as a topologically continuous
   1.269 -    range, separated by the ":" character.
   1.270 +    When Mercurial accepts more than one revision, they may be specified
   1.271 +    individually, or provided as a topologically continuous range, separated
   1.272 +    by the ":" character.
   1.273  
   1.274 -    The syntax of range notation is [BEGIN]:[END], where BEGIN and END
   1.275 -    are revision identifiers. Both BEGIN and END are optional. If
   1.276 -    BEGIN is not specified, it defaults to revision number 0. If END
   1.277 -    is not specified, it defaults to the tip. The range ":" thus means
   1.278 -    "all revisions".
   1.279 +    The syntax of range notation is [BEGIN]:[END], where BEGIN and END are
   1.280 +    revision identifiers. Both BEGIN and END are optional. If BEGIN is not
   1.281 +    specified, it defaults to revision number 0. If END is not specified, it
   1.282 +    defaults to the tip. The range ":" thus means "all revisions".
   1.283  
   1.284 -    If BEGIN is greater than END, revisions are treated in reverse
   1.285 -    order.
   1.286 +    If BEGIN is greater than END, revisions are treated in reverse order.
   1.287  
   1.288 -    A range acts as a closed interval. This means that a range of 3:5
   1.289 -    gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.
   1.290 +    A range acts as a closed interval. This means that a range of 3:5 gives 3,
   1.291 +    4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.
   1.292      ''')),
   1.293  
   1.294      (['diffs'], _('Diff Formats'),
   1.295       _(r'''
   1.296 -    Mercurial's default format for showing changes between two
   1.297 -    versions of a file is compatible with the unified format of GNU
   1.298 -    diff, which can be used by GNU patch and many other standard
   1.299 -    tools.
   1.300 +    Mercurial's default format for showing changes between two versions of a
   1.301 +    file is compatible with the unified format of GNU diff, which can be used
   1.302 +    by GNU patch and many other standard tools.
   1.303  
   1.304      While this standard format is often enough, it does not encode the
   1.305      following information:
   1.306 @@ -327,121 +316,116 @@
   1.307       - changes in binary files
   1.308       - creation or deletion of empty files
   1.309  
   1.310 -    Mercurial also supports the extended diff format from the git VCS
   1.311 -    which addresses these limitations. The git diff format is not
   1.312 -    produced by default because a few widespread tools still do not
   1.313 -    understand this format.
   1.314 +    Mercurial also supports the extended diff format from the git VCS which
   1.315 +    addresses these limitations. The git diff format is not produced by
   1.316 +    default because a few widespread tools still do not understand this
   1.317 +    format.
   1.318  
   1.319 -    This means that when generating diffs from a Mercurial repository
   1.320 -    (e.g. with "hg export"), you should be careful about things like
   1.321 -    file copies and renames or other things mentioned above, because
   1.322 -    when applying a standard diff to a different repository, this
   1.323 -    extra information is lost. Mercurial's internal operations (like
   1.324 -    push and pull) are not affected by this, because they use an
   1.325 -    internal binary format for communicating changes.
   1.326 +    This means that when generating diffs from a Mercurial repository (e.g.
   1.327 +    with "hg export"), you should be careful about things like file copies and
   1.328 +    renames or other things mentioned above, because when applying a standard
   1.329 +    diff to a different repository, this extra information is lost.
   1.330 +    Mercurial's internal operations (like push and pull) are not affected by
   1.331 +    this, because they use an internal binary format for communicating
   1.332 +    changes.
   1.333  
   1.334 -    To make Mercurial produce the git extended diff format, use the
   1.335 -    --git option available for many commands, or set 'git = True' in
   1.336 -    the [diff] section of your hgrc. You do not need to set this
   1.337 -    option when importing diffs in this format or using them in the mq
   1.338 -    extension.
   1.339 +    To make Mercurial produce the git extended diff format, use the --git
   1.340 +    option available for many commands, or set 'git = True' in the [diff]
   1.341 +    section of your hgrc. You do not need to set this option when importing
   1.342 +    diffs in this format or using them in the mq extension.
   1.343      ''')),
   1.344      (['templating'], _('Template Usage'),
   1.345       _(r'''
   1.346 -    Mercurial allows you to customize output of commands through
   1.347 -    templates. You can either pass in a template from the command
   1.348 -    line, via the --template option, or select an existing
   1.349 -    template-style (--style).
   1.350 +    Mercurial allows you to customize output of commands through templates.
   1.351 +    You can either pass in a template from the command line, via the
   1.352 +    --template option, or select an existing template-style (--style).
   1.353  
   1.354 -    You can customize output for any "log-like" command: log,
   1.355 -    outgoing, incoming, tip, parents, heads and glog.
   1.356 +    You can customize output for any "log-like" command: log, outgoing,
   1.357 +    incoming, tip, parents, heads and glog.
   1.358  
   1.359 -    Three styles are packaged with Mercurial: default (the style used
   1.360 -    when no explicit preference is passed), compact and changelog.
   1.361 -    Usage:
   1.362 +    Three styles are packaged with Mercurial: default (the style used when no
   1.363 +    explicit preference is passed), compact and changelog. Usage:
   1.364  
   1.365          $ hg log -r1 --style changelog
   1.366  
   1.367 -    A template is a piece of text, with markup to invoke variable
   1.368 -    expansion:
   1.369 +    A template is a piece of text, with markup to invoke variable expansion:
   1.370  
   1.371          $ hg log -r1 --template "{node}\n"
   1.372          b56ce7b07c52de7d5fd79fb89701ea538af65746
   1.373  
   1.374 -    Strings in curly braces are called keywords. The availability of
   1.375 -    keywords depends on the exact context of the templater. These
   1.376 -    keywords are usually available for templating a log-like command:
   1.377 +    Strings in curly braces are called keywords. The availability of keywords
   1.378 +    depends on the exact context of the templater. These keywords are usually
   1.379 +    available for templating a log-like command:
   1.380  
   1.381      - author: String. The unmodified author of the changeset.
   1.382 -    - branches: String. The name of the branch on which the changeset
   1.383 -          was committed. Will be empty if the branch name was default.
   1.384 +    - branches: String. The name of the branch on which the changeset was
   1.385 +          committed. Will be empty if the branch name was default.
   1.386      - date: Date information. The date when the changeset was committed.
   1.387      - desc: String. The text of the changeset description.
   1.388 -    - diffstat: String. Statistics of changes with the following
   1.389 -          format: "modified files: +added/-removed lines"
   1.390 -    - files: List of strings. All files modified, added, or removed by
   1.391 -          this changeset.
   1.392 +    - diffstat: String. Statistics of changes with the following format:
   1.393 +          "modified files: +added/-removed lines"
   1.394 +    - files: List of strings. All files modified, added, or removed by this
   1.395 +          changeset.
   1.396      - file_adds: List of strings. Files added by this changeset.
   1.397      - file_mods: List of strings. Files modified by this changeset.
   1.398      - file_dels: List of strings. Files removed by this changeset.
   1.399 -    - node: String. The changeset identification hash, as a
   1.400 -          40-character hexadecimal string.
   1.401 +    - node: String. The changeset identification hash, as a 40-character
   1.402 +          hexadecimal string.
   1.403      - parents: List of strings. The parents of the changeset.
   1.404      - rev: Integer. The repository-local changeset revision number.
   1.405      - tags: List of strings. Any tags associated with the changeset.
   1.406  
   1.407 -    The "date" keyword does not produce human-readable output. If you
   1.408 -    want to use a date in your output, you can use a filter to process
   1.409 -    it. Filters are functions which return a string based on the input
   1.410 -    variable. You can also use a chain of filters to get the desired
   1.411 -    output:
   1.412 +    The "date" keyword does not produce human-readable output. If you want to
   1.413 +    use a date in your output, you can use a filter to process it. Filters are
   1.414 +    functions which return a string based on the input variable. You can also
   1.415 +    use a chain of filters to get the desired output:
   1.416  
   1.417         $ hg tip --template "{date|isodate}\n"
   1.418         2008-08-21 18:22 +0000
   1.419  
   1.420      List of filters:
   1.421  
   1.422 -    - addbreaks: Any text. Add an XHTML "<br />" tag before the end of
   1.423 -          every line except the last.
   1.424 -    - age: Date. Returns a human-readable date/time difference between
   1.425 -          the given date/time and the current date/time.
   1.426 -    - basename: Any text. Treats the text as a path, and returns the
   1.427 -          last component of the path after splitting by the path
   1.428 -          separator (ignoring trailing separators). For example,
   1.429 -          "foo/bar/baz" becomes "baz" and "foo/bar//" becomes "bar".
   1.430 +    - addbreaks: Any text. Add an XHTML "<br />" tag before the end of every
   1.431 +          line except the last.
   1.432 +    - age: Date. Returns a human-readable date/time difference between the
   1.433 +          given date/time and the current date/time.
   1.434 +    - basename: Any text. Treats the text as a path, and returns the last
   1.435 +          component of the path after splitting by the path separator
   1.436 +          (ignoring trailing separators). For example, "foo/bar/baz" becomes
   1.437 +          "baz" and "foo/bar//" becomes "bar".
   1.438      - stripdir: Treat the text as path and strip a directory level, if
   1.439            possible. For example, "foo" and "foo/bar" becomes "foo".
   1.440 -    - date: Date. Returns a date in a Unix date format, including
   1.441 -          the timezone: "Mon Sep 04 15:13:13 2006 0700".
   1.442 -    - domain: Any text. Finds the first string that looks like an
   1.443 -          email address, and extracts just the domain component.
   1.444 -          Example: 'User <user@example.com>' becomes 'example.com'.
   1.445 -    - email: Any text. Extracts the first string that looks like an
   1.446 -          email address. Example: 'User <user@example.com>' becomes
   1.447 +    - date: Date. Returns a date in a Unix date format, including the
   1.448 +          timezone: "Mon Sep 04 15:13:13 2006 0700".
   1.449 +    - domain: Any text. Finds the first string that looks like an email
   1.450 +          address, and extracts just the domain component. Example: 'User
   1.451 +          <user@example.com>' becomes 'example.com'.
   1.452 +    - email: Any text. Extracts the first string that looks like an email
   1.453 +          address. Example: 'User <user@example.com>' becomes
   1.454            'user@example.com'.
   1.455 -    - escape: Any text. Replaces the special XML/XHTML characters "&",
   1.456 -          "<" and ">" with XML entities.
   1.457 +    - escape: Any text. Replaces the special XML/XHTML characters "&", "<" and
   1.458 +          ">" with XML entities.
   1.459      - fill68: Any text. Wraps the text to fit in 68 columns.
   1.460      - fill76: Any text. Wraps the text to fit in 76 columns.
   1.461      - firstline: Any text. Returns the first line of text.
   1.462      - nonempty: Any text. Returns '(none)' if the string is empty.
   1.463 -    - hgdate: Date. Returns the date as a pair of numbers:
   1.464 -          "1157407993 25200" (Unix timestamp, timezone offset).
   1.465 +    - hgdate: Date. Returns the date as a pair of numbers: "1157407993 25200"
   1.466 +          (Unix timestamp, timezone offset).
   1.467      - isodate: Date. Returns the date in ISO 8601 format.
   1.468      - localdate: Date. Converts a date to local date.
   1.469 -    - obfuscate: Any text. Returns the input text rendered as a
   1.470 -          sequence of XML entities.
   1.471 +    - obfuscate: Any text. Returns the input text rendered as a sequence of
   1.472 +          XML entities.
   1.473      - person: Any text. Returns the text before an email address.
   1.474 -    - rfc822date: Date. Returns a date using the same format used
   1.475 -          in email headers.
   1.476 -    - short: Changeset hash. Returns the short form of a changeset
   1.477 -          hash, i.e. a 12-byte hexadecimal string.
   1.478 +    - rfc822date: Date. Returns a date using the same format used in email
   1.479 +          headers.
   1.480 +    - short: Changeset hash. Returns the short form of a changeset hash, i.e.
   1.481 +          a 12-byte hexadecimal string.
   1.482      - shortdate: Date. Returns a date like "2006-09-18".
   1.483      - strip: Any text. Strips all leading and trailing whitespace.
   1.484 -    - tabindent: Any text. Returns the text, with every line except
   1.485 -          the first starting with a tab character.
   1.486 -    - urlescape: Any text. Escapes all "special" characters. For
   1.487 -          example, "foo bar" becomes "foo%20bar".
   1.488 +    - tabindent: Any text. Returns the text, with every line except the first
   1.489 +          starting with a tab character.
   1.490 +    - urlescape: Any text. Escapes all "special" characters. For example, "foo
   1.491 +          bar" becomes "foo%20bar".
   1.492      - user: Any text. Returns the user portion of an email address.
   1.493      ''')),
   1.494  
   1.495 @@ -455,57 +439,53 @@
   1.496        https://[user[:pass]@]host[:port]/[path][#revision]
   1.497        ssh://[user[:pass]@]host[:port]/[path][#revision]
   1.498  
   1.499 -    Paths in the local filesystem can either point to Mercurial
   1.500 -    repositories or to bundle files (as created by 'hg bundle' or
   1.501 -    'hg incoming --bundle').
   1.502 +    Paths in the local filesystem can either point to Mercurial repositories
   1.503 +    or to bundle files (as created by 'hg bundle' or 'hg incoming --bundle').
   1.504  
   1.505 -    An optional identifier after # indicates a particular branch, tag,
   1.506 -    or changeset to use from the remote repository. See also 'hg help
   1.507 -    revisions'.
   1.508 +    An optional identifier after # indicates a particular branch, tag, or
   1.509 +    changeset to use from the remote repository. See also 'hg help revisions'.
   1.510  
   1.511 -    Some features, such as pushing to http:// and https:// URLs are
   1.512 -    only possible if the feature is explicitly enabled on the remote
   1.513 -    Mercurial server.
   1.514 +    Some features, such as pushing to http:// and https:// URLs are only
   1.515 +    possible if the feature is explicitly enabled on the remote Mercurial
   1.516 +    server.
   1.517  
   1.518      Some notes about using SSH with Mercurial:
   1.519 -    - SSH requires an accessible shell account on the destination
   1.520 -      machine and a copy of hg in the remote path or specified with as
   1.521 -      remotecmd.
   1.522 -    - path is relative to the remote user's home directory by default.
   1.523 -      Use an extra slash at the start of a path to specify an absolute path:
   1.524 +    - SSH requires an accessible shell account on the destination machine and
   1.525 +      a copy of hg in the remote path or specified with as remotecmd.
   1.526 +    - path is relative to the remote user's home directory by default. Use an
   1.527 +      extra slash at the start of a path to specify an absolute path:
   1.528          ssh://example.com//tmp/repository
   1.529 -    - Mercurial doesn't use its own compression via SSH; the right
   1.530 -      thing to do is to configure it in your ~/.ssh/config, e.g.:
   1.531 +    - Mercurial doesn't use its own compression via SSH; the right thing to do
   1.532 +      is to configure it in your ~/.ssh/config, e.g.:
   1.533          Host *.mylocalnetwork.example.com
   1.534            Compression no
   1.535          Host *
   1.536            Compression yes
   1.537 -      Alternatively specify "ssh -C" as your ssh command in your hgrc
   1.538 -      or with the --ssh command line option.
   1.539 +      Alternatively specify "ssh -C" as your ssh command in your hgrc or with
   1.540 +      the --ssh command line option.
   1.541  
   1.542 -    These URLs can all be stored in your hgrc with path aliases under
   1.543 -    the [paths] section like so:
   1.544 +    These URLs can all be stored in your hgrc with path aliases under the
   1.545 +    [paths] section like so:
   1.546      [paths]
   1.547      alias1 = URL1
   1.548      alias2 = URL2
   1.549      ...
   1.550  
   1.551 -    You can then use the alias for any command that uses a URL (for
   1.552 -    example 'hg pull alias1' would pull from the 'alias1' path).
   1.553 +    You can then use the alias for any command that uses a URL (for example
   1.554 +    'hg pull alias1' would pull from the 'alias1' path).
   1.555  
   1.556 -    Two path aliases are special because they are used as defaults
   1.557 -    when you do not provide the URL to a command:
   1.558 +    Two path aliases are special because they are used as defaults when you do
   1.559 +    not provide the URL to a command:
   1.560  
   1.561      default:
   1.562 -      When you create a repository with hg clone, the clone command
   1.563 -      saves the location of the source repository as the new
   1.564 -      repository's 'default' path. This is then used when you omit
   1.565 -      path from push- and pull-like commands (including incoming and
   1.566 -      outgoing).
   1.567 +      When you create a repository with hg clone, the clone command saves the
   1.568 +      location of the source repository as the new repository's 'default'
   1.569 +      path. This is then used when you omit path from push- and pull-like
   1.570 +      commands (including incoming and outgoing).
   1.571  
   1.572      default-push:
   1.573 -      The push command will look for a path named 'default-push', and
   1.574 -      prefer it over 'default' if both are defined.
   1.575 +      The push command will look for a path named 'default-push', and prefer
   1.576 +      it over 'default' if both are defined.
   1.577      ''')),
   1.578      (["extensions"], _("Using additional features"), extshelp),
   1.579  )