Ticket #5327: 5327.diff

docs/newforms.txt

@@ -1106 +1106 @@
     * Validates that the given value exists in the list of choices.
 
 Takes one extra argument, ``choices``, which is an iterable (e.g., a list or
-tuple) of 2-tuples to use as choices for this field.
+tuple) of 2-tuples to use as choices for this field. The first item of each tuple
+will be used for the value and the second for the display. The normalized value 
+will be the first item of the tuple corresponding to the entry selected by the user. 
 
+``ModelChoiceField``
+~~~~~~~~~~~~~~~
+
+    * Default widget: ``Select``
+    * Empty value: ``None``
+    * Normalizes to: An instance.
+    * Validates that the given id exists in the queryset.
+
+Takes one extra argument, ``queryset``, which is QuerySet containing the 
+instances to choose. The instances' ``__unicode__`` method will be used for display. 
+
 ``DateField``
 ~~~~~~~~~~~~~
 
@@ -1255 +1268 @@
 Takes one extra argument, ``choices``, which is an iterable (e.g., a list or
 tuple) of 2-tuples to use as choices for this field.
 
+``ModelMultipleChoiceField``
+~~~~~~~~~~~~~~~
+
+    * Default widget: ``SelectMultiple``
+    * Empty value: ``[]`` (an empty list)
+    * Normalizes to: A list of instances.
+    * Validates that every id in the given list of values exists in the queryset.
+
+Takes one extra argument, ``queryset``, which is QuerySet containing the 
+instances to choose. The instances' ``__unicode__`` method will be used for display. 
+
+
 ``NullBooleanField``
 ~~~~~~~~~~~~~~~~~~~~