summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/deprecation.txt2
-rw-r--r--docs/ref/templates/builtins.txt7
-rw-r--r--docs/releases/1.8.txt12
3 files changed, 19 insertions, 2 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index 31ec014335..2adf9cd199 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -42,6 +42,8 @@ about each item can often be found in the release notes of two versions prior.
* The ``error_message`` argument of ``django.forms.RegexField`` will be removed.
+* The ``unordered_list`` filter will no longer support old style lists.
+
.. _deprecation-removed-in-1.9:
1.9
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 242f2c2c9a..c24da54e67 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -2259,8 +2259,11 @@ contains ``['States', ['Kansas', ['Lawrence', 'Topeka'], 'Illinois']]``, then
</ul>
</li>
-Note: An older, more restrictive and verbose input format is also supported:
-``['States', [['Kansas', [['Lawrence', []], ['Topeka', []]]], ['Illinois', []]]]``,
+.. deprecated:: 1.8
+
+ An older, more restrictive and verbose input format is also supported:
+ ``['States', [['Kansas', [['Lawrence', []], ['Topeka', []]]], ['Illinois', []]]]``.
+ Support for this syntax will be removed in Django 2.0.
.. templatefilter:: upper
diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt
index 9634b04db4..8fa719c82e 100644
--- a/docs/releases/1.8.txt
+++ b/docs/releases/1.8.txt
@@ -636,3 +636,15 @@ built-in tags. Simply remove ``'django.contrib.webdesign'`` from
It provided backwards compatibility for pre-1.0 code, but its functionality is
redundant. Use ``Field.error_messages['invalid']`` instead.
+
+Old :tfilter:`unordered_list` syntax
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+An older (pre-1.0), more restrictive and verbose input format for the
+:tfilter:`unordered_list` template filter has been deprecated::
+
+ ``['States', [['Kansas', [['Lawrence', []], ['Topeka', []]]], ['Illinois', []]]]``
+
+Using the new syntax, this becomes::
+
+ ``['States', ['Kansas', ['Lawrence', 'Topeka'], 'Illinois']]``