summaryrefslogtreecommitdiff
path: root/docs/settings.txt
diff options
context:
space:
mode:
authorJoseph Kocherhans <joseph@jkocherhans.com>2008-03-13 06:14:26 +0000
committerJoseph Kocherhans <joseph@jkocherhans.com>2008-03-13 06:14:26 +0000
commitbfc5660c472ac2e52cc4fdec78315c87b01357de (patch)
tree887c25472201f310cc5b95cb236cf5492af9bf57 /docs/settings.txt
parent304642769c5e0e704d0204bc241574c8c491cdf5 (diff)
newforms-admin: Merged from trunk up to [7232]
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7233 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/settings.txt')
-rw-r--r--docs/settings.txt14
1 files changed, 12 insertions, 2 deletions
diff --git a/docs/settings.txt b/docs/settings.txt
index 8478e0ce96..ace893f1b5 100644
--- a/docs/settings.txt
+++ b/docs/settings.txt
@@ -579,6 +579,16 @@ in standard language format. For example, U.S. English is ``"en-us"``. See the
.. _internationalization docs: ../i18n/
+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 SESSION_COOKIE_NAME). See the
+`internationalization docs`_ for details.
+
+
LANGUAGES
---------
@@ -822,8 +832,8 @@ SESSION_COOKIE_NAME
Default: ``'sessionid'``
-The name of the cookie to use for sessions. This can be whatever you want.
-See the `session docs`_.
+The name of the cookie to use for sessions. This can be whatever you want (but
+should be different from ``LANGUAGE_COOKIE_NAME``). See the `session docs`_.
SESSION_COOKIE_PATH
-------------------