summaryrefslogtreecommitdiff
path: root/docs/topics/conditional-view-processing.txt
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2010-01-10 18:09:26 +0000
committerAdrian Holovaty <adrian@holovaty.com>2010-01-10 18:09:26 +0000
commitbef891399ec278390ee148b0bb87d4c4140fc4c6 (patch)
tree22974f12f99276dc81a75369bd716ea4e5299876 /docs/topics/conditional-view-processing.txt
parent26dc65481896d7bd1955afd29ea91f2b91892a19 (diff)
Fixed #11904 -- Fixed error in conditional-view-processing.txt. Thanks, bronger and timo
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12179 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/topics/conditional-view-processing.txt')
-rw-r--r--docs/topics/conditional-view-processing.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/topics/conditional-view-processing.txt b/docs/topics/conditional-view-processing.txt
index 53cb3205d8..1ce3c3bb92 100644
--- a/docs/topics/conditional-view-processing.txt
+++ b/docs/topics/conditional-view-processing.txt
@@ -21,9 +21,9 @@ middleware to set the ``ETag`` header.
When the client next requests the same resource, it might send along a header
such as `If-modified-since`_, containing the date of the last modification
time it was sent, or `If-none-match`_, containing the ``ETag`` it was sent.
-If there is no match with the ETag, or if the resource has not been modified,
-a 304 status code can be sent back, instead of a full response, telling the
-client that nothing has changed.
+If the current version of the page matches the ``ETag`` sent by the client, or
+if the resource has not been modified, a 304 status code can be sent back,
+instead of a full response, telling the client that nothing has changed.
.. _If-none-match: http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.26
.. _If-modified-since: http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.25