Permalink
Browse files

[1.6.x] Fixed #22827 -- clarified what each cache middleware does.

Thanks Keryn Knight for the report.

Backport of f9b7a03 from master
  • Loading branch information...
mmardini authored and timgraham committed Jul 25, 2014
1 parent deeaa78 commit ae5a4668beceb7d90c9855d383f18fb5aad834a6
Showing with 8 additions and 8 deletions.
  1. +8 −8 docs/topics/cache.txt
View
@@ -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.
-
-Additionally, the cache middleware automatically sets a few headers in each
+``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, ``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

0 comments on commit ae5a466

Please sign in to comment.