Fixed #16584 -- Fixed a bunch of typos in code comments. Thanks, Bernhard Essl.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16598 bcc190cf-cafb-0310-a4f2-bffc1f526a37

28 files changed, 35 insertions, 35 deletions

diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index 5ee12d715f..7b7531a974 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -13,7 +13,7 @@ DEBUG = False
 TEMPLATE_DEBUG = False
 
 # Whether the framework should propagate raw exceptions rather than catching
-# them. This is useful under some testing siutations and should never be used
+# them. This is useful under some testing situations and should never be used
 # on a live site.
 DEBUG_PROPAGATE_EXCEPTIONS = False
 
@@ -389,7 +389,7 @@ DECIMAL_SEPARATOR = '.'
 # Boolean that sets whether to add thousand separator when formatting numbers
 USE_THOUSAND_SEPARATOR = False
 
-# Number of digits that will be together, when spliting them by
+# Number of digits that will be together, when splitting them by
 # THOUSAND_SEPARATOR. 0 means no grouping, 3 means splitting by thousands...
 NUMBER_GROUPING = 0
 
@@ -506,7 +506,7 @@ CSRF_COOKIE_SECURE = False
 # MESSAGES #
 ############
 
-# Class to use as messges backend
+# Class to use as messages backend
 MESSAGE_STORAGE = 'django.contrib.messages.storage.fallback.FallbackStorage'
 
 # Default values of MESSAGE_LEVEL and MESSAGE_TAGS are defined within
diff --git a/django/contrib/comments/views/comments.py b/django/contrib/comments/views/comments.py
index c2b553fe0d..23f14adf88 100644
--- a/django/contrib/comments/views/comments.py
+++ b/django/contrib/comments/views/comments.py
@@ -87,7 +87,7 @@ def post_comment(request, next=None, using=None):
             # preview templates, so we have to preserve that format.
             "comments/%s_%s_preview.html" % (model._meta.app_label, model._meta.module_name),
             "comments/%s_preview.html" % model._meta.app_label,
-            # Now the usual directory based template heirarchy.
+            # Now the usual directory based template hierarchy.
             "comments/%s/%s/preview.html" % (model._meta.app_label, model._meta.module_name),
             "comments/%s/preview.html" % model._meta.app_label,
             "comments/preview.html",
diff --git a/django/contrib/comments/views/moderation.py b/django/contrib/comments/views/moderation.py
index 73304ba416..ce4287c3f0 100644
--- a/django/contrib/comments/views/moderation.py
+++ b/django/contrib/comments/views/moderation.py
@@ -87,7 +87,7 @@ def approve(request, comment_id, next=None):
         )
 
 # The following functions actually perform the various flag/aprove/delete
-# actions. They've been broken out into seperate functions to that they
+# actions. They've been broken out into separate functions to that they
 # may be called from admin actions.
 
 def perform_flag(request, comment):
diff --git a/django/contrib/formtools/wizard/views.py b/django/contrib/formtools/wizard/views.py
index 61ba60ef09..f272db09e2 100644
--- a/django/contrib/formtools/wizard/views.py
+++ b/django/contrib/formtools/wizard/views.py
@@ -152,7 +152,7 @@ class WizardView(TemplateView):
                 # if not, add the form with a zero based counter as unicode
                 init_form_list[unicode(i)] = form
 
-        # walk through the ne created list of forms
+        # walk through the new created list of forms
         for form in init_form_list.itervalues():
             if issubclass(form, formsets.BaseFormSet):
                 # if the element is based on BaseFormSet (FormSet/ModelFormSet)
diff --git a/django/contrib/gis/db/backends/postgis/operations.py b/django/contrib/gis/db/backends/postgis/operations.py
index 5affcf9a18..32867484bf 100644
--- a/django/contrib/gis/db/backends/postgis/operations.py
+++ b/django/contrib/gis/db/backends/postgis/operations.py
@@ -536,7 +536,7 @@ class PostGISOperations(DatabaseOperations, BaseSpatialOperations):
                     op = op(self.geom_func_prefix, value[1])
                 elif lookup_type in self.distance_functions and lookup_type != 'dwithin':
                     if not field.geography and field.geodetic(self.connection):
-                        # Geodetic distances are only availble from Points to
+                        # Geodetic distances are only available from Points to
                         # PointFields on PostGIS 1.4 and below.
                         if not self.connection.ops.geography:
                             if field.geom_type != 'POINT':
