Ignore:
Timestamp:
Nov 5, 2008, 6:50:10 AM (11 years ago)
Author:
julian.reschke@…
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • draft-ietf-httpbis/latest/p6-cache.xml

    r331 r334  
    15651565
    15661566  <x:ref>cache-directive</x:ref> = <x:ref>cache-request-directive</x:ref>
    1567      | <x:ref>cache-response-directive</x:ref>
     1567     / <x:ref>cache-response-directive</x:ref>
    15681568
    15691569  <x:ref>cache-request-directive</x:ref> =
    15701570       "no-cache"                          ; <xref target="what.is.cacheable"/>
    1571      | "no-store"                          ; <xref target="what.may.be.stored.by.caches"/>
    1572      | "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"/>
    1573      | "max-stale" [ "=" <x:ref>delta-seconds</x:ref> ]   ; <xref target="modifications.of.the.basic.expiration.mechanism"/>
    1574      | "min-fresh" "=" <x:ref>delta-seconds</x:ref>       ; <xref target="modifications.of.the.basic.expiration.mechanism"/>
    1575      | "no-transform"                      ; <xref target="no-transform.directive"/>
    1576      | "only-if-cached"                    ; <xref target="cache.revalidation.and.reload.controls"/>
    1577      | <x:ref>cache-extension</x:ref>                     ; <xref target="cache.control.extensions"/>
     1571     / "no-store"                          ; <xref target="what.may.be.stored.by.caches"/>
     1572     / "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"/>
     1573     / "max-stale" [ "=" <x:ref>delta-seconds</x:ref> ]   ; <xref target="modifications.of.the.basic.expiration.mechanism"/>
     1574     / "min-fresh" "=" <x:ref>delta-seconds</x:ref>       ; <xref target="modifications.of.the.basic.expiration.mechanism"/>
     1575     / "no-transform"                      ; <xref target="no-transform.directive"/>
     1576     / "only-if-cached"                    ; <xref target="cache.revalidation.and.reload.controls"/>
     1577     / <x:ref>cache-extension</x:ref>                     ; <xref target="cache.control.extensions"/>
    15781578
    15791579  <x:ref>cache-response-directive</x:ref> =
    15801580       "public"                               ; <xref target="what.is.cacheable"/>
    1581      | "private" [ "=" <x:ref>DQUOTE</x:ref> 1#<x:ref>field-name</x:ref> <x:ref>DQUOTE</x:ref> ] ; <xref target="what.is.cacheable"/>
    1582      | "no-cache" [ "=" <x:ref>DQUOTE</x:ref> 1#<x:ref>field-name</x:ref> <x:ref>DQUOTE</x:ref> ] ; <xref target="what.is.cacheable"/>
    1583      | "no-store"                             ; <xref target="what.may.be.stored.by.caches"/>
    1584      | "no-transform"                         ; <xref target="no-transform.directive"/>
    1585      | "must-revalidate"                      ; <xref target="cache.revalidation.and.reload.controls"/>
    1586      | "proxy-revalidate"                     ; <xref target="cache.revalidation.and.reload.controls"/>
    1587      | "max-age" "=" <x:ref>delta-seconds</x:ref>            ; <xref target="modifications.of.the.basic.expiration.mechanism"/>
    1588      | "s-maxage" "=" <x:ref>delta-seconds</x:ref>           ; <xref target="modifications.of.the.basic.expiration.mechanism"/>
    1589      | <x:ref>cache-extension</x:ref>                        ; <xref target="cache.control.extensions"/>
    1590 
    1591   <x:ref>cache-extension</x:ref> = <x:ref>token</x:ref> [ "=" ( <x:ref>token</x:ref> | <x:ref>quoted-string</x:ref> ) ]
     1581     / "private" [ "=" <x:ref>DQUOTE</x:ref> 1#<x:ref>field-name</x:ref> <x:ref>DQUOTE</x:ref> ] ; <xref target="what.is.cacheable"/>
     1582     / "no-cache" [ "=" <x:ref>DQUOTE</x:ref> 1#<x:ref>field-name</x:ref> <x:ref>DQUOTE</x:ref> ] ; <xref target="what.is.cacheable"/>
     1583     / "no-store"                             ; <xref target="what.may.be.stored.by.caches"/>
     1584     / "no-transform"                         ; <xref target="no-transform.directive"/>
     1585     / "must-revalidate"                      ; <xref target="cache.revalidation.and.reload.controls"/>
     1586     / "proxy-revalidate"                     ; <xref target="cache.revalidation.and.reload.controls"/>
     1587     / "max-age" "=" <x:ref>delta-seconds</x:ref>            ; <xref target="modifications.of.the.basic.expiration.mechanism"/>
     1588     / "s-maxage" "=" <x:ref>delta-seconds</x:ref>           ; <xref target="modifications.of.the.basic.expiration.mechanism"/>
     1589     / <x:ref>cache-extension</x:ref>                        ; <xref target="cache.control.extensions"/>
     1590
     1591  <x:ref>cache-extension</x:ref> = <x:ref>token</x:ref> [ "=" ( <x:ref>token</x:ref> / <x:ref>quoted-string</x:ref> ) ]
    15921592</artwork></figure>
    15931593<t>
     
    21572157<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"/>
    21582158  <x:ref>Pragma</x:ref>            = "Pragma" ":" 1#<x:ref>pragma-directive</x:ref>
    2159   <x:ref>pragma-directive</x:ref>  = "no-cache" | <x:ref>extension-pragma</x:ref>
    2160   <x:ref>extension-pragma</x:ref>  = <x:ref>token</x:ref> [ "=" ( <x:ref>token</x:ref> | <x:ref>quoted-string</x:ref> ) ]
     2159  <x:ref>pragma-directive</x:ref>  = "no-cache" / <x:ref>extension-pragma</x:ref>
     2160  <x:ref>extension-pragma</x:ref>  = <x:ref>token</x:ref> [ "=" ( <x:ref>token</x:ref> / <x:ref>quoted-string</x:ref> ) ]
    21612161</artwork></figure>
    21622162<t>
     
    22052205</t>
    22062206<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Vary"/>
    2207   <x:ref>Vary</x:ref>  = "Vary" ":" ( "*" | 1#<x:ref>field-name</x:ref> )
     2207  <x:ref>Vary</x:ref>  = "Vary" ":" ( "*" / 1#<x:ref>field-name</x:ref> )
    22082208</artwork></figure>
    22092209<t>
     
    22682268 
    22692269  <x:ref>warn-code</x:ref>  = 3<x:ref>DIGIT</x:ref>
    2270   <x:ref>warn-agent</x:ref> = ( <x:ref>uri-host</x:ref> [ ":" <x:ref>port</x:ref> ] ) | <x:ref>pseudonym</x:ref>
     2270  <x:ref>warn-agent</x:ref> = ( <x:ref>uri-host</x:ref> [ ":" <x:ref>port</x:ref> ] ) / <x:ref>pseudonym</x:ref>
    22712271                  ; the name or pseudonym of the server adding
    22722272                  ; the Warning header, for use in debugging
     
    30283028<section title="Since draft-ietf-httpbis-p6-cache-04" anchor="changes.since.04">
    30293029<t>
     3030  Ongoing work on ABNF conversion (<eref target="http://tools.ietf.org/wg/httpbis/trac/ticket/36"/>):
     3031  <list style="symbols">
     3032    <t>
     3033      Use "/" instead of "|" for alternatives.
     3034    </t>
     3035  </list>
    30303036</t>
    30313037</section>
Note: See TracChangeset for help on using the changeset viewer.