Author: lukeplant
Date: 2009-10-27 16:52:25 -0500 (Tue, 27 Oct 2009)
New Revision: 11675

Modified:
   django/trunk/docs/ref/contrib/csrf.txt
   django/trunk/docs/ref/templates/builtins.txt
Log:
Documented the presence of {% csrf_token %} in Django 1.1.2 in trunk docs.



Modified: django/trunk/docs/ref/contrib/csrf.txt
===================================================================
--- django/trunk/docs/ref/contrib/csrf.txt      2009-10-27 21:50:58 UTC (rev 
11674)
+++ django/trunk/docs/ref/contrib/csrf.txt      2009-10-27 21:52:25 UTC (rev 
11675)
@@ -188,9 +188,12 @@
 
 The next step is to update all your applications to use the template tag, as
 described in `How to use it`_, steps 2-3.  This can be done as soon as is
-practical. Any applications that are updated will now require Django 1.2 or
+practical. Any applications that are updated will now require Django 1.1.2 or
 later, since they will use the CSRF template tag which was not available in
-earlier versions.
+earlier versions. (The template tag in 1.1.2 is actually a no-op that exists
+solely to ease the transition to 1.2 — it allows apps to be created that have
+CSRF protection under 1.2 without requiring users of the apps to upgrade to the
+Django 1.2.X series).
 
 The utility script ``extras/csrf_migration_helper.py`` can help to automate the
 finding of code and templates that may need to be upgraded.  It contains full

Modified: django/trunk/docs/ref/templates/builtins.txt
===================================================================
--- django/trunk/docs/ref/templates/builtins.txt        2009-10-27 21:50:58 UTC 
(rev 11674)
+++ django/trunk/docs/ref/templates/builtins.txt        2009-10-27 21:52:25 UTC 
(rev 11675)
@@ -56,9 +56,12 @@
 csrf_token
 ~~~~~~~~~~
 
-.. versionadded:: 1.2
+.. versionadded:: 1.1.2
 
-This is described in the documentation for :ref:`Cross Site Request Forgeries 
<ref-contrib-csrf>`.
+In the Django 1.1.X series, this is a no-op tag that returns an empty string 
for
+future compatibility purposes.  In Django 1.2 and later, it is used for CSRF
+protection, as described in the documentation for :ref:`Cross Site Request
+Forgeries <ref-contrib-csrf>`.
 
 cycle
 ~~~~~


--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to 
[email protected]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to