summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMin ho Kim <minho42@gmail.com>2019-09-11 20:55:17 +1000
committerCarlton Gibson <carlton@noumenal.es>2019-10-02 15:50:46 +0200
commit103a6f4307b4402198b03d79c683e195686572e1 (patch)
treea56a9fb838a38cbf8e44a114ed2ec9491213854d
parentf1d4a540b29c6766b988852bc302ac036a2d82e2 (diff)
Fixed some typos in comments and docs.
Thanks to Mads Jenson for review.
-rw-r--r--django/template/base.py2
-rw-r--r--docs/howto/deployment/asgi/uvicorn.txt2
-rw-r--r--docs/intro/contributing.txt2
-rw-r--r--docs/ref/middleware.txt6
-rw-r--r--tests/expressions/tests.py4
-rw-r--r--tests/gis_tests/test_geoforms.py2
6 files changed, 9 insertions, 9 deletions
diff --git a/django/template/base.py b/django/template/base.py
index 1101018785..6e22fbdcca 100644
--- a/django/template/base.py
+++ b/django/template/base.py
@@ -174,7 +174,7 @@ class Template:
"""
Parse and compile the template source into a nodelist. If debug
is True and an exception occurs during parsing, the exception is
- is annotated with contextual line information where it occurred in the
+ annotated with contextual line information where it occurred in the
template source.
"""
if self.engine.debug:
diff --git a/docs/howto/deployment/asgi/uvicorn.txt b/docs/howto/deployment/asgi/uvicorn.txt
index 70d32da113..c42341c778 100644
--- a/docs/howto/deployment/asgi/uvicorn.txt
+++ b/docs/howto/deployment/asgi/uvicorn.txt
@@ -19,7 +19,7 @@ Running Django in Uvicorn
When Uvicorn is installed, a ``uvicorn`` command is available which runs ASGI
applications. Uvicorn needs to be called with the location of a module
-containing a ASGI application object, followed by what the application is
+containing an ASGI application object, followed by what the application is
called (separated by a colon).
For a typical Django project, invoking Uvicorn would look like::
diff --git a/docs/intro/contributing.txt b/docs/intro/contributing.txt
index b21ec57f6d..02bed83e07 100644
--- a/docs/intro/contributing.txt
+++ b/docs/intro/contributing.txt
@@ -194,7 +194,7 @@ When contributing to Django it's very important that your code changes don't
introduce bugs into other areas of Django. One way to check that Django still
works after you make your changes is by running Django's test suite. If all
the tests still pass, then you can be reasonably sure that your changes
-work and haven't broken other parts Django. If you've never run Django's test
+work and haven't broken other parts of Django. If you've never run Django's test
suite before, it's a good idea to run it once beforehand to get familiar with
its output.
diff --git a/docs/ref/middleware.txt b/docs/ref/middleware.txt
index ec5584cc45..0e51dec75c 100644
--- a/docs/ref/middleware.txt
+++ b/docs/ref/middleware.txt
@@ -294,8 +294,8 @@ for:
keeping CSRF protection, consider enabling only same-origin referrers.
``SecurityMiddleware`` can set the ``Referrer-Policy`` header for you, based on
-the the :setting:`SECURE_REFERRER_POLICY` setting (note spelling: browsers send
-a ``Referer`` header when a user clicks a link, but the header instructing a
+the :setting:`SECURE_REFERRER_POLICY` setting (note spelling: browsers send a
+``Referer`` header when a user clicks a link, but the header instructing a
browser whether to do so is spelled ``Referrer-Policy``). The valid values for
this setting are:
@@ -522,7 +522,7 @@ Here are some hints about the ordering of various Django middleware classes:
#. :class:`~django.contrib.sessions.middleware.SessionMiddleware`
- Before any middleware that may raise an an exception to trigger an error
+ Before any middleware that may raise an exception to trigger an error
view (such as :exc:`~django.core.exceptions.PermissionDenied`) if you're
using :setting:`CSRF_USE_SESSIONS`.
diff --git a/tests/expressions/tests.py b/tests/expressions/tests.py
index 094b738792..1dba3d083a 100644
--- a/tests/expressions/tests.py
+++ b/tests/expressions/tests.py
@@ -1129,7 +1129,7 @@ class ExpressionOperatorTests(TestCase):
self.assertEqual(Number.objects.get(pk=self.n.pk).float, Approximate(15.500, places=3))
def test_lefthand_power(self):
- # LH Powert arithmetic operation on floats and integers
+ # LH Power arithmetic operation on floats and integers
Number.objects.filter(pk=self.n.pk).update(integer=F('integer') ** 2, float=F('float') ** 1.5)
self.assertEqual(Number.objects.get(pk=self.n.pk).integer, 1764)
self.assertEqual(Number.objects.get(pk=self.n.pk).float, Approximate(61.02, places=2))
@@ -1171,7 +1171,7 @@ class ExpressionOperatorTests(TestCase):
self.assertEqual(Number.objects.get(pk=self.n.pk).float, Approximate(15.500, places=3))
def test_righthand_power(self):
- # RH Powert arithmetic operation on floats and integers
+ # RH Power arithmetic operation on floats and integers
Number.objects.filter(pk=self.n.pk).update(integer=2 ** F('integer'), float=1.5 ** F('float'))
self.assertEqual(Number.objects.get(pk=self.n.pk).integer, 4398046511104)
self.assertEqual(Number.objects.get(pk=self.n.pk).float, Approximate(536.308, places=3))
diff --git a/tests/gis_tests/test_geoforms.py b/tests/gis_tests/test_geoforms.py
index dfb2e9e9e1..269ce03bde 100644
--- a/tests/gis_tests/test_geoforms.py
+++ b/tests/gis_tests/test_geoforms.py
@@ -235,7 +235,7 @@ class SpecializedFieldTest(SimpleTestCase):
ogr.transform(3857)
self.assertIn(escape(ogr.json), rendered)
- # map_srid in operlayers.html template must not be localized.
+ # map_srid in openlayers.html template must not be localized.
@override_settings(USE_L10N=True, USE_THOUSAND_SEPARATOR=True)
def test_pointfield(self):
class PointForm(forms.Form):