Ticket #16014: doc-patch-2.diff

docs/intro/tutorial01.txt

@@ -593 +593 @@
     Unicode string, and ``str(p)`` will return a normal string, with characters
     encoded as UTF-8.
 
-    If all of this is jibberish to you, just remember to add
+    If all of this is gibberish to you, just remember to add
     :meth:`~django.db.models.Model.__unicode__` methods to your models. With any
     luck, things should Just Work for you.
 

docs/internals/svn.txt

@@ -199 +199 @@
 fixes, and shortly after the release of Django 1.1 the branch
 ``django/branches/releases/1.1.X`` was created.
 
-Prior to the Django 1.0 release, these branches were maintaind within
+Prior to the Django 1.0 release, these branches were maintained within
 the top-level ``django/branches`` directory, and so the following
 branches exist there and provided support for older Django releases:
 

docs/internals/contributing.txt

@@ -472 +472 @@
     * Then, click the "Join this Team" button to become a member of this team.
       Every team has at least one coordinator who is responsible to review
       your membership request. You can of course also contact the team
-      coordinator to clarify procedual problems and handle the actual
+      coordinator to clarify procedural problems and handle the actual
       translation process.
 
     * Once you are a member of a team choose the translation resource you

docs/internals/deprecation.txt

@@ -20 +20 @@
 
     * 1.4
         * ``CsrfResponseMiddleware``.  This has been deprecated since the 1.2
-          release, in favour of the template tag method for inserting the CSRF
+          release, in favor of the template tag method for inserting the CSRF
           token.  ``CsrfMiddleware``, which combines ``CsrfResponseMiddleware``
           and ``CsrfViewMiddleware``, is also deprecated.
 
@@ -129 +129 @@
 
         * The undocumented function
           :func:`django.contrib.formtools.utils.security_hash`
-          is deprecated, in favour of :func:`django.contrib.formtools.utils.form_hmac`
+          is deprecated, in favor of :func:`django.contrib.formtools.utils.form_hmac`
 
         * The function-based generic views have been deprecated in
           favor of their class-based cousins. The following modules
@@ -161 +161 @@
           a :class:`~django.contrib.gis.geos.GEOSException` when called
           on a geometry with no SRID value.
 
-        * :class:`~django.http.CompatCookie` will be removed in favour of
+        * :class:`~django.http.CompatCookie` will be removed in favor of
           :class:`~django.http.SimpleCookie`.
 
         * :class:`django.core.context_processors.PermWrapper` and

docs/howto/jython.txt

@@ -65 +65 @@
 running on standard Python. However, are a few differences to keep in mind:
 
     * Remember to use the ``jython`` command instead of ``python``. The
-      documentation uses ``python`` for consistancy, but if you're using Jython
+      documentation uses ``python`` for consistency, but if you're using Jython
       you'll want to mentally replace ``python`` with ``jython`` every time it
       occurs.
 

docs/howto/custom-template-tags.txt

@@ -894 +894 @@
 .. admonition:: Variable scope in context
 
     Any variable set in the context will only be available in the same ``block``
-    of the template in which it was assigned. This behaviour is intentional;
+    of the template in which it was assigned. This behavior is intentional;
     it provides a scope for variables so that they don't conflict with
     context in other blocks.
 

docs/howto/custom-management-commands.txt

@@ -71 +71 @@
 <poll_id>``.
 
 The ``handle()`` method takes zero or more ``poll_ids`` and sets ``poll.opened``
-to ``False`` for each one. If the user referenced any nonexistant polls, a
+to ``False`` for each one. If the user referenced any nonexistent polls, a
 :class:`CommandError` is raised. The ``poll.opened`` attribute does not exist
 in the :doc:`tutorial</intro/tutorial01>` and was added to
 ``polls.models.Poll`` for this example.

docs/howto/static-files.txt

@@ -137 +137 @@
 directly in your templates. This means that a switch of static files servers
 only requires changing that single value. Much better!
 
-``staticfiles`` inludes two built-in ways of getting at this setting in your
+``staticfiles`` includes two built-in ways of getting at this setting in your
 templates: a context processor and a template tag.
 
 With a context processor
@@ -170 +170 @@
 every template. However, context processors require that you use
 :class:`~django.template.RequestContext` when rendering templates. This happens
 automatically if you're using a :doc:`generic view </ref/class-based-views>`,
-but in views written by hand you'll need to explicitally use ``RequestContext``
+but in views written by hand you'll need to explicitly use ``RequestContext``
 To see how that works, and to read more details, check out
 :ref:`subclassing-context-requestcontext`.
 
@@ -439 +439 @@
 
 Once that's done, all you have to do is run :djadmin:`collectstatic` and your
 static files would be pushed through your storage package up to S3. If you
-later needed to swich to a different storage provider, it could be as simple
+later needed to switch to a different storage provider, it could be as simple
 as changing your :setting:`STATICFILES_STORAGE` setting.
 
 For details on how you'd write one of these backends,

docs/howto/error-reporting.txt

@@ -44 +44 @@
    .. versionadded:: 1.3
 
    Server error emails are sent using the logging framework, so you can
