Changeset 334 for draft-ietf-httpbis/latest/p6-cache.xml

Timestamp:

Nov 5, 2008, 6:50:10 AM (11 years ago)

Author:

julian.reschke@…

Message:

use "/" instead of "|" for alternatives (related to #36)

File:

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

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

@@ -1565 +1565 @@
 
   <x:ref>cache-directive</x:ref> = <x:ref>cache-request-directive</x:ref>
-     | <x:ref>cache-response-directive</x:ref>
+     / <x:ref>cache-response-directive</x:ref>
 
   <x:ref>cache-request-directive</x:ref> =
        "no-cache"                          ; <xref target="what.is.cacheable"/>
-     | "no-store"                          ; <xref target="what.may.be.stored.by.caches"/>
-     | "max-age" "=" <x:ref>delta-seconds</x:ref>         ; <xref target="modifications.of.the.basic.expiration.mechanism"/>, <xref format="counter" target="cache.revalidation.and.reload.controls"/>
-     | "max-stale" [ "=" <x:ref>delta-seconds</x:ref> ]   ; <xref target="modifications.of.the.basic.expiration.mechanism"/>
-     | "min-fresh" "=" <x:ref>delta-seconds</x:ref>       ; <xref target="modifications.of.the.basic.expiration.mechanism"/>
-     | "no-transform"                      ; <xref target="no-transform.directive"/>
-     | "only-if-cached"                    ; <xref target="cache.revalidation.and.reload.controls"/>
-     | <x:ref>cache-extension</x:ref>                     ; <xref target="cache.control.extensions"/>
+     / "no-store"                          ; <xref target="what.may.be.stored.by.caches"/>
+     / "max-age" "=" <x:ref>delta-seconds</x:ref>         ; <xref target="modifications.of.the.basic.expiration.mechanism"/>, <xref format="counter" target="cache.revalidation.and.reload.controls"/>
+     / "max-stale" [ "=" <x:ref>delta-seconds</x:ref> ]   ; <xref target="modifications.of.the.basic.expiration.mechanism"/>
+     / "min-fresh" "=" <x:ref>delta-seconds</x:ref>       ; <xref target="modifications.of.the.basic.expiration.mechanism"/>
+     / "no-transform"                      ; <xref target="no-transform.directive"/>
+     / "only-if-cached"                    ; <xref target="cache.revalidation.and.reload.controls"/>
+     / <x:ref>cache-extension</x:ref>                     ; <xref target="cache.control.extensions"/>
 
   <x:ref>cache-response-directive</x:ref> =
        "public"                               ; <xref target="what.is.cacheable"/>
-     | "private" [ "=" <x:ref>DQUOTE</x:ref> 1#<x:ref>field-name</x:ref> <x:ref>DQUOTE</x:ref> ] ; <xref target="what.is.cacheable"/>
-     | "no-cache" [ "=" <x:ref>DQUOTE</x:ref> 1#<x:ref>field-name</x:ref> <x:ref>DQUOTE</x:ref> ] ; <xref target="what.is.cacheable"/>
-     | "no-store"                             ; <xref target="what.may.be.stored.by.caches"/>
-     | "no-transform"                         ; <xref target="no-transform.directive"/>
-     | "must-revalidate"                      ; <xref target="cache.revalidation.and.reload.controls"/>
-     | "proxy-revalidate"                     ; <xref target="cache.revalidation.and.reload.controls"/>
-     | "max-age" "=" <x:ref>delta-seconds</x:ref>            ; <xref target="modifications.of.the.basic.expiration.mechanism"/>
-     | "s-maxage" "=" <x:ref>delta-seconds</x:ref>           ; <xref target="modifications.of.the.basic.expiration.mechanism"/>
-     | <x:ref>cache-extension</x:ref>                        ; <xref target="cache.control.extensions"/>
-
-  <x:ref>cache-extension</x:ref> = <x:ref>token</x:ref> [ "=" ( <x:ref>token</x:ref> | <x:ref>quoted-string</x:ref> ) ]
+     / "private" [ "=" <x:ref>DQUOTE</x:ref> 1#<x:ref>field-name</x:ref> <x:ref>DQUOTE</x:ref> ] ; <xref target="what.is.cacheable"/>
+     / "no-cache" [ "=" <x:ref>DQUOTE</x:ref> 1#<x:ref>field-name</x:ref> <x:ref>DQUOTE</x:ref> ] ; <xref target="what.is.cacheable"/>
+     / "no-store"                             ; <xref target="what.may.be.stored.by.caches"/>
+     / "no-transform"                         ; <xref target="no-transform.directive"/>
+     / "must-revalidate"                      ; <xref target="cache.revalidation.and.reload.controls"/>
+     / "proxy-revalidate"                     ; <xref target="cache.revalidation.and.reload.controls"/>
+     / "max-age" "=" <x:ref>delta-seconds</x:ref>            ; <xref target="modifications.of.the.basic.expiration.mechanism"/>
+     / "s-maxage" "=" <x:ref>delta-seconds</x:ref>           ; <xref target="modifications.of.the.basic.expiration.mechanism"/>
+     / <x:ref>cache-extension</x:ref>                        ; <xref target="cache.control.extensions"/>
+
+  <x:ref>cache-extension</x:ref> = <x:ref>token</x:ref> [ "=" ( <x:ref>token</x:ref> / <x:ref>quoted-string</x:ref> ) ]
 </artwork></figure>
 <t>
@@ -2157 +2157 @@
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Pragma"/><iref primary="true" item="Grammar" subitem="pragma-directive"/><iref primary="true" item="Grammar" subitem="extension-pragma"/>
   <x:ref>Pragma</x:ref>            = "Pragma" ":" 1#<x:ref>pragma-directive</x:ref>
-  <x:ref>pragma-directive</x:ref>  = "no-cache" | <x:ref>extension-pragma</x:ref>
-  <x:ref>extension-pragma</x:ref>  = <x:ref>token</x:ref> [ "=" ( <x:ref>token</x:ref> | <x:ref>quoted-string</x:ref> ) ]
+  <x:ref>pragma-directive</x:ref>  = "no-cache" / <x:ref>extension-pragma</x:ref>
+  <x:ref>extension-pragma</x:ref>  = <x:ref>token</x:ref> [ "=" ( <x:ref>token</x:ref> / <x:ref>quoted-string</x:ref> ) ]
 </artwork></figure>
 <t>
@@ -2205 +2205 @@
 </t>
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Vary"/>
-  <x:ref>Vary</x:ref>  = "Vary" ":" ( "*" | 1#<x:ref>field-name</x:ref> )
+  <x:ref>Vary</x:ref>  = "Vary" ":" ( "*" / 1#<x:ref>field-name</x:ref> )
 </artwork></figure>
 <t>
@@ -2268 +2268 @@
   
   <x:ref>warn-code</x:ref>  = 3<x:ref>DIGIT</x:ref>
-  <x:ref>warn-agent</x:ref> = ( <x:ref>uri-host</x:ref> [ ":" <x:ref>port</x:ref> ] ) | <x:ref>pseudonym</x:ref>
+  <x:ref>warn-agent</x:ref> = ( <x:ref>uri-host</x:ref> [ ":" <x:ref>port</x:ref> ] ) / <x:ref>pseudonym</x:ref>
                   ; the name or pseudonym of the server adding
                   ; the Warning header, for use in debugging
@@ -3028 +3028 @@
 <section title="Since draft-ietf-httpbis-p6-cache-04" anchor="changes.since.04">
 <t>
+  Ongoing work on ABNF conversion (<eref target="http://tools.ietf.org/wg/httpbis/trac/ticket/36"/>):
+  <list style="symbols"> 
+    <t>
+      Use "/" instead of "|" for alternatives.
+    </t>
+  </list>
 </t>
 </section>