diff options
| author | Claude Paroz <claude@2xlibre.net> | 2020-10-17 16:17:00 +0200 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-10-17 21:06:57 +0200 |
| commit | 72a17c919bf9071ca34b00cd72b0084e5c6da8f6 (patch) | |
| tree | ad89533edabd77efb98ae0171346f71c2baeedfa /docs | |
| parent | 301bca9394cd977bc085c5cc50bd0ef9f6af52d7 (diff) | |
[3.0.x] Fixed #32110 -- Doc'd and tested enumerations for ChoiceField.choices.
Backport of 7f85498eef1d8fcc52e4fb70df8041f5452d405a from master
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/forms/fields.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt index 5f53becce8..89b9c697f1 100644 --- a/docs/ref/forms/fields.txt +++ b/docs/ref/forms/fields.txt @@ -408,12 +408,12 @@ 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 - <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. + field, :ref:`enumeration <field-choices-enum-types>` 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 <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`` -------------------- |
