Commit 560f58ab authored by Gabriel Hurley's avatar Gabriel Hurley
Browse files

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

[1.2.X] Fixed #14307 -- Linked ChoiceField.choices docs to Field.choices 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: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14232 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent d0a056bc

docs/ref/forms/fields.txt

+5 −1
Original line number Diff line number Diff line
@@ -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



``TypedChoiceField``

~~~~~~~~~~~~~~~~~~~~