From 8caf524a1dd35d57827dff6950460f9d8b9d2dab Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Sat, 17 Oct 2020 16:17:00 +0200 Subject: [3.1.x] Fixed #32110 -- Doc'd and tested enumerations for ChoiceField.choices. Backport of 7f85498eef1d8fcc52e4fb70df8041f5452d405a from master --- docs/ref/forms/fields.txt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'docs/ref/forms/fields.txt') diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt index 0bcf07ff08..44ccdbf765 100644 --- a/docs/ref/forms/fields.txt +++ b/docs/ref/forms/fields.txt @@ -410,12 +410,13 @@ For each field, we describe the default widget used if you don't specify .. attribute:: choices 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 - ` for more details. If the argument is a callable, it is - evaluated each time the field's form is initialized, in addition to - during rendering. Defaults to an empty list. + field, :ref:`enumeration ` choices, 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 ` + for more details. If the argument is a callable, it is evaluated each + time the field's form is initialized, in addition to during rendering. + Defaults to an empty list. ``TypedChoiceField`` -------------------- -- cgit v1.3