Merge branch 'master' into schema-alteration

1 files changed, 12 insertions, 0 deletions

diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt
index c8b8044d26..29f889445d 100644
--- a/docs/ref/forms/fields.txt
+++ b/docs/ref/forms/fields.txt
@@ -467,6 +467,11 @@ 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
@@ -1010,9 +1015,16 @@ objects (in the case of ``ModelMultipleChoiceField``) into the
       ``invalid_pk_value``
 
     .. versionchanged:: 1.5
+
         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