summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2018-07-09 15:06:36 -0400
committerGitHub <noreply@github.com>2018-07-09 15:06:36 -0400
commit8b1d361f28c80cb0fa84a3714d711174bd25cdfa (patch)
treee9c6f335ceec51ae6465e2a4b44a7dee9f5aa2cb /docs
parent45c035c823bfbd642dc1490f1c555316af403c4c (diff)
Fixed #29549 -- Doc'd that Field.choices are enforced by model validation.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/models/fields.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt
index 5fc785fb18..210619881c 100644
--- a/docs/ref/models/fields.txt
+++ b/docs/ref/models/fields.txt
@@ -82,8 +82,9 @@ If a field has ``blank=False``, the field will be required.
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
-this is given, the default form widget will be a select box with these choices
-instead of the standard text field.
+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::