summaryrefslogtreecommitdiff
path: root/django/utils
diff options
context:
space:
mode:
authorVille Skyttä <ville.skytta@iki.fi>2015-11-03 11:55:10 +0200
committerTim Graham <timograham@gmail.com>2015-11-03 10:33:05 +0000
commita3bbc38d545390f605f9bed947c9fdfe2ffa6055 (patch)
treec6376e8cd0bce8c9d0e3e58a8a86022e3b107f32 /django/utils
parented3e066cc157ed69f2697454540f7fb60cfcd308 (diff)
[1.9.x] Fixed #25668 -- Misc spelling errors
Backport of 3ee18400ae9b916da1a3bee9c9c630fd223a2d3c from master
Diffstat (limited to 'django/utils')
-rw-r--r--django/utils/encoding.py2
-rw-r--r--django/utils/termcolors.py4
2 files changed, 3 insertions, 3 deletions
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: