summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJakub Wilk <jwilk@jwilk.net>2016-03-13 19:47:58 +0100
committerJakub Wilk <jwilk@jwilk.net>2016-03-13 19:48:24 +0100
commit402da9ab7b2bae807b7ea30c23ef524b0aeb1903 (patch)
tree398cca9ff1cddcdbc8da7adeca62a25e6dae598a /docs
parent91f87b8f91f5f8d01ac4b814dce218be27f56ab2 (diff)
Fixed typos in docs.
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/howto-release-django.txt2
-rw-r--r--docs/ref/utils.txt2
-rw-r--r--docs/releases/1.0.txt2
-rw-r--r--docs/releases/security.txt2
-rw-r--r--docs/topics/conditional-view-processing.txt2
-rw-r--r--docs/topics/performance.txt2
6 files changed, 6 insertions, 6 deletions
diff --git a/docs/internals/howto-release-django.txt b/docs/internals/howto-release-django.txt
index 8ce965d5c4..c5254a8af3 100644
--- a/docs/internals/howto-release-django.txt
+++ b/docs/internals/howto-release-django.txt
@@ -365,7 +365,7 @@ You're almost done! All that's left to do now is:
New stable branch tasks
=======================
-There are several items to do in the time following a the creation of a new
+There are several items to do in the time following the creation of a new
stable branch (often following an alpha release). Some of these tasks don't
need to be done by the releaser.
diff --git a/docs/ref/utils.txt b/docs/ref/utils.txt
index 2a330ca953..202cbb4c12 100644
--- a/docs/ref/utils.txt
+++ b/docs/ref/utils.txt
@@ -155,7 +155,7 @@ The functions defined in this module share the following properties:
decorate methods or classes; in the latter case, ``name`` is the name
of the method to be decorated and is required.
- ``decorator`` may also be a a list or tuple of functions. They are wrapped
+ ``decorator`` may also be a list or tuple of functions. They are wrapped
in reverse order so that the call order is the order in which the functions
appear in the list/tuple.
diff --git a/docs/releases/1.0.txt b/docs/releases/1.0.txt
index 162caaa3a9..3d0043a797 100644
--- a/docs/releases/1.0.txt
+++ b/docs/releases/1.0.txt
@@ -5,7 +5,7 @@ Django 1.0 release notes
Welcome to Django 1.0!
We've been looking forward to this moment for over three years, and it's finally
-here. Django 1.0 represents a the largest milestone in Django's development to
+here. Django 1.0 represents the largest milestone in Django's development to
date: a Web framework that a group of perfectionists can truly be proud of.
Django 1.0 represents over three years of community development as an Open
diff --git a/docs/releases/security.txt b/docs/releases/security.txt
index c8d29ef7ba..58e16748f6 100644
--- a/docs/releases/security.txt
+++ b/docs/releases/security.txt
@@ -202,7 +202,7 @@ Versions affected
September 9, 2011 - CVE-2011-4137
---------------------------------
-`CVE-2011-4137 <https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-4137&cid=2>`_: Denial-of-service via via ``URLField.verify_exists``. `Full description <https://www.djangoproject.com/weblog/2011/sep/09/security-releases-issued/>`__
+`CVE-2011-4137 <https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-4137&cid=2>`_: Denial-of-service via ``URLField.verify_exists``. `Full description <https://www.djangoproject.com/weblog/2011/sep/09/security-releases-issued/>`__
Versions affected
~~~~~~~~~~~~~~~~~
diff --git a/docs/topics/conditional-view-processing.txt b/docs/topics/conditional-view-processing.txt
index 3d667337fd..742926e759 100644
--- a/docs/topics/conditional-view-processing.txt
+++ b/docs/topics/conditional-view-processing.txt
@@ -167,7 +167,7 @@ For example, consider the following exchange between the client and server:
the version it is trying to update.
4. Server checks to see if the resource has changed, by computing the ETag
the same way it does for a ``GET`` request (using the same function).
- If the resource *has* changed, it will return a 412 status code code,
+ If the resource *has* changed, it will return a 412 status code,
meaning "precondition failed".
5. Client sends a ``GET`` request to ``/foo/``, after receiving a 412
response, to retrieve an updated version of the content before updating
diff --git a/docs/topics/performance.txt b/docs/topics/performance.txt
index 76373f126f..c8c9d231af 100644
--- a/docs/topics/performance.txt
+++ b/docs/topics/performance.txt
@@ -171,7 +171,7 @@ final steps towards producing well-performing code, not a shortcut.
:class:`~django.utils.functional.cached_property`
-------------------------------------------------
-It's common to have to call a class instances's method more than once. If
+It's common to have to call a class instance's method more than once. If
that function is expensive, then doing so can be wasteful.
Using the :class:`~django.utils.functional.cached_property` decorator saves the