diff options
| author | Jon Dufresne <jon.dufresne@gmail.com> | 2019-05-17 08:27:19 -0700 |
|---|---|---|
| committer | Carlton Gibson <carlton.gibson@noumenal.es> | 2019-05-17 17:27:19 +0200 |
| commit | e86cc14bd36734d81c4e490a2453778e33b95a45 (patch) | |
| tree | d9991f0c8fc7cd41ff3c5e3eab60d024920d9283 /docs/ref | |
| parent | ccb7f7c6d237900614290085cca103d9509b89b9 (diff) | |
Changed docs to link to Python's description of iterable.
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/forms/fields.txt | 14 | ||||
| -rw-r--r-- | docs/ref/models/fields.txt | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt index d7bc32c412..aa13d4f021 100644 --- a/docs/ref/forms/fields.txt +++ b/docs/ref/forms/fields.txt @@ -407,13 +407,13 @@ For each field, we describe the default widget used if you don't specify .. attribute:: choices - Either an iterable (e.g., a list or tuple) of 2-tuples to use as - choices for this field, or a callable that returns such an iterable. - This argument accepts the same formats as the ``choices`` argument to a - model field. See the :ref:`model field reference documentation on - choices <field-choices>` for more details. If the argument is a - callable, it is evaluated each time the field's form is initialized. - Defaults to an empty list. + Either an :term:`iterable` of 2-tuples to use as choices for this + field, or a callable that returns such an iterable. This argument + accepts the same formats as the ``choices`` argument to a model field. + See the :ref:`model field reference documentation on choices + <field-choices>` for more details. If the argument is a callable, it is + evaluated each time the field's form is initialized. Defaults to an + empty list. ``TypedChoiceField`` -------------------- diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt index ff650851d7..a3c14f8b1b 100644 --- a/docs/ref/models/fields.txt +++ b/docs/ref/models/fields.txt @@ -80,11 +80,11 @@ If a field has ``blank=False``, the field will be required. .. attribute:: Field.choices -An iterable (e.g., a list or tuple) consisting itself of iterables of exactly -two items (e.g. ``[(A, B), (A, B) ...]``) to use as choices for this field. If -choices are given, they're enforced by :ref:`model validation -<validating-objects>` and the default form widget will be a select box with -these choices instead of the standard text field. +An :term:`iterable` consisting itself of iterables of exactly two items (e.g. +``[(A, B), (A, B) ...]``) to use as choices for this field. If choices are +given, they're enforced by :ref:`model validation <validating-objects>` and the +default form widget will be a select box with these choices instead of the +standard text field. The first element in each tuple is the actual value to be set on the model, and the second element is the human-readable name. For example:: |
