Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed a number of minor misspellings.

  • Loading branch information...
commit 47c755327be9a3b976f5f78fc21f336f27aa6413 1 parent ca39c0a
Julien Phalip authored July 27, 2013

Showing 28 changed files with 31 additions and 31 deletions. Show diff stats Hide diff stats

  1. 2  django/contrib/admin/filters.py
  2. 2  django/contrib/formtools/wizard/views.py
  3. 2  django/contrib/gis/geoip/prototypes.py
  4. 2  django/core/management/__init__.py
  5. 2  django/core/management/commands/dumpdata.py
  6. 2  django/db/backends/oracle/compiler.py
  7. 2  django/db/backends/sqlite3/base.py
  8. 2  django/db/models/fields/__init__.py
  9. 2  docs/howto/initial-data.txt
  10. 2  docs/ref/contrib/admin/actions.txt
  11. 2  docs/ref/contrib/staticfiles.txt
  12. 4  docs/ref/django-admin.txt
  13. 2  docs/ref/models/instances.txt
  14. 2  docs/releases/1.2.1.txt
  15. 2  docs/releases/1.5-beta-1.txt
  16. 2  docs/topics/class-based-views/mixins.txt
  17. 2  docs/topics/db/transactions.txt
  18. 2  docs/topics/http/sessions.txt
  19. 2  docs/topics/http/urls.txt
  20. 2  docs/topics/testing/advanced.txt
  21. 6  docs/topics/testing/overview.txt
  22. 2  tests/custom_managers/tests.py
  23. 2  tests/forms_tests/tests/test_forms.py
  24. 2  tests/model_formsets/tests.py
  25. 2  tests/queries/tests.py
  26. 2  tests/servers/tests.py
  27. 2  tests/settings_tests/tests.py
  28. 2  tests/template_tests/test_response.py
2  django/contrib/admin/filters.py
@@ -87,7 +87,7 @@ def value(self):
87 87
 
88 88
     def lookups(self, request, model_admin):
89 89
         """
90  
-        Must be overriden to return a list of tuples (value, verbose value)
  90
+        Must be overridden to return a list of tuples (value, verbose value)
91 91
         """
92 92
         raise NotImplementedError
93 93
 
2  django/contrib/formtools/wizard/views.py
@@ -17,7 +17,7 @@
17 17
 
18 18
 def normalize_name(name):
19 19
     """
20  
-    Converts camel-case style names into underscore seperated words. Example::
  20
+    Converts camel-case style names into underscore separated words. Example::
21 21
 
22 22
         >>> normalize_name('oneTwoThree')
23 23
         'one_two_three'
2  django/contrib/gis/geoip/prototypes.py
@@ -14,7 +14,7 @@ class GeoIPRecord(Structure):
14 14
                 ('longitude', c_float),
15 15
                 # TODO: In 1.4.6 this changed from `int dma_code;` to
16 16
                 # `union {int metro_code; int dma_code;};`.  Change
17  
-                # to a `ctypes.Union` in to accomodate in future when
  17
+                # to a `ctypes.Union` in to accommodate in future when
18 18
                 # pre-1.4.6 versions are no longer distributed.
19 19
                 ('dma_code', c_int),
20 20
                 ('area_code', c_int),
2  django/core/management/__init__.py
@@ -146,7 +146,7 @@ def call_command(name, *args, **options):
146 146
 
147 147
     # Grab out a list of defaults from the options. optparse does this for us
148 148
     # when the script runs from the command line, but since call_command can
149  
-    # be called programatically, we need to simulate the loading and handling
  149
+    # be called programmatically, we need to simulate the loading and handling
150 150
     # of defaults (see #10080 for details).
151 151
     defaults = {}
152 152
     for opt in klass.option_list:
2  django/core/management/commands/dumpdata.py
@@ -22,7 +22,7 @@ class Command(BaseCommand):
22 22
         make_option('-a', '--all', action='store_true', dest='use_base_manager', default=False,
23 23
             help="Use Django's base manager to dump all models stored in the database, including those that would otherwise be filtered or modified by a custom manager."),
24 24
         make_option('--pks', dest='primary_keys', help="Only dump objects with "
25  
-            "given primary keys. Accepts a comma seperated list of keys. "
  25
+            "given primary keys. Accepts a comma separated list of keys. "
26 26
             "This option will only work when you specify one model."),
27 27
     )
28 28
     help = ("Output the contents of the database as a fixture of the given "
2  django/db/backends/oracle/compiler.py
@@ -25,7 +25,7 @@ def resolve_columns(self, row, fields=()):
25 25
     def as_sql(self, with_limits=True, with_col_aliases=False):
26 26
         """
