summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2010-02-24 14:52:21 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2010-02-24 14:52:21 +0000
commitc1edfcd9ae65fb27f9f8534ae1374dae40b3bbf2 (patch)
tree38e33c9b6b9dd08537259c48bf6c0a304d3d6d5c /docs
parent18c800f1a389e20de45e0df0f8de3fa5303f887d (diff)
[1.1.X] Fixed #11933 -- Added versionchanged marker for the cache_db session backend. Thanks to gabrielhurley for the report and patch.
Backport of r12569 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12571 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/settings.txt4
-rw-r--r--docs/topics/http/sessions.txt4
2 files changed, 8 insertions, 0 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index f7705949fd..5c96960b85 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -873,6 +873,9 @@ SESSION_ENGINE
.. versionadded:: 1.0
+.. versionchanged:: 1.1
+ The ``cache_db`` backend was added
+
Default: ``django.contrib.sessions.backends.db``
Controls where Django stores session data. Valid values are:
@@ -880,6 +883,7 @@ Controls where Django stores session data. Valid values are:
* ``'django.contrib.sessions.backends.db'``
* ``'django.contrib.sessions.backends.file'``
* ``'django.contrib.sessions.backends.cache'``
+ * ``'django.contrib.sessions.backends.cache_db'``
See :ref:`topics-http-sessions`.
diff --git a/docs/topics/http/sessions.txt b/docs/topics/http/sessions.txt
index 3b1429b440..75fe49208c 100644
--- a/docs/topics/http/sessions.txt
+++ b/docs/topics/http/sessions.txt
@@ -410,6 +410,9 @@ SESSION_ENGINE
.. versionadded:: 1.0
+.. versionchanged:: 1.1
+ The ``cache_db`` backend was added
+
Default: ``django.contrib.sessions.backends.db``
Controls where Django stores session data. Valid values are:
@@ -417,6 +420,7 @@ Controls where Django stores session data. Valid values are:
* ``'django.contrib.sessions.backends.db'``
* ``'django.contrib.sessions.backends.file'``
* ``'django.contrib.sessions.backends.cache'``
+ * ``'django.contrib.sessions.backends.cache_db'``
See `configuring the session engine`_ for more details.