summaryrefslogtreecommitdiff
path: root/docs/ref/forms
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2010-11-09 05:19:17 +0000
committerAlex Gaynor <alex.gaynor@gmail.com>2010-11-09 05:19:17 +0000
commit66c72b1f80ed5bfc4001e42e9062e5a2b2db3830 (patch)
tree7d7b2b501210bae96edd093af1332bb0d09f8835 /docs/ref/forms
parentcaf51bfcd40bd718503dff418cd1953da07b1baf (diff)
[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].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14504 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref/forms')
-rw-r--r--docs/ref/forms/fields.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt
index cd32e10eed..91f245a0ac 100644
--- a/docs/ref/forms/fields.txt
+++ b/docs/ref/forms/fields.txt
@@ -682,8 +682,8 @@ and the error message as the value.
* 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 @@ example::
.. 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