From 02b6f16422495666038734a8e7d63d0dc3f34d4c Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Sun, 17 May 2009 16:53:38 +0000
Subject: [PATCH] [1.0.X] Fixed #11066 -- Corrected 11 duplicate "the"s found
 in docs and code comments. Thanks kaikuehne.

Merge of applicable parts of r10801 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10802 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/contrib/gis/geos/libgeos.py                     | 2 +-
 django/contrib/gis/measure.py                          | 2 +-
 django/contrib/gis/templates/gis/admin/openlayers.html | 2 +-
 django/core/files/uploadhandler.py                     | 2 +-
 django/template/defaulttags.py                         | 2 +-
 django/test/_doctest.py                                | 2 +-
 django/utils/feedgenerator.py                          | 2 +-
 django/views/generic/create_update.py                  | 2 +-
 docs/internals/contributing.txt                        | 2 +-
 tests/modeltests/get_object_or_404/models.py           | 2 +-
 tests/regressiontests/templates/loaders.py             | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py
index c8e938cb00..6bf0610487 100644
--- a/django/contrib/gis/geos/libgeos.py
+++ b/django/contrib/gis/geos/libgeos.py
@@ -37,7 +37,7 @@ elif os.name == 'posix':
 else:
     raise ImportError('Unsupported OS "%s"' % os.name)
 
-# Using the ctypes `find_library` utility to find the the path to the GEOS 
+# Using the ctypes `find_library` utility to find the path to the GEOS 
 # shared library.  This is better than manually specifiying each library name 
 # and extension (e.g., libgeos_c.[so|so.1|dylib].).
 if lib_names: 
diff --git a/django/contrib/gis/measure.py b/django/contrib/gis/measure.py
index 7f345329bc..37922040df 100644
--- a/django/contrib/gis/measure.py
+++ b/django/contrib/gis/measure.py
@@ -41,7 +41,7 @@ from decimal import Decimal
 class MeasureBase(object):
     def default_units(self, kwargs):
         """
-        Return the unit value and the the default units specified
+        Return the unit value and the default units specified
         from the given keyword arguments dictionary.
         """
         val = 0.0
diff --git a/django/contrib/gis/templates/gis/admin/openlayers.html b/django/contrib/gis/templates/gis/admin/openlayers.html
index 361cac55b4..ecb26aea9c 100644
--- a/django/contrib/gis/templates/gis/admin/openlayers.html
+++ b/django/contrib/gis/templates/gis/admin/openlayers.html
@@ -15,7 +15,7 @@
 </style>
 <!--[if IE]>
 <style type="text/css">
