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

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         #

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
 ---------------