From 7f5698de1d73399e5e0b9cb0950e964c61046c30 Mon Sep 17 00:00:00 2001 From: Gabriel Hurley Date: Fri, 15 Oct 2010 10:21:46 +0000 Subject: [PATCH] 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 --- docs/ref/forms/fields.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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`` ~~~~~~~~~~~~~~~~~~~~