summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJulien Phalip <jphalip@gmail.com>2013-07-27 18:45:25 -0700
committerJulien Phalip <jphalip@gmail.com>2013-07-27 18:46:03 -0700
commit47c755327be9a3b976f5f78fc21f336f27aa6413 (patch)
tree642bce46ec934223ed4a17ac3c6dbcbfdf953b8b /docs
parentca39c0a6becf497880181b3a5ef6db84130f9723 (diff)
Fixed a number of minor misspellings.
Diffstat (limited to 'docs')
-rw-r--r--docs/howto/initial-data.txt2
-rw-r--r--docs/ref/contrib/admin/actions.txt2
-rw-r--r--docs/ref/contrib/staticfiles.txt2
-rw-r--r--docs/ref/django-admin.txt4
-rw-r--r--docs/ref/models/instances.txt2
-rw-r--r--docs/releases/1.2.1.txt2
-rw-r--r--docs/releases/1.5-beta-1.txt2
-rw-r--r--docs/topics/class-based-views/mixins.txt2
-rw-r--r--docs/topics/db/transactions.txt2
-rw-r--r--docs/topics/http/sessions.txt2
-rw-r--r--docs/topics/http/urls.txt2
-rw-r--r--docs/topics/testing/advanced.txt2
-rw-r--r--docs/topics/testing/overview.txt6
13 files changed, 16 insertions, 16 deletions
diff --git a/docs/howto/initial-data.txt b/docs/howto/initial-data.txt
index cea07bfea3..b86aaa834e 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 <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
----------------------------------
diff --git a/docs/ref/contrib/admin/actions.txt b/docs/ref/contrib/admin/actions.txt
index 65d096921f..58d8244525 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
<disabling-admin-actions>` -- 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 806d135deb..678ab32a05 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 31c6a0f660..565c779525 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</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
diff --git a/docs/ref/models/instances.txt b/docs/ref/models/instances.txt
index f06866d9a1..1e7ad1ffdf 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 bdac39dd5d..0e193bfe34 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 69c591ac03..4495a281af 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 df1a5505a5..f6a70e7acc 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 903579cc38..4411b326d7 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
<managing-autocommit>`.
To disable autocommit temporarily, instead of::
diff --git a/docs/topics/http/sessions.txt b/docs/topics/http/sessions.txt
index 772ee122d5..8538859dad 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 8a3f240307..65c1f83168 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 2417274ab5..26d7521177 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 0380d6931b..0673ed6e7a 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