summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2013-04-18 20:38:07 +0200
committerClaude Paroz <claude@2xlibre.net>2013-04-18 20:38:07 +0200
commit5306285ce21d59742d67a447c9c1a1e4be6d86a4 (patch)
tree536d691b094e8489e2cdc189e50850de5902f131 /docs/ref
parent9f7b277d2e14abd89972f7593aad3543a5028760 (diff)
Complemented documentation following commit be9ae693c
Refs #17840. Thanks Carl Meyer for noticing the omission.
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/forms/fields.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt
index c8b8044d26..03898e60ea 100644
--- a/docs/ref/forms/fields.txt
+++ b/docs/ref/forms/fields.txt
@@ -467,6 +467,10 @@ For each field, we describe the default widget used if you don't specify
The ``max_value`` and ``min_value`` error messages may contain
``%(limit_value)s``, which will be substituted by the appropriate limit.
+ .. versionchanged:: 1.6
+ Similarly, the ``max_digits``, ``max_decimal_places`` and
+ ``max_whole_digits`` error messages may contain ``%(max)s``.
+
Takes four optional arguments:
.. attribute:: max_value
@@ -1013,6 +1017,11 @@ objects (in the case of ``ModelMultipleChoiceField``) into the
The empty and normalized values were changed to be consistently
``QuerySets`` instead of ``[]`` and ``QuerySet`` respectively.
+ .. versionchanged:: 1.6
+ The ``invalid_choice`` message may contain ``%(value)s`` and the
+ ``invalid_pk_value`` message may contain ``%(pk)s``, which will be
+ substituted by the appropriate values.
+
Allows the selection of one or more model objects, suitable for
representing a many-to-many relation. As with :class:`ModelChoiceField`,
you can use ``label_from_instance`` to customize the object