Browse files

[1.2.X] Fixed #14307 -- Linked ChoiceField.choices docs to Field.choi…

…ces docs to explain the formatting options available. Thanks to adamv for the report and Russ for the suggested fix.

Backport of [14231] from trunk.

git-svn-id: bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent d0a056b commit 560f58aba3be6a23698008600a87dc0bcd747fd7 Gabriel Hurley committed Oct 15, 2010
Showing with 5 additions and 1 deletion.
  1. +5 −1 docs/ref/forms/fields.txt
@@ -352,7 +352,11 @@ Takes one extra required argument:
.. attribute:: ChoiceField.choices
An iterable (e.g., a list or tuple) of 2-tuples to use as choices for this
- field.
+ field. This argument accepts the same formats as the ``choices`` argument
+ to a model field. See the `model field reference documentation on choices`_
+ for more details.
+ .. _model field reference documentation on choices: ../models/fields#choices

0 comments on commit 560f58a

Please sign in to comment.