Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.0.X] Fixed #11066 -- Corrected 11 duplicate "the"s found in docs a…

…nd 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
  • Loading branch information...
commit 02b6f16422495666038734a8e7d63d0dc3f34d4c 1 parent 1f5626d
Karen Tracey kmtracey authored
2  django/contrib/gis/geos/libgeos.py
View
@@ -37,7 +37,7 @@
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:
2  django/contrib/gis/measure.py
View
@@ -41,7 +41,7 @@
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
2  django/contrib/gis/templates/gis/admin/openlayers.html
View
@@ -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.
2  django/core/files/uploadhandler.py
View
@@ -151,7 +151,7 @@ def handle_raw_input(self, input_data, META, content_length, boundary, encoding=
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:
2  django/template/defaulttags.py
View
@@ -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).
"""
2  django/test/_doctest.py
View
@@ -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.
2  django/utils/feedgenerator.py
View
@@ -121,7 +121,7 @@ def root_attributes(self):
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
2  django/views/generic/create_update.py
View
@@ -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.
"""
2  docs/internals/contributing.txt
View
@@ -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
2  tests/modeltests/get_object_or_404/models.py
View
@@ -55,7 +55,7 @@ def __unicode__(self):
>>> 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!>
2  tests/regressiontests/templates/loaders.py
View
@@ -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()
Please sign in to comment.
Something went wrong with that request. Please try again.