summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorVille Skyttä <ville.skytta@iki.fi>2017-10-31 03:47:09 +0200
committerTim Graham <timograham@gmail.com>2017-10-30 21:47:27 -0400
commit8a6392e4c69fa6e51005d29ed8c0898e47ca0065 (patch)
treee47a479a255e21884159d1aa4bb700581baf4667 /docs
parentf2d5417d3b7a4012298fcffc6eab618cc09d0344 (diff)
[2.0.x] Fixed 'a'/'an' mix-ups in docs.
Backport of 617686e226231fe8ad3f2e49d3efabf6f5f434d3 from master
Diffstat (limited to 'docs')
-rw-r--r--docs/howto/custom-lookups.txt4
-rw-r--r--docs/ref/utils.txt2
-rw-r--r--docs/topics/db/multi-db.txt2
-rw-r--r--docs/topics/http/urls.txt2
-rw-r--r--docs/topics/testing/advanced.txt2
5 files changed, 6 insertions, 6 deletions
diff --git a/docs/howto/custom-lookups.txt b/docs/howto/custom-lookups.txt
index 64f7e5aca4..32037a29aa 100644
--- a/docs/howto/custom-lookups.txt
+++ b/docs/howto/custom-lookups.txt
@@ -109,7 +109,7 @@ or where it did not exceed a certain amount
functionality which is possible in a database backend independent manner,
and without duplicating functionality already in Django.
-We will start by writing a ``AbsoluteValue`` transformer. This will use the SQL
+We will start by writing an ``AbsoluteValue`` transformer. This will use the SQL
function ``ABS()`` to transform the value before comparison::
from django.db.models import Transform
@@ -257,7 +257,7 @@ operator. (Note that in reality almost all databases support both, including
all the official databases supported by Django).
We can change the behavior on a specific backend by creating a subclass of
-``NotEqual`` with a ``as_mysql`` method::
+``NotEqual`` with an ``as_mysql`` method::
class MySQLNotEqual(NotEqual):
def as_mysql(self, compiler, connection):
diff --git a/docs/ref/utils.txt b/docs/ref/utils.txt
index 2e67a1ea68..3047125337 100644
--- a/docs/ref/utils.txt
+++ b/docs/ref/utils.txt
@@ -993,7 +993,7 @@ appropriate entities.
.. function:: make_naive(value, timezone=None)
- Returns an naive :class:`~datetime.datetime` that represents in
+ Returns a naive :class:`~datetime.datetime` that represents in
``timezone`` the same point in time as ``value``, ``value`` being an
aware :class:`~datetime.datetime`. If ``timezone`` is set to ``None``, it
defaults to the :ref:`current time zone <default-current-time-zone>`.
diff --git a/docs/topics/db/multi-db.txt b/docs/topics/db/multi-db.txt
index 7617259b3d..78f3fe23d9 100644
--- a/docs/topics/db/multi-db.txt
+++ b/docs/topics/db/multi-db.txt
@@ -650,7 +650,7 @@ registered with any ``Admin`` instance::
This example sets up two admin sites. On the first site, the
``Author`` and ``Publisher`` objects are exposed; ``Publisher``
-objects have an tabular inline showing books published by that
+objects have a tabular inline showing books published by that
publisher. The second site exposes just publishers, without the
inlines.
diff --git a/docs/topics/http/urls.txt b/docs/topics/http/urls.txt
index 92303a408a..38648d7de0 100644
--- a/docs/topics/http/urls.txt
+++ b/docs/topics/http/urls.txt
@@ -227,7 +227,7 @@ This usage isn't particularly recommended as it makes it easier to accidentally
introduce errors between the intended meaning of a match and the arguments
of the view.
-In either case, using only one style within an given regex is recommended. When
+In either case, using only one style within a given regex is recommended. When
both styles are mixed, any unnamed groups are ignored and only named groups are
passed to the view function.
diff --git a/docs/topics/testing/advanced.txt b/docs/topics/testing/advanced.txt
index 996bcf1a06..120821e2a7 100644
--- a/docs/topics/testing/advanced.txt
+++ b/docs/topics/testing/advanced.txt
@@ -303,7 +303,7 @@ Advanced features of ``TransactionTestCase``
recommended that you do not hard code primary key values in tests.
Using ``reset_sequences = True`` will slow down the test, since the primary
- key reset is an relatively expensive database operation.
+ key reset is a relatively expensive database operation.
.. _testing-reusable-applications: