summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorRamiro Morales <cramm0@gmail.com>2013-05-21 18:32:39 -0300
committerRamiro Morales <cramm0@gmail.com>2013-05-23 07:49:29 -0300
commit8c2fd050f80f528cc1609c1a7f16901194834831 (patch)
treeeb8a44065ec57c9fefb6ef6914247c8a27637769 /docs
parent01769823f13df6e922faf63a2ac07293dc54b176 (diff)
Made fix for #9321 less buggy and more effective.
Don't try to be smart about building a good-looking help string because it evaluates translations too early, simply use the same old strategy as before. Thanks Donald Stufft for the report. Also, actually fix the case reported by the OP by special-casing CheckboxSelectMultiple. Added tests. Refs #9321.
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.6.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/releases/1.6.txt b/docs/releases/1.6.txt
index 3bc5a0996c..5ee454d4f8 100644
--- a/docs/releases/1.6.txt
+++ b/docs/releases/1.6.txt
@@ -522,10 +522,10 @@ facilities together with Django built-in form :doc:`fields </ref/forms/fields>`
and :doc:`widgets </ref/forms/widgets>` aren't affected but need to be aware of
what's described in :ref:`m2m-help_text-deprecation` below.
-This is because, as an temporary backward-compatible provision, the described
-non-standard behavior has been preserved but moved to the model form field layer
-and occurs only when the associated widget is
-:class:`~django.forms.SelectMultiple` or a subclass.
+This is because, as an ad-hoc temporary backward-compatibility provision, the
+described non-standard behavior has been preserved but moved to the model form
+field layer and occurs only when the associated widget is
+:class:`~django.forms.SelectMultiple` or selected subclasses.
QuerySet iteration
~~~~~~~~~~~~~~~~~~