diff --git a/django/contrib/gis/db/backends/spatialite/operations.py b/django/contrib/gis/db/backends/spatialite/operations.py
index f3bf3e5a56..449c527187 100644
--- a/django/contrib/gis/db/backends/spatialite/operations.py
+++ b/django/contrib/gis/db/backends/spatialite/operations.py
@@ -90,7 +90,7 @@ class SpatiaLiteOperations(DatabaseOperations, BaseSpatialOperations):
         'contains' : SpatiaLiteFunction('Contains'),
         'intersects' : SpatiaLiteFunction('Intersects'),
         'relate' : (SpatiaLiteRelate, basestring),
-        # Retruns true if B's bounding box completely contains A's bounding box.
+        # Returns true if B's bounding box completely contains A's bounding box.
         'contained' : SpatiaLiteFunction('MbrWithin'),
         # Returns true if A's bounding box completely contains B's bounding box.
         'bbcontains' : SpatiaLiteFunction('MbrContains'),
diff --git a/django/contrib/gis/gdal/envelope.py b/django/contrib/gis/gdal/envelope.py
index 0e6aa0ece6..ab0940e476 100644
--- a/django/contrib/gis/gdal/envelope.py
+++ b/django/contrib/gis/gdal/envelope.py
@@ -50,7 +50,7 @@ class Envelope(object):
             else:
                 raise TypeError('Incorrect type of argument: %s' % str(type(args[0])))
         elif len(args) == 4:
-            # Individiual parameters passed in.
+            # Individual parameters passed in.
             #  Thanks to ww for the help
             self._from_sequence(map(float, args))
         else:
@@ -125,7 +125,7 @@ class Envelope(object):
             # An x and an y parameter were passed in 
                 return self.expand_to_include((args[0], args[1], args[0], args[1])) 
         elif len(args) == 4: 
-            # Individiual parameters passed in. 
+            # Individual parameters passed in.
             return self.expand_to_include(args) 
         else: 
             raise OGRException('Incorrect number (%d) of arguments.' % len(args[0])) 
diff --git a/django/contrib/gis/geos/prototypes/io.py b/django/contrib/gis/geos/prototypes/io.py
index 5c0c8b5bef..56f702243d 100644
--- a/django/contrib/gis/geos/prototypes/io.py
+++ b/django/contrib/gis/geos/prototypes/io.py
@@ -207,7 +207,7 @@ class ThreadLocalIO(threading.local):
 thread_context = ThreadLocalIO()
 
 # These module-level routines return the I/O object that is local to the
-# the thread.  If the I/O object does not exist yet it will be initialized.
+# thread. If the I/O object does not exist yet it will be initialized.
 def wkt_r():
     if not thread_context.wkt_r:
         thread_context.wkt_r = _WKTReader()
diff --git a/django/contrib/gis/maps/google/zoom.py b/django/contrib/gis/maps/google/zoom.py
index 7e7219f132..fc9ff1db96 100644
--- a/django/contrib/gis/maps/google/zoom.py
+++ b/django/contrib/gis/maps/google/zoom.py
@@ -41,7 +41,7 @@ class GoogleZoom(object):
             # Getting the degrees and radians per pixel, and the 1/2 the number of
             # for every zoom level.
             self._degpp.append(z / 360.) # degrees per pixel
-            self._radpp.append(z / (2 * pi)) # radians per pixl
+            self._radpp.append(z / (2 * pi)) # radians per pixel
             self._npix.append(z / 2) # number of pixels to center of tile
 
             # Multiplying `z` by 2 for the next iteration.
diff --git a/django/contrib/gis/tests/geoapp/tests.py b/django/contrib/gis/tests/geoapp/tests.py
index 2960aee55b..b7ce3b7111 100644
--- a/django/contrib/gis/tests/geoapp/tests.py
+++ b/django/contrib/gis/tests/geoapp/tests.py
@@ -671,7 +671,7 @@ class GeoModelTest(TestCase):
                '12.40500 43.94833,12.40889 43.95499,12.41580 43.95795)))')
         sm = Country.objects.create(name='San Marino', mpoly=fromstr(wkt))
 
-        # Because floating-point arithmitic isn't exact, we set a tolerance
+        # Because floating-point arithmetic isn't exact, we set a tolerance
         # to pass into GEOS `equals_exact`.
         tol = 0.000000001
 
diff --git a/django/contrib/gis/tests/relatedapp/tests.py b/django/contrib/gis/tests/relatedapp/tests.py
index 250783b2de..f51f34398f 100644
--- a/django/contrib/gis/tests/relatedapp/tests.py
+++ b/django/contrib/gis/tests/relatedapp/tests.py
@@ -130,7 +130,7 @@ class RelatedGeoModelTest(TestCase):
 
         # Now creating a second Parcel where the borders are the same, just
         # in different coordinate systems.  The center points are also the
