Author: gabrielhurley
Date: 2010-10-15 05:22:50 -0500 (Fri, 15 Oct 2010)
New Revision: 14232
Modified:
django/branches/releases/1.2.X/docs/ref/forms/fields.txt
Log:
[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.
Modified: django/branches/releases/1.2.X/docs/ref/forms/fields.txt
===================================================================
--- django/branches/releases/1.2.X/docs/ref/forms/fields.txt 2010-10-15
10:21:46 UTC (rev 14231)
+++ django/branches/releases/1.2.X/docs/ref/forms/fields.txt 2010-10-15
10:22:50 UTC (rev 14232)
@@ -352,7 +352,11 @@
.. 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``
~~~~~~~~~~~~~~~~~~~~
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
