summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMoayad Mardini <moayad.m@gmail.com>2014-07-25 11:42:06 +0300
committerTim Graham <timograham@gmail.com>2014-07-25 06:26:45 -0400
commitae5a4668beceb7d90c9855d383f18fb5aad834a6 (patch)
tree7aea5c8c30188513044e3acbef29ff4146ff6f82 /docs
parentdeeaa78d5ef28c30bf932ba7726868f920fac7c5 (diff)
[1.6.x] Fixed #22827 -- clarified what each cache middleware does.
Thanks Keryn Knight for the report. Backport of f9b7a0383c from master
Diffstat (limited to 'docs')
-rw-r--r--docs/topics/cache.txt14
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/topics/cache.txt b/docs/topics/cache.txt
index 06532b23e5..6ad6276c1e 100644
--- a/docs/topics/cache.txt
+++ b/docs/topics/cache.txt
@@ -442,14 +442,14 @@ Then, add the following required settings to your Django settings file:
the site, or some other string that is unique to this Django instance, to
prevent key collisions. Use an empty string if you don't care.
-The cache middleware caches GET and HEAD responses with status 200, where the request
-and response headers allow. Responses to requests for the same URL with different
-query parameters are considered to be unique pages and are cached separately.
-The cache middleware expects that a HEAD request is answered with the same
-response headers as the corresponding GET request; in which case it can return
-a cached GET response for HEAD request.
+``FetchFromCacheMiddleware`` caches GET and HEAD responses with status 200,
+where the request and response headers allow. Responses to requests for the same
+URL with different query parameters are considered to be unique pages and are
+cached separately. This middleware expects that a HEAD request is answered with
+the same response headers as the corresponding GET request; in which case it can
+return a cached GET response for HEAD request.
-Additionally, the cache middleware automatically sets a few headers in each
+Additionally, ``UpdateCacheMiddleware`` automatically sets a few headers in each
:class:`~django.http.HttpResponse`:
* Sets the ``Last-Modified`` header to the current date/time when a fresh