summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-08-19 08:37:27 -0400
committerTim Graham <timograham@gmail.com>2015-08-19 08:37:27 -0400
commit47201371d2805391f4dec3528cdc05f083814165 (patch)
tree65e42ffe18c8d76309baab19481cae31fd064960 /docs
parentf33607ce0b744794f6ceafa1dddffbcb32e90978 (diff)
Refs #24451 -- Corrected Django version for {% cycle %} deprecation.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/templates/builtins.txt2
-rw-r--r--docs/releases/1.9.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 1f5c5920c1..01134bd5d4 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -195,7 +195,7 @@ call to ``{% cycle %}`` doesn't specify ``silent``::
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.
+ this syntax will be removed in Django 1.10.
.. templatetag:: debug
diff --git a/docs/releases/1.9.txt b/docs/releases/1.9.txt
index 2e1900fc82..b3b09abbb5 100644
--- a/docs/releases/1.9.txt
+++ b/docs/releases/1.9.txt
@@ -982,7 +982,7 @@ versions:
{% 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.
+will be removed in Django 1.10 following an accelerated deprecation.
``ForeignKey`` and ``OneToOneField`` ``on_delete`` argument
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~