summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/middleware.txt3
-rw-r--r--docs/topics/http/decorators.txt5
2 files changed, 8 insertions, 0 deletions
diff --git a/docs/ref/middleware.txt b/docs/ref/middleware.txt
index d899922dc1..c762457839 100644
--- a/docs/ref/middleware.txt
+++ b/docs/ref/middleware.txt
@@ -153,6 +153,9 @@ header, the middleware adds one if needed. If the response has an ``ETag`` or
``If-Modified-Since``, the response is replaced by an
:class:`~django.http.HttpResponseNotModified`.
+You can handle conditional GET operations with individual views using the
+:func:`~django.views.decorators.http.conditional_page()` decorator.
+
Locale middleware
-----------------
diff --git a/docs/topics/http/decorators.txt b/docs/topics/http/decorators.txt
index 9cad144954..1c48e667f1 100644
--- a/docs/topics/http/decorators.txt
+++ b/docs/topics/http/decorators.txt
@@ -63,6 +63,11 @@ control caching behavior on particular views.
.. function:: condition(etag_func=None, last_modified_func=None)
+.. function:: conditional_page()
+
+ This decorator provides the conditional GET operation handling of
+ :class:`~django.middleware.http.ConditionalGetMiddleware` to a view.
+
.. function:: etag(etag_func)
.. function:: last_modified(last_modified_func)