diff options
| author | David Smith <smithdc@gmail.com> | 2020-05-25 17:05:22 +0100 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-06-03 21:02:48 +0200 |
| commit | dbdc192ca30b70a9f22c6bc4b3155bbccd01c323 (patch) | |
| tree | bb8ddf9934dcf6ba05b9dd8e081a76f02f162a36 /docs/ref | |
| parent | 25352dc019d175dfa6e62a50de76cb3614955077 (diff) | |
Preferred usage of among/while to amongst/whilst.
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/checks.txt | 4 | ||||
| -rw-r--r-- | docs/ref/forms/fields.txt | 4 | ||||
| -rw-r--r-- | docs/ref/models/querysets.txt | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/docs/ref/checks.txt b/docs/ref/checks.txt index 79b8de1591..d5aeca2d8c 100644 --- a/docs/ref/checks.txt +++ b/docs/ref/checks.txt @@ -343,11 +343,11 @@ Models * **models.E028**: ``db_table`` ``<db_table>`` is used by multiple models: ``<model list>``. * **models.E029**: index name ``<index>`` is not unique for model ``<model>``. -* **models.E030**: index name ``<index>`` is not unique amongst models: +* **models.E030**: index name ``<index>`` is not unique among models: ``<model list>``. * **models.E031**: constraint name ``<constraint>`` is not unique for model ``<model>``. -* **models.E032**: constraint name ``<constraint>`` is not unique amongst +* **models.E032**: constraint name ``<constraint>`` is not unique among models: ``<model list>``. * **models.E033**: The index name ``<index>`` cannot start with an underscore or a number. diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt index 58db957512..d7f3ca17a2 100644 --- a/docs/ref/forms/fields.txt +++ b/docs/ref/forms/fields.txt @@ -711,7 +711,7 @@ For each field, we describe the default widget used if you don't specify After the field has been cleaned and validated, the ``UploadedFile`` object will have an additional ``image`` attribute containing the Pillow `Image`_ instance used to check if the file was a valid image. Pillow - closes the underlying file descriptor after verifying an image, so whilst + closes the underlying file descriptor after verifying an image, so while non-image data attributes, such as ``format``, ``height``, and ``width``, are available, methods that access the underlying image data, such as ``getdata()`` or ``getpixel()``, cannot be used without reopening the file. @@ -1354,7 +1354,7 @@ By default, :class:`ModelChoiceField` and :class:`ModelMultipleChoiceField` use When iterated, ``ModelChoiceIterator`` yields 2-tuple choices containing :class:`ModelChoiceIteratorValue` instances as the first ``value`` element in -each choice. ``ModelChoiceIteratorValue`` wraps the choice value whilst +each choice. ``ModelChoiceIteratorValue`` wraps the choice value while maintaining a reference to the source model instance that can be used in custom widget implementations, for example, to add `data-* attributes`_ to ``<option>`` elements. diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt index 2e862dbbb7..01ba71c182 100644 --- a/docs/ref/models/querysets.txt +++ b/docs/ref/models/querysets.txt @@ -1710,7 +1710,7 @@ to refer to the queryset's model. On PostgreSQL only, you can pass ``no_key=True`` in order to acquire a weaker lock, that still allows creating rows that merely reference locked rows -(through a foreign key, for example) whilst the lock is in place. The +(through a foreign key, for example) while the lock is in place. The PostgreSQL documentation has more details about `row-level lock modes <https://www.postgresql.org/docs/current/explicit-locking.html#LOCKING-ROWS>`_. |