diff --git a/django/contrib/admin/filters.py b/django/contrib/admin/filters.py index 4131494515764..3a37de2404ab6 100644 --- a/django/contrib/admin/filters.py +++ b/django/contrib/admin/filters.py @@ -87,7 +87,7 @@ def value(self): def lookups(self, request, model_admin): """ - Must be overriden to return a list of tuples (value, verbose value) + Must be overridden to return a list of tuples (value, verbose value) """ raise NotImplementedError diff --git a/django/contrib/formtools/wizard/views.py b/django/contrib/formtools/wizard/views.py index c478f20854621..c137f1aeafef1 100644 --- a/django/contrib/formtools/wizard/views.py +++ b/django/contrib/formtools/wizard/views.py @@ -17,7 +17,7 @@ def normalize_name(name): """ - Converts camel-case style names into underscore seperated words. Example:: + Converts camel-case style names into underscore separated words. Example:: >>> normalize_name('oneTwoThree') 'one_two_three' diff --git a/django/contrib/gis/geoip/prototypes.py b/django/contrib/gis/geoip/prototypes.py index 283d7213952b3..c13dd8aba2edd 100644 --- a/django/contrib/gis/geoip/prototypes.py +++ b/django/contrib/gis/geoip/prototypes.py @@ -14,7 +14,7 @@ class GeoIPRecord(Structure): ('longitude', c_float), # TODO: In 1.4.6 this changed from `int dma_code;` to # `union {int metro_code; int dma_code;};`. Change - # to a `ctypes.Union` in to accomodate in future when + # to a `ctypes.Union` in to accommodate in future when # pre-1.4.6 versions are no longer distributed. ('dma_code', c_int), ('area_code', c_int), diff --git a/django/core/management/__init__.py b/django/core/management/__init__.py index 8fd46aa759d05..0ed8e0a786df7 100644 --- a/django/core/management/__init__.py +++ b/django/core/management/__init__.py @@ -146,7 +146,7 @@ def call_command(name, *args, **options): # Grab out a list of defaults from the options. optparse does this for us # when the script runs from the command line, but since call_command can - # be called programatically, we need to simulate the loading and handling + # be called programmatically, we need to simulate the loading and handling # of defaults (see #10080 for details). defaults = {} for opt in klass.option_list: diff --git a/django/core/management/commands/dumpdata.py b/django/core/management/commands/dumpdata.py index c5eb1b9a9e34a..100c1872a76d4 100644 --- a/django/core/management/commands/dumpdata.py +++ b/django/core/management/commands/dumpdata.py @@ -22,7 +22,7 @@ class Command(BaseCommand): make_option('-a', '--all', action='store_true', dest='use_base_manager', default=False, 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."), make_option('--pks', dest='primary_keys', help="Only dump objects with " - "given primary keys. Accepts a comma seperated list of keys. " + "given primary keys. Accepts a comma separated list of keys. " "This option will only work when you specify one model."), ) help = ("Output the contents of the database as a fixture of the given " diff --git a/django/db/backends/oracle/compiler.py b/django/db/backends/oracle/compiler.py index d2d4cd3ac9db8..b6eb80e7ceee0 100644 --- a/django/db/backends/oracle/compiler.py +++ b/django/db/backends/oracle/compiler.py @@ -25,7 +25,7 @@ def resolve_columns(self, row, fields=()): def as_sql(self, with_limits=True, with_col_aliases=False): """ Creates the SQL for this query. Returns the SQL string and list - of parameters. This is overriden from the original Query class + of parameters. This is overridden from the original Query class to handle the additional SQL Oracle requires to emulate LIMIT and OFFSET. diff --git a/django/db/backends/sqlite3/base.py b/django/db/backends/sqlite3/base.py index dc7db2fceb08b..f396bf7408c2a 100644 --- a/django/db/backends/sqlite3/base.py +++ b/django/db/backends/sqlite3/base.py @@ -335,7 +335,7 @@ def get_connection_params(self): if 'check_same_thread' in kwargs and kwargs['check_same_thread']: warnings.warn( 'The `check_same_thread` option was provided and set to ' - 'True. It will be overriden with False. Use the ' + 'True. It will be overridden with False. Use the ' '`DatabaseWrapper.allow_thread_sharing` property instead ' 'for controlling thread shareability.', RuntimeWarning diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index ddc76fccf755e..4f5707952ef1c 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -90,7 +90,7 @@ class Field(object): 'already exists.'), } - # Generic field type description, usually overriden by subclasses + # Generic field type description, usually overridden by subclasses def _description(self): return _('Field of type: %(field_type)s') % { 'field_type': self.__class__.__name__ diff --git a/docs/howto/initial-data.txt b/docs/howto/initial-data.txt index cea07bfea3698..b86aaa834e5a0 100644 --- a/docs/howto/initial-data.txt +++ b/docs/howto/initial-data.txt @@ -142,7 +142,7 @@ database tables already will have been created. If you require data for a test case, you should add it using either a :ref:`test fixture `, or - programatically add it during the ``setUp()`` of your test case. + programmatically add it during the ``setUp()`` of your test case. Database-backend-specific SQL data ---------------------------------- diff --git a/docs/ref/contrib/admin/actions.txt b/docs/ref/contrib/admin/actions.txt index 65d096921f5c0..58d82445254a7 100644 --- a/docs/ref/contrib/admin/actions.txt +++ b/docs/ref/contrib/admin/actions.txt @@ -271,7 +271,7 @@ Making actions available site-wide This makes the `export_selected_objects` action globally available as an action named `"export_selected_objects"`. You can explicitly give the action - a name -- good if you later want to programatically :ref:`remove the action + a name -- good if you later want to programmatically :ref:`remove the action ` -- by passing a second argument to :meth:`AdminSite.add_action()`:: diff --git a/docs/ref/contrib/staticfiles.txt b/docs/ref/contrib/staticfiles.txt index 806d135debed2..678ab32a0586e 100644 --- a/docs/ref/contrib/staticfiles.txt +++ b/docs/ref/contrib/staticfiles.txt @@ -226,7 +226,7 @@ CachedStaticFilesStorage would be replaced by calling the :meth:`~django.core.files.storage.Storage.url` - method of the ``CachedStaticFilesStorage`` storage backend, ultimatively + method of the ``CachedStaticFilesStorage`` storage backend, ultimately saving a ``'css/styles.55e7cbb9ba48.css'`` file with the following content: diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index 31c6a0f660250..565c779525b69 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -233,7 +233,7 @@ probably be using this flag. .. django-admin-option:: --pks By default, ``dumpdata`` will output all the records of the model, but -you can use the ``--pks`` option to specify a comma seperated list of +you can use the ``--pks`` option to specify a comma separated list of primary keys on which to filter. This is only available when dumping one model. @@ -743,7 +743,7 @@ You can provide an IPv6 address surrounded by brackets A hostname containing ASCII-only characters can also be used. If the :doc:`staticfiles` contrib app is enabled -(default in new projects) the :djadmin:`runserver` command will be overriden +(default in new projects) the :djadmin:`runserver` command will be overridden with its own :ref:`runserver` command. .. django-admin-option:: --noreload diff --git a/docs/ref/models/instances.txt b/docs/ref/models/instances.txt index f06866d9a17c7..1e7ad1ffdf8ad 100644 --- a/docs/ref/models/instances.txt +++ b/docs/ref/models/instances.txt @@ -118,7 +118,7 @@ validation for your own manually created models. For example:: article.full_clean() except ValidationError as e: # Do something based on the errors contained in e.message_dict. - # Display them to a user, or handle them programatically. + # Display them to a user, or handle them programmatically. pass The first step ``full_clean()`` performs is to clean each individual field. diff --git a/docs/releases/1.2.1.txt b/docs/releases/1.2.1.txt index bdac39dd5d186..0e193bfe3446a 100644 --- a/docs/releases/1.2.1.txt +++ b/docs/releases/1.2.1.txt @@ -4,7 +4,7 @@ Django 1.2.1 release notes Django 1.2.1 was released almost immediately after 1.2.0 to correct two small bugs: one was in the documentation packaging script, the other was a bug_ that -affected datetime form field widgets when localisation was enabled. +affected datetime form field widgets when localization was enabled. .. _bug: https://code.djangoproject.com/ticket/13560 diff --git a/docs/releases/1.5-beta-1.txt b/docs/releases/1.5-beta-1.txt index 69c591ac0351e..4495a281af455 100644 --- a/docs/releases/1.5-beta-1.txt +++ b/docs/releases/1.5-beta-1.txt @@ -7,7 +7,7 @@ November 27, 2012. Welcome to Django 1.5 beta! This is the second in a series of preview/development releases leading -up to the eventual release of Django 1.5, scheduled for Decemeber +up to the eventual release of Django 1.5, scheduled for December 2012. This release is primarily targeted at developers who are interested in trying out new features and testing the Django codebase to help identify and resolve bugs prior to the final 1.5 release. diff --git a/docs/topics/class-based-views/mixins.txt b/docs/topics/class-based-views/mixins.txt index df1a5505a5b30..f6a70e7acc4d1 100644 --- a/docs/topics/class-based-views/mixins.txt +++ b/docs/topics/class-based-views/mixins.txt @@ -170,7 +170,7 @@ being taken from the :attr:`~django.views.generic.list.MultipleObjectTemplateResponseMixin.template_name_suffix` attribute. (The date based generic views use suffixes such as ``_archive``, ``_archive_year`` and so on to use different templates for the various -specialised date-based list views.) +specialized date-based list views.) Using Django's class-based view mixins ====================================== diff --git a/docs/topics/db/transactions.txt b/docs/topics/db/transactions.txt index 903579cc388d2..4411b326d70d6 100644 --- a/docs/topics/db/transactions.txt +++ b/docs/topics/db/transactions.txt @@ -619,7 +619,7 @@ context managers breaks atomicity. Managing autocommit ~~~~~~~~~~~~~~~~~~~ -Django 1.6 introduces an explicit :ref:`API for mananging autocommit +Django 1.6 introduces an explicit :ref:`API for managing autocommit `. To disable autocommit temporarily, instead of:: diff --git a/docs/topics/http/sessions.txt b/docs/topics/http/sessions.txt index 772ee122d5bad..8538859dad450 100644 --- a/docs/topics/http/sessions.txt +++ b/docs/topics/http/sessions.txt @@ -293,7 +293,7 @@ You can edit it multiple times. expiration (or those set to expire at browser close), this will equal the date :setting:`SESSION_COOKIE_AGE` seconds from now. - This function accepts the same keyword argumets as :meth:`get_expiry_age`. + This function accepts the same keyword arguments as :meth:`get_expiry_age`. .. method:: get_expire_at_browser_close diff --git a/docs/topics/http/urls.txt b/docs/topics/http/urls.txt index 8a3f24030748f..65c1f83168b92 100644 --- a/docs/topics/http/urls.txt +++ b/docs/topics/http/urls.txt @@ -623,7 +623,7 @@ change the entry in the URLconf. In some scenarios where views are of a generic nature, a many-to-one relationship might exist between URLs and views. For these cases the view name -isn't a good enough identificator for it when it comes the time of reversing +isn't a good enough identifier for it when comes the time of reversing URLs. Read the next section to know about the solution Django provides for this. .. _naming-url-patterns: diff --git a/docs/topics/testing/advanced.txt b/docs/topics/testing/advanced.txt index 2417274ab5ecc..26d7521177287 100644 --- a/docs/topics/testing/advanced.txt +++ b/docs/topics/testing/advanced.txt @@ -174,7 +174,7 @@ Advanced features of ``TransactionTestCase`` .. warning:: This attribute is a private API. It may be changed or removed without - a deprecation period in the future, for instance to accomodate changes + a deprecation period in the future, for instance to accommodate changes in application loading. It's used to optimize Django's own test suite, which contains hundreds diff --git a/docs/topics/testing/overview.txt b/docs/topics/testing/overview.txt index 0380d6931b510..0673ed6e7a131 100644 --- a/docs/topics/testing/overview.txt +++ b/docs/topics/testing/overview.txt @@ -1421,7 +1421,7 @@ The decorator can also be applied to test case classes:: You can also simulate the absence of a setting by deleting it after settings -have been overriden, like this:: +have been overridden, like this:: @override_settings() def test_something(self): @@ -1437,7 +1437,7 @@ callbacks to clean up and otherwise reset state when settings are changed. Django itself uses this signal to reset various data: ================================ ======================== -Overriden settings Data reset +Overridden settings Data reset ================================ ======================== USE_TZ, TIME_ZONE Databases timezone TEMPLATE_CONTEXT_PROCESSORS Context processors cache @@ -1639,7 +1639,7 @@ your test suite. .. versionadded:: 1.5 Asserts that the strings ``xml1`` and ``xml2`` are equal. The - comparison is based on XML semantics. Similarily to + comparison is based on XML semantics. Similarly to :meth:`~SimpleTestCase.assertHTMLEqual`, the comparison is made on parsed content, hence only semantic differences are considered, not syntax differences. When unvalid XML is passed in any parameter, an diff --git a/tests/custom_managers/tests.py b/tests/custom_managers/tests.py index 7fa58b2a885ef..5ab58b534a478 100644 --- a/tests/custom_managers/tests.py +++ b/tests/custom_managers/tests.py @@ -36,7 +36,7 @@ def test_manager(self): with self.assertRaises(AttributeError): manager.optout_public_method() - # Test that the overriden method is called. + # Test that the overridden method is called. queryset = manager.filter() self.assertQuerysetEqual(queryset, ["Bugs Bunny"], six.text_type) self.assertEqual(queryset._filter_CustomQuerySet, True) diff --git a/tests/forms_tests/tests/test_forms.py b/tests/forms_tests/tests/test_forms.py index c77181273c049..89c19cc5a4d2d 100644 --- a/tests/forms_tests/tests/test_forms.py +++ b/tests/forms_tests/tests/test_forms.py @@ -1824,7 +1824,7 @@ class SomeForm(Form): # passing just one argument: overrides the field's label (('custom',), {}, ''), - # the overriden label is escaped + # the overridden label is escaped (('custom&',), {}, ''), ((mark_safe('custom&'),), {}, ''), diff --git a/tests/model_formsets/tests.py b/tests/model_formsets/tests.py index f66b5abb635e7..3bb4f95ea5b07 100644 --- a/tests/model_formsets/tests.py +++ b/tests/model_formsets/tests.py @@ -391,7 +391,7 @@ class Meta: def test_custom_queryset_init(self): """ - Test that a queryset can be overriden in the __init__ method. + Test that a queryset can be overridden in the __init__ method. https://docs.djangoproject.com/en/dev/topics/forms/modelforms/#changing-the-queryset """ author1 = Author.objects.create(name='Charles Baudelaire') diff --git a/tests/queries/tests.py b/tests/queries/tests.py index 514b0ee5d7331..94c12c5ba980a 100644 --- a/tests/queries/tests.py +++ b/tests/queries/tests.py @@ -789,7 +789,7 @@ def test_ticket7076(self): ) def test_ticket7181(self): - # Ordering by related tables should accomodate nullable fields (this + # Ordering by related tables should accommodate nullable fields (this # test is a little tricky, since NULL ordering is database dependent. # Instead, we just count the number of results). self.assertEqual(len(Tag.objects.order_by('parent__name')), 5) diff --git a/tests/servers/tests.py b/tests/servers/tests.py index be74afe820d07..1f02a88d5ac8a 100644 --- a/tests/servers/tests.py +++ b/tests/servers/tests.py @@ -113,7 +113,7 @@ def raises_exception(cls, address, exception): def test_test_test(self): # Intentionally empty method so that the test is picked up by the - # test runner and the overriden setUpClass() method is executed. + # test runner and the overridden setUpClass() method is executed. pass class LiveServerViews(LiveServerBase): diff --git a/tests/settings_tests/tests.py b/tests/settings_tests/tests.py index 87ed4d4f5eb49..3673031447553 100644 --- a/tests/settings_tests/tests.py +++ b/tests/settings_tests/tests.py @@ -163,7 +163,7 @@ def test_settings_delete_wrapped(self): def test_override_settings_delete(self): """ - Allow deletion of a setting in an overriden settings set (#18824) + Allow deletion of a setting in an overridden settings set (#18824) """ previous_i18n = settings.USE_I18N with self.settings(USE_I18N=False): diff --git a/tests/template_tests/test_response.py b/tests/template_tests/test_response.py index 6acc45626fef3..65f753136185c 100644 --- a/tests/template_tests/test_response.py +++ b/tests/template_tests/test_response.py @@ -95,7 +95,7 @@ def test_content_access_rendered(self): self.assertEqual(response.content, b'foo') def test_set_content(self): - # content can be overriden + # content can be overridden response = self._response() self.assertFalse(response.is_rendered) response.content = 'spam'