Fixed #21939 -- Deprecated loading ssi/url tags from future.

3 files changed, 12 insertions, 14 deletions

diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index 4b79e4696d..057c6dd3fe 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -12,9 +12,6 @@ about each item can often be found in the release notes of two versions prior.
 2.0
 ---
 
-* ``ssi`` and ``url`` template tags will be removed from the ``future`` template
-  tag library (used during the 1.3/1.4 deprecation period).
-
 .. _deprecation-removed-in-1.9:
 
 1.9
@@ -119,6 +116,9 @@ details on these changes.
 * ``django.utils.module_loading.import_by_path`` will be removed in favor of
   ``django.utils.module_loading.import_string``.
 
+* ``ssi`` and ``url`` template tags will be removed from the ``future`` template
+  tag library (used during the 1.3/1.4 deprecation period).
+
 .. _deprecation-removed-in-1.8:
 
 1.8
diff --git a/docs/intro/tutorial03.txt b/docs/intro/tutorial03.txt
index 9754808897..5b2bee5fe7 100644
--- a/docs/intro/tutorial03.txt
+++ b/docs/intro/tutorial03.txt
@@ -548,17 +548,6 @@ defined in your url configurations by using the ``{% url %}`` template tag:
 
     <li><a href="{% url 'detail' question.id %}">{{ question.question_text }}</a></li>
 
-.. note::
-
-    If ``{% url 'detail' question.id %}`` (with quotes) doesn't work, but
-    ``{% url detail question.id %}`` (without quotes) does, that means you're
-    using a version of Django < 1.5. In this case, add the following
-    declaration at the top of your template:
-
-    .. code-block:: html+django
-
-        {% load url from future %}
-
 The way this works is by looking up the URL definition as specified in the
 ``polls.urls`` module. You can see exactly where the URL name of 'detail' is
 defined below::
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index 8e9ebe72a1..cd9a9dd225 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -1337,3 +1337,12 @@ The functionality required by ``check_field()`` is the same as that provided
 by ``validate_field()``, but the output format is different. Third-party database
 backends needing this functionality should modify their backends to provide an
 implementation of ``check_field()``.
+
+Loading ``ssi`` and ``url`` template tags from ``future`` library
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Django 1.3 introduced ``{% load ssi from future %}`` and
+``{% load url from future %}`` syntax for forward compatibility of the
+:ttag:`ssi` and :ttag:`url` template tags. This syntax is now deprecated and
+will be removed in Django 1.9. You can simply remove the
+``{% load ... from future %}`` tags.