27 27
         Creates the SQL for this query. Returns the SQL string and list
28  
-        of parameters.  This is overriden from the original Query class
  28
+        of parameters.  This is overridden from the original Query class
29 29
         to handle the additional SQL Oracle requires to emulate LIMIT
30 30
         and OFFSET.
31 31
 
2  django/db/backends/sqlite3/base.py
@@ -335,7 +335,7 @@ def get_connection_params(self):
335 335
         if 'check_same_thread' in kwargs and kwargs['check_same_thread']:
336 336
             warnings.warn(
337 337
                 'The `check_same_thread` option was provided and set to '
338  
-                'True. It will be overriden with False. Use the '
  338
+                'True. It will be overridden with False. Use the '
339 339
                 '`DatabaseWrapper.allow_thread_sharing` property instead '
340 340
                 'for controlling thread shareability.',
341 341
                 RuntimeWarning
2  django/db/models/fields/__init__.py
@@ -90,7 +90,7 @@ class Field(object):
90 90
                     'already exists.'),
91 91
     }
92 92
 
93  
-    # Generic field type description, usually overriden by subclasses
  93
+    # Generic field type description, usually overridden by subclasses
94 94
     def _description(self):
95 95
         return _('Field of type: %(field_type)s') % {
96 96
             'field_type': self.__class__.__name__
2  docs/howto/initial-data.txt
@@ -142,7 +142,7 @@ database tables already will have been created.
142 142
 
143 143
     If you require data for a test case, you should add it using
144 144
     either a :ref:`test fixture <topics-testing-fixtures>`, or
145  
-    programatically add it during the ``setUp()`` of your test case.
  145
+    programmatically add it during the ``setUp()`` of your test case.
146 146
 
147 147
 Database-backend-specific SQL data
148 148
 ----------------------------------
2  docs/ref/contrib/admin/actions.txt
@@ -271,7 +271,7 @@ Making actions available site-wide
271 271
 
272 272
     This makes the `export_selected_objects` action globally available as an
273 273
     action named `"export_selected_objects"`. You can explicitly give the action
274  
-    a name -- good if you later want to programatically :ref:`remove the action
  274
+    a name -- good if you later want to programmatically :ref:`remove the action
275 275
     <disabling-admin-actions>` -- by passing a second argument to
276 276
     :meth:`AdminSite.add_action()`::
277 277
 
2  docs/ref/contrib/staticfiles.txt
@@ -226,7 +226,7 @@ CachedStaticFilesStorage
226 226
 
227 227
     would be replaced by calling the
228 228
     :meth:`~django.core.files.storage.Storage.url`
229  
-    method of the ``CachedStaticFilesStorage`` storage backend, ultimatively
  229
+    method of the ``CachedStaticFilesStorage`` storage backend, ultimately
230 230
     saving a ``'css/styles.55e7cbb9ba48.css'`` file with the following
231 231
     content:
232 232
 
4  docs/ref/django-admin.txt
@@ -233,7 +233,7 @@ probably be using this flag.
233 233
 .. django-admin-option:: --pks
234 234
 
235 235
 By default, ``dumpdata`` will output all the records of the model, but
236  
-you can use the ``--pks`` option to specify a comma seperated list of
  236
+you can use the ``--pks`` option to specify a comma separated list of
237 237
 primary keys on which to filter.  This is only available when dumping
238 238
 one model.
239 239
 
@@ -743,7 +743,7 @@ You can provide an IPv6 address surrounded by brackets
743 743
 A hostname containing ASCII-only characters can also be used.
744 744
 
745 745
 If the :doc:`staticfiles</ref/contrib/staticfiles>` contrib app is enabled
746  
-(default in new projects) the :djadmin:`runserver` command will be overriden
  746
+(default in new projects) the :djadmin:`runserver` command will be overridden
747 747
 with its own :ref:`runserver<staticfiles-runserver>` command.
748 748
 
749 749
 .. django-admin-option:: --noreload
2  docs/ref/models/instances.txt
@@ -118,7 +118,7 @@ validation for your own manually created models. For example::
118 118
         article.full_clean()
119 119
     except ValidationError as e:
120 120
         # Do something based on the errors contained in e.message_dict.
121  
-        # Display them to a user, or handle them programatically.
  121
+        # Display them to a user, or handle them programmatically.
122 122
         pass
123 123
 
124 124
 The first step ``full_clean()`` performs is to clean each individual field.
2  docs/releases/1.2.1.txt
@@ -4,7 +4,7 @@ Django 1.2.1 release notes
4 4
 
5 5
 Django 1.2.1 was released almost immediately after 1.2.0 to correct two small
6 6
 bugs: one was in the documentation packaging script, the other was a bug_ that
7  
-affected datetime form field widgets when localisation was enabled.
  7
+affected datetime form field widgets when localization was enabled.
8 8
 
9 9
 .. _bug: https://code.djangoproject.com/ticket/13560
10 10
 
2  docs/releases/1.5-beta-1.txt
@@ -7,7 +7,7 @@ November 27, 2012.
7 7
 Welcome to Django 1.5 beta!
8 8
 
9 9
 This is the second in a series of preview/development releases leading
10  
-up to the eventual release of Django 1.5, scheduled for Decemeber
  10
+up to the eventual release of Django 1.5, scheduled for December
11 11
 2012. This release is primarily targeted at developers who are
12 12
 interested in trying out new features and testing the Django codebase
13 13
 to help identify and resolve bugs prior to the final 1.5 release.
2  docs/topics/class-based-views/mixins.txt
@@ -170,7 +170,7 @@ being taken from the
170 170
 :attr:`~django.views.generic.list.MultipleObjectTemplateResponseMixin.template_name_suffix`
171 171
 attribute. (The date based generic views use suffixes such as ``_archive``,
172 172
 ``_archive_year`` and so on to use different templates for the various
173  
-specialised date-based list views.)
  173
+specialized date-based list views.)
174 174
 
175 175
 Using Django's class-based view mixins
176 176
 ======================================
2  docs/topics/db/transactions.txt
@@ -619,7 +619,7 @@ context managers breaks atomicity.
619 619
 Managing autocommit
620 620
 ~~~~~~~~~~~~~~~~~~~
621 621
 
622  
-Django 1.6 introduces an explicit :ref:`API for mananging autocommit
  622
+Django 1.6 introduces an explicit :ref:`API for managing autocommit
623 623
 <managing-autocommit>`.
624 624
 
625 625
 To disable autocommit temporarily, instead of::
2  docs/topics/http/sessions.txt
@@ -293,7 +293,7 @@ You can edit it multiple times.
293 293
       expiration (or those set to expire at browser close), this will equal the
294 294
       date :setting:`SESSION_COOKIE_AGE` seconds from now.
295 295
 
296  
-      This function accepts the same keyword argumets as :meth:`get_expiry_age`.
  296
+      This function accepts the same keyword arguments as :meth:`get_expiry_age`.
297 297
 
298 298
     .. method:: get_expire_at_browser_close
299 299
 
2  docs/topics/http/urls.txt
@@ -623,7 +623,7 @@ change the entry in the URLconf.
623 623
 
624 624
 In some scenarios where views are of a generic nature, a many-to-one
625 625
 relationship might exist between URLs and views. For these cases the view name
626  
-isn't a good enough identificator for it when it comes the time of reversing
  626
+isn't a good enough identifier for it when comes the time of reversing
627 627
 URLs. Read the next section to know about the solution Django provides for this.
628 628
 
629 629
 .. _naming-url-patterns:
2  docs/topics/testing/advanced.txt
@@ -174,7 +174,7 @@ Advanced features of ``TransactionTestCase``
174 174
     .. warning::
175 175
 
176 176
         This attribute is a private API. It may be changed or removed without
177  
-        a deprecation period in the future, for instance to accomodate changes
  177
+        a deprecation period in the future, for instance to accommodate changes
178 178
         in application loading.
179 179
 
180 180
         It's used to optimize Django's own test suite, which contains hundreds
6  docs/topics/testing/overview.txt
@@ -1421,7 +1421,7 @@ The decorator can also be applied to test case classes::
1421 1421
 
1422 1422
 
1423 1423
 You can also simulate the absence of a setting by deleting it after settings
1424  
-have been overriden, like this::
  1424
+have been overridden, like this::
1425 1425
 
1426 1426
     @override_settings()
1427 1427
     def test_something(self):
@@ -1437,7 +1437,7 @@ callbacks to clean up and otherwise reset state when settings are changed.
1437 1437
 Django itself uses this signal to reset various data:
1438 1438
 
1439 1439
 ================================ ========================
1440  
-Overriden settings               Data reset
  1440
+Overridden settings              Data reset
1441 1441
 ================================ ========================
1442 1442
 USE_TZ, TIME_ZONE                Databases timezone
1443 1443
 TEMPLATE_CONTEXT_PROCESSORS      Context processors cache
@@ -1639,7 +1639,7 @@ your test suite.
1639 1639
     .. versionadded:: 1.5
1640 1640
 
1641 1641
     Asserts that the strings ``xml1`` and ``xml2`` are equal. The
1642  
-    comparison is based on XML semantics. Similarily to
  1642
+    comparison is based on XML semantics. Similarly to
1643 1643
     :meth:`~SimpleTestCase.assertHTMLEqual`, the comparison is
1644 1644
     made on parsed content, hence only semantic differences are considered, not
1645 1645
     syntax differences. When unvalid XML is passed in any parameter, an
2  tests/custom_managers/tests.py
@@ -36,7 +36,7 @@ def test_manager(self):
36 36
             with self.assertRaises(AttributeError):
37 37
                manager.optout_public_method()
38 38
 
39  
-            # Test that the overriden method is called.
  39
+            # Test that the overridden method is called.
40 40
             queryset = manager.filter()
41 41
             self.assertQuerysetEqual(queryset, ["Bugs Bunny"], six.text_type)
42 42
             self.assertEqual(queryset._filter_CustomQuerySet, True)
2  tests/forms_tests/tests/test_forms.py
@@ -1824,7 +1824,7 @@ class SomeForm(Form):
1824 1824
             # passing just one argument: overrides the field's label
1825 1825
             (('custom',), {}, '<label for="id_field">custom:</label>'),
1826 1826
 
1827  
-            # the overriden label is escaped
  1827
+            # the overridden label is escaped
1828 1828
             (('custom&',), {}, '<label for="id_field">custom&amp;:</label>'),
1829 1829
             ((mark_safe('custom&'),), {}, '<label for="id_field">custom&:</label>'),
1830 1830
 
2  tests/model_formsets/tests.py
@@ -391,7 +391,7 @@ class Meta:
391 391
 
392 392
     def test_custom_queryset_init(self):
393 393
         """
394  
-        Test that a queryset can be overriden in the __init__ method.
  394
+        Test that a queryset can be overridden in the __init__ method.
395 395
         https://docs.djangoproject.com/en/dev/topics/forms/modelforms/#changing-the-queryset
396 396
         """
397 397
         author1 = Author.objects.create(name='Charles Baudelaire')
2  tests/queries/tests.py
@@ -789,7 +789,7 @@ def test_ticket7076(self):
789 789
         )
