innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[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
This commit is contained in:
Gabriel Hurley 2010-10-15 10:22:50 +00:00
parent d0a056bcff
commit 560f58aba3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/ref/forms/fields.txt
View File

@ -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``
~~~~~~~~~~~~~~~~~~~~