diff options
| -rw-r--r-- | django/conf/global_settings.py | 2 | ||||
| -rw-r--r-- | docs/sessions.txt | 6 | ||||
| -rw-r--r-- | docs/settings.txt | 6 |
3 files changed, 5 insertions, 9 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 565f72cfaf..7271f9c69a 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -193,7 +193,7 @@ MIDDLEWARE_CLASSES = ( # SESSIONS # ############ -SESSION_COOKIE_NAME = 'hotclub' # Cookie name. This can be whatever you want. +SESSION_COOKIE_NAME = 'sessionid' # Cookie name. This can be whatever you want. SESSION_COOKIE_AGE = 60 * 60 * 24 * 7 * 2 # Age of cookie, in seconds (default: 2 weeks). SESSION_COOKIE_DOMAIN = None # A string like ".lawrence.com", or None for standard domain cookie. SESSION_SAVE_EVERY_REQUEST = False # Whether to save the session data on every request. diff --git a/docs/sessions.txt b/docs/sessions.txt index c7d3cd9bfc..bebee3a79f 100644 --- a/docs/sessions.txt +++ b/docs/sessions.txt @@ -215,13 +215,11 @@ domain cookie. SESSION_COOKIE_NAME ------------------- -Default: ``'hotclub'`` +Default: ``'sessionid'`` (**Django development version.** Previous default was +``'hotclub'``, which was deemed to pornish.) The name of the cookie to use for sessions. This can be whatever you want. -``'hotclub'`` is a reference to the Hot Club of France, the band Django -Reinhardt played in. - SESSION_SAVE_EVERY_REQUEST -------------------------- diff --git a/docs/settings.txt b/docs/settings.txt index 66baeb0860..164407659d 100644 --- a/docs/settings.txt +++ b/docs/settings.txt @@ -525,14 +525,12 @@ domain cookie. See the `session docs`_. SESSION_COOKIE_NAME ------------------- -Default: ``'hotclub'`` +Default: ``'sessionid'`` (**Django development version.** Previous default was +``'hotclub'``, which was deemed to pornish.) The name of the cookie to use for sessions. This can be whatever you want. See the `session docs`_. -``'hotclub'`` is a reference to the Hot Club of France, the band Django -Reinhardt played in. - SESSION_SAVE_EVERY_REQUEST -------------------------- |