summaryrefslogtreecommitdiff
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
parent090ca6512f514556394d4a8d321db7883f03e2a6 (diff)
Fixed typos in comments and docs.
-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
-rw-r--r--docs/ref/checks.txt2
-rw-r--r--js_tests/qunit/qunit.js2
-rw-r--r--tests/admin_views/tests.py2
-rw-r--r--tests/i18n/tests.py2
7 files changed, 7 insertions, 7 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)
diff --git a/docs/ref/checks.txt b/docs/ref/checks.txt
index 1a388c6b37..20fb50e131 100644
--- a/docs/ref/checks.txt
+++ b/docs/ref/checks.txt
@@ -406,7 +406,7 @@ The following checks are run if you use the :option:`check --deploy` option:
* **security.W017**: :setting:`CSRF_COOKIE_HTTPONLY` is not set to ``True``.
Using an ``HttpOnly`` CSRF cookie makes it more difficult for cross-site
scripting attacks to steal the CSRF token. *This check is removed in Django
- 1.11 as the* :setting:`CSRF_COOKIE_HTTPONLY` *setting offers no pratical
+ 1.11 as the* :setting:`CSRF_COOKIE_HTTPONLY` *setting offers no practical
benefit.*
* **security.W018**: You should not have :setting:`DEBUG` set to ``True`` in
deployment.
diff --git a/js_tests/qunit/qunit.js b/js_tests/qunit/qunit.js
index 47c904cf32..2272b87a12 100644
--- a/js_tests/qunit/qunit.js
+++ b/js_tests/qunit/qunit.js
@@ -2308,7 +2308,7 @@ QUnit.config.testId = [].concat( urlParams.testId || [] );
// Exact case-insensitive match of the module name
QUnit.config.module = urlParams.module;
-// Regular expression or case-insenstive substring match against "moduleName: testName"
+// Regular expression or case-insensitive substring match against "moduleName: testName"
QUnit.config.filter = urlParams.filter;
// Test order randomization
diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py
index 7e6040fe52..9709bcaf88 100644
--- a/tests/admin_views/tests.py
+++ b/tests/admin_views/tests.py
@@ -4090,7 +4090,7 @@ class AdminInlineTests(TestCase):
response = self.client.post(collector_url, self.post_data)
self.assertEqual(response.status_code, 302)
self.assertEqual(Widget.objects.count(), 0)
- # But after adding the permisson it can.
+ # But after adding the permission it can.
permissionuser.user_permissions.add(get_perm(Widget, get_permission_codename('add', Widget._meta)))
self.post_data['widget_set-0-name'] = "Widget 1"
collector_url = reverse('admin:admin_views_collector_change', args=(self.collector.pk,))
diff --git a/tests/i18n/tests.py b/tests/i18n/tests.py
index 300af388e6..ac813b3439 100644
--- a/tests/i18n/tests.py
+++ b/tests/i18n/tests.py
@@ -1677,7 +1677,7 @@ class UnprefixedDefaultLanguageTests(SimpleTestCase):
def test_no_redirect_on_404(self):
"""
A request for a nonexistent URL shouldn't cause a redirect to
- /<defaut_language>/<request_url> when prefix_default_language=False and
+ /<default_language>/<request_url> when prefix_default_language=False and
/<default_language>/<request_url> has a URL match (#27402).
"""
# A match for /group1/group2/ must exist for this to act as a