summaryrefslogtreecommitdiff
path: root/docs/ref/models
diff options
context:
space:
mode:
authorJon Dufresne <jon.dufresne@gmail.com>2019-05-17 08:27:19 -0700
committerCarlton Gibson <carlton.gibson@noumenal.es>2019-05-17 17:27:57 +0200
commited221f7c97de9781ca5e6dd55a9963dfbe4a89af (patch)
tree30ecba9ea39385639dd4587a605052aa1e14cac3 /docs/ref/models
parent0aca34fc83c72c55a57ea362a3e77ed4405a0162 (diff)
[2.2.x] Changed docs to link to Python's description of iterable.
Backport of e86cc14bd36734d81c4e490a2453778e33b95a45 from master
Diffstat (limited to 'docs/ref/models')
-rw-r--r--docs/ref/models/fields.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt
index 2b97e19338..a5afcec748 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::