Fixed several typos in Django

20 files changed, 23 insertions, 23 deletions

diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index 374b5587b5..a116da4bd6 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -259,7 +259,7 @@ ABSOLUTE_URL_OVERRIDES = {}
 # Example: ('/home/html', '/var/www')
 ALLOWED_INCLUDE_ROOTS = ()
 
-# If this is a admin settings module, this should be a list of
+# If this is an admin settings module, this should be a list of
 # settings modules (in the format 'foo.bar.baz') for which this admin
 # is an admin.
 ADMIN_FOR = ()
diff --git a/django/contrib/auth/tests/test_auth_backends.py b/django/contrib/auth/tests/test_auth_backends.py
index 2b115e113b..4ed7244057 100644
--- a/django/contrib/auth/tests/test_auth_backends.py
+++ b/django/contrib/auth/tests/test_auth_backends.py
@@ -373,7 +373,7 @@ class NoBackendsTest(TestCase):
 @skipIfCustomUser
 class InActiveUserBackendTest(TestCase):
     """
-    Tests for a inactive user
+    Tests for an inactive user
     """
     backend = 'django.contrib.auth.tests.test_auth_backends.SimpleRowlevelBackend'
 
diff --git a/django/contrib/auth/tests/test_management.py b/django/contrib/auth/tests/test_management.py
index c78142722f..7fd41b9e8b 100644
--- a/django/contrib/auth/tests/test_management.py
+++ b/django/contrib/auth/tests/test_management.py
@@ -229,7 +229,7 @@ class CreatesuperuserManagementCommandTestCase(TestCase):
         self.assertEqual(command_output, 'Superuser created successfully.')
 
     def test_verbosity_zero(self):