-        # the same (but in different coordinate systems), and this time they
+        # same (but in different coordinate systems), and this time they
         # actually correspond to the centroid of the border.
         c1 = b1.centroid
         c2 = c1.transform(2276, clone=True)
diff --git a/django/contrib/localflavor/cz/forms.py b/django/contrib/localflavor/cz/forms.py
index 26782d06cb..402cb3e000 100644
--- a/django/contrib/localflavor/cz/forms.py
+++ b/django/contrib/localflavor/cz/forms.py
@@ -134,7 +134,7 @@ class CZICNumberField(Field):
         # remainder is equal:
         #  0 or 10: last digit is 1
         #  1: last digit is 0
-        # in other case, last digin is 11 - remainder
+        # in other case, last digit is 11 - remainder
 
         if (not remainder % 10 and check == 1) or \
         (remainder == 1 and check == 0) or \
diff --git a/django/core/management/commands/syncdb.py b/django/core/management/commands/syncdb.py
index a5228a1ab7..4383c341c8 100644
--- a/django/core/management/commands/syncdb.py
+++ b/django/core/management/commands/syncdb.py
@@ -140,7 +140,7 @@ class Command(NoArgsCommand):
 
         if verbosity >= 1:
             print "Installing indexes ..."
-        # Install SQL indicies for all newly created models
+        # Install SQL indices for all newly created models
         for app_name, model_list in manifest.items():
             for model in model_list:
                 if model in created_models:
diff --git a/django/core/management/sql.py b/django/core/management/sql.py
index dc3fc5794e..298882f503 100644
--- a/django/core/management/sql.py
+++ b/django/core/management/sql.py
@@ -11,7 +11,7 @@ def sql_create(app, style, connection):
 
     if connection.settings_dict['ENGINE'] == 'django.db.backends.dummy':
         # This must be the "dummy" database backend, which means the user
