summaryrefslogtreecommitdiff
path: root/docs/ref/templates
diff options
context:
space:
mode:
authorLuke Plant <L.Plant.98@cantab.net>2009-10-27 21:52:25 +0000
committerLuke Plant <L.Plant.98@cantab.net>2009-10-27 21:52:25 +0000
commit9dc9770736ddf236be5ae08447bb323433fffd44 (patch)
tree2628019e681e1dbf0928b8b77ace8d9b92d7c26a /docs/ref/templates
parent905dba3694efa20de061d5350cd7de08ed0e5f46 (diff)
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
Diffstat (limited to 'docs/ref/templates')
-rw-r--r--docs/ref/templates/builtins.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 7084dc0a78..8266224c39 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -56,9 +56,12 @@ Ignore everything between ``{% comment %}`` and ``{% endcomment %}``
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
~~~~~