Changeset 2512

Timestamp:

19/12/13 03:07:42 (9 years ago)

Author:

mnot@…

Message:

clear up "cache directive" language

File:

• draft-ietf-httpbis/latest/p6-cache.xml (modified) (9 diffs)

draft-ietf-httpbis/latest/p6-cache.xml

@@ -290 +290 @@
       target="header.cache-control" />) does not appear in request or response
       header fields, and</t>
-      <t>the "private" cache response directive (see <xref
+      <t>the "private" response directive (see <xref
       target="cache-response-directive.private" />) does not appear in the
       response, if the cache is shared, and</t>
@@ -301 +301 @@
             <t>contains an <x:ref>Expires</x:ref> header field (see
             <xref target="header.expires"/>), or</t>
-            <t>contains a max-age response cache directive (see <xref
+            <t>contains a max-age response directive (see <xref
             target="cache-response-directive.max-age" />), or</t>
-            <t>contains a s-maxage response cache directive (see <xref
+            <t>contains a s-maxage response directive (see <xref
             target="cache-response-directive.s-maxage" />) and the cache is
             shared, or</t>
@@ -311 +311 @@
             <t>has a status code that is defined as cacheable by default
             (see <xref target="heuristic.freshness" />), or</t>
-            <t>contains a public response cache directive (see <xref
+            <t>contains a public response directive (see <xref
             target="cache-response-directive.public"/>).</t>
          </list>
@@ -567 +567 @@
    provide an explicit expiration time in the future, using either the
    <x:ref>Expires</x:ref> header field (<xref target="header.expires" />) or
-   the max-age response cache directive (<xref
+   the max-age response directive (<xref
    target="cache-response-directive.max-age" />). Generally, origin servers
    will assign future explicit expiration times to responses in the belief
@@ -637 +637 @@
    freshness_lifetime) of a response by using the first match of:
    <list style="symbols">
-      <t>If the cache is shared and the s-maxage response cache directive
+      <t>If the cache is shared and the s-maxage response directive
       (<xref target="cache-response-directive.s-maxage" />) is present, use its value,
       or</t>
-      <t>If the max-age response cache directive (<xref
+      <t>If the max-age response directive (<xref
       target="cache-response-directive.max-age" />) is present, use its value, or</t>
       <t>If the <x:ref>Expires</x:ref> response header field
@@ -679 +679 @@
    freshness whose status codes are defined as cacheable by default (see
    &status-overview;), and those responses without explicit freshness that have
-   been marked as explicitly cacheable (e.g., with a "public" response cache
+   been marked as explicitly cacheable (e.g., with a "public" response 
    directive).
 </t>
@@ -1218 +1218 @@
 </t>
 <t>
-   The "max-age" request directive indicates that the client is unwilling to
-   accept a response whose age is greater than the specified number of
-   seconds. Unless the max-stale request directive is also present, the
-   client is not willing to accept a stale response.
+   The "max-age" request directive indicates that the client is unwilling
+   to accept a response whose age is greater than the specified number of
+   seconds. Unless the max-stale request directive is also present, the client
+   is not willing to accept a stale response.
 </t>
 <t>
@@ -2525 +2525 @@
 </t>
 <t>
-  The "no-store" cache request directive doesn't apply to responses; i.e.,
+  The "no-store" request directive doesn't apply to responses; i.e.,
   a cache can satisfy a request with no-store on it, and does not invalidate
   it.
@@ -2538 +2538 @@
 </t>
 <t>
-  The "no-cache" response cache directive's meaning has been clarified.
+  The "no-cache" response directive's meaning has been clarified.
   (<xref target="cache-response-directive.no-cache" />)
 </t>