Code

Ticket #11066: the-the-documentation.diff

File the-the-documentation.diff, 8.8 KB (added by kaikuehne, 5 years ago)
Line 
1Index: django/test/_doctest.py
2===================================================================
3--- django/test/_doctest.py     (revision 10731)
4+++ django/test/_doctest.py     (working copy)
5@@ -1,5 +1,5 @@
6 # This is a slightly modified version of the doctest.py that shipped with Python 2.4
7-# It incorporates changes that have been submitted the the Python ticket tracker
8+# It incorporates changes that have been submitted to the Python ticket tracker
9 # as ticket #1521051. These changes allow for a DoctestRunner and Doctest base
10 # class to be specified when constructing a DoctestSuite.
11 
12Index: django/core/files/uploadhandler.py
13===================================================================
14--- django/core/files/uploadhandler.py  (revision 10731)
15+++ django/core/files/uploadhandler.py  (working copy)
16@@ -152,7 +152,7 @@
17         Use the content_length to signal whether or not this handler should be in use.
18         """
19         # Check the content-length header to see if we should
20-        # If the the post is too large, we cannot use the Memory handler.
21+        # If the post is too large, we cannot use the Memory handler.
22         if content_length > settings.FILE_UPLOAD_MAX_MEMORY_SIZE:
23             self.activated = False
24         else:
25Index: django/views/generic/create_update.py
26===================================================================
27--- django/views/generic/create_update.py       (revision 10731)
28+++ django/views/generic/create_update.py       (working copy)
29@@ -71,7 +71,7 @@
30 def lookup_object(model, object_id, slug, slug_field):
31     """
32     Return the ``model`` object with the passed ``object_id``.  If
33-    ``object_id`` is None, then return the the object whose ``slug_field``
34+    ``object_id`` is None, then return the object whose ``slug_field``
35     equals the passed ``slug``.  If ``slug`` and ``slug_field`` are not passed,
36     then raise Http404 exception.
37     """
38Index: django/utils/feedgenerator.py
39===================================================================
40--- django/utils/feedgenerator.py       (revision 10731)
41+++ django/utils/feedgenerator.py       (working copy)
42@@ -121,7 +121,7 @@
43 
44     def add_root_elements(self, handler):
45         """
46-        Add elements in the the root (i.e. feed/channel) element. Called
47+        Add elements in the root (i.e. feed/channel) element. Called
48         from write().
49         """
50         pass
51Index: django/contrib/gis/db/backend/spatialite/creation.py
52===================================================================
53--- django/contrib/gis/db/backend/spatialite/creation.py        (revision 10731)
54+++ django/contrib/gis/db/backend/spatialite/creation.py        (working copy)
55@@ -15,7 +15,7 @@
56     if settings.DATABASE_ENGINE != 'sqlite3':
57         raise Exception('SpatiaLite database creation only supported on sqlite3 platform.')
58 
59-    # Getting the test database name using the the SQLite backend's
60+    # Getting the test database name using the SQLite backend's
61     # `_create_test_db`.  Unless `TEST_DATABASE_NAME` is defined,
62     # it returns ":memory:".
63     db_name = connection.creation._create_test_db(verbosity, autoclobber)
64Index: django/contrib/gis/measure.py
65===================================================================
66--- django/contrib/gis/measure.py       (revision 10731)
67+++ django/contrib/gis/measure.py       (working copy)
68@@ -41,7 +41,7 @@
69 class MeasureBase(object):
70     def default_units(self, kwargs):
71         """
72-        Return the unit value and the the default units specified
73+        Return the unit value and the default units specified
74         from the given keyword arguments dictionary.
75         """
76         val = 0.0
77Index: django/contrib/gis/geos/libgeos.py
78===================================================================
79--- django/contrib/gis/geos/libgeos.py  (revision 10731)
80+++ django/contrib/gis/geos/libgeos.py  (working copy)
81@@ -30,7 +30,7 @@
82 else:
83     raise ImportError('Unsupported OS "%s"' % os.name)
84 
85-# Using the ctypes `find_library` utility to find the the path to the GEOS
86+# Using the ctypes `find_library` utility to find the path to the GEOS
87 # shared library.  This is better than manually specifiying each library name
88 # and extension (e.g., libgeos_c.[so|so.1|dylib].).
89 if lib_names:
90Index: django/contrib/gis/templates/gis/admin/openlayers.html
91===================================================================
92--- django/contrib/gis/templates/gis/admin/openlayers.html      (revision 10731)
93+++ django/contrib/gis/templates/gis/admin/openlayers.html      (working copy)
94@@ -15,7 +15,7 @@
95 </style>
96 <!--[if IE]>
97 <style type="text/css">
98-  /* This fixes the the mouse offset issues in IE. */
99+  /* This fixes the mouse offset issues in IE. */
100   #{{ id }}_admin_map { position: static; vertical-align: top; }
101   /* `font-size: 0` fixes the 1px border between tiles, but borks LayerSwitcher.
102       Thus, this is disabled until a better fix is found.
103Index: django/contrib/csrf/tests.py
104===================================================================
105--- django/contrib/csrf/tests.py        (revision 10731)
106+++ django/contrib/csrf/tests.py        (working copy)
107@@ -59,7 +59,7 @@
108     # Check the post processing
109     def test_process_response_no_session(self):
110         """
111-        Check the the post-processor does nothing if no session active
112+        Check the post-processor does nothing if no session active
113         """
114         req = self._get_GET_no_session_request()
115         resp = self._get_post_form_response()
116Index: django/template/defaulttags.py
117===================================================================
118--- django/template/defaulttags.py      (revision 10731)
119+++ django/template/defaulttags.py      (working copy)
120@@ -1136,7 +1136,7 @@
121 
122         <img src='bar.gif' height='10' width='{% widthratio this_value max_value 100 %}' />
123 
124-    Above, if ``this_value`` is 175 and ``max_value`` is 200, the the image in
125+    Above, if ``this_value`` is 175 and ``max_value`` is 200, the image in
126     the above example will be 88 pixels wide (because 175/200 = .875;
127     .875 * 100 = 87.5 which is rounded up to 88).
128     """
129Index: tests/modeltests/get_object_or_404/models.py
130===================================================================
131--- tests/modeltests/get_object_or_404/models.py        (revision 10731)
132+++ tests/modeltests/get_object_or_404/models.py        (working copy)
133@@ -55,7 +55,7 @@
134 >>> get_object_or_404(Article, title__contains="Run")
135 <Article: Run away!>
136 
137-# We can also use the the Article manager through an Author object.
138+# We can also use the Article manager through an Author object.
139 >>> get_object_or_404(a.article_set, title__contains="Run")
140 <Article: Run away!>
141 
142Index: tests/regressiontests/templates/loaders.py
143===================================================================
144--- tests/regressiontests/templates/loaders.py  (revision 10731)
145+++ tests/regressiontests/templates/loaders.py  (working copy)
146@@ -45,7 +45,7 @@
147     Creates a mock egg with a list of resources.
148 
149     name: The name of the module.
150-    resources: A dictionary of resources. Keys are the names and values the the data.
151+    resources: A dictionary of resources. Keys are the names and values the data.
152     """
153     egg = imp.new_module(name)
154     egg.__loader__ = MockLoader()
155Index: docs/internals/contributing.txt
156===================================================================
157--- docs/internals/contributing.txt     (revision 10731)
158+++ docs/internals/contributing.txt     (working copy)
159@@ -325,7 +325,7 @@
160         tickets, we keep all the discussion in one place, which helps everyone.
161 
162     "worksforme"
163-        Used when the the ticket doesn't contain enough detail to replicate
164+        Used when the ticket doesn't contain enough detail to replicate
165         the original bug.
166 
167 If you believe that the ticket was closed in error -- because you're
168Index: docs/ref/contrib/admin/actions.txt
169===================================================================
170--- docs/ref/contrib/admin/actions.txt  (revision 10731)
171+++ docs/ref/contrib/admin/actions.txt  (working copy)
172@@ -187,7 +187,7 @@
173 ---------------------------------------
174 
175 By default, after an action is performed the user is simply redirected back
176-the the original change list page. However, some actions, especially more
177+to the original change list page. However, some actions, especially more
178 complex ones, will need to return intermediate pages. For example, the
179 built-in delete action asks for confirmation before deleting the selected
180 objects.
181Index: docs/ref/authbackends.txt
182===================================================================
183--- docs/ref/authbackends.txt   (revision 10731)
184+++ docs/ref/authbackends.txt   (working copy)
185@@ -22,7 +22,7 @@
186 .. class:: ModelBackend
187 
188     This is the default authentication backend used by Django.  It
189-    authenticates using usernames and passwords stored in the the
190+    authenticates using usernames and passwords stored in the
191     :class:`~django.contrib.auth.models.User` model.
192 
193