From 7355437e49833d68f8a02c91f8e0ed2059266e5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konrad=20=C5=9Awiat?= Date: Thu, 16 Jul 2015 23:38:44 +0200 Subject: [PATCH] [1.8.x] Fixed #25125 -- Updated docs on cookie naming conventions. Thanks Tim Graham for the review and kezabelle for the report. Backport of 2f6bdab1597ee42b36752bf9f624d3386e951379 from master --- docs/ref/settings.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 53a5dda00c..078907e2d3 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -388,7 +388,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 @@ -1718,8 +1719,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 @@ -3061,8 +3062,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