diff options
author | Karen Tracey <kmtracey@gmail.com> | 2009-05-17 16:45:28 +0000 |
---|---|---|
committer | Karen Tracey <kmtracey@gmail.com> | 2009-05-17 16:45:28 +0000 |
commit | 50745cc31ecd0ff76dafed2fb903d14c1b30d707 (patch) | |
tree | c2c20c8a28dd952023df4f9d4604ec64dbeae4ca | |
parent | 92e5249a677c1c60d2a13ad0203716840fc71143 (diff) | |
download | django-50745cc31ecd0ff76dafed2fb903d14c1b30d707.tar.gz |
Fixed #11066 -- Corrected 15 duplicate "the"s found in docs and code comments. Thanks kaikuehne.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r-- | django/contrib/csrf/tests.py | 2 | ||||
-rw-r--r-- | django/contrib/gis/db/backend/spatialite/creation.py | 2 | ||||
-rw-r--r-- | django/contrib/gis/geos/libgeos.py | 2 | ||||
-rw-r--r-- | django/contrib/gis/measure.py | 2 | ||||
-rw-r--r-- | django/contrib/gis/templates/gis/admin/openlayers.html | 2 | ||||
-rwxr-xr-x | django/core/files/uploadhandler.py | 2 | ||||
-rw-r--r-- | django/template/defaulttags.py | 2 | ||||
-rw-r--r-- | django/test/_doctest.py | 2 | ||||
-rw-r--r-- | django/utils/feedgenerator.py | 2 | ||||
-rw-r--r-- | django/views/generic/create_update.py | 2 | ||||
-rw-r--r-- | docs/internals/contributing.txt | 2 | ||||
-rw-r--r-- | docs/ref/authbackends.txt | 2 | ||||
-rw-r--r-- | docs/ref/contrib/admin/actions.txt | 2 | ||||
-rw-r--r-- | tests/modeltests/get_object_or_404/models.py | 2 | ||||
-rw-r--r-- | tests/regressiontests/templates/loaders.py | 2 |
15 files changed, 15 insertions, 15 deletions
diff --git a/django/contrib/csrf/tests.py b/django/contrib/csrf/tests.py index f00929fb28..3c533a01e6 100644 --- a/django/contrib/csrf/tests.py +++ b/django/contrib/csrf/tests.py @@ -59,7 +59,7 @@ class CsrfMiddlewareTest(TestCase): # Check the post processing def test_process_response_no_session(self): """ - Check the the post-processor does nothing if no session active + Check the post-processor does nothing if no session active """ req = self._get_GET_no_session_request() resp = self._get_post_form_response() diff --git a/django/contrib/gis/db/backend/spatialite/creation.py b/django/contrib/gis/db/backend/spatialite/creation.py index cc668eca6a..9836773226 100644 --- a/django/contrib/gis/db/backend/spatialite/creation.py +++ b/django/contrib/gis/db/backend/spatialite/creation.py @@ -15,7 +15,7 @@ def create_test_spatial_db(verbosity=1, autoclobber=False, interactive=False): if settings.DATABASE_ENGINE != 'sqlite3': raise Exception('SpatiaLite database creation only supported on sqlite3 platform.') - # Getting the test database name using the the SQLite backend's + # Getting the test database name using the SQLite backend's # `_create_test_db`. Unless `TEST_DATABASE_NAME` is defined, # it returns ":memory:". db_name = connection.creation._create_test_db(verbosity, autoclobber) diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py index 0839a620c7..f1aecb0de5 100644 --- a/django/contrib/gis/geos/libgeos.py +++ b/django/contrib/gis/geos/libgeos.py @@ -30,7 +30,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 0870c65562..4292eb6474 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 f6945853fe..6c769780e5 100755 --- a/django/core/files/uploadhandler.py +++ b/django/core/files/uploadhandler.py @@ -152,7 +152,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 1d8e039a9a..a61dd8b36c 100644 --- a/django/template/defaulttags.py +++ b/django/template/defaulttags.py @@ -1136,7 +1136,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/docs/ref/authbackends.txt b/docs/ref/authbackends.txt index 941152733a..7cb54df7ea 100644 --- a/docs/ref/authbackends.txt +++ b/docs/ref/authbackends.txt @@ -22,7 +22,7 @@ The following backends are available in :mod:`django.contrib.auth.backends`: .. class:: ModelBackend This is the default authentication backend used by Django. It - authenticates using usernames and passwords stored in the the + authenticates using usernames and passwords stored in the :class:`~django.contrib.auth.models.User` model. diff --git a/docs/ref/contrib/admin/actions.txt b/docs/ref/contrib/admin/actions.txt index 904d20eb33..3b5de92d70 100644 --- a/docs/ref/contrib/admin/actions.txt +++ b/docs/ref/contrib/admin/actions.txt @@ -200,7 +200,7 @@ Actions that provide intermediate pages --------------------------------------- By default, after an action is performed the user is simply redirected back -the the original change list page. However, some actions, especially more +to the original change list page. However, some actions, especially more complex ones, will need to return intermediate pages. For example, the built-in delete action asks for confirmation before deleting the selected objects. 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() |