diff options
| author | Дилян Палаузов <dilyanpalauzov@users.noreply.github.com> | 2017-11-06 22:11:39 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-11-06 22:41:23 -0500 |
| commit | e68baf386219ab64539ba5cef628811be03fdb84 (patch) | |
| tree | c91ea8f0b79ba3a9edc66db32c3ed18ea6ebf837 /docs | |
| parent | bcaef2c91d234fe742973eb7df8a47f2048d3e63 (diff) | |
[2.0.x] Fixed #28776 -- Fixed a/an/and typos in docs and comments.
Backport of 6c0042430e3618ce5c276d195d92a6b884daa3a3 from master
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/settings.txt | 2 | ||||
| -rw-r--r-- | docs/releases/1.1.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 5c530b7a04..4ac811797e 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -1885,7 +1885,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>`. |