Fixed various dodgy behaviours

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

8 files changed, 9 insertions, 9 deletions

diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index 6932340daf..4f0f8337eb 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -152,7 +152,7 @@ DATABASES = {
     },
 }
 
-# Classes used to implement db routing behaviour
+# Classes used to implement DB routing behavior.
 DATABASE_ROUTERS = []
 
 # The email backend to use. For possible shortcuts see django.core.mail.
diff --git a/django/contrib/admin/static/admin/js/admin/ordering.js b/django/contrib/admin/static/admin/js/admin/ordering.js
index 53c42f3609..595be4d62b 100644
--- a/django/contrib/admin/static/admin/js/admin/ordering.js
+++ b/django/contrib/admin/static/admin/js/admin/ordering.js
@@ -11,7 +11,7 @@ function reorder_init() {
     setOrder(input.value.split(','));
     input.disabled = true;
     draw();
-    // Now initialise the dragging behaviour
+    // Now initialize the dragging behavior
     var limit = (lis.length - 1) * height;
     for (var i = 0; i < lis.length; i++) {
         var li = lis[i];
diff --git a/django/contrib/gis/geos/tests/test_geos.py b/django/contrib/gis/geos/tests/test_geos.py
index eb13a62cb9..9b241e6164 100644
--- a/django/contrib/gis/geos/tests/test_geos.py
+++ b/django/contrib/gis/geos/tests/test_geos.py
@@ -892,11 +892,11 @@ class GEOSTest(unittest.TestCase, TestDataMixin):
 
     def test23_transform_nosrid(self):
         """ Testing `transform` method (no SRID) """
-        # raise a warning if SRID <0/None
+        # Raise a warning if SRID <0/None.
         import warnings
         print "\nBEGIN - expecting Warnings; safe to ignore.\n"
 
-        # test for do-nothing behaviour.
+        # Test for do-nothing behavior.
         try:
             # Keeping line-noise down by only printing the relevant
             # warnings once.
diff --git a/django/contrib/sessions/tests.py b/django/contrib/sessions/tests.py
index 50297dce2f..3886c34512 100644
--- a/django/contrib/sessions/tests.py
+++ b/django/contrib/sessions/tests.py
@@ -410,6 +410,6 @@ class CookieSessionTests(SessionTestsMixin, TestCase):
         This test tested cycle_key() which would create a new session
         key for the same session data. But we can't invalidate previously
         signed cookies (other than letting them expire naturally) so
-        testing for this behaviour is meaningless.
+        testing for this behavior is meaningless.
         """
         pass
diff --git a/django/core/management/__init__.py b/django/core/management/__init__.py
index 6edb0ba399..7e8eebdaa3 100644
--- a/django/core/management/__init__.py
+++ b/django/core/management/__init__.py
@@ -168,7 +168,7 @@ class LaxOptionParser(OptionParser):
     def print_lax_help(self):
         """Output the basic options available to every command.
 
-        This just redirects to the default print_help() behaviour.
+        This just redirects to the default print_help() behavior.
         """
         OptionParser.print_help(self)
 
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index 4afe28806d..ea56d4b17d 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -1249,7 +1249,7 @@ class Query(object):
         case). Finally, 'negate' is used in the same sense as for add_filter()
         -- it indicates an exclude() filter, or something similar. It is only
         passed in here so that it can be passed to a field's extra_filter() for
-        customised behaviour.
+        customized behavior.
 
         Returns the final field involved in the join, the target database
         column (used for any 'where' constraint), the final 'opts' value and the
diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py
index 7e2ee6758f..2d4a180e75 100644
--- a/django/template/defaulttags.py
+++ b/django/template/defaulttags.py
@@ -474,7 +474,7 @@ class WithNode(Node):
 @register.tag
 def autoescape(parser, token):
     """
-    Force autoescape behaviour for this block.
+    Force autoescape behavior for this block.
     """
     args = token.contents.split()
     if len(args) != 2:
diff --git a/django/views/debug.py b/django/views/debug.py
index ad89a335e2..caa3fa6971 100644
--- a/django/views/debug.py
+++ b/django/views/debug.py
@@ -92,7 +92,7 @@ def get_exception_reporter_filter(request):
 class ExceptionReporterFilter(object):
     """
     Base for all exception reporter filter classes. All overridable hooks
-    contain lenient default behaviours.
+    contain lenient default behaviors.
     """
 
     def get_request_repr(self, request):