From 79e914e4967adc3030be7044f502e37bbb4ba88e Mon Sep 17 00:00:00 2001
From: Malcolm Tredinnick <malcolm.tredinnick@gmail.com>
Date: Thu, 5 Jul 2007 11:08:40 +0000
Subject: [PATCH] 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 | 1 +
 docs/settings.txt              | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index 75ba271c1ee..2a7df569fbe 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 9c9602d9ec3..050e377713a 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
 ---------------