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/p3-payload.xml

    r331 r334  
    476476  <x:ref>parameter</x:ref>      = <x:ref>attribute</x:ref> "=" <x:ref>value</x:ref>
    477477  <x:ref>attribute</x:ref>      = <x:ref>token</x:ref>
    478   <x:ref>value</x:ref>          = <x:ref>token</x:ref> | <x:ref>quoted-string</x:ref>
     478  <x:ref>value</x:ref>          = <x:ref>token</x:ref> / <x:ref>quoted-string</x:ref>
    479479</artwork></figure>
    480480<t>
     
    600600<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="qvalue"/>
    601601  <x:ref>qvalue</x:ref>         = ( "0" [ "." 0*3<x:ref>DIGIT</x:ref> ] )
    602                  | ( "1" [ "." 0*3("0") ] )
     602                 / ( "1" [ "." 0*3("0") ] )
    603603</artwork></figure>
    604604<t>
     
    668668<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="entity-header"/><iref primary="true" item="Grammar" subitem="extension-header"/>
    669669  <x:ref>entity-header</x:ref>  = <x:ref>Content-Encoding</x:ref>         ; <xref target="header.content-encoding"/>
    670                  | <x:ref>Content-Language</x:ref>         ; <xref target="header.content-language"/>
    671                  | <x:ref>Content-Length</x:ref>           ; &header-content-length;
    672                  | <x:ref>Content-Location</x:ref>         ; <xref target="header.content-location"/>
    673                  | <x:ref>Content-MD5</x:ref>              ; <xref target="header.content-md5"/>
    674                  | <x:ref>Content-Range</x:ref>            ; &header-content-range;
    675                  | <x:ref>Content-Type</x:ref>             ; <xref target="header.content-type"/>
    676                  | <x:ref>Expires</x:ref>                  ; &header-expires;
    677                  | <x:ref>Last-Modified</x:ref>            ; &header-last-modified;
    678                  | <x:ref>extension-header</x:ref>
     670                 / <x:ref>Content-Language</x:ref>         ; <xref target="header.content-language"/>
     671                 / <x:ref>Content-Length</x:ref>           ; &header-content-length;
     672                 / <x:ref>Content-Location</x:ref>         ; <xref target="header.content-location"/>
     673                 / <x:ref>Content-MD5</x:ref>              ; <xref target="header.content-md5"/>
     674                 / <x:ref>Content-Range</x:ref>            ; &header-content-range;
     675                 / <x:ref>Content-Type</x:ref>             ; <xref target="header.content-type"/>
     676                 / <x:ref>Expires</x:ref>                  ; &header-expires;
     677                 / <x:ref>Last-Modified</x:ref>            ; &header-last-modified;
     678                 / <x:ref>extension-header</x:ref>
    679679 
    680680  <x:ref>extension-header</x:ref> = <x:ref>message-header</x:ref>
     
    929929 
    930930  <x:ref>media-range</x:ref>    = ( "*/*"
    931                    | ( <x:ref>type</x:ref> "/" "*" )
    932                    | ( <x:ref>type</x:ref> "/" <x:ref>subtype</x:ref> )
     931                   / ( <x:ref>type</x:ref> "/" "*" )
     932                   / ( <x:ref>type</x:ref> "/" <x:ref>subtype</x:ref> )
    933933                   ) *( ";" <x:ref>parameter</x:ref> )
    934934  <x:ref>accept-params</x:ref>  = ";" "q" "=" <x:ref>qvalue</x:ref> *( <x:ref>accept-extension</x:ref> )
    935   <x:ref>accept-extension</x:ref> = ";" <x:ref>token</x:ref> [ "=" ( <x:ref>token</x:ref> | <x:ref>quoted-string</x:ref> ) ]
     935  <x:ref>accept-extension</x:ref> = ";" <x:ref>token</x:ref> [ "=" ( <x:ref>token</x:ref> / <x:ref>quoted-string</x:ref> ) ]
    936936</artwork></figure>
    937937<t>
     
    10481048<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Accept-Charset"/>
    10491049  <x:ref>Accept-Charset</x:ref> = "Accept-Charset" ":"
    1050           1#( ( <x:ref>charset</x:ref> | "*" ) [ ";" "q" "=" <x:ref>qvalue</x:ref> ] )
     1050          1#( ( <x:ref>charset</x:ref> / "*" ) [ ";" "q" "=" <x:ref>qvalue</x:ref> ] )
    10511051</artwork></figure>
    10521052<t>
     
    10891089  <x:ref>Accept-Encoding</x:ref>  = "Accept-Encoding" ":"
    10901090                     #( <x:ref>codings</x:ref> [ ";" "q" "=" <x:ref>qvalue</x:ref> ] )
    1091   <x:ref>codings</x:ref>          = ( <x:ref>content-coding</x:ref> | "*" )
     1091  <x:ref>codings</x:ref>          = ( <x:ref>content-coding</x:ref> / "*" )
    10921092</artwork></figure>
    10931093<t>
     
    13651365<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Content-Location"/>
    13661366  <x:ref>Content-Location</x:ref> = "Content-Location" ":"
    1367                     ( <x:ref>absoluteURI</x:ref> | <x:ref>relativeURI</x:ref> )
     1367                    ( <x:ref>absoluteURI</x:ref> / <x:ref>relativeURI</x:ref> )
    13681368</artwork></figure>
    13691369<t>
     
    24932493  <x:ref>content-disposition</x:ref> = "Content-Disposition" ":"
    24942494                        <x:ref>disposition-type</x:ref> *( ";" <x:ref>disposition-parm</x:ref> )
    2495   <x:ref>disposition-type</x:ref> = "attachment" | <x:ref>disp-extension-token</x:ref>
    2496   <x:ref>disposition-parm</x:ref> = <x:ref>filename-parm</x:ref> | <x:ref>disp-extension-parm</x:ref>
     2495  <x:ref>disposition-type</x:ref> = "attachment" / <x:ref>disp-extension-token</x:ref>
     2496  <x:ref>disposition-parm</x:ref> = <x:ref>filename-parm</x:ref> / <x:ref>disp-extension-parm</x:ref>
    24972497  <x:ref>filename-parm</x:ref> = "filename" "=" <x:ref>quoted-string</x:ref>
    24982498  <x:ref>disp-extension-token</x:ref> = <x:ref>token</x:ref>
    2499   <x:ref>disp-extension-parm</x:ref> = <x:ref>token</x:ref> "=" ( <x:ref>token</x:ref> | <x:ref>quoted-string</x:ref> )
     2499  <x:ref>disp-extension-parm</x:ref> = <x:ref>token</x:ref> "=" ( <x:ref>token</x:ref> / <x:ref>quoted-string</x:ref> )
    25002500</artwork></figure>
    25012501<t>
     
    27142714  </list>
    27152715</t>
    2716  </section>
     2716<t>
     2717  Ongoing work on ABNF conversion (<eref target="http://tools.ietf.org/wg/httpbis/trac/ticket/36"/>):
     2718  <list style="symbols">
     2719    <t>
     2720      Use "/" instead of "|" for alternatives.
     2721    </t>
     2722  </list>
     2723</t>
     2724</section>
    27172725
    27182726</section>
Note: See TracChangeset for help on using the changeset viewer.