summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-07-05 11:08:40 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-07-05 11:08:40 +0000
commit79e914e4967adc3030be7044f502e37bbb4ba88e (patch)
tree4b3eba128c53ad2825d8ec7e06cf4fd67222e186
parentd0b627acc2e9553b09cab3435258bcef044728ae (diff)
Added CACHE_MIDDLEWARE_SECONDS to global settings and documentation (it's
used by the cache middleware). Refs #1015. git-svn-id: http://code.djangoproject.com/svn/django/trunk@5618 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/conf/global_settings.py1
-rw-r--r--docs/settings.txt9
2 files changed, 10 insertions, 0 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index 75ba271c1e..2a7df569fb 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -283,6 +283,7 @@ SESSION_EXPIRE_AT_BROWSER_CLOSE = False # Whether sessions expire when a user
# possible values.
CACHE_BACKEND = 'simple://'
CACHE_MIDDLEWARE_KEY_PREFIX = ''
+CACHE_MIDDLEWARE_SECONDS = 600
####################
# COMMENTS #
diff --git a/docs/settings.txt b/docs/settings.txt
index 9c9602d9ec..050e377713 100644
--- a/docs/settings.txt
+++ b/docs/settings.txt
@@ -233,12 +233,21 @@ Default: ``'simple://'``
The cache backend to use. See the `cache docs`_.
CACHE_MIDDLEWARE_KEY_PREFIX
+---------------------------
Default: ``''`` (Empty string)
The cache key prefix that the cache middleware should use. See the
`cache docs`_.
+CACHE_MIDDLEWARE_SECONDS
+------------------------
+
+Default: ``600``
+
+The default number of seconds to cache a page when the caching middleware or
+``cache_page()`` decorator is used.
+
DATABASE_ENGINE
---------------