Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

[1.2.X] Fixed #14307 -- Linked ChoiceField.choices docs to Field.choi…

…ces 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
  • Loading branch information...
commit 560f58aba3be6a23698008600a87dc0bcd747fd7 1 parent d0a056b
authored October 15, 2010

Showing 1 changed file with 5 additions and 1 deletion. Show diff stats Hide diff stats

  1. 6  docs/ref/forms/fields.txt
6  docs/ref/forms/fields.txt
@@ -352,7 +352,11 @@ Takes one extra required argument:
352 352
 .. attribute:: ChoiceField.choices
353 353
 
354 354
     An iterable (e.g., a list or tuple) of 2-tuples to use as choices for this
355  
-    field.
  355
+    field. This argument accepts the same formats as the ``choices`` argument
  356
+    to a model field. See the `model field reference documentation on choices`_
  357
+    for more details.
  358
+    
  359
+    .. _model field reference documentation on choices: ../models/fields#choices
356 360
 
357 361
 ``TypedChoiceField``
358 362
 ~~~~~~~~~~~~~~~~~~~~

0 notes on commit 560f58a

Please sign in to comment.
Something went wrong with that request. Please try again.