From eb351ac9cba2d6b2750aecb4353ba482d6dca87f Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Tue, 24 Apr 2012 19:55:52 +0000
Subject: Fixed #18037 -- Changed behaviour of url and ssi template tags to the
 new syntax, as per official deprecation timeline. Thanks Ramiro Morales and
 Jannis Leidel for the review.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17934 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 docs/topics/auth.txt           | 2 --
 docs/topics/i18n/timezones.txt | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'docs/topics')

diff --git a/docs/topics/auth.txt b/docs/topics/auth.txt
index fcd8f4f677..d166fe5bcf 100644
--- a/docs/topics/auth.txt
+++ b/docs/topics/auth.txt
@@ -1020,7 +1020,6 @@ The login_required decorator
     .. code-block:: html+django
 
         {% extends "base.html" %}
-        {% load url from future %}
 
         {% block content %}
 
@@ -1242,7 +1241,6 @@ includes a few other useful built-in views located in
 
     .. code-block:: html+django
 
-        {% load url from future %}
         Someone asked for password reset for email {{ email }}. Follow the link below:
         {{ protocol}}://{{ site_name }}{% url 'auth_password_reset_confirm' uidb36=uid token=token %}
 
diff --git a/docs/topics/i18n/timezones.txt b/docs/topics/i18n/timezones.txt
index d500230110..ec6270c1c4 100644
--- a/docs/topics/i18n/timezones.txt
+++ b/docs/topics/i18n/timezones.txt
@@ -208,7 +208,7 @@ Include a form in ``template.html`` that will ``POST`` to this view:
 
 .. code-block:: html+django
 
-    {% load tz %}{% load url from future %}
+    {% load tz %}
     <form action="{% url 'set_timezone' %}" method="POST">
         {% csrf_token %}
         <label for="timezone">Time zone:</label>
-- 
cgit v1.3