summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorДилян Палаузов <dilyanpalauzov@users.noreply.github.com>2017-11-06 22:11:39 -0500
committerTim Graham <timograham@gmail.com>2017-11-06 22:41:03 -0500
commit6c0042430e3618ce5c276d195d92a6b884daa3a3 (patch)
treecc272a4d835f9ff18f25f79335d0d3190850feef /docs
parent5587485d49af8b32ab660854f751a234baa6610b (diff)
Fixed #28776 -- Fixed a/an/and typos in docs and comments.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/settings.txt2
-rw-r--r--docs/releases/1.1.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 4c1b5eb0d7..204016b900 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1862,7 +1862,7 @@ __ https://github.com/django/django/blob/master/django/utils/log.py
Default: ``'logging.config.dictConfig'``
A path to a callable that will be used to configure logging in the
-Django project. Points at a instance of Python's :ref:`dictConfig
+Django project. Points at an instance of Python's :ref:`dictConfig
<logging-config-dictschema>` configuration method by default.
If you set :setting:`LOGGING_CONFIG` to ``None``, the logging
diff --git a/docs/releases/1.1.txt b/docs/releases/1.1.txt
index 1ef5667336..3a359559bd 100644
--- a/docs/releases/1.1.txt
+++ b/docs/releases/1.1.txt
@@ -207,7 +207,7 @@ detail in :doc:`the ORM aggregation documentation </topics/db/aggregation>`.
Query expressions
~~~~~~~~~~~~~~~~~
-Queries can now refer to a another field on the query and can traverse
+Queries can now refer to another field on the query and can traverse
relationships to refer to fields on related models. This is implemented in the
new :class:`~django.db.models.F` object; for full details, including examples,
consult the :class:`F expressions documentation <django.db.models.F>`.