[PATCH stable] help: fix some instances of 'the the'

[Mads Kiilerich]

# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1343264053 -7200
# Branch stable
# Node ID 1675ef8a2bf2e32e9f42aa3a74b48c0f44ff9b80
# Parent  bf5bb38bcc7c28f7a355fdfff323aba2018cbb17
help: fix some instances of 'the the'

diff --git a/contrib/wix/README.txt b/contrib/wix/README.txt
--- a/contrib/wix/README.txt
+++ b/contrib/wix/README.txt
@@ -7,7 +7,7 @@
 must kept up to date with distribution changes within their branch.  In
 other words, the default branch WXS files are expected to diverge from
 the stable branch WXS files.  Storing them within the same repository is
-the only sane way to keep the the source tree and the installer in sync.
+the only sane way to keep the source tree and the installer in sync.
 
 The MSI installer builder uses only the mercurial.ini file from the
 contrib/win32 folder, the contents of which have been historically used
diff --git a/hgext/convert/__init__.py b/hgext/convert/__init__.py
--- a/hgext/convert/__init__.py
+++ b/hgext/convert/__init__.py
@@ -197,7 +197,7 @@
         delete them.
 
     :hook.cvschangesets: Specify a Python function to be called after
-        the changesets are calculated from the the CVS log. The
+        the changesets are calculated from the CVS log. The
         function is passed a list with the changeset entries, and can
         modify the changesets in-place, or add or delete them.
 
diff --git a/mercurial/discovery.py b/mercurial/discovery.py
--- a/mercurial/discovery.py
+++ b/mercurial/discovery.py
@@ -95,7 +95,7 @@
     (inclusive) are included. If you already know the local repo's heads,
     passing them in onlyheads is faster than letting them be recomputed here.
 
-    If commoninc is given, it must the the result of a prior call to
+    If commoninc is given, it must be the result of a prior call to
     findcommonincoming(repo, other, force) to avoid recomputing it here.
 
     If portable is given, compute more conservative common and missingheads,
diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
--- a/mercurial/help/config.txt
+++ b/mercurial/help/config.txt
@@ -1065,7 +1065,7 @@
 
 rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``.
 
-Relative subrepository paths are first made absolute, and the the
+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.
 
diff --git a/mercurial/hook.py b/mercurial/hook.py
--- a/mercurial/hook.py
+++ b/mercurial/hook.py
@@ -66,7 +66,7 @@
                              (hname, funcname))
     try:
         try:
-            # redirect IO descriptors the the ui descriptors so hooks
+            # redirect IO descriptors to the ui descriptors so hooks
             # that write directly to these don't mess up the command
             # protocol when running through the command server
             old = sys.stdout, sys.stderr, sys.stdin
diff --git a/mercurial/keepalive.py b/mercurial/keepalive.py
--- a/mercurial/keepalive.py
+++ b/mercurial/keepalive.py
@@ -211,7 +211,7 @@
                 h.close()
 
     def _request_closed(self, request, host, connection):
-        """tells us that this request is now closed and the the
+        """tells us that this request is now closed and that the
         connection is ready for another request"""
         self._cm.set_ready(connection, 1)
 
diff --git a/tests/test-convert.t b/tests/test-convert.t
--- a/tests/test-convert.t
+++ b/tests/test-convert.t
@@ -178,8 +178,8 @@
                     or delete them.
       hook.cvschangesets
                     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
+                    are calculated from the CVS log. The function is passed a
+                    list with the changeset entries, and can modify the
                     changesets in-place, or add or delete them.
   
       An additional "debugcvsps" Mercurial command allows the builtin changeset