Author: Alex
Date: 2010-11-08 23:19:17 -0600 (Mon, 08 Nov 2010)
New Revision: 14504

Modified:
   django/branches/releases/1.2.X/docs/ref/forms/fields.txt
Log:
[1.2.X] Fixed #14650 -- noted that underscores are also valid in slug fields.  
Thanks to stringify for the report and patch.  Backport of [14503].

Modified: django/branches/releases/1.2.X/docs/ref/forms/fields.txt
===================================================================
--- django/branches/releases/1.2.X/docs/ref/forms/fields.txt    2010-11-09 
05:18:47 UTC (rev 14503)
+++ django/branches/releases/1.2.X/docs/ref/forms/fields.txt    2010-11-09 
05:19:17 UTC (rev 14504)
@@ -682,8 +682,8 @@
    * Default widget: ``TextInput``
    * Empty value: ``''`` (an empty string)
    * Normalizes to: A Unicode object.
-   * Validates that the given value contains only letters, numbers and
-     hyphens.
+   * Validates that the given value contains only letters, numbers,
+     underscores, and hyphens.
    * Error messages: ``required``, ``invalid``
 
 This field is intended for use in representing a model
@@ -910,11 +910,11 @@
 .. class:: ModelMultipleChoiceField(**kwargs)
 
     * Default widget: ``SelectMultiple``
-    * Empty value: ``[]`` (an empty list) 
+    * Empty value: ``[]`` (an empty list)
     * Normalizes to: A list of model instances.
     * Validates that every id in the given list of values exists in the
       queryset.
-    * Error message keys: ``required``, ``list``, ``invalid_choice``, 
+    * Error message keys: ``required``, ``list``, ``invalid_choice``,
       ``invalid_pk_value``
 
 Allows the selection of one or more model objects, suitable for

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to