summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorLuke Plant <L.Plant.98@cantab.net>2009-10-27 01:10:20 +0000
committerLuke Plant <L.Plant.98@cantab.net>2009-10-27 01:10:20 +0000
commit2ddf1364c401d5cc80b31b43567500f9aeb9414b (patch)
tree350dc1e5732c9086e35bc23e1edc0f8d3b295ab9 /docs/ref
parentc2ffe94d9a3e2857bdbd017d61ef5f42a3419bd7 (diff)
Added 'version added' info to CSRF_* settings.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11665 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/settings.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index a7df35c2ac..a3120501aa 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -148,6 +148,9 @@ The default number of seconds to cache a page when the caching middleware or
CSRF_COOKIE_NAME
----------------
+
+.. versionadded:: 1.2
+
Default: ``'csrftoken'``
The name of the cookie to use for the CSRF authentication token. This can be whatever you
@@ -158,6 +161,8 @@ want. See :ref:`ref-contrib-csrf`.
CSRF_COOKIE_DOMAIN
------------------
+.. versionadded:: 1.2
+
Default: ``None``
The domain to be used when setting the CSRF cookie. This can be useful for
@@ -171,6 +176,8 @@ accepted by accepted by a view served from another subdomain.
CSRF_FAILURE_VIEW
-----------------
+.. versionadded:: 1.2
+
Default: ``'django.views.csrf.csrf_failure'``
A dotted path to the view function to be used when an incoming request