[1.9.x] Fixed #25668 -- Misc spelling errors

Backport of 3ee18400ae9b916da1a3bee9c9c630fd223a2d3c from master

4 files changed, 5 insertions, 5 deletions

diff --git a/django/core/cache/backends/base.py b/django/core/cache/backends/base.py
index 7835c9793a..186a45ddd6 100644
--- a/django/core/cache/backends/base.py
+++ b/django/core/cache/backends/base.py
@@ -259,7 +259,7 @@ class BaseCache(object):
         return version + delta
 
     def decr_version(self, key, delta=1, version=None):
-        """Substracts delta from the cache version for the supplied key. Returns
+        """Subtracts delta from the cache version for the supplied key. Returns
         the new version.
         """
         return self.incr_version(key, -delta, version)
diff --git a/django/test/testcases.py b/django/test/testcases.py
index 302c284edb..6b31e974e3 100644
--- a/django/test/testcases.py
+++ b/django/test/testcases.py
@@ -991,7 +991,7 @@ class TestCase(TransactionTestCase):
     Similar to TransactionTestCase, but uses `transaction.atomic()` to achieve
     test isolation.
 
-    In most situation, TestCase should be prefered to TransactionTestCase as
+    In most situations, TestCase should be preferred to TransactionTestCase as
     it allows faster execution. However, there are some situations where using
     TransactionTestCase might be necessary (e.g. testing some transactional
     behavior).
diff --git a/django/utils/encoding.py b/django/utils/encoding.py
index 48fde393a7..6bc285d899 100644
--- a/django/utils/encoding.py
+++ b/django/utils/encoding.py
@@ -223,7 +223,7 @@ def escape_uri_path(path):
     #   reserved    = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" | "$" | ","
     #   unreserved  = alphanum | mark
     #   mark        = "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")"
-    # The list of safe characters here is constructed substracting ";", "=",
+    # The list of safe characters here is constructed subtracting ";", "=",
     # and "?" according to section 3.3 of RFC 2396.
     # The reason for not subtracting and escaping "/" is that we are escaping
     # the entire path, not a path segment.
diff --git a/django/utils/termcolors.py b/django/utils/termcolors.py
index 507b25dd77..4924918e25 100644
--- a/django/utils/termcolors.py
+++ b/django/utils/termcolors.py
@@ -144,7 +144,7 @@ DEFAULT_PALETTE = DARK_PALETTE
 def parse_color_setting(config_string):
     """Parse a DJANGO_COLORS environment variable to produce the system palette
 
-    The general form of a pallete definition is:
+    The general form of a palette definition is:
 
         "palette;role=fg;role=fg/bg;role=fg,option,option;role=fg/bg,option,option"
 
@@ -156,7 +156,7 @@ def parse_color_setting(config_string):
         option is a display options.
 
     Specifying a named palette is the same as manually specifying the individual
-    definitions for each role. Any individual definitions following the pallete
+    definitions for each role. Any individual definitions following the palette
     definition will augment the base palette definition.
 
     Valid roles: