[PATCH 3 of 4 STABLE] help: spelling fixes

Matt Harbison mharbison72 at gmail.com
Wed May 3 23:30:33 EDT 2017


# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1493863667 14400
#      Wed May 03 22:07:47 2017 -0400
# Branch stable
# Node ID a915b7b37d08050b393f8ed9482270bd2c5abdf5
# Parent  22e30c35e527bd4f9c7f0f31f61b42754d849dc9
help: spelling fixes

I wasn't sure if 'favicon' in config.txt was on purpose.  But it doesn't exist
anywhere else in the repository.

diff --git a/mercurial/help/bundlespec.txt b/mercurial/help/bundlespec.txt
--- a/mercurial/help/bundlespec.txt
+++ b/mercurial/help/bundlespec.txt
@@ -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
diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
--- a/mercurial/help/config.txt
+++ b/mercurial/help/config.txt
@@ -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
@@ -2323,7 +2323,7 @@
 
 ``staticurl``
     Base URL to use for static files. If unset, static files (e.g. the
-    hgicon.png favicon) will be served by the CGI script itself. Use
+    hgicon.png icon) will be served by the CGI script itself. Use
     this setting to serve them directly with the HTTP server.
     Example: ``http://hgserver/static/``.
 
diff --git a/mercurial/help/internals/changegroups.txt b/mercurial/help/internals/changegroups.txt
--- a/mercurial/help/internals/changegroups.txt
+++ b/mercurial/help/internals/changegroups.txt
@@ -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.
diff --git a/mercurial/help/templates.txt b/mercurial/help/templates.txt
--- a/mercurial/help/templates.txt
+++ b/mercurial/help/templates.txt
@@ -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::
 


More information about the Mercurial-devel mailing list