Fixed #24451 -- Deprecated comma-separated {% cycle %} syntax.

3 files changed, 24 insertions, 8 deletions

diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index a597baf439..cb5d989450 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -187,6 +187,9 @@ details on these changes.
   from ``allow_migrate(self, db, model)`` to
   ``allow_migrate(self, db, app_label, model_name=None, **hints)``.
 
+* Support for the syntax of ``{% cycle %}`` that uses comma-separated arguments
+  will be removed.
+
 .. _deprecation-removed-in-1.9:
 
 1.9
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 4c7d1d6031..aef4443c6a 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -185,17 +185,17 @@ call to ``{% cycle %}`` doesn't specify ``silent``::
     {% cycle 'row1' 'row2' as rowcolors silent %}
     {% cycle rowcolors %}
 
-For backward compatibility, the ``{% cycle %}`` tag supports the much inferior
-old syntax from previous Django versions. You shouldn't use this in any new
-projects, but for the sake of the people who are still using it, here's what it
-looks like::
+.. deprecated:: 1.9
 
-    {% cycle row1,row2,row3 %}
+    The ``{% cycle %}`` tag supports the much inferior old syntax from previous
+    Django versions. You shouldn't use this in any new projects, but for the
+    sake of the people who are still using it, here's what it looks like::
 
-In this syntax, each value gets interpreted as a literal string, and there's no
-way to specify variable values. Or literal commas. Or spaces. Did we mention
-you shouldn't use this syntax in any new projects?
+        {% cycle row1,row2,row3 %}
 
+    In this syntax, each value gets interpreted as a literal string, and there's
+    no way to specify variable values, literal commas, or spaces. Support for
+    this syntax will be removed in Django 2.0.
 
 .. templatetag:: debug
 
diff --git a/docs/releases/1.9.txt b/docs/releases/1.9.txt
index 4cfdaaa1eb..b75216fbc6 100644
--- a/docs/releases/1.9.txt
+++ b/docs/releases/1.9.txt
@@ -277,6 +277,19 @@ template tags that store results in a template variable. The
 ability, making the ``assignment_tag`` obsolete. Tags that use
 ``assignment_tag`` should be updated to use ``simple_tag``.
 
+``{% cycle %}`` syntax with comma-separated arguments
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The :ttag:`cycle` tag supports an inferior old syntax from previous Django
+versions:
+
+.. code-block:: html+django
+
+    {% cycle row1,row2,row3 %}
+
+Its parsing caused bugs with the current syntax, so support for the old syntax
+will be removed in Django 2.0 following an accelerated deprecation.
+
 Miscellaneous
 ~~~~~~~~~~~~~