-        # We can supress output on the management command
+        # We can suppress output on the management command
         new_io = six.StringIO()
         call_command(
             "createsuperuser",
diff --git a/django/contrib/formtools/wizard/views.py b/django/contrib/formtools/wizard/views.py
index 77cf80ac8b..e66d891be8 100644
--- a/django/contrib/formtools/wizard/views.py
+++ b/django/contrib/formtools/wizard/views.py
@@ -369,13 +369,13 @@ class WizardView(TemplateView):
         """
         Returns a dictionary which will be passed to the form for `step`
         as `initial`. If no initial data was provided while initializing the
-        form wizard, a empty dictionary will be returned.
+        form wizard, an empty dictionary will be returned.
         """
         return self.initial_dict.get(step, {})
 
     def get_form_instance(self, step):
         """
-        Returns a object which will be passed to the form for `step`
+        Returns an object which will be passed to the form for `step`
         as `instance`. If no instance object was provided while initializing
         the form wizard, None will be returned.
         """
diff --git a/django/contrib/gis/db/backends/oracle/operations.py b/django/contrib/gis/db/backends/oracle/operations.py
index 72ac381612..c409dcbb68 100644
--- a/django/contrib/gis/db/backends/oracle/operations.py
+++ b/django/contrib/gis/db/backends/oracle/operations.py
@@ -233,7 +233,7 @@ class OracleOperations(DatabaseOperations, BaseSpatialOperations):
         "Returns the SQL WHERE clause for use in Oracle spatial SQL construction."
         geo_col, db_type = lvalue
 
-        # See if a Oracle Geometry function matches the lookup type next
+        # See if an Oracle Geometry function matches the lookup type next
         lookup_info = self.geometry_functions.get(lookup_type, False)
         if lookup_info:
             # Lookup types that are tuples take tuple arguments, e.g., 'relate' and
diff --git a/django/contrib/messages/storage/cookie.py b/django/contrib/messages/storage/cookie.py
index b28fc783be..02f13597dc 100644
--- a/django/contrib/messages/storage/cookie.py
+++ b/django/contrib/messages/storage/cookie.py
@@ -142,7 +142,7 @@ class CookieStorage(BaseStorage):
 
     def _decode(self, data):
         """
-        Safely decodes a encoded text stream back into a list of messages.
+        Safely decodes an encoded text stream back into a list of messages.
 
         If the encoded text stream contained an invalid hash or was in an
         invalid format, ``None`` is returned.
diff --git a/django/core/files/storage.py b/django/core/files/storage.py
index 3e600fb913..98864f7f22 100644
--- a/django/core/files/storage.py
+++ b/django/core/files/storage.py
@@ -101,7 +101,7 @@ class Storage(object):
         Returns True if a file referenced by the given name already exists in the
         storage system, or False if the name is available for a new file.
         """
-        raise NotImplementedError('subclasses of Storage must provide a exists() method')
+        raise NotImplementedError('subclasses of Storage must provide an exists() method')
 
     def listdir(self, path):
         """
diff --git a/django/core/mail/message.py b/django/core/mail/message.py
index cdd265521b..34caa37ffd 100644
--- a/django/core/mail/message.py
+++ b/django/core/mail/message.py
@@ -341,7 +341,7 @@ class EmailMessage(object):
                 content = content.message()
             elif not isinstance(content, Message):
                 # For compatibility with existing code, parse the message
-                # into a email.Message object if it is not one already.
+                # into an email.Message object if it is not one already.
                 content = message_from_string(content)
 
             attachment = SafeMIMEMessage(content, subtype)
diff --git a/django/core/management/__init__.py b/django/core/management/__init__.py
index e1a7a16c88..3b4ce960c1 100644
--- a/django/core/management/__init__.py
+++ b/django/core/management/__init__.py
@@ -252,7 +252,7 @@ class ManagementUtility(object):
         Subcommand options are saved as pairs. A pair consists of
         the long option string (e.g. '--exclude') and a boolean
         value indicating if the option requires arguments. When printing to
-        stdout, a equal sign is appended to options which require arguments.
+        stdout, an equal sign is appended to options which require arguments.
 
         Note: If debugging this function, it is recommended to write the debug
         output in a separate file. Otherwise the debug output will be treated
diff --git a/django/core/management/base.py b/django/core/management/base.py
index 5116b417f4..52f4a074dc 100644
--- a/django/core/management/base.py
+++ b/django/core/management/base.py
@@ -331,7 +331,7 @@ class BaseCommand(object):
 
         try:
             if (self.requires_system_checks and
-                    not options.get('skip_validation') and  # This will be removed at the end of deprecation proccess for `skip_validation`.
+                    not options.get('skip_validation') and  # This will be removed at the end of deprecation process for `skip_validation`.
                     not options.get('skip_checks')):
                 self.check()
             output = self.handle(*args, **options)
diff --git a/django/core/management/commands/runserver.py b/django/core/management/commands/runserver.py
index 28c6337a43..2d7d6bffde 100644
--- a/django/core/management/commands/runserver.py
+++ b/django/core/management/commands/runserver.py
@@ -28,7 +28,7 @@ DEFAULT_PORT = "8000"
 class Command(BaseCommand):
     option_list = BaseCommand.option_list + (
         make_option('--ipv6', '-6', action='store_true', dest='use_ipv6', default=False,
-            help='Tells Django to use a IPv6 address.'),
+            help='Tells Django to use an IPv6 address.'),
         make_option('--nothreading', action='store_false', dest='use_threading', default=True,
             help='Tells Django to NOT use threading.'),
         make_option('--noreload', action='store_false', dest='use_reloader', default=True,
diff --git a/django/core/management/commands/testserver.py b/django/core/management/commands/testserver.py
index 0a9c99dcbf..0409660414 100644
--- a/django/core/management/commands/testserver.py
+++ b/django/core/management/commands/testserver.py
@@ -11,7 +11,7 @@ class Command(BaseCommand):
             type='string', default='',
             help='port number or ipaddr:port to run the server on'),
         make_option('--ipv6', '-6', action='store_true', dest='use_ipv6', default=False,
-            help='Tells Django to use a IPv6 address.'),
+            help='Tells Django to use an IPv6 address.'),
     )
     help = 'Runs a development server with data from the given fixture(s).'
     args = '[fixture ...]'
diff --git a/django/core/serializers/__init__.py b/django/core/serializers/__init__.py
index 3720c770d5..68200e754f 100644
--- a/django/core/serializers/__init__.py
+++ b/django/core/serializers/__init__.py
@@ -132,7 +132,7 @@ def serialize(format, queryset, **options):
 def deserialize(format, stream_or_string, **options):
     """
     Deserialize a stream or a string. Returns an iterator that yields ``(obj,
-    m2m_relation_dict)``, where ``obj`` is a instantiated -- but *unsaved* --
+    m2m_relation_dict)``, where ``obj`` is an instantiated -- but *unsaved* --
     object, and ``m2m_relation_dict`` is a dictionary of ``{m2m_field_name :
     list_of_related_objects}``.
     """
diff --git a/django/core/servers/fastcgi.py b/django/core/servers/fastcgi.py
index 1dcd22723c..b44473baed 100644
--- a/django/core/servers/fastcgi.py
+++ b/django/core/servers/fastcgi.py
@@ -3,7 +3,7 @@ FastCGI (or SCGI, or AJP1.3 ...) server that implements the WSGI protocol.
 
 Uses the flup python package: http://www.saddi.com/software/flup/
 
-This is a adaptation of the flup package to add FastCGI server support
+This is an adaptation of the flup package to add FastCGI server support
 to run Django apps from Web servers that support the FastCGI protocol.
 This module can be run standalone or from the django-admin / manage.py
 scripts using the "runfcgi" directive.
diff --git a/django/db/models/options.py b/django/db/models/options.py
index 4f04746200..632c71f3f9 100644
--- a/django/db/models/options.py
+++ b/django/db/models/options.py
@@ -542,7 +542,7 @@ class Options(object):
         """
         Returns a list of parent classes leading to 'model' (order from closet
         to most distant ancestor). This has to handle the case were 'model' is
