Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed a number of minor misspellings.

  • Loading branch information...
commit 47c755327be9a3b976f5f78fc21f336f27aa6413 1 parent ca39c0a
@jphalip jphalip authored
Showing with 31 additions and 31 deletions.
  1. +1 −1  django/contrib/admin/filters.py
  2. +1 −1  django/contrib/formtools/wizard/views.py
  3. +1 −1  django/contrib/gis/geoip/prototypes.py
  4. +1 −1  django/core/management/__init__.py
  5. +1 −1  django/core/management/commands/dumpdata.py
  6. +1 −1  django/db/backends/oracle/compiler.py
  7. +1 −1  django/db/backends/sqlite3/base.py
  8. +1 −1  django/db/models/fields/__init__.py
  9. +1 −1  docs/howto/initial-data.txt
  10. +1 −1  docs/ref/contrib/admin/actions.txt
  11. +1 −1  docs/ref/contrib/staticfiles.txt
  12. +2 −2 docs/ref/django-admin.txt
  13. +1 −1  docs/ref/models/instances.txt
  14. +1 −1  docs/releases/1.2.1.txt
  15. +1 −1  docs/releases/1.5-beta-1.txt
  16. +1 −1  docs/topics/class-based-views/mixins.txt
  17. +1 −1  docs/topics/db/transactions.txt
  18. +1 −1  docs/topics/http/sessions.txt
  19. +1 −1  docs/topics/http/urls.txt
  20. +1 −1  docs/topics/testing/advanced.txt
  21. +3 −3 docs/topics/testing/overview.txt
  22. +1 −1  tests/custom_managers/tests.py
  23. +1 −1  tests/forms_tests/tests/test_forms.py
  24. +1 −1  tests/model_formsets/tests.py
  25. +1 −1  tests/queries/tests.py
  26. +1 −1  tests/servers/tests.py
  27. +1 −1  tests/settings_tests/tests.py
  28. +1 −1  tests/template_tests/test_response.py
View
2  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
View
2  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'
View
2  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),
View
2  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:
View
2  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 "
View
2  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.
View
2  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
View
2  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__
View
2  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 <topics-testing-fixtures>`, 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
----------------------------------
View
2  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
<disabling-admin-actions>` -- by passing a second argument to
:meth:`AdminSite.add_action()`::
View
2  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:
View
4 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</ref/contrib/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<staticfiles-runserver>` command.
.. django-admin-option:: --noreload
View
2  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.
View
2  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
View
2  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.
View
2  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
======================================
View
2  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
<managing-autocommit>`.
To disable autocommit temporarily, instead of::
View
2  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
View
2  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:
View
2  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
View
6 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
View
2  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)
View
2  tests/forms_tests/tests/test_forms.py
@@ -1824,7 +1824,7 @@ class SomeForm(Form):
# passing just one argument: overrides the field's label
(('custom',), {}, '<label for="id_field">custom:</label>'),
- # the overriden label is escaped
+ # the overridden label is escaped
(('custom&',), {}, '<label for="id_field">custom&amp;:</label>'),
((mark_safe('custom&'),), {}, '<label for="id_field">custom&:</label>'),
View
2  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')
View
2  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)
View
2  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):
View
2  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):
View
2  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'
Please sign in to comment.
Something went wrong with that request. Please try again.