summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorFlorian Apolloner <florian@apolloner.eu>2013-05-21 02:33:40 -0700
committerFlorian Apolloner <florian@apolloner.eu>2013-05-21 02:33:40 -0700
commit60585f6621563627220eeb5bbac993b92d76a704 (patch)
tree482a0d531c1db78d693120d5af706af1e69d7353 /docs
parent18856f866cc0e1cc703ae3f4c84b3c25a847b370 (diff)
parenta542b808baf49ede4d40b2893f1bb74cd60d56f6 (diff)
Merge pull request #1190 from ambv/doc_settings_fix
Removed a confusing duplicate SESSION_COOKIE_DOMAIN header
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/settings.txt15
1 files changed, 3 insertions, 12 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index c1170e19c5..b8ebc16bad 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -2231,6 +2231,9 @@ Controls where Django stores message data. Valid values are:
See :ref:`message storage backends <message-storage-backends>` for more details.
+The backends that use cookies -- ``CookieStorage`` and ``FallbackStorage`` --
+use the value of :setting:`SESSION_COOKIE_DOMAIN` when setting their cookies.
+
.. setting:: MESSAGE_TAGS
MESSAGE_TAGS
@@ -2262,18 +2265,6 @@ to override. See :ref:`message-displaying` above for more details.
according to the values in the above :ref:`constants table
<message-level-constants>`.
-.. _messages-session_cookie_domain:
-
-SESSION_COOKIE_DOMAIN
----------------------
-
-Default: ``None``
-
-The storage backends that use cookies -- ``CookieStorage`` and
-``FallbackStorage`` -- use the value of :setting:`SESSION_COOKIE_DOMAIN` in
-setting their cookies.
-
-
.. _settings-sessions:
Sessions