summaryrefslogtreecommitdiff
path: root/docs/ref/forms
diff options
context:
space:
mode:
authorGabriel Hurley <gabehr@gmail.com>2010-10-15 10:21:46 +0000
committerGabriel Hurley <gabehr@gmail.com>2010-10-15 10:21:46 +0000
commit7f5698de1d73399e5e0b9cb0950e964c61046c30 (patch)
treea0c95f8427a585a1d1370f95ee54007f987e2c5b /docs/ref/forms
parent2197b56f3034a1fe6c7ba95848cedc7e41f0580c (diff)
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.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14231 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref/forms')
-rw-r--r--docs/ref/forms/fields.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt
index 5c482afd22..a62efbf353 100644
--- a/docs/ref/forms/fields.txt
+++ b/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
``TypedChoiceField``
~~~~~~~~~~~~~~~~~~~~