diff options
| author | Gabriel Hurley <gabehr@gmail.com> | 2010-10-15 10:22:50 +0000 |
|---|---|---|
| committer | Gabriel Hurley <gabehr@gmail.com> | 2010-10-15 10:22:50 +0000 |
| commit | 560f58aba3be6a23698008600a87dc0bcd747fd7 (patch) | |
| tree | ea7acd7fdf4ff21773c07426e002c9cfdb10afd3 /docs | |
| parent | d0a056bcff57c7c870d66ca7e827d54fece2899b (diff) | |
[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
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/forms/fields.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt index c005436a25..4171e60da6 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`` ~~~~~~~~~~~~~~~~~~~~ |