summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorMin ho Kim <minho42@gmail.com>2019-07-02 17:36:17 +1000
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2019-07-02 09:36:17 +0200
commitfbb83fefd43a89d1a802d77dcc3a9c9ac15a5afa (patch)
tree035f7261b2c9af23dbc9db9ed835db6caf42ca2b /django
parent090ca6512f514556394d4a8d321db7883f03e2a6 (diff)
Fixed typos in comments and docs.
Diffstat (limited to 'django')
-rw-r--r--django/contrib/contenttypes/management/__init__.py2
-rw-r--r--django/db/backends/base/base.py2
-rw-r--r--django/utils/html.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/django/contrib/contenttypes/management/__init__.py b/django/contrib/contenttypes/management/__init__.py
index 563cba2fdf..df931d9c7f 100644
--- a/django/contrib/contenttypes/management/__init__.py
+++ b/django/contrib/contenttypes/management/__init__.py
@@ -31,7 +31,7 @@ class RenameContentType(migrations.RunPython):
# asking the user what should be done next.
content_type.model = old_model
else:
- # Clear the cache as the `get_by_natual_key()` call will cache
+ # Clear the cache as the `get_by_natural_key()` call will cache
# the renamed ContentType instance by its old model name.
ContentType.objects.clear_cache()
diff --git a/django/db/backends/base/base.py b/django/db/backends/base/base.py
index 6435f478dd..9a4c27f0f3 100644
--- a/django/db/backends/base/base.py
+++ b/django/db/backends/base/base.py
@@ -397,7 +397,7 @@ class BaseDatabaseWrapper:
The usual way to start a transaction is to turn autocommit off.
SQLite does not properly start a transaction when disabling
autocommit. To avoid this buggy behavior and to actually enter a new
- transaction, an explcit BEGIN is required. Using
+ transaction, an explicit BEGIN is required. Using
force_begin_transaction_with_broken_autocommit=True will issue an
explicit BEGIN with SQLite. This option will be ignored for other
backends.
diff --git a/django/utils/html.py b/django/utils/html.py
index b26cbd16b8..fb636600c9 100644
--- a/django/utils/html.py
+++ b/django/utils/html.py
@@ -274,7 +274,7 @@ def urlize(text, trim_url_limit=None, nofollow=False, autoescape=False):
trail = closing + trail
trimmed_something = True
# Trim trailing punctuation (after trimming wrapping punctuation,
- # as encoded entities contain ';'). Unescape entites to avoid
+ # as encoded entities contain ';'). Unescape entities to avoid
# breaking them by removing ';'.
middle_unescaped = html.unescape(middle)
stripped = middle_unescaped.rstrip(TRAILING_PUNCTUATION_CHARS)