-   customize this behaviour by :doc:`customizing your logging configuration
+   customize this behavior by :doc:`customizing your logging configuration
    </topics/logging>`.
 
 404 errors

docs/topics/auth.txt

@@ -283 +283 @@
         The :attr:`~django.contrib.auth.models.User.username` and
         :attr:`~django.contrib.auth.models.User.password` are set as given. The
         domain portion of :attr:`~django.contrib.auth.models.User.email` is
-        automatically convered to lowercase, and the returned
+        automatically converted to lowercase, and the returned
         :class:`~django.contrib.auth.models.User` object will have
         :attr:`~models.User.is_active` set to ``True``.
 
@@ -1244 +1244 @@
 :ref:`model Meta attribute <meta-options>`.
 
 This example Task model creates three custom permissions, i.e., actions users
-can or cannot do with Task instances, specific to your appication::
+can or cannot do with Task instances, specific to your application::
 
     class Task(models.Model):
         ...

docs/topics/http/shortcuts.txt

@@ -4 +4 @@
 
 .. module:: django.shortcuts
    :synopsis:
-       Convience shortcuts that spam multiple levels of Django's MVC stack.
+       Convenience shortcuts that spam multiple levels of Django's MVC stack.
 
 .. index:: shortcuts
 

docs/topics/cache.txt

@@ -615 +615 @@
 :ref:`respect the active language<i18n-cache-key>`. For the ``cache`` template
 tag you could use one of the
 :ref:`translation-specific variables<template-translation-vars>` available in
-templates to archieve the same result:
+templates to achieve the same result:
 
 .. code-block:: html+django
 
@@ -843 +843 @@
     # Version 2 isn't available, either
     >>> cache.get('my_key', version=2)
     None
-    # But version 3 *is* availble
+    # But version 3 *is* available
     >>> cache.get('my_key', version=3)
     'hello world!'
 

docs/topics/db/models.txt

@@ -188 +188 @@
 
         ::
 
-            >>> p = Person(name="Fred Flinstone", gender="M")
+            >>> p = Person(name="Fred Flintstone", gender="M")
             >>> p.save()
             >>> p.gender
             u'M'
@@ -791 +791 @@
  2. If you're subclassing an existing model (perhaps something from another
     application entirely) and want each model to have its own database table,
     :ref:`multi-table-inheritance` is the way to go.
- 3. Finally, if you only want to modify the Python-level behaviour of a model,
+ 3. Finally, if you only want to modify the Python-level behavior of a model,
     without changing the models fields in any way, you can use
     :ref:`proxy-models`.
 
@@ -1218 +1218 @@
 from that base class.
 
 Overriding fields in a parent model leads to difficulties in areas such as
-initialising new instances (specifying which field is being initialized in
+initializing new instances (specifying which field is being initialized in
 ``Model.__init__``) and serialization. These are features which normal Python
 class inheritance doesn't have to deal with in quite the same way, so the
 difference between Django model inheritance and Python class inheritance isn't

docs/topics/db/optimization.txt

@@ -93 +93 @@
 Use the ``with`` template tag
 -----------------------------
 
-To make use of the caching behaviour of ``QuerySet``, you may need to use the
+To make use of the caching behavior of ``QuerySet``, you may need to use the
 :ttag:`with` template tag.
 
 Use ``iterator()``
 ------------------
 
-When you have a lot of objects, the caching behaviour of the ``QuerySet`` can
+When you have a lot of objects, the caching behavior of the ``QuerySet`` can
 cause a large amount of memory to be used. In this case,
 :meth:`~django.db.models.QuerySet.iterator()` may help.
 
@@ -252 +252 @@
 
 Note, however, that these bulk update methods cannot call the ``save()`` or
 ``delete()`` methods of individual instances, which means that any custom
-behaviour you have added for these methods will not be executed, including
+behavior you have added for these methods will not be executed, including
 anything driven from the normal database object :doc:`signals </ref/signals>`.
 
 Use foreign key values directly

docs/topics/db/aggregation.txt

@@ -233 +233 @@
 publisher; the second query will only include good books in the annotated
 count. In the first query, the annotation precedes the filter, so the
 filter has no effect on the annotation. In the second query, the filter
-preceeds the annotation, and as a result, the filter constrains the objects
+precedes the annotation, and as a result, the filter constrains the objects
 considered when calculating the annotation.
 
 ``order_by()``

docs/topics/db/transactions.txt

@@ -234 +234 @@
 actually do anything.
 
 Savepoints aren't especially useful if you are using the default
-``autocommit`` behaviour of Django. However, if you are using
+``autocommit`` behavior of Django. However, if you are using
 ``commit_on_success`` or ``commit_manually``, each open transaction will build
 up a series of database operations, awaiting a commit or rollback. If you
 issue a rollback, the entire transaction is rolled back. Savepoints provide

docs/topics/class-based-views.txt

@@ -72 +72 @@
 
 Then, we just need to add this new view into our URLconf. As the class-based
 views themselves are classes, we point the URL to the as_view class method
-instead, which is the entrypoint for class-based views::
+instead, which is the entry point for class-based views::
 
     # urls.py
     from django.conf.urls.defaults import *

docs/topics/testing.txt

@@ -95 +95 @@
 
         import unittest
 
-    If you want to continue to use the base unittest libary, you can --
+    If you want to continue to use the base unittest library, you can --
     you just won't get any of the nice new unittest2 features.
 
 .. _unittest2: http://pypi.python.org/pypi/unittest2

docs/topics/logging.txt

@@ -156 +156 @@
 some other way of organizing your logging messages, you can provide
 any dot-separated name to identify your logger::
 
-    # Get an instance of a specfic named logger
+    # Get an instance of a specific named logger
     logger = logging.getLogger('project.interesting.stuff')
 
 The dotted paths of logger names define a hierarchy. The

docs/topics/signals.txt

@@ -106 +106 @@
 Connecting receiver functions
 -----------------------------
 
-There are two ways you can connect a receiever to a signal. You can take the
+There are two ways you can connect a receiver to a signal. You can take the
 manual connect route:
 
 .. code-block:: python

docs/releases/1.3.txt

@@ -521 +521 @@
 Previously, a callable in a template would only be called automatically as part
 of the variable resolution process if it was retrieved via attribute
 lookup. This was an inconsistency that could result in confusing and unhelpful
-behaviour::
+behavior::
 
     >>> Template("{{ user.get_full_name }}").render(Context({'user': user}))
     u'Joe Bloggs'
@@ -529 +529 @@
     u'<bound method User.get_full_name of <...
 
 This has been resolved in Django 1.3 - the result in both cases will be ``u'Joe
-Bloggs'``. Although the previous behaviour was not useful for a template language
+Bloggs'``. Although the previous behavior was not useful for a template language
 designed for web designers, and was never deliberately supported, it is possible
 that some templates may be broken by this change.
 

docs/releases/1.4.txt

@@ -132 +132 @@
 version would redirect to ``/notaflatpageoravalidurl/``, which would
 subsequently raise a 404. Requesting ``/notaflatpageoravalidurl`` now will
 immediately raise a 404. Additionally redirects returned by flatpages are now
-permanent (301 status code) to match the behaviour of the
+permanent (301 status code) to match the behavior of the
 :class:`~django.middleware.common.CommonMiddleware`.
 
 `COMMENTS_BANNED_USERS_GROUP` setting
@@ -144 +144 @@
 app, e.g. the template tags. To fix this problem the code was removed from
 the feed class.
 
-If you rely on the feature and want to restore the old behaviour, simply use
+If you rely on the feature and want to restore the old behavior, simply use
 a custom comment model manager to exclude the user group, e.g.::
 
     from django.conf import settings

docs/releases/1.3-beta-1.txt

@@ -27 +27 @@
 automatically serve static files during development (if the :setting:`DEBUG`
 setting is ``True``) when using the :djadmin:`runserver` management command.
 Based on feedback from the community this release adds two new options to the
-:djadmin:`runserver` command to modify this behaviour:
+:djadmin:`runserver` command to modify this behavior:
 
     * ``--nostatic``: prevents the :djadmin:`runserver` command from serving
       files completely.

docs/ref/models/querysets.txt

@@ -986 +986 @@
 
 Usually, if another transaction has already acquired a lock on one of the
 selected rows, the query will block until the lock is released. If this is
-not the behaviour you want, call ``select_for_update(nowait=True)``. This will
+not the behavior you want, call ``select_for_update(nowait=True)``. This will
 make the call non-blocking. If a conflicting lock is already acquired by
 another transaction, ``django.db.utils.DatabaseError`` will be raised when
 the queryset is evaluated.
@@ -1124 +1124 @@
     Foo.objects.get_or_create(defaults__exact='bar', defaults={'defaults': 'baz'})
 
 
-The ``get_or_create()`` method has similar error behaviour to ``create()``
+The ``get_or_create()`` method has similar error behavior to ``create()``
 when you are using manually specified primary keys. If an object needs to be
 created and the key already exists in the database, an ``IntegrityError`` will
 be raised.

docs/ref/forms/validation.txt

@@ -361 +361 @@
 ``cleaned_data``.
 
 In fact, Django will currently completely wipe out the ``cleaned_data``
-dictionary if there are any errors in the form. However, this behaviour may
+dictionary if there are any errors in the form. However, this behavior may
 change in the future, so it's not a bad idea to clean up after yourself in the
 first place.

docs/ref/contrib/flatpages.txt

@@ -86 +86 @@
 
     .. versionchanged:: 1.4
        Redirects by the middlware are permanent (301 status code) instead of
-       temporary (302) to match behaviour of the
+       temporary (302) to match behavior of the
        :class:`~django.middleware.common.CommonMiddleware`.
 
     If it doesn't find a match, the request continues to be processed as usual.

docs/ref/contrib/csrf.txt

@@ -396 +396 @@
 Settings
 ========
 
-A number of settings can be used to control Django's CSRF behaviour.
+A number of settings can be used to control Django's CSRF behavior.
 
 CSRF_COOKIE_DOMAIN
 ------------------