Changeset 1695 for draft-ietf-httpbis

Timestamp:

25/06/12 07:18:34 (10 years ago)

Author:

julian.reschke@…

Message:

remove predefined directives from cache control ABNF (make it generic) and deal with the special cases introduced by pre-existing cache directives (see #307)

Location:

draft-ietf-httpbis/latest

Files:

• httpbis.abnf (modified) (1 diff)
• p6-cache.html (modified) (31 diffs)
• p6-cache.xml (modified) (6 diffs)

draft-ietf-httpbis/latest/httpbis.abnf

@@ -80 +80 @@
 byte-ranges-specifier = bytes-unit "=" byte-range-set
 bytes-unit = "bytes"
-cache-directive = cache-request-directive / cache-response-directive
-cache-extension = token [ "=" ( token / quoted-string ) ]
-cache-request-directive = "no-cache" / "no-store" / ( "max-age=" delta-seconds ) / ( "max-stale" [ "=" delta-seconds ] ) / ( "min-fresh=" delta-seconds ) / "no-transform" / "only-if-cached" / cache-extension
-cache-response-directive = "public" / ( "private" [ "=" DQUOTE *( "," OWS ) field-name *( OWS "," [ OWS field-name ] ) DQUOTE ] ) / ( "no-cache" [ "=" DQUOTE *( "," OWS ) field-name *( OWS "," [ OWS field-name ] ) DQUOTE ] ) / "no-store" / "no-transform" / "must-revalidate" / "proxy-revalidate" / ( "max-age=" delta-seconds ) / ( "s-maxage=" delta-seconds ) / cache-extension
+cache-directive = token [ "=" ( token / quoted-string ) ]
 challenge = auth-scheme [ 1*SP ( b64token / [ ( "," / auth-param ) *( OWS "," [ OWS auth-param ] ) ] ) ]
 charset = token

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

@@ -452 +452 @@
   } 
   @bottom-center {
-       content: "Expires December 25, 2012"; 
+       content: "Expires December 27, 2012"; 
   } 
   @bottom-right {
@@ -494 +494 @@
       <meta name="dct.creator" content="Reschke, J. F.">
       <meta name="dct.identifier" content="urn:ietf:id:draft-ietf-httpbis-p6-cache-latest">
-      <meta name="dct.issued" scheme="ISO8601" content="2012-06-23">
+      <meta name="dct.issued" scheme="ISO8601" content="2012-06-25">
       <meta name="dct.replaces" content="urn:ietf:rfc:2616">
       <meta name="dct.abstract" content="The Hypertext Transfer Protocol (HTTP) is an application-level protocol for distributed, collaborative, hypertext information systems. HTTP has been in use by the World Wide Web global information initiative since 1990. This document is Part 6 of the seven-part specification that defines the protocol referred to as &#34;HTTP/1.1&#34; and, taken together, obsoletes RFC 2616. Part 6 defines requirements on HTTP caches and the associated header fields that control cache behavior or indicate cacheable response messages.">
@@ -520 +520 @@
             </tr>
             <tr>
-               <td class="left">Expires: December 25, 2012</td>
+               <td class="left">Expires: December 27, 2012</td>
                <td class="right">M. Nottingham, Editor</td>
             </tr>
@@ -537 +537 @@
             <tr>
                <td class="left"></td>
-               <td class="right">June 23, 2012</td>
+               <td class="right">June 25, 2012</td>
             </tr>
          </tbody>
@@ -567 +567 @@
          in progress”.
       </p>
-      <p>This Internet-Draft will expire on December 25, 2012.</p>
+      <p>This Internet-Draft will expire on December 27, 2012.</p>
       <h1><a id="rfc.copyrightnotice" href="#rfc.copyrightnotice">Copyright Notice</a></h1>
       <p>Copyright © 2012 IETF Trust and the persons identified as the document authors. All rights reserved.</p>
@@ -623 +623 @@
                <li>3.1&nbsp;&nbsp;&nbsp;<a href="#header.age">Age</a></li>
                <li>3.2&nbsp;&nbsp;&nbsp;<a href="#header.cache-control">Cache-Control</a><ul>
-                     <li>3.2.1&nbsp;&nbsp;&nbsp;<a href="#cache-request-directive">Request Cache-Control Directives</a></li>
-                     <li>3.2.2&nbsp;&nbsp;&nbsp;<a href="#cache-response-directive">Response Cache-Control Directives</a></li>
+                     <li>3.2.1&nbsp;&nbsp;&nbsp;<a href="#cache-request-directive">Request Cache-Control Directives</a><ul>
+                           <li>3.2.1.1&nbsp;&nbsp;&nbsp;<a href="#cache-request-directive.no-cache">no-cache</a></li>
+                           <li>3.2.1.2&nbsp;&nbsp;&nbsp;<a href="#cache-request-directive.no-store">no-store</a></li>
+                           <li>3.2.1.3&nbsp;&nbsp;&nbsp;<a href="#cache-request-directive.max-age">max-age</a></li>
+                           <li>3.2.1.4&nbsp;&nbsp;&nbsp;<a href="#cache-request-directive.max-stale">max-stale</a></li>
+                           <li>3.2.1.5&nbsp;&nbsp;&nbsp;<a href="#cache-request-directive.min-fresh">min-fresh</a></li>
+                           <li>3.2.1.6&nbsp;&nbsp;&nbsp;<a href="#cache-request-directive.no-transform">no-transform</a></li>
+                           <li>3.2.1.7&nbsp;&nbsp;&nbsp;<a href="#cache-request-directive.only-if-cached">only-if-cached</a></li>
+                        </ul>
+                     </li>
+                     <li>3.2.2&nbsp;&nbsp;&nbsp;<a href="#cache-response-directive">Response Cache-Control Directives</a><ul>
+                           <li>3.2.2.1&nbsp;&nbsp;&nbsp;<a href="#cache-response-directive.only-if-cached">public</a></li>
+                           <li>3.2.2.2&nbsp;&nbsp;&nbsp;<a href="#cache-response-directive.private">private</a></li>
+                           <li>3.2.2.3&nbsp;&nbsp;&nbsp;<a href="#cache-response-directive.no-cache">no-cache</a></li>
+                           <li>3.2.2.4&nbsp;&nbsp;&nbsp;<a href="#cache-response-directive.no-store">no-store</a></li>
+                           <li>3.2.2.5&nbsp;&nbsp;&nbsp;<a href="#cache-response-directive.must-revalidate">must-revalidate</a></li>
+                           <li>3.2.2.6&nbsp;&nbsp;&nbsp;<a href="#cache-response-directive.proxy-revalidate">proxy-revalidate</a></li>
+                           <li>3.2.2.7&nbsp;&nbsp;&nbsp;<a href="#cache-response-directive.max-age">max-age</a></li>
+                           <li>3.2.2.8&nbsp;&nbsp;&nbsp;<a href="#cache-response-directive.s-maxage">s-maxage</a></li>
+                           <li>3.2.2.9&nbsp;&nbsp;&nbsp;<a href="#cache-response-directive.no-transform">no-transform</a></li>
+                        </ul>
+                     </li>
                      <li>3.2.3&nbsp;&nbsp;&nbsp;<a href="#cache.control.extensions">Cache Control Extensions</a></li>
                   </ul>
@@ -1223 +1243 @@
          cache.
       </p>
-      <p id="rfc.section.3.2.p.5">Cache directives are identified by a token, to be compared case-insensitively, and have an optional argument.</p>
+      <p id="rfc.section.3.2.p.5">Cache directives are identified by a token, to be compared case-insensitively, and have an optional argument, that can use
+         both token and quoted-string syntax. For the directives defined below that define arguments, recipients ought to accept both
+         forms, even if one is documented to be preferred. For any directive not defined by this specification, recipients <em class="bcp14">MUST</em> accept both forms.
+      </p>
       <div id="rfc.figure.u.9"></div><pre class="inline"><span id="rfc.iref.g.3"></span><span id="rfc.iref.g.4"></span>  <a href="#header.cache-control" class="smpl">Cache-Control</a>   = 1#<a href="#header.cache-control" class="smpl">cache-directive</a>
 
-  <a href="#header.cache-control" class="smpl">cache-directive</a> = <a href="#header.cache-control" class="smpl">cache-request-directive</a>
-     / <a href="#header.cache-control" class="smpl">cache-response-directive</a>
-
-  <a href="#header.cache-control" class="smpl">cache-extension</a> = <a href="#core.rules" class="smpl">token</a> [ "=" ( <a href="#core.rules" class="smpl">token</a> / <a href="#core.rules" class="smpl">quoted-string</a> ) ]
-</pre><h3 id="rfc.section.3.2.1"><a href="#rfc.section.3.2.1">3.2.1</a>&nbsp;<a id="cache-request-directive" href="#cache-request-directive">Request Cache-Control Directives</a></h3>
-      <div id="rfc.figure.u.10"></div><pre class="inline"><span id="rfc.iref.g.5"></span>  <a href="#header.cache-control" class="smpl">cache-request-directive</a> =
-       "no-cache"
-     / "no-store"
-     / "max-age" "=" <a href="#delta-seconds" class="smpl">delta-seconds</a>
-     / "max-stale" [ "=" <a href="#delta-seconds" class="smpl">delta-seconds</a> ]
-     / "min-fresh" "=" <a href="#delta-seconds" class="smpl">delta-seconds</a>
-     / "no-transform"
-     / "only-if-cached"
-     / <a href="#header.cache-control" class="smpl">cache-extension</a>
-</pre><p id="rfc.section.3.2.1.p.2"> <dfn>no-cache</dfn>  <span id="rfc.iref.c.7"></span>  <span id="rfc.iref.n.1"></span>  
-      </p>
+  <a href="#header.cache-control" class="smpl">cache-directive</a> = <a href="#core.rules" class="smpl">token</a> [ "=" ( <a href="#core.rules" class="smpl">token</a> / <a href="#core.rules" class="smpl">quoted-string</a> ) ]
+</pre><p id="rfc.section.3.2.p.7">For the cache directives defined below, no argument is defined (nor allowed) otherwise stated otherwise.</p>
+      <h3 id="rfc.section.3.2.1"><a href="#rfc.section.3.2.1">3.2.1</a>&nbsp;<a id="cache-request-directive" href="#cache-request-directive">Request Cache-Control Directives</a></h3>
+      <div id="rfc.iref.c.7"></div>
+      <div id="rfc.iref.n.1"></div>
+      <h4 id="rfc.section.3.2.1.1"><a href="#rfc.section.3.2.1.1">3.2.1.1</a>&nbsp;<a id="cache-request-directive.no-cache" href="#cache-request-directive.no-cache">no-cache</a></h4>
+      <p id="rfc.section.3.2.1.1.p.1">The no-cache request directive indicates that a cache <em class="bcp14">MUST NOT</em> use a stored response to satisfy the request without successful validation on the origin server.
+      </p>
+      <div id="rfc.iref.c.8"></div>
+      <div id="rfc.iref.n.2"></div>
+      <h4 id="rfc.section.3.2.1.2"><a href="#rfc.section.3.2.1.2">3.2.1.2</a>&nbsp;<a id="cache-request-directive.no-store" href="#cache-request-directive.no-store">no-store</a></h4>
+      <p id="rfc.section.3.2.1.2.p.1">The no-store request directive indicates that a cache <em class="bcp14">MUST NOT</em> store any part of either this request or any response to it. This directive applies to both private and shared caches. "<em class="bcp14">MUST NOT</em> store" in this context means that the cache <em class="bcp14">MUST NOT</em> intentionally store the information in non-volatile storage, and <em class="bcp14">MUST</em> make a best-effort attempt to remove the information from volatile storage as promptly as possible after forwarding it.
+      </p>
+      <p id="rfc.section.3.2.1.2.p.2">This directive is NOT a reliable or sufficient mechanism for ensuring privacy. In particular, malicious or compromised caches
+         might not recognize or obey this directive, and communications networks might be vulnerable to eavesdropping.
+      </p>
+      <p id="rfc.section.3.2.1.2.p.3">Note that if a request containing this directive is satisfied from a cache, the no-store request directive does not apply
+         to the already stored response.
+      </p>
+      <div id="rfc.iref.c.9"></div>
+      <div id="rfc.iref.m.1"></div>
+      <h4 id="rfc.section.3.2.1.3"><a href="#rfc.section.3.2.1.3">3.2.1.3</a>&nbsp;<a id="cache-request-directive.max-age" href="#cache-request-directive.max-age">max-age</a></h4>
+      <p id="rfc.section.3.2.1.3.p.1">Argument syntax: </p>
       <ul class="empty">
-         <li>The no-cache request directive indicates that a cache <em class="bcp14">MUST NOT</em> use a stored response to satisfy the request without successful validation on the origin server.
-         </li>
-      </ul>
-      <p id="rfc.section.3.2.1.p.3"> <dfn>no-store</dfn>  <span id="rfc.iref.c.8"></span>  <span id="rfc.iref.n.2"></span>  
-      </p>
+         <li> <a href="#delta-seconds" class="smpl">delta-seconds</a> (see <a href="#delta-seconds" title="Delta Seconds">Section&nbsp;1.5</a>)
+         </li>
+      </ul>
+      <p id="rfc.section.3.2.1.3.p.2">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.
+      </p>
+      <p id="rfc.section.3.2.1.3.p.3"> <b>Note:</b> This directive uses the token form of the argument syntax; e.g., 'max-age=5', not 'max-age="5"'. Senders <em class="bcp14">SHOULD NOT</em> use the quoted-string form.
+      </p>
+      <div id="rfc.iref.c.10"></div>
+      <div id="rfc.iref.m.2"></div>
+      <h4 id="rfc.section.3.2.1.4"><a href="#rfc.section.3.2.1.4">3.2.1.4</a>&nbsp;<a id="cache-request-directive.max-stale" href="#cache-request-directive.max-stale">max-stale</a></h4>
+      <p id="rfc.section.3.2.1.4.p.1">Argument syntax: </p>
       <ul class="empty">
-         <li>The no-store request directive indicates that a cache <em class="bcp14">MUST NOT</em> store any part of either this request or any response to it. This directive applies to both private and shared caches. "<em class="bcp14">MUST NOT</em> store" in this context means that the cache <em class="bcp14">MUST NOT</em> intentionally store the information in non-volatile storage, and <em class="bcp14">MUST</em> make a best-effort attempt to remove the information from volatile storage as promptly as possible after forwarding it.
-         </li>
-         <li>This directive is NOT a reliable or sufficient mechanism for ensuring privacy. In particular, malicious or compromised caches
-            might not recognize or obey this directive, and communications networks might be vulnerable to eavesdropping.
-         </li>
-         <li>Note that if a request containing this directive is satisfied from a cache, the no-store request directive does not apply
-            to the already stored response.
-         </li>
-      </ul>
-      <p id="rfc.section.3.2.1.p.4"> <dfn>max-age</dfn>  <span id="rfc.iref.c.9"></span>  <span id="rfc.iref.m.1"></span>  
-      </p>
+         <li> <a href="#delta-seconds" class="smpl">delta-seconds</a> (see <a href="#delta-seconds" title="Delta Seconds">Section&nbsp;1.5</a>)
+         </li>
+      </ul>
+      <p id="rfc.section.3.2.1.4.p.2">The max-stale request directive indicates that the client is willing to accept a response that has exceeded its expiration
+         time. If max-stale is assigned a value, then the client is willing to accept a response that has exceeded its expiration time
+         by no more than the specified number of seconds. If no value is assigned to max-stale, then the client is willing to accept
+         a stale response of any age.
+      </p>
+      <p id="rfc.section.3.2.1.4.p.3"> <b>Note:</b> This directive uses the token form of the argument syntax; e.g., 'max-stale=10', not 'max-stale="10"'. Senders <em class="bcp14">SHOULD NOT</em> use the quoted-string form.
+      </p>
+      <div id="rfc.iref.c.11"></div>
+      <div id="rfc.iref.m.3"></div>
+      <h4 id="rfc.section.3.2.1.5"><a href="#rfc.section.3.2.1.5">3.2.1.5</a>&nbsp;<a id="cache-request-directive.min-fresh" href="#cache-request-directive.min-fresh">min-fresh</a></h4>
+      <p id="rfc.section.3.2.1.5.p.1">Argument syntax: </p>
       <ul class="empty">
-         <li>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.
-         </li>
-      </ul>
-      <p id="rfc.section.3.2.1.p.5"> <dfn>max-stale</dfn>  <span id="rfc.iref.c.10"></span>  <span id="rfc.iref.m.2"></span>  
-      </p>
+         <li> <a href="#delta-seconds" class="smpl">delta-seconds</a> (see <a href="#delta-seconds" title="Delta Seconds">Section&nbsp;1.5</a>)
+         </li>
+      </ul>
+      <p id="rfc.section.3.2.1.5.p.2">The min-fresh request directive indicates that the client is willing to accept a response whose freshness lifetime is no less
+         than its current age plus the specified time in seconds. That is, the client wants a response that will still be fresh for
+         at least the specified number of seconds.
+      </p>
+      <p id="rfc.section.3.2.1.5.p.3"> <b>Note:</b> This directive uses the token form of the argument syntax; e.g., 'min-fresh=20', not 'min-fresh="20"'. Senders <em class="bcp14">SHOULD NOT</em> use the quoted-string form.
+      </p>
+      <div id="rfc.iref.c.12"></div>
+      <div id="rfc.iref.n.3"></div>
+      <h4 id="rfc.section.3.2.1.6"><a href="#rfc.section.3.2.1.6">3.2.1.6</a>&nbsp;<a id="cache-request-directive.no-transform" href="#cache-request-directive.no-transform">no-transform</a></h4>
+      <p id="rfc.section.3.2.1.6.p.1">The no-transform request directive indicates that an intermediary (whether or not it implements a cache) <em class="bcp14">MUST NOT</em> change the Content-Encoding, Content-Range or Content-Type request header fields, nor the request representation.
+      </p>
+      <div id="rfc.iref.c.13"></div>
+      <div id="rfc.iref.o.1"></div>
+      <h4 id="rfc.section.3.2.1.7"><a href="#rfc.section.3.2.1.7">3.2.1.7</a>&nbsp;<a id="cache-request-directive.only-if-cached" href="#cache-request-directive.only-if-cached">only-if-cached</a></h4>
+      <p id="rfc.section.3.2.1.7.p.1">The only-if-cached request directive indicates that the client only wishes to obtain a stored response. If it receives 3ive,
+         a cache <em class="bcp14">SHOULD</em> either respond using a stored response that is consistent with the other constraints of the request, or respond with a 504
+         (Gateway Timeout) status code. If a group of caches is being operated as a unified system with good internal connectivity,
+         a member cache <em class="bcp14">MAY</em> forward such a request within that group of caches.
+      </p>
+      <h3 id="rfc.section.3.2.2"><a href="#rfc.section.3.2.2">3.2.2</a>&nbsp;<a id="cache-response-directive" href="#cache-response-directive">Response Cache-Control Directives</a></h3>
+      <div id="rfc.iref.c.14"></div>
+      <div id="rfc.iref.p.2"></div>
+      <h4 id="rfc.section.3.2.2.1"><a href="#rfc.section.3.2.2.1">3.2.2.1</a>&nbsp;<a id="cache-response-directive.only-if-cached" href="#cache-response-directive.only-if-cached">public</a></h4>
+      <p id="rfc.section.3.2.2.1.p.1">The public response directive indicates that a response whose associated request contains an 'Authentication' header <em class="bcp14">MAY</em> be stored (see <a href="#caching.authenticated.responses" title="Shared Caching of Authenticated Responses">Section&nbsp;2.7</a>).
+      </p>
+      <div id="rfc.iref.c.15"></div>
+      <div id="rfc.iref.p.3"></div>
+      <h4 id="rfc.section.3.2.2.2"><a href="#rfc.section.3.2.2.2">3.2.2.2</a>&nbsp;<a id="cache-response-directive.private" href="#cache-response-directive.private">private</a></h4>
+      <p id="rfc.section.3.2.2.2.p.1">Argument syntax: </p>
       <ul class="empty">
-         <li>The max-stale request directive indicates that the client is willing to accept a response that has exceeded its expiration
-            time. If max-stale is assigned a value, then the client is willing to accept a response that has exceeded its expiration time
-            by no more than the specified number of seconds. If no value is assigned to max-stale, then the client is willing to accept
-            a stale response of any age.
-         </li>
-      </ul>
-      <p id="rfc.section.3.2.1.p.6"> <dfn>min-fresh</dfn>  <span id="rfc.iref.c.11"></span>  <span id="rfc.iref.m.3"></span>  
-      </p>
+         <li>#<a href="#abnf.dependencies" class="smpl">field-name</a> 
+         </li>
+      </ul>
+      <p id="rfc.section.3.2.2.2.p.2">The private response directive indicates that the response message is intended for a single user and <em class="bcp14">MUST NOT</em> be stored by a shared cache. A private cache <em class="bcp14">MAY</em> store the response.
+      </p>
+      <p id="rfc.section.3.2.2.2.p.3">If the private response directive specifies one or more field-names, this requirement is limited to the field-values associated
+         with the listed response header fields. That is, a shared cache <em class="bcp14">MUST NOT</em> store the specified field-names(s), whereas it <em class="bcp14">MAY</em> store the remainder of the response message.
+      </p>
+      <p id="rfc.section.3.2.2.2.p.4">The field-names given are not limited to the set of standard header fields defined by this specification. Field names are
+         case-insensitive.
+      </p>
+      <p id="rfc.section.3.2.2.2.p.5"> <b>Note:</b> This usage of the word "private" only controls where the response can be stored; it cannot ensure the privacy of the message
+         content. Also, private response directives with field-names are often handled by implementations as if an unqualified private
+         directive was received; i.e., the special handling for the qualified form is not widely implemented.
+      </p>
+      <p id="rfc.section.3.2.2.2.p.6"> <b>Note:</b> This directive uses the quoted-string form of the argument syntax. Senders <em class="bcp14">SHOULD NOT</em> use the token form (even if quoting appears not to be needed for single-entry lists).
+      </p>
+      <div id="rfc.iref.c.16"></div>
+      <div id="rfc.iref.n.4"></div>
+      <h4 id="rfc.section.3.2.2.3"><a href="#rfc.section.3.2.2.3">3.2.2.3</a>&nbsp;<a id="cache-response-directive.no-cache" href="#cache-response-directive.no-cache">no-cache</a></h4>
+      <p id="rfc.section.3.2.2.3.p.1">Argument syntax: </p>
       <ul class="empty">
-         <li>The min-fresh request directive indicates that the client is willing to accept a response whose freshness lifetime is no less
-            than its current age plus the specified time in seconds. That is, the client wants a response that will still be fresh for
-            at least the specified number of seconds.
-         </li>
-      </ul>
-      <p id="rfc.section.3.2.1.p.7"> <dfn>no-transform</dfn>  <span id="rfc.iref.c.12"></span>  <span id="rfc.iref.n.3"></span>  
-      </p>
+         <li>#<a href="#abnf.dependencies" class="smpl">field-name</a> 
+         </li>
+      </ul>
+      <p id="rfc.section.3.2.2.3.p.2">The no-cache response directive indicates that the response <em class="bcp14">MUST NOT</em> be used to satisfy a subsequent request without successful validation on the origin server. This allows an origin server to
+         prevent a cache from using it to satisfy a request without contacting it, even by caches that have been configured to return
+         stale responses.
+      </p>
+      <p id="rfc.section.3.2.2.3.p.3">If the no-cache response directive specifies one or more field-names, then a cache <em class="bcp14">MAY</em> use the response to satisfy a subsequent request, subject to any other restrictions on caching. However, any header fields
+         in the response that have the field-name(s) listed <em class="bcp14">MUST NOT</em> be sent in the response to a subsequent request without successful revalidation with the origin server. This allows an origin
+         server to prevent the re-use of certain header fields in a response, while still allowing caching of the rest of the response.
+      </p>
+      <p id="rfc.section.3.2.2.3.p.4">The field-names given are not limited to the set of standard header fields defined by this specification. Field names are
+         case-insensitive.
+      </p>
+      <p id="rfc.section.3.2.2.3.p.5"> <b>Note:</b> Most HTTP/1.0 caches will not recognize or obey this directive. Also, no-cache response directives with field-names are often
+         handled by implementations as if an unqualified no-cache directive was received; i.e., the special handling for the qualified
+         form is not widely implemented.
+      </p>
+      <p id="rfc.section.3.2.2.3.p.6"> <b>Note:</b> This directive uses the quoted-string form of the argument syntax. Senders <em class="bcp14">SHOULD NOT</em> use the token form (even if quoting appears not to be needed for single-entry lists).
+      </p>
+      <div id="rfc.iref.c.17"></div>
+      <div id="rfc.iref.n.5"></div>
+      <h4 id="rfc.section.3.2.2.4"><a href="#rfc.section.3.2.2.4">3.2.2.4</a>&nbsp;<a id="cache-response-directive.no-store" href="#cache-response-directive.no-store">no-store</a></h4>
+      <p id="rfc.section.3.2.2.4.p.1">The no-store response directive indicates that a cache <em class="bcp14">MUST NOT</em> store any part of either the immediate request or response. This directive applies to both private and shared caches. "<em class="bcp14">MUST NOT</em> store" in this context means that the cache <em class="bcp14">MUST NOT</em> intentionally store the information in non-volatile storage, and <em class="bcp14">MUST</em> make a best-effort attempt to remove the information from volatile storage as promptly as possible after forwarding it.
+      </p>
+      <p id="rfc.section.3.2.2.4.p.2">This directive is NOT a reliable or sufficient mechanism for ensuring privacy. In particular, malicious or compromised caches
+         might not recognize or obey this directive, and communications networks might be vulnerable to eavesdropping.
+      </p>
+      <div id="rfc.iref.c.18"></div>
+      <div id="rfc.iref.m.4"></div>
+      <h4 id="rfc.section.3.2.2.5"><a href="#rfc.section.3.2.2.5">3.2.2.5</a>&nbsp;<a id="cache-response-directive.must-revalidate" href="#cache-response-directive.must-revalidate">must-revalidate</a></h4>
+      <p id="rfc.section.3.2.2.5.p.1">The must-revalidate response directive indicates that once it has become stale, a cache <em class="bcp14">MUST NOT</em> use the response to satisfy subsequent requests without successful validation on the origin server.
+      </p>
+      <p id="rfc.section.3.2.2.5.p.2">The must-revalidate directive is necessary to support reliable operation for certain protocol features. In all circumstances
+         a cache <em class="bcp14">MUST</em> obey the must-revalidate directive; in particular, if a cache cannot reach the origin server for any reason, it <em class="bcp14">MUST</em> generate a 504 (Gateway Timeout) response.
+      </p>
+      <p id="rfc.section.3.2.2.5.p.3">The must-revalidate directive ought to be used by servers if and only if failure to validate a request on the representation
+         could result in incorrect operation, such as a silently unexecuted financial transaction.
+      </p>
+      <div id="rfc.iref.c.19"></div>
+      <div id="rfc.iref.p.4"></div>
+      <h4 id="rfc.section.3.2.2.6"><a href="#rfc.section.3.2.2.6">3.2.2.6</a>&nbsp;<a id="cache-response-directive.proxy-revalidate" href="#cache-response-directive.proxy-revalidate">proxy-revalidate</a></h4>
+      <p id="rfc.section.3.2.2.6.p.1">The proxy-revalidate response directive has the same meaning as the must-revalidate response directive, except that it does
+         not apply to private caches.
+      </p>
+      <div id="rfc.iref.c.20"></div>
+      <div id="rfc.iref.m.5"></div>
+      <h4 id="rfc.section.3.2.2.7"><a href="#rfc.section.3.2.2.7">3.2.2.7</a>&nbsp;<a id="cache-response-directive.max-age" href="#cache-response-directive.max-age">max-age</a></h4>
+      <p id="rfc.section.3.2.2.7.p.1">Argument syntax: </p>
       <ul class="empty">
-         <li>The no-transform request directive indicates that an intermediary (whether or not it implements a cache) <em class="bcp14">MUST NOT</em> change the Content-Encoding, Content-Range or Content-Type request header fields, nor the request representation.
-         </li>
-      </ul>
-      <p id="rfc.section.3.2.1.p.8"> <dfn>only-if-cached</dfn>  <span id="rfc.iref.c.13"></span>  <span id="rfc.iref.o.1"></span>  
-      </p>
+         <li> <a href="#delta-seconds" class="smpl">delta-seconds</a> (see <a href="#delta-seconds" title="Delta Seconds">Section&nbsp;1.5</a>)
+         </li>
+      </ul>
+      <p id="rfc.section.3.2.2.7.p.2">The max-age response directive indicates that the response is to be considered stale after its age is greater than the specified
+         number of seconds.
+      </p>
+      <p id="rfc.section.3.2.2.7.p.3"> <b>Note:</b> This directive uses the token form of the argument syntax; e.g., 'max-age=5', not 'max-age="5"'. Senders <em class="bcp14">SHOULD NOT</em> use the quoted-string form.
+      </p>
+      <div id="rfc.iref.c.21"></div>
+      <div id="rfc.iref.s.4"></div>
+      <h4 id="rfc.section.3.2.2.8"><a href="#rfc.section.3.2.2.8">3.2.2.8</a>&nbsp;<a id="cache-response-directive.s-maxage" href="#cache-response-directive.s-maxage">s-maxage</a></h4>
+      <p id="rfc.section.3.2.2.8.p.1">Argument syntax: </p>
       <ul class="empty">
-         <li>The only-if-cached request directive indicates that the client only wishes to obtain a stored response. If it receives this
-            directive, a cache <em class="bcp14">SHOULD</em> either respond using a stored response that is consistent with the other constraints of the request, or respond with a 504
-            (Gateway Timeout) status code. If a group of caches is being operated as a unified system with good internal connectivity,
-            a member cache <em class="bcp14">MAY</em> forward such a request within that group of caches.
-         </li>
-      </ul>
-      <h3 id="rfc.section.3.2.2"><a href="#rfc.section.3.2.2">3.2.2</a>&nbsp;<a id="cache-response-directive" href="#cache-response-directive">Response Cache-Control Directives</a></h3>
-      <div id="rfc.figure.u.11"></div><pre class="inline"><span id="rfc.iref.g.6"></span>  <a href="#header.cache-control" class="smpl">cache-response-directive</a> =
-       "public"
-     / "private" [ "=" <a href="#notation" class="smpl">DQUOTE</a> 1#<a href="#abnf.dependencies" class="smpl">field-name</a> <a href="#notation" class="smpl">DQUOTE</a> ]
-     / "no-cache" [ "=" <a href="#notation" class="smpl">DQUOTE</a> 1#<a href="#abnf.dependencies" class="smpl">field-name</a> <a href="#notation" class="smpl">DQUOTE</a> ]
-     / "no-store"
-     / "no-transform"
-     / "must-revalidate"
-     / "proxy-revalidate"
-     / "max-age" "=" <a href="#delta-seconds" class="smpl">delta-seconds</a>
-     / "s-maxage" "=" <a href="#delta-seconds" class="smpl">delta-seconds</a>
-     / <a href="#header.cache-control" class="smpl">cache-extension</a>
-</pre><p id="rfc.section.3.2.2.p.2"> <dfn>public</dfn>  <span id="rfc.iref.c.14"></span>  <span id="rfc.iref.p.2"></span>  
-      </p>
-      <ul class="empty">
-         <li>The public response directive indicates that a response whose associated request contains an 'Authentication' header <em class="bcp14">MAY</em> be stored (see <a href="#caching.authenticated.responses" title="Shared Caching of Authenticated Responses">Section&nbsp;2.7</a>).
-         </li>
-      </ul>
-      <p id="rfc.section.3.2.2.p.3"> <dfn>private</dfn>  <span id="rfc.iref.c.15"></span>  <span id="rfc.iref.p.3"></span>  
-      </p>
-      <ul class="empty">
-         <li>The private response directive indicates that the response message is intended for a single user and <em class="bcp14">MUST NOT</em> be stored by a shared cache. A private cache <em class="bcp14">MAY</em> store the response.
-         </li>
-         <li>If the private response directive specifies one or more field-names, this requirement is limited to the field-values associated
-            with the listed response header fields. That is, a shared cache <em class="bcp14">MUST NOT</em> store the specified field-names(s), whereas it <em class="bcp14">MAY</em> store the remainder of the response message.
-         </li>
-         <li>The field-names given are not limited to the set of standard header fields defined by this specification. Field names are
-            case-insensitive.
-         </li>
-         <li><b>Note:</b> This usage of the word "private" only controls where the response can be stored; it cannot ensure the privacy of the message
-            content. Also, private response directives with field-names are often handled by implementations as if an unqualified private
-            directive was received; i.e., the special handling for the qualified form is not widely implemented.
-         </li>
-      </ul>
-      <p id="rfc.section.3.2.2.p.4"> <dfn>no-cache</dfn>  <span id="rfc.iref.c.16"></span>  <span id="rfc.iref.n.4"></span>  
-      </p>
-      <ul class="empty">
-         <li>The no-cache response directive indicates that the response <em class="bcp14">MUST NOT</em> be used to satisfy a subsequent request without successful validation on the origin server. This allows an origin server to
-            prevent a cache from using it to satisfy a request without contacting it, even by caches that have been configured to return
-            stale responses.
-         </li>
-         <li>If the no-cache response directive specifies one or more field-names, then a cache <em class="bcp14">MAY</em> use the response to satisfy a subsequent request, subject to any other restrictions on caching. However, any header fields
-            in the response that have the field-name(s) listed <em class="bcp14">MUST NOT</em> be sent in the response to a subsequent request without successful revalidation with the origin server. This allows an origin
-            server to prevent the re-use of certain header fields in a response, while still allowing caching of the rest of the response.
-         </li>
-         <li>The field-names given are not limited to the set of standard header fields defined by this specification. Field names are
-            case-insensitive.
-         </li>
-         <li><b>Note:</b> Most HTTP/1.0 caches will not recognize or obey this directive. Also, no-cache response directives with field-names are often
-            handled by implementations as if an unqualified no-cache directive was received; i.e., the special handling for the qualified
-            form is not widely implemented.
-         </li>
-      </ul>
-      <p id="rfc.section.3.2.2.p.5"> <dfn>no-store</dfn>  <span id="rfc.iref.c.17"></span>  <span id="rfc.iref.n.5"></span>  
-      </p>
-      <ul class="empty">
-         <li>The no-store response directive indicates that a cache <em class="bcp14">MUST NOT</em> store any part of either the immediate request or response. This directive applies to both private and shared caches. "<em class="bcp14">MUST NOT</em> store" in this context means that the cache <em class="bcp14">MUST NOT</em> intentionally store the information in non-volatile storage, and <em class="bcp14">MUST</em> make a best-effort attempt to remove the information from volatile storage as promptly as possible after forwarding it.
-         </li>
-         <li>This directive is NOT a reliable or sufficient mechanism for ensuring privacy. In particular, malicious or compromised caches
-            might not recognize or obey this directive, and communications networks might be vulnerable to eavesdropping.
-         </li>
-      </ul>
-      <p id="rfc.section.3.2.2.p.6"> <dfn>must-revalidate</dfn>  <span id="rfc.iref.c.18"></span>  <span id="rfc.iref.m.4"></span>  
-      </p>
-      <ul class="empty">
-         <li>The must-revalidate response directive indicates that once it has become stale, a cache <em class="bcp14">MUST NOT</em> use the response to satisfy subsequent requests without successful validation on the origin server.
-         </li>
-         <li>The must-revalidate directive is necessary to support reliable operation for certain protocol features. In all circumstances
-            a cache <em class="bcp14">MUST</em> obey the must-revalidate directive; in particular, if a cache cannot reach the origin server for any reason, it <em class="bcp14">MUST</em> generate a 504 (Gateway Timeout) response.
-         </li>
-         <li>The must-revalidate directive ought to be used by servers if and only if failure to validate a request on the representation
-            could result in incorrect operation, such as a silently unexecuted financial transaction.
-         </li>
-      </ul>
-      <p id="rfc.section.3.2.2.p.7"> <dfn>proxy-revalidate</dfn>  <span id="rfc.iref.c.19"></span>  <span id="rfc.iref.p.4"></span>  
-      </p>
-      <ul class="empty">
-         <li>The proxy-revalidate response directive has the same meaning as the must-revalidate response directive, except that it does
-            not apply to private caches.
-         </li>
-      </ul>
-      <p id="rfc.section.3.2.2.p.8"> <dfn>max-age</dfn>  <span id="rfc.iref.c.20"></span>  <span id="rfc.iref.m.5"></span>  
-      </p>
-      <ul class="empty">
-         <li>The max-age response directive indicates that the response is to be considered stale after its age is greater than the specified
-            number of seconds.
-         </li>
-      </ul>
-      <p id="rfc.section.3.2.2.p.9"> <dfn>s-maxage</dfn>  <span id="rfc.iref.c.21"></span>  <span id="rfc.iref.s.4"></span>  
-      </p>
-      <ul class="empty">
-         <li>The s-maxage response directive indicates that, in shared caches, the maximum age specified by this directive overrides the
-            maximum age specified by either the max-age directive or the Expires header field. The s-maxage directive also implies the
-            semantics of the proxy-revalidate response directive.
-         </li>
-      </ul>
-      <p id="rfc.section.3.2.2.p.10"> <dfn>no-transform</dfn>  <span id="rfc.iref.c.22"></span>  <span id="rfc.iref.n.6"></span>  
-      </p>
-      <ul class="empty">
-         <li>The no-transform response directive indicates that an intermediary (regardless of whether it implements a cache) <em class="bcp14">MUST NOT</em> change the Content-Encoding, Content-Range or Content-Type response header fields, nor the response representation.
-         </li>
-      </ul>
+         <li> <a href="#delta-seconds" class="smpl">delta-seconds</a> (see <a href="#delta-seconds" title="Delta Seconds">Section&nbsp;1.5</a>)
+         </li>
+      </ul>
+      <p id="rfc.section.3.2.2.8.p.2">The s-maxage response directive indicates that, in shared caches, the maximum age specified by this directive overrides the
+         maximum age specified by either the max-age directive or the Expires header field. The s-maxage directive also implies the
+         semantics of the proxy-revalidate response directive.
+      </p>
+      <p id="rfc.section.3.2.2.8.p.3"> <b>Note:</b> This directive uses the token form of the argument syntax; e.g., 's-maxage=10', not 's-maxage="10"'. Senders <em class="bcp14">SHOULD NOT</em> use the quoted-string form.
+      </p>
+      <div id="rfc.iref.c.22"></div>
+      <div id="rfc.iref.n.6"></div>
+      <h4 id="rfc.section.3.2.2.9"><a href="#rfc.section.3.2.2.9">3.2.2.9</a>&nbsp;<a id="cache-response-directive.no-transform" href="#cache-response-directive.no-transform">no-transform</a></h4>
+      <p id="rfc.section.3.2.2.9.p.1">The no-transform response directive indicates that an intermediary (regardless of whether it implements a cache) <em class="bcp14">MUST NOT</em> change the Content-Encoding, Content-Range or Content-Type response header fields, nor the response representation.
+      </p>
       <h3 id="rfc.section.3.2.3"><a href="#rfc.section.3.2.3">3.2.3</a>&nbsp;<a id="cache.control.extensions" href="#cache.control.extensions">Cache Control Extensions</a></h3>
       <p id="rfc.section.3.2.3.p.1">The Cache-Control header field can be extended through the use of one or more cache-extension tokens, each with an optional
@@ -1416 +1450 @@
          private response in their shared cache(s) could do so by including
       </p>
-      <div id="rfc.figure.u.12"></div><pre class="text">  Cache-Control: private, community="UCI"
+      <div id="rfc.figure.u.10"></div><pre class="text">  Cache-Control: private, community="UCI"
 </pre><p id="rfc.section.3.2.3.p.5">A cache seeing this header field will act correctly even if the cache does not understand the community cache-extension, since
          it will also see and understand the private directive and thus default to the safe behavior.
@@ -1445 +1479 @@
       <p id="rfc.section.3.3.p.3">The field-value is an absolute date and time as defined by HTTP-date in <a href="p2-semantics.html#http.date" title="Date/Time Formats">Section 5.1</a> of <a href="#Part2" id="rfc.xref.Part2.7"><cite title="HTTP/1.1, part 2: Message Semantics">[Part2]</cite></a>; a sender <em class="bcp14">MUST</em> use the rfc1123-date format.
       </p>
-      <div id="rfc.figure.u.13"></div><pre class="inline"><span id="rfc.iref.g.7"></span>  <a href="#header.expires" class="smpl">Expires</a> = <a href="#abnf.dependencies" class="smpl">HTTP-date</a>
-</pre><div id="rfc.figure.u.14"></div> 
+      <div id="rfc.figure.u.11"></div><pre class="inline"><span id="rfc.iref.g.5"></span>  <a href="#header.expires" class="smpl">Expires</a> = <a href="#abnf.dependencies" class="smpl">HTTP-date</a>
+</pre><div id="rfc.figure.u.12"></div> 
       <p>For example</p>  <pre class="text">  Expires: Thu, 01 Dec 1994 16:00:00 GMT
 </pre><p id="rfc.section.3.3.p.6">A cache <em class="bcp14">MUST</em> treat other invalid date formats, especially including the value "0", as in the past (i.e., "already expired").
@@ -1473 +1507 @@
          deprecates such extensions to improve interoperability.
       </p>
-      <div id="rfc.figure.u.15"></div><pre class="inline"><span id="rfc.iref.g.8"></span><span id="rfc.iref.g.9"></span><span id="rfc.iref.g.10"></span>  <a href="#header.pragma" class="smpl">Pragma</a>           = 1#<a href="#header.pragma" class="smpl">pragma-directive</a>
+      <div id="rfc.figure.u.13"></div><pre class="inline"><span id="rfc.iref.g.6"></span><span id="rfc.iref.g.7"></span><span id="rfc.iref.g.8"></span>  <a href="#header.pragma" class="smpl">Pragma</a>           = 1#<a href="#header.pragma" class="smpl">pragma-directive</a>
   <a href="#header.pragma" class="smpl">pragma-directive</a> = "no-cache" / <a href="#header.pragma" class="smpl">extension-pragma</a>
   <a href="#header.pragma" class="smpl">extension-pragma</a> = <a href="#core.rules" class="smpl">token</a> [ "=" ( <a href="#core.rules" class="smpl">token</a> / <a href="#core.rules" class="smpl">quoted-string</a> ) ]
@@ -1481 +1515 @@
          no-cache is purposefully omitted to target other Cache-Control response directives at HTTP/1.1 caches. For example:
       </p>
-      <div id="rfc.figure.u.16"></div> <pre class="text">GET / HTTP/1.1
+      <div id="rfc.figure.u.14"></div> <pre class="text">GET / HTTP/1.1
 Host: www.example.com
 Cache-Control: max-age=30
@@ -1504 +1538 @@
          the representation.
       </p>
-      <div id="rfc.figure.u.17"></div><pre class="inline"><span id="rfc.iref.g.11"></span>  <a href="#header.vary" class="smpl">Vary</a> = "*" / 1#<a href="#abnf.dependencies" class="smpl">field-name</a>
+      <div id="rfc.figure.u.15"></div><pre class="inline"><span id="rfc.iref.g.9"></span>  <a href="#header.vary" class="smpl">Vary</a> = "*" / 1#<a href="#abnf.dependencies" class="smpl">field-name</a>
 </pre><p id="rfc.section.3.5.p.5">The set of header fields named by the Vary field value is known as the selecting header fields.</p>
       <p id="rfc.section.3.5.p.6">A server <em class="bcp14">SHOULD</em> include a Vary header field with any cacheable response that is subject to server-driven negotiation. Doing so allows a cache
@@ -1531 +1565 @@
          be applied to response messages.
       </p>
-      <div id="rfc.figure.u.18"></div><pre class="inline"><span id="rfc.iref.g.12"></span><span id="rfc.iref.g.13"></span><span id="rfc.iref.g.14"></span><span id="rfc.iref.g.15"></span><span id="rfc.iref.g.16"></span><span id="rfc.iref.g.17"></span>  <a href="#header.warning" class="smpl">Warning</a>       = 1#<a href="#header.warning" class="smpl">warning-value</a>
+      <div id="rfc.figure.u.16"></div><pre class="inline"><span id="rfc.iref.g.10"></span><span id="rfc.iref.g.11"></span><span id="rfc.iref.g.12"></span><span id="rfc.iref.g.13"></span><span id="rfc.iref.g.14"></span><span id="rfc.iref.g.15"></span>  <a href="#header.warning" class="smpl">Warning</a>       = 1#<a href="#header.warning" class="smpl">warning-value</a>
   
   <a href="#header.warning" class="smpl">warning-value</a> = <a href="#header.warning" class="smpl">warn-code</a> <a href="#notation" class="smpl">SP</a> <a href="#header.warning" class="smpl">warn-agent</a> <a href="#notation" class="smpl">SP</a> <a href="#header.warning" class="smpl">warn-text</a>
@@ -1570 +1604 @@
          of its meaning.
       </p>
-      <div id="rfc.iref.78"></div>
+      <div id="rfc.iref.76"></div>
       <div id="rfc.iref.w.2"></div>
       <h3 id="rfc.section.3.6.1"><a href="#rfc.section.3.6.1">3.6.1</a>&nbsp;<a id="warn.110" href="#warn.110">110 Response is Stale</a></h3>
       <p id="rfc.section.3.6.1.p.1">A cache <em class="bcp14">SHOULD</em> include this whenever the returned response is stale.
       </p>
-      <div id="rfc.iref.79"></div>
+      <div id="rfc.iref.77"></div>
       <div id="rfc.iref.w.3"></div>
       <h3 id="rfc.section.3.6.2"><a href="#rfc.section.3.6.2">3.6.2</a>&nbsp;<a id="warn.111" href="#warn.111">111 Revalidation Failed</a></h3>
@@ -1581 +1615 @@
          the server.
       </p>
-      <div id="rfc.iref.80"></div>
+      <div id="rfc.iref.78"></div>
       <div id="rfc.iref.w.4"></div>
       <h3 id="rfc.section.3.6.3"><a href="#rfc.section.3.6.3">3.6.3</a>&nbsp;<a id="warn.112" href="#warn.112">112 Disconnected Operation</a></h3>
       <p id="rfc.section.3.6.3.p.1">A cache <em class="bcp14">SHOULD</em> include this if it is intentionally disconnected from the rest of the network for a period of time.
       </p>
-      <div id="rfc.iref.81"></div>
+      <div id="rfc.iref.79"></div>
       <div id="rfc.iref.w.5"></div>
       <h3 id="rfc.section.3.6.4"><a href="#rfc.section.3.6.4">3.6.4</a>&nbsp;<a id="warn.113" href="#warn.113">113 Heuristic Expiration</a></h3>
@@ -1592 +1626 @@
          hours.
       </p>
-      <div id="rfc.iref.82"></div>
+      <div id="rfc.iref.80"></div>
       <div id="rfc.iref.w.6"></div>
       <h3 id="rfc.section.3.6.5"><a href="#rfc.section.3.6.5">3.6.5</a>&nbsp;<a id="warn.199" href="#warn.199">199 Miscellaneous Warning</a></h3>
       <p id="rfc.section.3.6.5.p.1">The warning text can include arbitrary information to be presented to a human user, or logged. A system receiving this warning <em class="bcp14">MUST NOT</em> take any automated action, besides presenting the warning to the user.
       </p>
-      <div id="rfc.iref.83"></div>
+      <div id="rfc.iref.81"></div>
       <div id="rfc.iref.w.7"></div>
       <h3 id="rfc.section.3.6.6"><a href="#rfc.section.3.6.6">3.6.6</a>&nbsp;<a id="warn.214" href="#warn.214">214 Transformation Applied</a></h3>
@@ -1603 +1637 @@
          or modifying the representation data, unless this Warning code already appears in the response.
       </p>
-      <div id="rfc.iref.84"></div>
+      <div id="rfc.iref.82"></div>
       <div id="rfc.iref.w.8"></div>
       <h3 id="rfc.section.3.6.7"><a href="#rfc.section.3.6.7">3.6.7</a>&nbsp;<a id="warn.299" href="#warn.299">299 Miscellaneous Persistent Warning</a></h3>
@@ -1649 +1683 @@
                <tr>
                   <td class="left">max-age</td>
-                  <td class="left"> <a href="#cache-request-directive" title="Request Cache-Control Directives">Section&nbsp;3.2.1</a>, <a href="#cache-response-directive" title="Response Cache-Control Directives">Section&nbsp;3.2.2</a> 
+                  <td class="left"> <a href="#cache-request-directive.max-age" title="max-age">Section&nbsp;3.2.1.3</a>, <a href="#cache-response-directive.max-age" title="max-age">Section&nbsp;3.2.2.7</a> 
                   </td>
                </tr>
                <tr>
                   <td class="left">max-stale</td>
-                  <td class="left"> <a href="#cache-request-directive" title="Request Cache-Control Directives">Section&nbsp;3.2.1</a> 
+                  <td class="left"> <a href="#cache-request-directive.max-stale" title="max-stale">Section&nbsp;3.2.1.4</a> 
                   </td>
                </tr>
                <tr>
                   <td class="left">min-fresh</td>
-                  <td class="left"> <a href="#cache-request-directive" title="Request Cache-Control Directives">Section&nbsp;3.2.1</a> 
+                  <td class="left"> <a href="#cache-request-directive.min-fresh" title="min-fresh">Section&nbsp;3.2.1.5</a> 
                   </td>
                </tr>
                <tr>
                   <td class="left">must-revalidate</td>
-                  <td class="left"> <a href="#cache-response-directive" title="Response Cache-Control Directives">Section&nbsp;3.2.2</a> 
+                  <td class="left"> <a href="#cache-response-directive.must-revalidate" title="must-revalidate">Section&nbsp;3.2.2.5</a> 
                   </td>
                </tr>
                <tr>
                   <td class="left">no-cache</td>
-                  <td class="left"> <a href="#cache-request-directive" title="Request Cache-Control Directives">Section&nbsp;3.2.1</a>, <a href="#cache-response-directive" title="Response Cache-Control Directives">Section&nbsp;3.2.2</a> 
+                  <td class="left"> <a href="#cache-request-directive.no-cache" title="no-cache">Section&nbsp;3.2.1.1</a>, <a href="#cache-response-directive.no-cache" title="no-cache">Section&nbsp;3.2.2.3</a> 
                   </td>
                </tr>
                <tr>
                   <td class="left">no-store</td>
-                  <td class="left"> <a href="#cache-request-directive" title="Request Cache-Control Directives">Section&nbsp;3.2.1</a>, <a href="#cache-response-directive" title="Response Cache-Control Directives">Section&nbsp;3.2.2</a> 
+                  <td class="left"> <a href="#cache-request-directive.no-store" title="no-store">Section&nbsp;3.2.1.2</a>, <a href="#cache-response-directive.no-store" title="no-store">Section&nbsp;3.2.2.4</a> 
                   </td>
                </tr>
                <tr>
                   <td class="left">no-transform</td>
-                  <td class="left"> <a href="#cache-request-directive" title="Request Cache-Control Directives">Section&nbsp;3.2.1</a>, <a href="#cache-response-directive" title="Response Cache-Control Directives">Section&nbsp;3.2.2</a> 
+                  <td class="left"> <a href="#cache-request-directive.no-transform" title="no-transform">Section&nbsp;3.2.1.6</a>, <a href="#cache-response-directive.no-transform" title="no-transform">Section&nbsp;3.2.2.9</a> 
                   </td>
                </tr>
                <tr>
                   <td class="left">only-if-cached</td>
-                  <td class="left"> <a href="#cache-request-directive" title="Request Cache-Control Directives">Section&nbsp;3.2.1</a> 
+                  <td class="left"> <a href="#cache-request-directive.only-if-cached" title="only-if-cached">Section&nbsp;3.2.1.7</a> 
                   </td>
                </tr>
                <tr>
                   <td class="left">private</td>
-                  <td class="left"> <a href="#cache-response-directive" title="Response Cache-Control Directives">Section&nbsp;3.2.2</a> 
+                  <td class="left"> <a href="#cache-response-directive.private" title="private">Section&nbsp;3.2.2.2</a> 
                   </td>
                </tr>
                <tr>
                   <td class="left">proxy-revalidate</td>
-                  <td class="left"> <a href="#cache-response-directive" title="Response Cache-Control Directives">Section&nbsp;3.2.2</a> 
+                  <td class="left"> <a href="#cache-response-directive.proxy-revalidate" title="proxy-revalidate">Section&nbsp;3.2.2.6</a> 
                   </td>
                </tr>
                <tr>
                   <td class="left">public</td>
-                  <td class="left"> <a href="#cache-response-directive" title="Response Cache-Control Directives">Section&nbsp;3.2.2</a> 
+                  <td class="left"> <a href="#cache-response-directive.only-if-cached" title="public">Section&nbsp;3.2.2.1</a> 
                   </td>
                </tr>
                <tr>
                   <td class="left">s-maxage</td>
-                  <td class="left"> <a href="#cache-response-directive" title="Response Cache-Control Directives">Section&nbsp;3.2.2</a> 
+                  <td class="left"> <a href="#cache-response-directive.s-maxage" title="s-maxage">Section&nbsp;3.2.2.8</a> 
                   </td>
                </tr>
@@ -1950 +1984 @@
       </p>
       <h1 id="rfc.section.B"><a href="#rfc.section.B">B.</a>&nbsp;<a id="collected.abnf" href="#collected.abnf">Collected ABNF</a></h1>
-      <div id="rfc.figure.u.19"></div> <pre class="inline"><a href="#header.age" class="smpl">Age</a> = delta-seconds
+      <div id="rfc.figure.u.17"></div> <pre class="inline"><a href="#header.age" class="smpl">Age</a> = delta-seconds
 
 <a href="#header.cache-control" class="smpl">Cache-Control</a> = *( "," OWS ) cache-directive *( OWS "," [ OWS
@@ -1970 +2004 @@
  )
 
-<a href="#header.cache-control" class="smpl">cache-directive</a> = cache-request-directive / cache-response-directive
-<a href="#header.cache-control" class="smpl">cache-extension</a> = token [ "=" ( token / quoted-string ) ]
-<a href="#header.cache-control" class="smpl">cache-request-directive</a> = "no-cache" / "no-store" / ( "max-age="
- delta-seconds ) / ( "max-stale" [ "=" delta-seconds ] ) / (
- "min-fresh=" delta-seconds ) / "no-transform" / "only-if-cached" /
- cache-extension
-<a href="#header.cache-control" class="smpl">cache-response-directive</a> = "public" / ( "private" [ "=" DQUOTE *( ","
- OWS ) field-name *( OWS "," [ OWS field-name ] ) DQUOTE ] ) / (
- "no-cache" [ "=" DQUOTE *( "," OWS ) field-name *( OWS "," [ OWS
- field-name ] ) DQUOTE ] ) / "no-store" / "no-transform" /
- "must-revalidate" / "proxy-revalidate" / ( "max-age=" delta-seconds
- ) / ( "s-maxage=" delta-seconds ) / cache-extension
+<a href="#header.cache-control" class="smpl">cache-directive</a> = token [ "=" ( token / quoted-string ) ]
 
 <a href="#delta-seconds" class="smpl">delta-seconds</a> = 1*DIGIT
@@ -2005 +2028 @@
 <a href="#header.warning" class="smpl">warning-value</a> = warn-code SP warn-agent SP warn-text [ SP warn-date
  ]
-</pre> <div id="rfc.figure.u.20"></div>
+</pre> <div id="rfc.figure.u.18"></div>
       <p>ABNF diagnostics:</p><pre class="inline">; Age defined but not used
 ; Cache-Control defined but not used
@@ -2018 +2041 @@
       <p id="rfc.section.C.1.p.1">Closed issues: </p>
       <ul>
+         <li> &lt;<a href="http://tools.ietf.org/wg/httpbis/trac/ticket/307">http://tools.ietf.org/wg/httpbis/trac/ticket/307</a>&gt;: "untangle Cache-Control ABNF"
+         </li>
          <li> &lt;<a href="http://tools.ietf.org/wg/httpbis/trac/ticket/355">http://tools.ietf.org/wg/httpbis/trac/ticket/355</a>&gt;: "Case sensitivity of header fields in CC values"
          </li>
@@ -2031 +2056 @@
          <ul class="ind">
             <li><a id="rfc.index.1" href="#rfc.index.1"><b>1</b></a><ul>
-                  <li>110 Response is Stale (warn code)&nbsp;&nbsp;<a href="#rfc.iref.78"><b>3.6.1</b></a>, <a href="#rfc.xref.warn.110.1">5.2</a></li>
-                  <li>111 Revalidation Failed (warn code)&nbsp;&nbsp;<a href="#rfc.iref.79"><b>3.6.2</b></a>, <a href="#rfc.xref.warn.111.1">5.2</a></li>
-                  <li>112 Disconnected Operation (warn code)&nbsp;&nbsp;<a href="#rfc.iref.80"><b>3.6.3</b></a>, <a href="#rfc.xref.warn.112.1">5.2</a></li>
-                  <li>113 Heuristic Expiration (warn code)&nbsp;&nbsp;<a href="#rfc.iref.81"><b>3.6.4</b></a>, <a href="#rfc.xref.warn.113.1">5.2</a></li>
-                  <li>199 Miscellaneous Warning (warn code)&nbsp;&nbsp;<a href="#rfc.iref.82"><b>3.6.5</b></a>, <a href="#rfc.xref.warn.199.1">5.2</a></li>
+                  <li>110 Response is Stale (warn code)&nbsp;&nbsp;<a href="#rfc.iref.76"><b>3.6.1</b></a>, <a href="#rfc.xref.warn.110.1">5.2</a></li>
+                  <li>111 Revalidation Failed (warn code)&nbsp;&nbsp;<a href="#rfc.iref.77"><b>3.6.2</b></a>, <a href="#rfc.xref.warn.111.1">5.2</a></li>
+                  <li>112 Disconnected Operation (warn code)&nbsp;&nbsp;<a href="#rfc.iref.78"><b>3.6.3</b></a>, <a href="#rfc.xref.warn.112.1">5.2</a></li>
+                  <li>113 Heuristic Expiration (warn code)&nbsp;&nbsp;<a href="#rfc.iref.79"><b>3.6.4</b></a>, <a href="#rfc.xref.warn.113.1">5.2</a></li>
+                  <li>199 Miscellaneous Warning (warn code)&nbsp;&nbsp;<a href="#rfc.iref.80"><b>3.6.5</b></a>, <a href="#rfc.xref.warn.199.1">5.2</a></li>
                </ul>
             </li>
             <li><a id="rfc.index.2" href="#rfc.index.2"><b>2</b></a><ul>
-                  <li>214 Transformation Applied (warn code)&nbsp;&nbsp;<a href="#rfc.iref.83"><b>3.6.6</b></a>, <a href="#rfc.xref.warn.214.1">5.2</a></li>
-                  <li>299 Miscellaneous Persistent Warning (warn code)&nbsp;&nbsp;<a href="#rfc.iref.84"><b>3.6.7</b></a>, <a href="#rfc.xref.warn.299.1">5.2</a></li>
+                  <li>214 Transformation Applied (warn code)&nbsp;&nbsp;<a href="#rfc.iref.81"><b>3.6.6</b></a>, <a href="#rfc.xref.warn.214.1">5.2</a></li>
+                  <li>299 Miscellaneous Persistent Warning (warn code)&nbsp;&nbsp;<a href="#rfc.iref.82"><b>3.6.7</b></a>, <a href="#rfc.xref.warn.299.1">5.2</a></li>
                </ul>
             </li>
@@ -2052 +2077 @@
                   <li>Cache Directives&nbsp;&nbsp;
                      <ul>
-                        <li>max-age&nbsp;&nbsp;<a href="#rfc.iref.c.9"><b>3.2.1</b></a>, <a href="#rfc.iref.c.20"><b>3.2.2</b></a></li>
-                        <li>max-stale&nbsp;&nbsp;<a href="#rfc.iref.c.10"><b>3.2.1</b></a></li>
-                        <li>min-fresh&nbsp;&nbsp;<a href="#rfc.iref.c.11"><b>3.2.1</b></a></li>
-                        <li>must-revalidate&nbsp;&nbsp;<a href="#rfc.iref.c.18"><b>3.2.2</b></a></li>
-                        <li>no-cache&nbsp;&nbsp;<a href="#rfc.iref.c.7"><b>3.2.1</b></a>, <a href="#rfc.iref.c.16"><b>3.2.2</b></a></li>
-                        <li>no-store&nbsp;&nbsp;<a href="#rfc.iref.c.8"><b>3.2.1</b></a>, <a href="#rfc.iref.c.17"><b>3.2.2</b></a></li>
-                        <li>no-transform&nbsp;&nbsp;<a href="#rfc.iref.c.12"><b>3.2.1</b></a>, <a href="#rfc.iref.c.22"><b>3.2.2</b></a></li>
-                        <li>only-if-cached&nbsp;&nbsp;<a href="#rfc.iref.c.13"><b>3.2.1</b></a></li>
-                        <li>private&nbsp;&nbsp;<a href="#rfc.iref.c.15"><b>3.2.2</b></a></li>
-                        <li>proxy-revalidate&nbsp;&nbsp;<a href="#rfc.iref.c.19"><b>3.2.2</b></a></li>
-                        <li>public&nbsp;&nbsp;<a href="#rfc.iref.c.14"><b>3.2.2</b></a></li>
-                        <li>s-maxage&nbsp;&nbsp;<a href="#rfc.iref.c.21"><b>3.2.2</b></a></li>
+                        <li>max-age&nbsp;&nbsp;<a href="#rfc.iref.c.9"><b>3.2.1.3</b></a>, <a href="#rfc.iref.c.20"><b>3.2.2.7</b></a></li>
+                        <li>max-stale&nbsp;&nbsp;<a href="#rfc.iref.c.10"><b>3.2.1.4</b></a></li>
+                        <li>min-fresh&nbsp;&nbsp;<a href="#rfc.iref.c.11"><b>3.2.1.5</b></a></li>
+                        <li>must-revalidate&nbsp;&nbsp;<a href="#rfc.iref.c.18"><b>3.2.2.5</b></a></li>
+                        <li>no-cache&nbsp;&nbsp;<a href="#rfc.iref.c.7"><b>3.2.1.1</b></a>, <a href="#rfc.iref.c.16"><b>3.2.2.3</b></a></li>
+                        <li>no-store&nbsp;&nbsp;<a href="#rfc.iref.c.8"><b>3.2.1.2</b></a>, <a href="#rfc.iref.c.17"><b>3.2.2.4</b></a></li>
+                        <li>no-transform&nbsp;&nbsp;<a href="#rfc.iref.c.12"><b>3.2.1.6</b></a>, <a href="#rfc.iref.c.22"><b>3.2.2.9</b></a></li>
+                        <li>only-if-cached&nbsp;&nbsp;<a href="#rfc.iref.c.13"><b>3.2.1.7</b></a></li>
+                        <li>private&nbsp;&nbsp;<a href="#rfc.iref.c.15"><b>3.2.2.2</b></a></li>
+                        <li>proxy-revalidate&nbsp;&nbsp;<a href="#rfc.iref.c.19"><b>3.2.2.6</b></a></li>
+                        <li>public&nbsp;&nbsp;<a href="#rfc.iref.c.14"><b>3.2.2.1</b></a></li>
+                        <li>s-maxage&nbsp;&nbsp;<a href="#rfc.iref.c.21"><b>3.2.2.8</b></a></li>
                      </ul>
                   </li>
@@ -2088 +2113 @@
                         <li><tt>Age</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.2"><b>3.1</b></a></li>
                         <li><tt>Cache-Control</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.3"><b>3.2</b></a></li>
-                        <li><tt>cache-extension</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.4"><b>3.2</b></a></li>
-                        <li><tt>cache-request-directive</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.5"><b>3.2.1</b></a></li>
-                        <li><tt>cache-response-directive</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.6"><b>3.2.2</b></a></li>
+                        <li><tt>cache-directive</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.4"><b>3.2</b></a></li>
                         <li><tt>delta-seconds</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.1"><b>1.5</b></a></li>
-                        <li><tt>Expires</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.7"><b>3.3</b></a></li>
-                        <li><tt>extension-pragma</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.10"><b>3.4</b></a></li>
-                        <li><tt>Pragma</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.8"><b>3.4</b></a></li>
-                        <li><tt>pragma-directive</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.9"><b>3.4</b></a></li>
-                        <li><tt>Vary</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.11"><b>3.5</b></a></li>
-                        <li><tt>warn-agent</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.15"><b>3.6</b></a></li>
-                        <li><tt>warn-code</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.14"><b>3.6</b></a></li>
-                        <li><tt>warn-date</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.17"><b>3.6</b></a></li>
-                        <li><tt>warn-text</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.16"><b>3.6</b></a></li>
-                        <li><tt>Warning</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.12"><b>3.6</b></a></li>
-                        <li><tt>warning-value</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.13"><b>3.6</b></a></li>
+                        <li><tt>Expires</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.5"><b>3.3</b></a></li>
+                        <li><tt>extension-pragma</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.8"><b>3.4</b></a></li>
+                        <li><tt>Pragma</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.6"><b>3.4</b></a></li>
+                        <li><tt>pragma-directive</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.7"><b>3.4</b></a></li>
+                        <li><tt>Vary</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.9"><b>3.5</b></a></li>
+                        <li><tt>warn-agent</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.13"><b>3.6</b></a></li>
+                        <li><tt>warn-code</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.12"><b>3.6</b></a></li>
+                        <li><tt>warn-date</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.15"><b>3.6</b></a></li>
+                        <li><tt>warn-text</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.14"><b>3.6</b></a></li>
+                        <li><tt>Warning</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.10"><b>3.6</b></a></li>
+                        <li><tt>warning-value</tt>&nbsp;&nbsp;<a href="#rfc.iref.g.11"><b>3.6</b></a></li>
                      </ul>
                   </li>
@@ -2124 +2147 @@
                   <li>max-age&nbsp;&nbsp;
                      <ul>
-                        <li>Cache Directive&nbsp;&nbsp;<a href="#rfc.iref.m.1"><b>3.2.1</b></a>, <a href="#rfc.iref.m.5"><b>3.2.2</b></a></li>
+                        <li>Cache Directive&nbsp;&nbsp;<a href="#rfc.iref.m.1"><b>3.2.1.3</b></a>, <a href="#rfc.iref.m.5"><b>3.2.2.7</b></a></li>
                      </ul>
                   </li>
                   <li>max-stale&nbsp;&nbsp;
                      <ul>
-                        <li>Cache Directive&nbsp;&nbsp;<a href="#rfc.iref.m.2"><b>3.2.1</b></a></li>
+                        <li>Cache Directive&nbsp;&nbsp;<a href="#rfc.iref.m.2"><b>3.2.1.4</b></a></li>
                      </ul>
                   </li>
                   <li>min-fresh&nbsp;&nbsp;
                      <ul>
-                        <li>Cache Directive&nbsp;&nbsp;<a href="#rfc.iref.m.3"><b>3.2.1</b></a></li>
+                        <li>Cache Directive&nbsp;&nbsp;<a href="#rfc.iref.m.3"><b>3.2.1.5</b></a></li>
                      </ul>
                   </li>
                   <li>must-revalidate&nbsp;&nbsp;
                      <ul>
-                        <li>Cache Directive&nbsp;&nbsp;<a href="#rfc.iref.m.4"><b>3.2.2</b></a></li>
+                        <li>Cache Directive&nbsp;&nbsp;<a href="#rfc.iref.m.4"><b>3.2.2.5</b></a></li>
                      </ul>
                   </li>
@@ -2147 +2170 @@
                   <li>no-cache&nbsp;&nbsp;
                      <ul>
-                        <li>Cache Directive&nbsp;&nbsp;<a href="#rfc.iref.n.1"><b>3.2.1</b></a>, <a href="#rfc.iref.n.4"><b>3.2.2</b></a></li>
+                        <li>Cache Directive&nbsp;&nbsp;<a href="#rfc.iref.n.1"><b>3.2.1.1</b></a>, <a href="#rfc.iref.n.4"><b>3.2.2.3</b></a></li>
                      </ul>
                   </li>
                   <li>no-store&nbsp;&nbsp;
                      <ul>
-                        <li>Cache Directive&nbsp;&nbsp;<a href="#rfc.iref.n.2"><b>3.2.1</b></a>, <a href="#rfc.iref.n.5"><b>3.2.2</b></a></li>
+                        <li>Cache Directive&nbsp;&nbsp;<a href="#rfc.iref.n.2"><b>3.2.1.2</b></a>, <a href="#rfc.iref.n.5"><b>3.2.2.4</b></a></li>
                      </ul>
                   </li>
                   <li>no-transform&nbsp;&nbsp;
                      <ul>
-                        <li>Cache Directive&nbsp;&nbsp;<a href="#rfc.iref.n.3"><b>3.2.1</b></a>, <a href="#rfc.iref.n.6"><b>3.2.2</b></a></li>
+                        <li>Cache Directive&nbsp;&nbsp;<a href="#rfc.iref.n.3"><b>3.2.1.6</b></a>, <a href="#rfc.iref.n.6"><b>3.2.2.9</b></a></li>
                      </ul>
                   </li>
@@ -2165 +2188 @@
                   <li>only-if-cached&nbsp;&nbsp;
                      <ul>
-                        <li>Cache Directive&nbsp;&nbsp;<a href="#rfc.iref.o.1"><b>3.2.1</b></a></li>
+                        <li>Cache Directive&nbsp;&nbsp;<a href="#rfc.iref.o.1"><b>3.2.1.7</b></a></li>
                      </ul>
                   </li>
@@ -2208 +2231 @@
                   <li>private&nbsp;&nbsp;
                      <ul>
-                        <li>Cache Directive&nbsp;&nbsp;<a href="#rfc.iref.p.3"><b>3.2.2</b></a></li>
+                        <li>Cache Directive&nbsp;&nbsp;<a href="#rfc.iref.p.3"><b>3.2.2.2</b></a></li>
                      </ul>
                   </li>
@@ -2214 +2237 @@
                   <li>proxy-revalidate&nbsp;&nbsp;
                      <ul>
-                        <li>Cache Directive&nbsp;&nbsp;<a href="#rfc.iref.p.4"><b>3.2.2</b></a></li>
+                        <li>Cache Directive&nbsp;&nbsp;<a href="#rfc.iref.p.4"><b>3.2.2.6</b></a></li>
                      </ul>
                   </li>
                   <li>public&nbsp;&nbsp;
                      <ul>
-                        <li>Cache Directive&nbsp;&nbsp;<a href="#rfc.iref.p.2"><b>3.2.2</b></a></li>
+                        <li>Cache Directive&nbsp;&nbsp;<a href="#rfc.iref.p.2"><b>3.2.2.1</b></a></li>
                      </ul>
                   </li>
@@ -2250 +2273 @@
                   <li>s-maxage&nbsp;&nbsp;
                      <ul>
-                        <li>Cache Directive&nbsp;&nbsp;<a href="#rfc.iref.s.4"><b>3.2.2</b></a></li>
+                        <li>Cache Directive&nbsp;&nbsp;<a href="#rfc.iref.s.4"><b>3.2.2.8</b></a></li>
                      </ul>
                   </li>

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

@@ -1186 +1186 @@
    <x:anchor-alias value="Cache-Control"/>
    <x:anchor-alias value="cache-directive"/>
-   <x:anchor-alias value="cache-extension"/>
-   <x:anchor-alias value="cache-request-directive"/>
-   <x:anchor-alias value="cache-response-directive"/>
 <t>
    The "Cache-Control" header field is used to specify directives for
@@ -1215 +1212 @@
    target a directive to a specific cache.
 </t>
-<t>Cache directives are identified by a token, to be compared case-insensitively, and have an optional argument.</t>
-<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Cache-Control"/><iref primary="true" item="Grammar" subitem="cache-extension"/>
+<t>
+   Cache directives are identified by a token, to be compared case-insensitively,
+   and have an optional argument, that can use both token and quoted-string
+   syntax. For the directives defined below that define arguments, recipients
+   ought to accept both forms, even if one is documented to be preferred. For
+   any directive not defined by this specification, recipients &MUST; accept
+   both forms. 
+</t>
+<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Cache-Control"/><iref primary="true" item="Grammar" subitem="cache-directive"/>
   <x:ref>Cache-Control</x:ref>   = 1#<x:ref>cache-directive</x:ref>
 
-  <x:ref>cache-directive</x:ref> = <x:ref>cache-request-directive</x:ref>
-     / <x:ref>cache-response-directive</x:ref>
-
-  <x:ref>cache-extension</x:ref> = <x:ref>token</x:ref> [ "=" ( <x:ref>token</x:ref> / <x:ref>quoted-string</x:ref> ) ]
+  <x:ref>cache-directive</x:ref> = <x:ref>token</x:ref> [ "=" ( <x:ref>token</x:ref> / <x:ref>quoted-string</x:ref> ) ]
 </artwork></figure>
+<t>
+   For the cache directives defined below, no argument is defined (nor allowed)
+   otherwise stated otherwise.
+</t>
 
 <section anchor="cache-request-directive" 
    title="Request Cache-Control Directives">
-   <x:anchor-alias value="cache-request-directive" />
-
-<figure><artwork type="abnf2616"><iref item="Grammar" primary="true" 
-   subitem="cache-request-directive" />
-  <x:ref>cache-request-directive</x:ref> =
-       "no-cache"
-     / "no-store"
-     / "max-age" "=" <x:ref>delta-seconds</x:ref>
-     / "max-stale" [ "=" <x:ref>delta-seconds</x:ref> ]
-     / "min-fresh" "=" <x:ref>delta-seconds</x:ref>
-     / "no-transform"
-     / "only-if-cached"
-     / <x:ref>cache-extension</x:ref>
-</artwork></figure>
-
-<t>
-   <x:dfn>no-cache</x:dfn>
+
+<section title="no-cache" anchor="cache-request-directive.no-cache">
    <iref item="Cache Directives" primary="true" subitem="no-cache" />
    <iref item="no-cache" primary="true" subitem="Cache Directive" />
-   <list>
-      <t>The no-cache request directive indicates that a cache &MUST-NOT; 
-      use a stored response to satisfy the request without successful 
-      validation on the origin server.</t> 
-   </list>
-</t>
-<t>
-   <x:dfn>no-store</x:dfn>
+<t>
+   The no-cache request directive indicates that a cache &MUST-NOT; 
+   use a stored response to satisfy the request without successful 
+   validation on the origin server.
+</t>
+</section>
+ 
+<section title="no-store" anchor="cache-request-directive.no-store">
    <iref item="Cache Directives" primary="true" subitem="no-store" />
    <iref item="no-store" primary="true" subitem="Cache Directive" />
-   <list>
-      <t>The no-store request directive indicates that a cache &MUST-NOT;
-      store any part of either this request or any response to it. This
-      directive applies to both private and shared caches. "&MUST-NOT;
-      store" in this context means that the cache &MUST-NOT; intentionally
-      store the information in non-volatile storage, and &MUST; make a
-      best-effort attempt to remove the information from volatile storage as
-      promptly as possible after forwarding it.</t>
-      <t>This directive is NOT a reliable or sufficient mechanism for ensuring
-      privacy. In particular, malicious or compromised caches might not
-      recognize or obey this directive, and communications networks might be
-      vulnerable to eavesdropping.</t>
-      <t>Note that if a request containing this directive is satisfied from a
-      cache, the no-store request directive does not apply to the already
-      stored response.</t>
-   </list>
-</t>
-<t>
-   <x:dfn>max-age</x:dfn>
+<t>
+   The no-store request directive indicates that a cache &MUST-NOT;
+   store any part of either this request or any response to it. This
+   directive applies to both private and shared caches. "&MUST-NOT;
+   store" in this context means that the cache &MUST-NOT; intentionally
+   store the information in non-volatile storage, and &MUST; make a
+   best-effort attempt to remove the information from volatile storage as
+   promptly as possible after forwarding it.
+</t>
+<t>
+   This directive is NOT a reliable or sufficient mechanism for ensuring
+   privacy. In particular, malicious or compromised caches might not
+   recognize or obey this directive, and communications networks might be
+   vulnerable to eavesdropping.
+</t>
+<t>
+   Note that if a request containing this directive is satisfied from a
+   cache, the no-store request directive does not apply to the already
+   stored response.
+</t>
+</section>
+
+<section title="max-age" anchor="cache-request-directive.max-age">
    <iref item="Cache Directives" primary="true" subitem="max-age" />
    <iref item="max-age" primary="true" subitem="Cache Directive" />
+<t>
+   Argument syntax:
    <list>
-      <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.</t>
-   </list>
-</t>
-<t>
-   <x:dfn>max-stale</x:dfn>
+      <t>
+        <x:ref>delta-seconds</x:ref> (see <xref target="delta-seconds"/>)
+      </t>
+   </list>
+</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.
+</t>
+<t>
+   &Note; This directive uses the token form of the argument syntax;
+   e.g., 'max-age=5', not 'max-age="5"'. Senders &SHOULD-NOT; use the
+   quoted-string form.
+</t>
+</section>
+
+<section title="max-stale" anchor="cache-request-directive.max-stale">
    <iref item="Cache Directives" primary="true" subitem="max-stale" />
    <iref item="max-stale" primary="true" subitem="Cache Directive" />
+<t>
+   Argument syntax:
    <list>
-      <t>The max-stale request directive indicates that the client is willing
-      to accept a response that has exceeded its expiration time. If max-stale
-      is assigned a value, then the client is willing to accept a response
-      that has exceeded its expiration time by no more than the specified
-      number of seconds. If no value is assigned to max-stale, then the client
-      is willing to accept a stale response of any age.</t>
-   </list>
-</t>
-<t>
-   <x:dfn>min-fresh</x:dfn>
+      <t>
+        <x:ref>delta-seconds</x:ref> (see <xref target="delta-seconds"/>)
+      </t>
+   </list>
+</t>
+<t>
+   The max-stale request directive indicates that the client is willing
+   to accept a response that has exceeded its expiration time. If max-stale
+   is assigned a value, then the client is willing to accept a response
+   that has exceeded its expiration time by no more than the specified
+   number of seconds. If no value is assigned to max-stale, then the client
+   is willing to accept a stale response of any age.
+</t>
+<t>
+   &Note; This directive uses the token form of the argument syntax;
+   e.g., 'max-stale=10', not 'max-stale="10"'. Senders &SHOULD-NOT; use the
+   quoted-string form.
+</t>
+</section>
+
+<section title="min-fresh" anchor="cache-request-directive.min-fresh">
    <iref item="Cache Directives" primary="true" subitem="min-fresh" />
    <iref item="min-fresh" primary="true" subitem="Cache Directive" />
+<t>
+   Argument syntax:
    <list>
-      <t>The min-fresh request directive indicates that the client is willing
-      to accept a response whose freshness lifetime is no less than its
-      current age plus the specified time in seconds. That is, the client
-      wants a response that will still be fresh for at least the specified
-      number of seconds.</t>
-   </list>
-</t>
-<t>
-   <x:dfn>no-transform</x:dfn>
+      <t>
+        <x:ref>delta-seconds</x:ref> (see <xref target="delta-seconds"/>)
+      </t>
+   </list>
+</t>
+<t>
+   The min-fresh request directive indicates that the client is willing
+   to accept a response whose freshness lifetime is no less than its
+   current age plus the specified time in seconds. That is, the client
+   wants a response that will still be fresh for at least the specified
+   number of seconds.
+</t>
+<t>
+   &Note; This directive uses the token form of the argument syntax;
+   e.g., 'min-fresh=20', not 'min-fresh="20"'. Senders &SHOULD-NOT; use the
+   quoted-string form.
+</t>
+</section>
+
+<section title="no-transform" anchor="cache-request-directive.no-transform">
    <iref item="Cache Directives" primary="true" subitem="no-transform" />
    <iref item="no-transform" primary="true" subitem="Cache Directive" />
-   <list>
-      <t>The no-transform request directive indicates that an intermediary
-        (whether or not it implements a cache) &MUST-NOT; change the 
-        Content-Encoding, Content-Range or Content-Type request header fields, 
-        nor the request representation.</t>
-   </list>
-</t>
-<t>
-   <x:dfn>only-if-cached</x:dfn>
+<t>
+   The no-transform request directive indicates that an intermediary
+   (whether or not it implements a cache) &MUST-NOT; change the 
+   Content-Encoding, Content-Range or Content-Type request header fields, 
+   nor the request representation.
+</t>
+</section>
+
+<section title="only-if-cached" anchor="cache-request-directive.only-if-cached">
    <iref item="Cache Directives" primary="true" subitem="only-if-cached" />
    <iref item="only-if-cached" primary="true" subitem="Cache Directive" />
-   <list>
-      <t>The only-if-cached request directive indicates that the client only
-      wishes to obtain a stored response. If it receives this directive, a
-      cache &SHOULD; either respond using a stored response that is consistent
-      with the other constraints of the request, or respond with a 504
-      (Gateway Timeout) status code. If a group of caches is being operated as
-      a unified system with good internal connectivity, a member cache &MAY;
-      forward such a request within that group of caches.</t>
-   </list>
-</t>
+<t>
+   The only-if-cached request directive indicates that the client only
+   wishes to obtain a stored response. If it receives 3ive, a
+   cache &SHOULD; either respond using a stored response that is consistent
+   with the other constraints of the request, or respond with a 504
+   (Gateway Timeout) status code. If a group of caches is being operated as
+   a unified system with good internal connectivity, a member cache &MAY;
+   forward such a request within that group of caches.
+</t>
+</section>
 </section>
 
@@ -1340 +1373 @@
    <x:anchor-alias value="cache-response-directive" />
 
-<figure><artwork type="abnf2616"><iref item="Grammar" primary="true" 
-   subitem="cache-response-directive" />
-  <x:ref>cache-response-directive</x:ref> =
-       "public"
-     / "private" [ "=" <x:ref>DQUOTE</x:ref> 1#<x:ref>field-name</x:ref> <x:ref>DQUOTE</x:ref> ]
-     / "no-cache" [ "=" <x:ref>DQUOTE</x:ref> 1#<x:ref>field-name</x:ref> <x:ref>DQUOTE</x:ref> ]
-     / "no-store"
-     / "no-transform"
-     / "must-revalidate"
-     / "proxy-revalidate"
-     / "max-age" "=" <x:ref>delta-seconds</x:ref>
-     / "s-maxage" "=" <x:ref>delta-seconds</x:ref>
-     / <x:ref>cache-extension</x:ref>
-</artwork></figure>
-
-<t>
-   <x:dfn>public</x:dfn>
+<section title="public" anchor="cache-response-directive.only-if-cached">
    <iref item="Cache Directives" primary="true" subitem="public" />
    <iref item="public" primary="true" subitem="Cache Directive" />
-   <list>
-      <t>The public response directive indicates that a response whose 
-        associated request contains an 'Authentication' header &MAY; be 
-        stored (see <xref target="caching.authenticated.responses" />).</t>
-  </list>
-</t>
-<t>
-   <x:dfn>private</x:dfn>
+<t>
+   The public response directive indicates that a response whose 
+   associated request contains an 'Authentication' header &MAY; be 
+   stored (see <xref target="caching.authenticated.responses" />).
+</t>
+</section>
+
+<section title="private" anchor="cache-response-directive.private">
    <iref item="Cache Directives" primary="true" subitem="private" />
    <iref item="private" primary="true" subitem="Cache Directive" />
+<t>
+   Argument syntax:
    <list>
-      <t>The private response directive indicates that the response message is
-      intended for a single user and &MUST-NOT; be stored by a shared cache. A
-      private cache &MAY; store the response.</t>
-      <t>If the private response directive specifies one or more field-names,
-      this requirement is limited to the field-values associated with the
-      listed response header fields. That is, a shared cache &MUST-NOT; store
-      the specified field-names(s), whereas it &MAY; store the remainder of the
-      response message.</t>
-      <t>The field-names given are not limited to the set of standard header
-      fields defined by this specification. Field names are case-insensitive.
+      <t>
+        #<x:ref>field-name</x:ref>
       </t>
-      <t>&Note; This usage of the word "private" only controls
-      where the response can be stored; it cannot ensure the privacy of the
-      message content. Also, private response directives with field-names are
-      often handled by implementations as if an unqualified private directive
-      was received; i.e., the special handling for the qualified form is not
-      widely implemented.</t>
-   </list>
-</t>
-<t>
-   <x:dfn>no-cache</x:dfn>
+   </list>
+</t>
+<t>
+   The private response directive indicates that the response message is
+   intended for a single user and &MUST-NOT; be stored by a shared cache. A
+   private cache &MAY; store the response.
+</t>
+<t>
+   If the private response directive specifies one or more field-names,
+   this requirement is limited to the field-values associated with the
+   listed response header fields. That is, a shared cache &MUST-NOT; store
+   the specified field-names(s), whereas it &MAY; store the remainder of the
+   response message.
+</t>
+<t>
+   The field-names given are not limited to the set of standard header
+   fields defined by this specification. Field names are case-insensitive.
+</t>
+<t>
+   &Note; This usage of the word "private" only controls
+   where the response can be stored; it cannot ensure the privacy of the
+   message content. Also, private response directives with field-names are
+   often handled by implementations as if an unqualified private directive
+   was received; i.e., the special handling for the qualified form is not
+   widely implemented.
+</t>
+<t>
+   &Note; This directive uses the quoted-string form of the argument
+   syntax. Senders &SHOULD-NOT; use the token form (even if quoting appears not
+   to be needed for single-entry lists).
+</t>
+</section>
+
+<section title="no-cache" anchor="cache-response-directive.no-cache">
    <iref item="Cache Directives" primary="true" subitem="no-cache" />
    <iref item="no-cache" primary="true" subitem="Cache Directive" />
+<t>
+   Argument syntax:
    <list>
-      <t>The no-cache response directive indicates that the response &MUST-NOT;
-      be used to satisfy a subsequent request without successful validation on
-      the origin server. This allows an origin server to prevent a cache from
-      using it to satisfy a request without contacting it, even by caches that
-      have been configured to return stale responses.</t>
-      <t>If the no-cache response directive specifies one or more field-names,
-      then a cache &MAY; use the response to satisfy a subsequent request,
-      subject to any other restrictions on caching. However, any header fields
-      in the response that have the field-name(s) listed &MUST-NOT; be sent
-      in the response to a subsequent request without successful revalidation
-      with the origin server. This allows an origin server to prevent the
-      re-use of certain header fields in a response, while still allowing
-      caching of the rest of the response.</t> 
-      <t>The field-names given are not limited to the set of standard header
-      fields defined by this specification. Field names are case-insensitive.
+      <t>
+        #<x:ref>field-name</x:ref>
       </t>
-      <t>&Note; Most HTTP/1.0 caches will not recognize or obey
-      this directive. Also, no-cache response directives with field-names are
-      often handled by implementations as if an unqualified no-cache directive
-      was received; i.e., the special handling for the qualified form is not
-      widely implemented.</t>
-   </list>
-</t>
-<t>
-   <x:dfn>no-store</x:dfn>
+   </list>
+</t>
+<t>
+   The no-cache response directive indicates that the response &MUST-NOT;
+   be used to satisfy a subsequent request without successful validation on
+   the origin server. This allows an origin server to prevent a cache from
+   using it to satisfy a request without contacting it, even by caches that
+   have been configured to return stale responses.
+</t>
+<t>
+   If the no-cache response directive specifies one or more field-names,
+   then a cache &MAY; use the response to satisfy a subsequent request,
+   subject to any other restrictions on caching. However, any header fields
+   in the response that have the field-name(s) listed &MUST-NOT; be sent
+   in the response to a subsequent request without successful revalidation
+   with the origin server. This allows an origin server to prevent the
+   re-use of certain header fields in a response, while still allowing
+   caching of the rest of the response.
+</t> 
+<t>
+   The field-names given are not limited to the set of standard header
+   fields defined by this specification. Field names are case-insensitive.
+</t>
+<t>
+   &Note; Most HTTP/1.0 caches will not recognize or obey
+   this directive. Also, no-cache response directives with field-names are
+   often handled by implementations as if an unqualified no-cache directive
+   was received; i.e., the special handling for the qualified form is not
+   widely implemented.
+</t>
+<t>
+   &Note; This directive uses the quoted-string form of the argument
+   syntax. Senders &SHOULD-NOT; use the token form (even if quoting appears not
+   to be needed for single-entry lists).
+</t>
+</section>
+
+<section title="no-store" anchor="cache-response-directive.no-store">
    <iref item="Cache Directives" primary="true" subitem="no-store" />
    <iref item="no-store" primary="true" subitem="Cache Directive" />
-   <list>
-      <t>The no-store response directive indicates that a cache &MUST-NOT;
-      store any part of either the immediate request or response. This
-      directive applies to both private and shared caches. "&MUST-NOT;
-      store" in this context means that the cache &MUST-NOT; intentionally
-      store the information in non-volatile storage, and &MUST; make a
-      best-effort attempt to remove the information from volatile storage as
-      promptly as possible after forwarding it.</t>
-      <t>This directive is NOT a reliable or sufficient mechanism for ensuring
-      privacy. In particular, malicious or compromised caches might not
-      recognize or obey this directive, and communications networks might be
-      vulnerable to eavesdropping.</t>
-   </list>
-</t>
-<t>
-   <x:dfn>must-revalidate</x:dfn>
+<t>
+   The no-store response directive indicates that a cache &MUST-NOT;
+   store any part of either the immediate request or response. This
+   directive applies to both private and shared caches. "&MUST-NOT;
+   store" in this context means that the cache &MUST-NOT; intentionally
+   store the information in non-volatile storage, and &MUST; make a
+   best-effort attempt to remove the information from volatile storage as
+   promptly as possible after forwarding it.
+</t>
+<t>
+   This directive is NOT a reliable or sufficient mechanism for ensuring
+   privacy. In particular, malicious or compromised caches might not
+   recognize or obey this directive, and communications networks might be
+   vulnerable to eavesdropping.
+</t>
+</section>
+
+<section title="must-revalidate" anchor="cache-response-directive.must-revalidate">
    <iref item="Cache Directives" primary="true" subitem="must-revalidate" />
    <iref item="must-revalidate" primary="true" subitem="Cache Directive" />
-   <list>
-      <t>The must-revalidate response directive indicates that once it has
-      become stale, a cache &MUST-NOT; use the response to satisfy subsequent
-      requests without successful validation on the origin server.</t>
-      <t>The must-revalidate directive is necessary to support reliable
-      operation for certain protocol features. In all circumstances a
-      cache &MUST; obey the must-revalidate directive; in particular,
-      if a cache cannot reach the origin server for any reason, it &MUST;
-      generate a 504 (Gateway Timeout) response.</t>
-      <t>The must-revalidate directive ought to be used by servers if and only
-      if failure to validate a request on the representation could result in
-      incorrect operation, such as a silently unexecuted financial
-      transaction.</t>
-   </list>
-</t>
-<t>
-   <x:dfn>proxy-revalidate</x:dfn>
+<t>
+   The must-revalidate response directive indicates that once it has
+   become stale, a cache &MUST-NOT; use the response to satisfy subsequent
+   requests without successful validation on the origin server.
+</t>
+<t>
+   The must-revalidate directive is necessary to support reliable
+   operation for certain protocol features. In all circumstances a
+   cache &MUST; obey the must-revalidate directive; in particular,
+   if a cache cannot reach the origin server for any reason, it &MUST;
+   generate a 504 (Gateway Timeout) response.
+</t>
+<t>
+   The must-revalidate directive ought to be used by servers if and only
+   if failure to validate a request on the representation could result in
+   incorrect operation, such as a silently unexecuted financial
+   transaction.
+</t>
+</section>
+
+<section title="proxy-revalidate" anchor="cache-response-directive.proxy-revalidate">
    <iref item="Cache Directives" primary="true" subitem="proxy-revalidate" />
    <iref item="proxy-revalidate" primary="true" subitem="Cache Directive" />
-   <list>
-      <t>The proxy-revalidate response directive has the same meaning as the
-      must-revalidate response directive, except that it does not apply to
-      private caches.</t>
-   </list>
-</t>
-<t>
-   <x:dfn>max-age</x:dfn>
+<t>
+   The proxy-revalidate response directive has the same meaning as the
+   must-revalidate response directive, except that it does not apply to
+   private caches.
+</t>
+</section>
+
+<section title="max-age" anchor="cache-response-directive.max-age">
    <iref item="Cache Directives" primary="true" subitem="max-age" />
    <iref item="max-age" primary="true" subitem="Cache Directive" />
+<t>
+   Argument syntax:
    <list>
-      <t>The max-age response directive indicates that the response is to be
-      considered stale after its age is greater than the specified number of
-      seconds.</t>
-   </list>
-</t>
-<t>
-   <x:dfn>s-maxage</x:dfn>
+      <t>
+        <x:ref>delta-seconds</x:ref> (see <xref target="delta-seconds"/>)
+      </t>
+   </list>
+</t>
+<t>
+   The max-age response directive indicates that the response is to be
+   considered stale after its age is greater than the specified number of
+   seconds.
+</t>
+<t>
+   &Note; This directive uses the token form of the argument syntax;
+   e.g., 'max-age=5', not 'max-age="5"'. Senders &SHOULD-NOT; use the
+   quoted-string form.
+</t>
+</section>      
+
+<section title="s-maxage" anchor="cache-response-directive.s-maxage">
    <iref item="Cache Directives" primary="true" subitem="s-maxage" />
    <iref item="s-maxage" primary="true" subitem="Cache Directive" />
+<t>
+   Argument syntax:
    <list>
-      <t>The s-maxage response directive indicates that, in shared caches, the
-      maximum age specified by this directive overrides the maximum age
-      specified by either the max-age directive or the Expires header field. The
-      s-maxage directive also implies the semantics of the proxy-revalidate
-      response directive.</t>
-   </list>
-</t>
-<t>
-   <x:dfn>no-transform</x:dfn>
+      <t>
+        <x:ref>delta-seconds</x:ref> (see <xref target="delta-seconds"/>)
+      </t>
+   </list>
+</t>
+<t>
+   The s-maxage response directive indicates that, in shared caches, the
+   maximum age specified by this directive overrides the maximum age
+   specified by either the max-age directive or the Expires header field. The
+   s-maxage directive also implies the semantics of the proxy-revalidate
+   response directive.
+</t>
+<t>
+   &Note; This directive uses the token form of the argument syntax;
+   e.g., 's-maxage=10', not 's-maxage="10"'. Senders &SHOULD-NOT; use the
+   quoted-string form.
+</t>
+</section>
+
+<section title="no-transform" anchor="cache-response-directive.no-transform">
    <iref item="Cache Directives" primary="true" subitem="no-transform" />
    <iref item="no-transform" primary="true" subitem="Cache Directive" />
-   <list>
-      <t>The no-transform response directive indicates that an intermediary
-      (regardless of whether it implements a cache) &MUST-NOT; change the 
-      Content-Encoding, Content-Range or Content-Type response header fields, 
-      nor the response representation.</t>
-   </list>
-</t>
+<t>
+   The no-transform response directive indicates that an intermediary
+   (regardless of whether it implements a cache) &MUST-NOT; change the 
+   Content-Encoding, Content-Range or Content-Type response header fields, 
+   nor the response representation.
+</t>
+</section>
 
 </section>
@@ -1953 +2038 @@
    <c>max-age</c>
    <c>
-      <xref target="cache-request-directive"/>, <xref target="cache-response-directive"/>
+      <xref target="cache-request-directive.max-age"/>, <xref target="cache-response-directive.max-age"/>
    </c>
    <c>max-stale</c>
    <c>
-      <xref target="cache-request-directive"/>
+      <xref target="cache-request-directive.max-stale"/>
    </c>
    <c>min-fresh</c>
    <c>
-      <xref target="cache-request-directive"/>
+      <xref target="cache-request-directive.min-fresh"/>
    </c>
    <c>must-revalidate</c>
    <c>
-      <xref target="cache-response-directive"/>
+      <xref target="cache-response-directive.must-revalidate"/>
    </c>
    <c>no-cache</c>
    <c>
-      <xref target="cache-request-directive"/>, <xref target="cache-response-directive"/>
+      <xref target="cache-request-directive.no-cache"/>, <xref target="cache-response-directive.no-cache"/>
    </c>
    <c>no-store</c>
    <c>
-      <xref target="cache-request-directive"/>, <xref target="cache-response-directive"/>
+      <xref target="cache-request-directive.no-store"/>, <xref target="cache-response-directive.no-store"/>
    </c>
    <c>no-transform</c>
    <c>
-      <xref target="cache-request-directive"/>, <xref target="cache-response-directive"/>
+      <xref target="cache-request-directive.no-transform"/>, <xref target="cache-response-directive.no-transform"/>
    </c>
    <c>only-if-cached</c>
    <c>
-      <xref target="cache-request-directive"/>
+      <xref target="cache-request-directive.only-if-cached"/>
    </c>
    <c>private</c>
    <c>
-      <xref target="cache-response-directive"/>
+      <xref target="cache-response-directive.private"/>
    </c>
    <c>proxy-revalidate</c>
    <c>
-      <xref target="cache-response-directive"/>
+      <xref target="cache-response-directive.proxy-revalidate"/>
    </c>
    <c>public</c>
    <c>
-      <xref target="cache-response-directive"/>
+      <xref target="cache-response-directive.only-if-cached"/>
    </c>
    <c>s-maxage</c>
    <c>
-      <xref target="cache-response-directive"/>
+      <xref target="cache-response-directive.s-maxage"/>
    </c>
    <c>stale-if-error</c>
@@ -2443 +2528 @@
  )
 
-<x:ref>cache-directive</x:ref> = cache-request-directive / cache-response-directive
-<x:ref>cache-extension</x:ref> = token [ "=" ( token / quoted-string ) ]
-<x:ref>cache-request-directive</x:ref> = "no-cache" / "no-store" / ( "max-age="
- delta-seconds ) / ( "max-stale" [ "=" delta-seconds ] ) / (
- "min-fresh=" delta-seconds ) / "no-transform" / "only-if-cached" /
- cache-extension
-<x:ref>cache-response-directive</x:ref> = "public" / ( "private" [ "=" DQUOTE *( ","
- OWS ) field-name *( OWS "," [ OWS field-name ] ) DQUOTE ] ) / (
- "no-cache" [ "=" DQUOTE *( "," OWS ) field-name *( OWS "," [ OWS
- field-name ] ) DQUOTE ] ) / "no-store" / "no-transform" /
- "must-revalidate" / "proxy-revalidate" / ( "max-age=" delta-seconds
- ) / ( "s-maxage=" delta-seconds ) / cache-extension
+<x:ref>cache-directive</x:ref> = token [ "=" ( token / quoted-string ) ]
 
 <x:ref>delta-seconds</x:ref> = 1*DIGIT
@@ -2501 +2575 @@
   <list style="symbols">
     <t>
+      <eref target="http://tools.ietf.org/wg/httpbis/trac/ticket/307"/>:
+      "untangle Cache-Control ABNF"
+    </t>
+    <t>
       <eref target="http://tools.ietf.org/wg/httpbis/trac/ticket/355"/>:
       "Case sensitivity of header fields in CC values"