-  /* This fixes the the mouse offset issues in IE. */
+  /* This fixes the mouse offset issues in IE. */
   #{{ id }}_admin_map { position: static; vertical-align: top; }
   /* `font-size: 0` fixes the 1px border between tiles, but borks LayerSwitcher.
       Thus, this is disabled until a better fix is found.
diff --git a/django/core/files/uploadhandler.py b/django/core/files/uploadhandler.py
index b93ff9446e..3599697225 100644
--- a/django/core/files/uploadhandler.py
+++ b/django/core/files/uploadhandler.py
@@ -151,7 +151,7 @@ class MemoryFileUploadHandler(FileUploadHandler):
         Use the content_length to signal whether or not this handler should be in use.
         """
         # Check the content-length header to see if we should
-        # If the the post is too large, we cannot use the Memory handler.
+        # If the post is too large, we cannot use the Memory handler.
         if content_length > settings.FILE_UPLOAD_MAX_MEMORY_SIZE:
             self.activated = False
         else:
diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py
index 0b23d4dc6e..e9caef52e3 100644
--- a/django/template/defaulttags.py
+++ b/django/template/defaulttags.py
@@ -1102,7 +1102,7 @@ def widthratio(parser, token):
 
         <img src='bar.gif' height='10' width='{% widthratio this_value max_value 100 %}' />
 
-    Above, if ``this_value`` is 175 and ``max_value`` is 200, the the image in
+    Above, if ``this_value`` is 175 and ``max_value`` is 200, the image in
     the above example will be 88 pixels wide (because 175/200 = .875;
     .875 * 100 = 87.5 which is rounded up to 88).
     """
diff --git a/django/test/_doctest.py b/django/test/_doctest.py
index a56483c3ab..17fc88a1bc 100644
--- a/django/test/_doctest.py
+++ b/django/test/_doctest.py
@@ -1,5 +1,5 @@
 # This is a slightly modified version of the doctest.py that shipped with Python 2.4
-# It incorporates changes that have been submitted the the Python ticket tracker
+# It incorporates changes that have been submitted to the Python ticket tracker
 # as ticket #1521051. These changes allow for a DoctestRunner and Doctest base
 # class to be specified when constructing a DoctestSuite.
 
diff --git a/django/utils/feedgenerator.py b/django/utils/feedgenerator.py
index de924a3077..c9445f932f 100644
--- a/django/utils/feedgenerator.py
+++ b/django/utils/feedgenerator.py
@@ -121,7 +121,7 @@ class SyndicationFeed(object):
 
     def add_root_elements(self, handler):
         """
-        Add elements in the the root (i.e. feed/channel) element. Called
+        Add elements in the root (i.e. feed/channel) element. Called
         from write().
         """
         pass
diff --git a/django/views/generic/create_update.py b/django/views/generic/create_update.py
index 634fb1bdcd..f1f718e79d 100644
--- a/django/views/generic/create_update.py
+++ b/django/views/generic/create_update.py
@@ -71,7 +71,7 @@ def redirect(post_save_redirect, obj):
 def lookup_object(model, object_id, slug, slug_field):
     """
     Return the ``model`` object with the passed ``object_id``.  If
-    ``object_id`` is None, then return the the object whose ``slug_field``
+    ``object_id`` is None, then return the object whose ``slug_field``
     equals the passed ``slug``.  If ``slug`` and ``slug_field`` are not passed,
     then raise Http404 exception.
     """
diff --git a/docs/internals/contributing.txt b/docs/internals/contributing.txt
index 6055c0e59f..1f1161de43 100644
--- a/docs/internals/contributing.txt
+++ b/docs/internals/contributing.txt
@@ -325,7 +325,7 @@ A ticket can be resolved in a number of ways:
         tickets, we keep all the discussion in one place, which helps everyone.
 
     "worksforme"
-        Used when the the ticket doesn't contain enough detail to replicate
+        Used when the ticket doesn't contain enough detail to replicate
         the original bug.
 
 If you believe that the ticket was closed in error -- because you're
diff --git a/tests/modeltests/get_object_or_404/models.py b/tests/modeltests/get_object_or_404/models.py
index 6e4da44481..b2812e61e7 100644
--- a/tests/modeltests/get_object_or_404/models.py
+++ b/tests/modeltests/get_object_or_404/models.py
@@ -55,7 +55,7 @@ Http404: No Article matches the given query.
 >>> get_object_or_404(Article, title__contains="Run")
 <Article: Run away!>
 
-# We can also use the the Article manager through an Author object.
+# We can also use the Article manager through an Author object.
 >>> get_object_or_404(a.article_set, title__contains="Run")
 <Article: Run away!>
 
diff --git a/tests/regressiontests/templates/loaders.py b/tests/regressiontests/templates/loaders.py
index fdaf9ac83f..c552a62578 100644
--- a/tests/regressiontests/templates/loaders.py
+++ b/tests/regressiontests/templates/loaders.py
@@ -45,7 +45,7 @@ def create_egg(name, resources):
     Creates a mock egg with a list of resources.
 
     name: The name of the module.
-    resources: A dictionary of resources. Keys are the names and values the the data.
+    resources: A dictionary of resources. Keys are the names and values the data.
     """
     egg = imp.new_module(name)
     egg.__loader__ = MockLoader()