Fixed doc typos.

11 files changed, 16 insertions, 16 deletions

diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index a7746e3deb..47efa42c16 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -1803,7 +1803,7 @@ in your own admin JavaScript without including a second copy, you can use the
 
 The :class:`ModelAdmin` class requires jQuery by default, so there is no need
 to add jQuery to your ``ModelAdmin``’s list of media resources unless you have
-a specifc need. For example, if you require the jQuery library to be in the
+a specific need. For example, if you require the jQuery library to be in the
 global namespace (for example when using third-party jQuery plugins) or if you
 need a newer version of jQuery, you will have to include your own copy.
 
diff --git a/docs/ref/contrib/gis/geoquerysets.txt b/docs/ref/contrib/gis/geoquerysets.txt
index 5f1d3521eb..b27781bdc8 100644
--- a/docs/ref/contrib/gis/geoquerysets.txt
+++ b/docs/ref/contrib/gis/geoquerysets.txt
@@ -1102,7 +1102,7 @@ Aggregate Methods
 *Availability*: PostGIS
 
 Returns a ``GEOMETRYCOLLECTION`` or a ``MULTI`` geometry object from the geometry
-column.  This is analagous to a simplified version of the :meth:`GeoQuerySet.unionagg` method,
+column.  This is analogous to a simplified version of the :meth:`GeoQuerySet.unionagg` method,
 except it can be several orders of magnitude faster than performing a union because
 it simply rolls up geometries into a collection or multi object, not caring about
 dissolving boundaries.
diff --git a/docs/ref/contrib/gis/install/postgis.txt b/docs/ref/contrib/gis/install/postgis.txt
index 75597fbb38..a248d33690 100644
--- a/docs/ref/contrib/gis/install/postgis.txt
+++ b/docs/ref/contrib/gis/install/postgis.txt
@@ -11,7 +11,7 @@ might also need additional libraries, see `PostGIS requirements`_.
 
 .. note::
 
-    The `psycopg2`_ module is required for use as the database adaptor
+    The `psycopg2`_ module is required for use as the database adapter
     when using GeoDjango with PostGIS.
 
 .. _psycopg2: http://initd.org/psycopg/
diff --git a/docs/ref/contrib/staticfiles.txt b/docs/ref/contrib/staticfiles.txt
index 79ce21ecda..961abf5c5d 100644
--- a/docs/ref/contrib/staticfiles.txt
+++ b/docs/ref/contrib/staticfiles.txt
@@ -321,7 +321,7 @@ CachedStaticFilesStorage
 but uses Django's :doc:`caching framework</topics/cache>` for storing the
 hashed names of processed files instead of a static manifest file called
 ``staticfiles.json``. This is mostly useful for situations in which you don't
-have accesss to the file system.
+have access to the file system.
 
 If you want to override certain options of the cache backend the storage uses,
 simply specify a custom entry in the :setting:`CACHES` setting named
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index f7c4f0f9fb..33f47914c2 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -259,8 +259,8 @@ drivers that implement this API:
 Both drivers are thread-safe and both provide connection pooling. The major
 difference is that MySQL Connector/Python supports Python 3.
 
-In addition to a DB API driver, Django needs an adaptor to access the database
-drivers from its ORM. Django provides an adaptor for MySQLdb while MySQL
+In addition to a DB API driver, Django needs an adapter to access the database
+drivers from its ORM. Django provides an adapter for MySQLdb while MySQL
 Connector/Python includes `its own`_.
 
 .. _its own: http://dev.mysql.com/doc/refman/5.6/en/connector-python-django-backend.html
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index e2b4daec44..724be51837 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -1239,8 +1239,8 @@ syncdb
 
 .. deprecated:: 1.7
 
-    This command has been deprecated in favour of the :djadmin:`migrate`
-    command, which performs both the old behaviour as well as executing
+    This command has been deprecated in favor of the :djadmin:`migrate`
+    command, which performs both the old behavior as well as executing
     migrations. It is now just an alias to that command.
 
 Alias for :djadmin:`migrate`.
diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt
index f48f9ff4ad..c2194cc512 100644
--- a/docs/ref/forms/fields.txt
+++ b/docs/ref/forms/fields.txt
@@ -666,7 +666,7 @@ For each field, we describe the default widget used if you don't specify
 .. class:: IPAddressField(**kwargs)
 
     .. deprecated:: 1.7