-        # hasn't set ENGINE for the databse.
+        # hasn't set ENGINE for the database.
         raise CommandError("Django doesn't know which syntax to use for your SQL statements,\n" +
             "because you haven't specified the ENGINE setting for the database.\n" +
             "Edit your settings file and change DATBASES['default']['ENGINE'] to something like\n" +
diff --git a/django/db/models/deletion.py b/django/db/models/deletion.py
index e1653462d7..9a6d49955a 100644
--- a/django/db/models/deletion.py
+++ b/django/db/models/deletion.py
@@ -217,7 +217,7 @@ class Collector(object):
             self.data[model] = sorted(instances, key=attrgetter("pk"))
 
         # if possible, bring the models in an order suitable for databases that
-        # don't support transactions or cannot defer contraint checks until the
+        # don't support transactions or cannot defer constraint checks until the
         # end of a transaction.
         self.sort()
 
diff --git a/django/forms/formsets.py b/django/forms/formsets.py
index 3810ebf7fd..4d2d9fca47 100644
--- a/django/forms/formsets.py
+++ b/django/forms/formsets.py
@@ -213,7 +213,7 @@ class BaseFormSet(StrAndUnicode):
                     return (1, 0) # +infinity, larger than any number
                 return (0, k[1])
             self._ordering.sort(key=compare_ordering_key)
-        # Return a list of form.cleaned_data dicts in the order spcified by
+        # Return a list of form.cleaned_data dicts in the order specified by
         # the form data.
         return [self.forms[i[0]] for i in self._ordering]
     ordered_forms = property(_get_ordered_forms)
diff --git a/django/forms/models.py b/django/forms/models.py
index 9a985458e9..527da5e3ba 100644
--- a/django/forms/models.py
+++ b/django/forms/models.py
@@ -117,7 +117,7 @@ def model_to_dict(instance, fields=None, exclude=None):
         if exclude and f.name in exclude:
             continue
         if isinstance(f, ManyToManyField):
-            # If the object doesn't have a primry key yet, just use an empty
+            # If the object doesn't have a primary key yet, just use an empty
             # list for its m2m fields. Calling f.value_from_object will raise
             # an exception.
             if instance.pk is None:
@@ -288,7 +288,7 @@ class BaseModelForm(BaseForm):
             # Exclude empty fields that are not required by the form, if the
             # underlying model field is required. This keeps the model field
             # from raising a required error. Note: don't exclude the field from
-            # validaton if the model field allows blanks. If it does, the blank
+            # validation if the model field allows blanks. If it does, the blank
             # value may be included in a unique check, so cannot be excluded
             # from validation.
             else:
diff --git a/django/http/__init__.py b/django/http/__init__.py
index c97b402f48..3d928d9f5d 100644
--- a/django/http/__init__.py
+++ b/django/http/__init__.py
@@ -282,7 +282,7 @@ class HttpRequest(object):
 
     def _get_upload_handlers(self):
         if not self._upload_handlers:
-            # If thre are no upload handlers defined, initialize them from settings.
+            # If there are no upload handlers defined, initialize them from settings.
             self._initialize_handlers()
         return self._upload_handlers
 
diff --git a/django/middleware/gzip.py b/django/middleware/gzip.py
index 47f75aa416..8e88a8c318 100644
--- a/django/middleware/gzip.py
+++ b/django/middleware/gzip.py
@@ -22,7 +22,7 @@ class GZipMiddleware(object):
         if response.has_header('Content-Encoding'):
             return response
 
-        # MSIE have issues with gzipped respones of various content types.
+        # MSIE have issues with gzipped response of various content types.
         if "msie" in request.META.get('HTTP_USER_AGENT', '').lower():
             ctype = response.get('Content-Type', '').lower()
             if not ctype.startswith("text/") or "javascript" in ctype:
diff --git a/django/test/_doctest.py b/django/test/_doctest.py
index cd562bbd9b..fe9b2f1890 100644
--- a/django/test/_doctest.py
+++ b/django/test/_doctest.py
@@ -552,7 +552,7 @@ class DocTestParser:
         ^ (?P<msg> \w+ .*)   #     a line *starts* with alphanum.
         """, re.VERBOSE | re.MULTILINE | re.DOTALL)
 
-    # A callable returning a true value iff its argument is a blank line
+    # A callable returning a true value if its argument is a blank line
     # or contains a single comment.
     _IS_BLANK_OR_COMMENT = re.compile(r'^[ ]*(#.*)?$').match
 
diff --git a/extras/csrf_migration_helper.py b/extras/csrf_migration_helper.py
index 6aaf6b433d..94b5a20802 100755
--- a/extras/csrf_migration_helper.py
+++ b/extras/csrf_migration_helper.py
@@ -43,7 +43,7 @@
 #
 # - It's impossible to programmatically determine which forms should and should
 #   not have the token added.  The developer must decide when to do this,
-#   ensuring that the token is only added to internally targetted forms.
+#   ensuring that the token is only added to internally targeted forms.
 #
 # - It's impossible to programmatically work out when a template is used.  The
 #   attempts to trace back to view functions are guesses, and could easily fail
diff --git a/tests/modeltests/lookup/tests.py b/tests/modeltests/lookup/tests.py
index b05227c9a1..33eeae7435 100644
--- a/tests/modeltests/lookup/tests.py
+++ b/tests/modeltests/lookup/tests.py
@@ -251,7 +251,7 @@ class LookupTests(TestCase):
     def test_values_list(self):
         # values_list() is similar to values(), except that the results are
         # returned as a list of tuples, rather than a list of dictionaries.
-        # Within each tuple, the order of the elemnts is the same as the order
+        # Within each tuple, the order of the elements is the same as the order
         # of fields in the values_list() call.
         identity = lambda x:x
         self.assertQuerysetEqual(Article.objects.values_list('headline'),
diff --git a/tests/modeltests/unmanaged_models/models.py b/tests/modeltests/unmanaged_models/models.py
index 0c2cf500da..bfbd5447f2 100644
--- a/tests/modeltests/unmanaged_models/models.py
+++ b/tests/modeltests/unmanaged_models/models.py
@@ -5,7 +5,7 @@ is generated for the table on various manage.py operations.
 
 from django.db import models
 
-#  All of these models are creatd in the database by Django.
+#  All of these models are created in the database by Django.
 
 class A01(models.Model):
     f_a = models.CharField(max_length=10, db_index=True)
diff --git a/tests/regressiontests/admin_widgets/tests.py b/tests/regressiontests/admin_widgets/tests.py
index c1b6888967..a7bfe55b2a 100644
--- a/tests/regressiontests/admin_widgets/tests.py
+++ b/tests/regressiontests/admin_widgets/tests.py
@@ -274,7 +274,7 @@ class ForeignKeyRawIdWidgetTest(DjangoTestCase):
         )
 
     def test_fk_related_model_not_in_admin(self):
-        # FK to a model not registered with admin site. Raw ID widget shoud
+        # FK to a model not registered with admin site. Raw ID widget should
         # have no magnifying glass link. See #16542
         big_honeycomb = models.Honeycomb.objects.create(location='Old tree')
         big_honeycomb.bee_set.create()
@@ -287,7 +287,7 @@ class ForeignKeyRawIdWidgetTest(DjangoTestCase):
         )
 
     def test_fk_to_self_model_not_in_admin(self):
-        # FK to self, not registered with admin site. Raw ID widget shoud have
+        # FK to self, not registered with admin site. Raw ID widget should have
         # no magnifying glass link. See #16542
         subject1 = models.Individual.objects.create(name='Subject #1')
         models.Individual.objects.create(name='Child', parent=subject1)
@@ -345,7 +345,7 @@ class ManyToManyRawIdWidgetTest(DjangoTestCase):
 
     def test_m2m_related_model_not_in_admin(self):
         # M2M relationship with model not registered with admin site. Raw ID
-        # widget shoud have no magnifying glass link. See #16542
+        # widget should have no magnifying glass link. See #16542
         consultor1 = models.Advisor.objects.create(name='Rockstar Techie')
 
         c1 = models.Company.objects.create(name='Doodle')
diff --git a/tests/regressiontests/aggregation_regress/tests.py b/tests/regressiontests/aggregation_regress/tests.py
index 49e1e611e9..acdc59ae97 100644
--- a/tests/regressiontests/aggregation_regress/tests.py
+++ b/tests/regressiontests/aggregation_regress/tests.py
@@ -644,7 +644,7 @@ class AggregationTests(TestCase):
         )
 
         # Regression for #10766 - Shouldn't be able to reference an aggregate
-        # fields in an an aggregate() call.
+        # fields in an aggregate() call.
         self.assertRaises(
             FieldError,
             lambda: Book.objects.annotate(mean_age=Avg('authors__age')).annotate(Avg('mean_age'))
diff --git a/tests/regressiontests/cache/tests.py b/tests/regressiontests/cache/tests.py
index 6a5201ffeb..7eafe12917 100644
--- a/tests/regressiontests/cache/tests.py
+++ b/tests/regressiontests/cache/tests.py
@@ -220,7 +220,7 @@ class BaseCacheTests(object):
         self.assertEqual(self.cache.has_key("goodbye1"), False)
 
     def test_in(self):
-        # The in operator can be used to inspet cache contents
+        # The in operator can be used to inspect cache contents
         self.cache.set("hello2", "goodbye2")
         self.assertEqual("hello2" in self.cache, True)
         self.assertEqual("goodbye2" in self.cache, False)
@@ -338,7 +338,7 @@ class BaseCacheTests(object):
             self.assertEqual(self.cache.get(key), value)
 
     def test_binary_string(self):
-        # Binary strings should be cachable
+        # Binary strings should be cacheable
         from zlib import compress, decompress
         value = 'value_to_be_compressed'
         compressed_value = compress(value)
diff --git a/tests/regressiontests/generic_views/dates.py b/tests/regressiontests/generic_views/dates.py
index b9608d694f..f86e1cd5be 100644
--- a/tests/regressiontests/generic_views/dates.py
+++ b/tests/regressiontests/generic_views/dates.py
@@ -339,7 +339,7 @@ class DayArchiveViewTests(TestCase):
         self.assertEqual(list(res.context['book_list']), [b])
         self.assertEqual(res.context['day'], future)
 
-        # allow_future but not allow_empty, next/prev amust be valid
+        # allow_future but not allow_empty, next/prev must be valid
         self.assertEqual(res.context['next_day'], None)
         self.assertEqual(res.context['previous_day'], datetime.date(2008, 10, 1))
 
diff --git a/tests/regressiontests/multiple_database/tests.py b/tests/regressiontests/multiple_database/tests.py
index 02ee34f820..2d5b0a82aa 100644
--- a/tests/regressiontests/multiple_database/tests.py
+++ b/tests/regressiontests/multiple_database/tests.py
@@ -1085,7 +1085,7 @@ class RouterTestCase(TestCase):
         self.assertEqual(list(pro.authors.values_list('name', flat=True)), [u'Marty Alchin'])
         self.assertEqual(pro.editor.name, u'Marty Alchin')
 
-        # get_or_create is a special case. The get needs to be targetted at
+        # get_or_create is a special case. The get needs to be targeted at
         # the write database in order to avoid potential transaction
         # consistency problems
         book, created = Book.objects.get_or_create(title="Pro Django")