Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Documented the presence of {% csrf_token %} in Django 1.1.2 in trunk …

…docs.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11675 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 9dc9770736ddf236be5ae08447bb323433fffd44 1 parent 905dba3
Luke Plant authored October 27, 2009
7  docs/ref/contrib/csrf.txt
@@ -188,9 +188,12 @@ applications in your project will meet its requirements by virtue of the
188 188
 
189 189
 The next step is to update all your applications to use the template tag, as
190 190
 described in `How to use it`_, steps 2-3.  This can be done as soon as is
191  
-practical. Any applications that are updated will now require Django 1.2 or
  191
+practical. Any applications that are updated will now require Django 1.1.2 or
192 192
 later, since they will use the CSRF template tag which was not available in
193  
-earlier versions.
  193
+earlier versions. (The template tag in 1.1.2 is actually a no-op that exists
  194
+solely to ease the transition to 1.2 — it allows apps to be created that have
  195
+CSRF protection under 1.2 without requiring users of the apps to upgrade to the
  196
+Django 1.2.X series).
194 197
 
195 198
 The utility script ``extras/csrf_migration_helper.py`` can help to automate the
196 199
 finding of code and templates that may need to be upgraded.  It contains full
7  docs/ref/templates/builtins.txt
@@ -56,9 +56,12 @@ Ignore everything between ``{% comment %}`` and ``{% endcomment %}``
56 56
 csrf_token
57 57
 ~~~~~~~~~~
58 58
 
59  
-.. versionadded:: 1.2
  59
+.. versionadded:: 1.1.2
60 60
 
61  
-This is described in the documentation for :ref:`Cross Site Request Forgeries <ref-contrib-csrf>`.
  61
+In the Django 1.1.X series, this is a no-op tag that returns an empty string for
  62
+future compatibility purposes.  In Django 1.2 and later, it is used for CSRF
  63
+protection, as described in the documentation for :ref:`Cross Site Request
  64
+Forgeries <ref-contrib-csrf>`.
62 65
 
63 66
 cycle
64 67
 ~~~~~

0 notes on commit 9dc9770

Please sign in to comment.
Something went wrong with that request. Please try again.