-        This field has been deprecated in favour of
+        This field has been deprecated in favor of
         :class:`~django.forms.GenericIPAddressField`.
 
     * Default widget: :class:`TextInput`
diff --git a/docs/ref/migration-operations.txt b/docs/ref/migration-operations.txt
index 70406adc22..cb77d7d93f 100644
--- a/docs/ref/migration-operations.txt
+++ b/docs/ref/migration-operations.txt
@@ -47,7 +47,7 @@ rather than a field takes from another model).
 
 ``options`` is an optional dictionary of values from the model's ``Meta`` class.
 
-``bases`` is an optional list of other classes to have this model inheirit from;
+``bases`` is an optional list of other classes to have this model inherit from;
 it can contain both class objects as well as strings in the format
 ``"appname.ModelName"`` if you want to depend on another model (so you inherit
 from the historical version). If it's not supplied, it defaults to just
@@ -122,7 +122,7 @@ The ``preserve_default`` argument indicates whether the field's default
 value is permanent and should be baked into the project state (``True``),
 or if it is temporary and just for this migration (``False``) - usually
 because the migration is adding a non-nullable field to a table and needs
-a default value to put into existing rows. It does not effect the behaviour
+a default value to put into existing rows. It does not effect the behavior
 of setting defaults in the database directly - Django never sets database
 defaults, and always applies them in the Django ORM code.
 
@@ -188,7 +188,7 @@ correctly, in which case you should manually split the SQL into multiple calls
 to ``RunSQL``.
 
 The ``state_operations`` argument is so you can supply operations that are
-equivalent to the SQL in terms of project state; for example, if you are 
+equivalent to the SQL in terms of project state; for example, if you are
 manually creating a column, you should pass in a list containing an ``AddField``
 operation here so that the autodetector still has an up-to-date state of the
 model (otherwise, when you next run ``makemigrations``, it won't see any
diff --git a/docs/ref/models/custom-lookups.txt b/docs/ref/models/custom-lookups.txt
index b800897712..8aa2f792e5 100644
--- a/docs/ref/models/custom-lookups.txt
+++ b/docs/ref/models/custom-lookups.txt
@@ -198,7 +198,7 @@ MySQL for the NotEqual operator. Instead of ``<>`` we will be using ``!=``
 operator. (Note that in reality almost all databases support both, including
 all the official databases supported by Django).
 
-We can change the behaviour on a specific backend by creating a subclass of
+We can change the behavior on a specific backend by creating a subclass of
 ``NotEqual`` with a ``as_mysql`` method::
 
   class MySQLNotEqual(NotEqual):
@@ -241,7 +241,7 @@ to this API.
     The ``get_lookup()`` method is used to fetch lookups. By default the
     lookup is fetched from the expression's output type in the same way
     described in registering and fetching lookup documentation below.
-    It is possible to override this method to alter that behaviour.
+    It is possible to override this method to alter that behavior.
 
 .. method:: as_vendorname(qn, connection)
 
diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt
index 7c95f0fd70..4e02c66ca0 100644
--- a/docs/ref/models/fields.txt
+++ b/docs/ref/models/fields.txt
@@ -867,7 +867,7 @@ databases supported by Django. The default form widget for this field is a
 .. class:: IPAddressField([**options])
 
 .. deprecated:: 1.7
-    This field has been deprecated in favour of
+    This field has been deprecated in favor of
     :class:`~django.db.models.GenericIPAddressField`.
 
 An IP address, in string format (e.g. "192.0.2.30"). The default form widget
diff --git a/docs/ref/templates/api.txt b/docs/ref/templates/api.txt
index 5701b1a9d1..08c86d99fc 100644
--- a/docs/ref/templates/api.txt
+++ b/docs/ref/templates/api.txt
@@ -225,7 +225,7 @@ straight lookups. Here are some things to keep in mind:
     sensitive_function.alters_data = True
 
 * Occasionally you may want to turn off this feature for other reasons,
-  and tell the template system to leave a variable un-called no matter
+  and tell the template system to leave a variable uncalled no matter
   what.  To do so, set a ``do_not_call_in_templates`` attribute on the
   callable with the value ``True``.  The template system then will act as
   if your variable is not callable (allowing you to access attributes of