summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorKonrad Świat <konrad.swiat@gmail.com>2015-07-16 23:38:44 +0200
committerTim Graham <timograham@gmail.com>2015-07-17 07:57:01 -0400
commit2f6bdab1597ee42b36752bf9f624d3386e951379 (patch)
tree8c9c6f6c5b6ff048b4f7627d1a2f17b2037a458a /docs/ref
parent1ef4aeab403f7fb74c0b9b11fde854fd03afc40c (diff)
Fixed #25125 -- Updated docs on cookie naming conventions.
Thanks Tim Graham for the review and kezabelle for the report.
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/settings.txt11
1 files changed, 6 insertions, 5 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 71588532d5..0cd83615e7 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -366,7 +366,8 @@ CSRF_COOKIE_NAME
Default: ``'csrftoken'``
The name of the cookie to use for the CSRF authentication token. This can be
-whatever you want. See :doc:`/ref/csrf`.
+whatever you want (as long as it's different from the other cookie names in
+your application). See :doc:`/ref/csrf`.
.. setting:: CSRF_COOKIE_PATH
@@ -1614,8 +1615,8 @@ LANGUAGE_COOKIE_NAME
Default: ``'django_language'``
The name of the cookie to use for the language cookie. This can be whatever
-you want (but should be different from :setting:`SESSION_COOKIE_NAME`). See
-:doc:`/topics/i18n/index`.
+you want (as long as it's different from the other cookie names in your
+application). See :doc:`/topics/i18n/index`.
.. setting:: LANGUAGE_COOKIE_PATH
@@ -2943,8 +2944,8 @@ SESSION_COOKIE_NAME
Default: ``'sessionid'``
-The name of the cookie to use for sessions. This can be whatever you want (but
-should be different from :setting:`LANGUAGE_COOKIE_NAME`).
+The name of the cookie to use for sessions. This can be whatever you want
+(as long as it's different from the other cookie names in your application).
.. setting:: SESSION_COOKIE_PATH