--- a/mercurial/help/bundlespec.txt Wed May 03 22:05:23 2017 -0400
+++ b/mercurial/help/bundlespec.txt Wed May 03 22:07:47 2017 -0400
@@ -24,7 +24,7 @@
The literal bundle format string is used.
<compression>-<type>
- The compression engine and format are delimited by a hypthen (``-``).
+ The compression engine and format are delimited by a hyphen (``-``).
Optional parameters follow the ``<type>``. Parameters are URI escaped
``key=value`` pairs. Each pair is delimited by a semicolon (``;``). The
--- a/mercurial/help/config.txt Wed May 03 22:05:23 2017 -0400
+++ b/mercurial/help/config.txt Wed May 03 22:07:47 2017 -0400
@@ -419,7 +419,7 @@
terminal. Any invalid value will disable color.
``pagermode``
- String: optinal override of ``color.mode`` used with pager.
+ String: optional override of ``color.mode`` used with pager.
On some systems, terminfo mode may cause problems when using
color with ``less -R`` as a pager program. less with the -R option
--- a/mercurial/help/internals/changegroups.txt Wed May 03 22:05:23 2017 -0400
+++ b/mercurial/help/internals/changegroups.txt Wed May 03 22:07:47 2017 -0400
@@ -72,7 +72,7 @@
The *delta data* is a series of *delta*s that describe a diff from an existing
entry (either that the recipient already has, or previously specified in the
-bundlei/changegroup).
+bundle/changegroup).
The *delta header* is different between versions ``1``, ``2``, and
``3`` of the changegroup format.
--- a/mercurial/help/templates.txt Wed May 03 22:05:23 2017 -0400
+++ b/mercurial/help/templates.txt Wed May 03 22:07:47 2017 -0400
@@ -62,7 +62,7 @@
* for multiplication
/ for floor division (division rounded to integer nearest -infinity)
-Division fulfils the law x = x / y + mod(x, y).
+Division fulfills the law x = x / y + mod(x, y).
Also, for any expression that returns a list, there is a list operator::
--- a/tests/test-help.t Wed May 03 22:05:23 2017 -0400
+++ b/tests/test-help.t Wed May 03 22:07:47 2017 -0400
@@ -1032,7 +1032,7 @@
The *delta data* is a series of *delta*s that describe a diff from an
existing entry (either that the recipient already has, or previously
- specified in the bundlei/changegroup).
+ specified in the bundle/changegroup).
The *delta header* is different between versions "1", "2", and "3" of the
changegroup format.
@@ -3183,7 +3183,7 @@
<p>
The *delta data* is a series of *delta*s that describe a diff from an existing
entry (either that the recipient already has, or previously specified in the
- bundlei/changegroup).
+ bundle/changegroup).
</p>
<p>
The *delta header* is different between versions "1", "2", and