-        a granparent or even more distant relation.
+        a grandparent or even more distant relation.
         """
         if not self.parents:
             return None
diff --git a/django/db/models/query.py b/django/db/models/query.py
index f2defa2100..f314fcd553 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -1780,7 +1780,7 @@ def prefetch_related_objects(result_cache, related_lookups):
                 # Last one, this *must* resolve to something that supports
                 # prefetching, otherwise there is no point adding it and the
                 # developer asking for it has made a mistake.
-                raise ValueError("'%s' does not resolve to a item that supports "
+                raise ValueError("'%s' does not resolve to an item that supports "
                                  "prefetching - this is an invalid parameter to "
                                  "prefetch_related()." % lookup.prefetch_through)
 
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index cb94989a05..6421f38796 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -1491,7 +1491,7 @@ class Query(object):
         query.remove_inherited_models()
 
         # Add extra check to make sure the selected field will not be null
-        # since we are adding a IN <subquery> clause. This prevents the
+        # since we are adding an IN <subquery> clause. This prevents the
         # database from tripping over IN (...,NULL,...) selects and returning
         # nothing
         alias, col = query.select[0].col
@@ -2091,7 +2091,7 @@ class JoinPromoter(object):
             # join.
             # Note that in this example we could just as well have the __gte
             # clause and the OR clause swapped. Or we could replace the __gte
-            # clause with a OR clause containing rel_a__col=1|rel_a__col=2,
+            # clause with an OR clause containing rel_a__col=1|rel_a__col=2,
             # and again we could safely demote to INNER.
         query.promote_joins(to_promote)
         query.demote_joins(to_demote)
diff --git a/django/forms/fields.py b/django/forms/fields.py
index 934192c037..c5a1ac8137 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -79,7 +79,7 @@ class Field(object):
         #                   messages that the field will raise.
         # show_hidden_initial -- Boolean that specifies if it is needed to render a
         #                        hidden widget with initial value after widget.
-        # validators -- List of addtional validators to use
+        # validators -- List of additional validators to use
         # localize -- Boolean that specifies if the field should be localized.
         # label_suffix -- Suffix to be added to the label. Overrides
         #                 form's label_suffix.
diff --git a/django/middleware/http.py b/django/middleware/http.py
index 9954267196..8e4bc55881 100644
--- a/django/middleware/http.py
+++ b/django/middleware/http.py
@@ -3,7 +3,7 @@ from django.utils.http import http_date, parse_http_date_safe
 
 class ConditionalGetMiddleware(object):
     """
-    Handles conditional GET operations. If the response has a ETag or
+    Handles conditional GET operations. If the response has an ETag or
     Last-Modified header, and the request has If-None-Match or
     If-Modified-Since, the response is replaced by an HttpNotModified.
 
diff --git a/django/utils/ipv6.py b/django/utils/ipv6.py
index 675448f6f8..02e3b7208c 100644
--- a/django/utils/ipv6.py
+++ b/django/utils/ipv6.py
@@ -9,7 +9,7 @@ from django.utils.six.moves import xrange
 def clean_ipv6_address(ip_str, unpack_ipv4=False,
         error_message=_("This is not a valid IPv6 address.")):
     """
-    Cleans a IPv6 address string.
+    Cleans an IPv6 address string.
 
     Validity is checked by calling is_valid_ipv6_address() - if an
     invalid address is passed, ValidationError is raised.
@@ -90,7 +90,7 @@ def clean_ipv6_address(ip_str, unpack_ipv4=False,
 
 def _sanitize_ipv4_mapping(ip_str):
     """
-    Sanitize IPv4 mapping in a expanded IPv6 address.
+    Sanitize IPv4 mapping in an expanded IPv6 address.
 
     This converts ::ffff:0a0a:0a0a to ::ffff:10.10.10.10.
     If there is nothing to sanitize, returns an unchanged