summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorFrankie Robertson <frankie@robertson.name>2014-12-23 15:38:34 +0200
committerTim Graham <timograham@gmail.com>2014-12-23 14:35:30 -0500
commit446b50b90e9e60760618b236d8b0ea75a3b19d5a (patch)
treece1ef2fc98325345069659614d6d937d5f82c1b4 /docs/ref
parent061caa5b386681dc7bdef16918873043224a299c (diff)
Fixed #24035 -- Clarified docs on CACHE_MIDDLEWARE_KEY_PREFIX vs KEY_PREFIX
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/settings.txt11
1 files changed, 7 insertions, 4 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index ef5d5fe2e1..d5dc447d8d 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -283,7 +283,8 @@ CACHE_MIDDLEWARE_ALIAS
Default: ``default``
-The cache connection to use for the cache middleware.
+The cache connection to use for the :ref:`cache middleware
+<the-per-site-cache>`.
.. setting:: CACHE_MIDDLEWARE_KEY_PREFIX
@@ -292,7 +293,9 @@ CACHE_MIDDLEWARE_KEY_PREFIX
Default: ``''`` (Empty string)
-The cache key prefix that the cache middleware should use.
+A string which will be prefixed to the cache keys generated by the :ref:`cache
+middleware <the-per-site-cache>`. This prefix is combined with the
+:setting:`KEY_PREFIX <CACHES-KEY_PREFIX>` setting; it does not replace it.
See :doc:`/topics/cache`.
@@ -303,8 +306,8 @@ CACHE_MIDDLEWARE_SECONDS
Default: ``600``
-The default number of seconds to cache a page when the caching middleware or
-``cache_page()`` decorator is used.
+The default number of seconds to cache a page for the :ref:`cache middleware
+<the-per-site-cache>`.
See :doc:`/topics/cache`.