790 790
 
791 791
     def test_ticket7181(self):
792  
-        # Ordering by related tables should accomodate nullable fields (this
  792
+        # Ordering by related tables should accommodate nullable fields (this
793 793
         # test is a little tricky, since NULL ordering is database dependent.
794 794
         # Instead, we just count the number of results).
795 795
         self.assertEqual(len(Tag.objects.order_by('parent__name')), 5)
2  tests/servers/tests.py
@@ -113,7 +113,7 @@ def raises_exception(cls, address, exception):
113 113
 
114 114
     def test_test_test(self):
115 115
         # Intentionally empty method so that the test is picked up by the
116  
-        # test runner and the overriden setUpClass() method is executed.
  116
+        # test runner and the overridden setUpClass() method is executed.
117 117
         pass
118 118
 
119 119
 class LiveServerViews(LiveServerBase):
2  tests/settings_tests/tests.py
@@ -163,7 +163,7 @@ def test_settings_delete_wrapped(self):
163 163
 
164 164
     def test_override_settings_delete(self):
165 165
         """
166  
-        Allow deletion of a setting in an overriden settings set (#18824)
  166
+        Allow deletion of a setting in an overridden settings set (#18824)
167 167
         """
168 168
         previous_i18n = settings.USE_I18N
169 169
         with self.settings(USE_I18N=False):
2  tests/template_tests/test_response.py
@@ -95,7 +95,7 @@ def test_content_access_rendered(self):
95 95
         self.assertEqual(response.content, b'foo')
96 96
 
97 97
     def test_set_content(self):
98  
-        # content can be overriden
  98
+        # content can be overridden
99 99
         response = self._response()
100 100
         self.assertFalse(response.is_rendered)
101 101
         response.content = 'spam'

0 notes on commit 47c7553

Please sign in to comment.
Something went wrong with that request. Please try again.