Fixed #1626 -- Fixed a bunch of typos in comments and docs. Thanks, Dexter

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

9 files changed, 11 insertions, 11 deletions

diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py
index 36fc03706b..b87fd15e60 100644
--- a/django/contrib/admin/templatetags/admin_list.py
+++ b/django/contrib/admin/templatetags/admin_list.py
@@ -79,7 +79,7 @@ def result_headers(cl):
             if field_name == '__repr__':
                 header = lookup_opts.verbose_name
             else:
-                func = getattr(cl.mod.Klass, field_name) # Let AttributeErrors propogate.
+                func = getattr(cl.mod.Klass, field_name) # Let AttributeErrors propagate.
                 try:
                     header = func.short_description
                 except AttributeError:
diff --git a/django/core/meta/__init__.py b/django/core/meta/__init__.py
index 49032e7c74..8121736096 100644
--- a/django/core/meta/__init__.py
+++ b/django/core/meta/__init__.py
@@ -1733,7 +1733,7 @@ def manipulator_init(opts, add, change, self, obj_key=None, follow=None):
             if opts.one_to_one_field:
                 # Sanity check -- Make sure the "parent" object exists.
                 # For example, make sure the Place exists for the Restaurant.
-                # Let the ObjectDoesNotExist exception propogate up.
+                # Let the ObjectDoesNotExist exception propagate up.
                 lookup_kwargs = opts.one_to_one_field.rel.limit_choices_to
                 lookup_kwargs['%s__exact' % opts.one_to_one_field.rel.field_name] = obj_key
                 _ = opts.one_to_one_field.rel.to.get_model_module().get_object(**lookup_kwargs)
diff --git a/django/core/meta/fields.py b/django/core/meta/fields.py
index edd1e4313a..8eeb9550c6 100644
--- a/django/core/meta/fields.py
+++ b/django/core/meta/fields.py
@@ -80,7 +80,7 @@ class BoundField(object):
 
 # A guide to Field parameters:
 #
-#   * name:      The name of the field specifed in the model.
+#   * name:      The name of the field specified in the model.
 #   * attname:   The attribute to use on the model object. This is the same as
 #                "name", except in the case of ForeignKeys, where "_id" is
 #                appended.
diff --git a/django/core/servers/basehttp.py b/django/core/servers/basehttp.py
index 2cb5471fe5..c792e0a970 100644
--- a/django/core/servers/basehttp.py
+++ b/django/core/servers/basehttp.py
@@ -46,7 +46,7 @@ class FileWrapper:
         raise StopIteration
 
 # Regular expression that matches `special' characters in parameters, the
-# existance of which force quoting of the parameter value.
+# existence of which force quoting of the parameter value.
 tspecials = re.compile(r'[ \(\)<>@,;:\\"/\[\]\?=]')
 
 def _formatparam(param, value=None, quote=1):
diff --git a/django/utils/_threading_local.py b/django/utils/_threading_local.py
index c90fde0653..90717a8d84 100644
--- a/django/utils/_threading_local.py
+++ b/django/utils/_threading_local.py
@@ -149,7 +149,7 @@ class _localbase(object):
             raise TypeError("Initialization arguments are not supported")
 
         # We need to create the thread dict in anticipation of
-        # __init__ being called, to make sire we don't cal it
+        # __init__ being called, to make sure we don't call it
         # again ourselves.
         dict = object.__getattribute__(self, '__dict__')
         currentThread().__dict__[key] = dict
diff --git a/docs/modpython.txt b/docs/modpython.txt
index 5800968ee5..24cb405231 100644
--- a/docs/modpython.txt
+++ b/docs/modpython.txt
@@ -190,7 +190,7 @@ Error handling
 ==============
 
 When you use Apache/mod_python, errors will be caught by Django -- in other
-words, they won't propogate to the Apache level and won't appear in the Apache
+words, they won't propagate to the Apache level and won't appear in the Apache
 ``error_log``.
 
 The exception for this is if something is really wonky in your Django setup. In
diff --git a/tests/doctest.py b/tests/doctest.py
index 0a13d77586..df7aa978d3 100644
--- a/tests/doctest.py
+++ b/tests/doctest.py
@@ -846,7 +846,7 @@ class DocTestFinder:
         if extraglobs is not None:
             globs.update(extraglobs)
 
-        # Recursively expore `obj`, extracting DocTests.
+        # Recursively explore `obj`, extracting DocTests.
         tests = []
         self._find(tests, obj, name, module, source_lines, globs, {})
         return tests
@@ -1210,7 +1210,7 @@ class DocTestRunner:
         # Process each example.
         for examplenum, example in enumerate(test.examples):
 
-            # If REPORT_ONLY_FIRST_FAILURE is set, then supress
+            # If REPORT_ONLY_FIRST_FAILURE is set, then suppress
             # reporting after the first failure.
             quiet = (self.optionflags & REPORT_ONLY_FIRST_FAILURE and
                      failures > 0)
diff --git a/tests/othertests/cache.py b/tests/othertests/cache.py
index 513e2186c4..81f2c20328 100644
--- a/tests/othertests/cache.py
+++ b/tests/othertests/cache.py
@@ -15,7 +15,7 @@ class C:
 cache.set("key", "value")
 assert cache.get("key") == "value"
 
-# get with non-existant keys
+# get with non-existent keys
 assert cache.get("does not exist") is None
 assert cache.get("does not exist", "bang!") == "bang!"
 
@@ -57,4 +57,4 @@ for (key, value) in stuff.items():
 # expiration
 cache.set('expire', 'very quickly', 1)
 time.sleep(2)
-assert cache.get("expire") == None
\ No newline at end of file
+assert cache.get("expire") == None
diff --git a/tests/testapp/models/basic.py b/tests/testapp/models/basic.py
index 6ce64322e4..7261b8783f 100644
--- a/tests/testapp/models/basic.py
+++ b/tests/testapp/models/basic.py
@@ -195,7 +195,7 @@ datetime.datetime(2005, 7, 31, 12, 30, 45)
 
 API_TESTS += """
 
-# You can manually specify the primary key when creating a new objet
+# You can manually specify the primary key when creating a new object
 >>> a101 = articles.Article(id=101, headline='Article 101', pub_date=datetime(2005, 7, 31, 12, 30, 45))
 >>> a101.save()
 >>> a101 = articles.get_object(pk=101)