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/p2-semantics.xml

    r333 r334  
    392392<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Method"/><iref primary="true" item="Grammar" subitem="extension-method"/>
    393393  <x:ref>Method</x:ref>         = <x:abnf-char-sequence>"OPTIONS"</x:abnf-char-sequence>   ; "OPTIONS", <xref target="OPTIONS"/>
    394                  | <x:abnf-char-sequence>"GET"</x:abnf-char-sequence>               ; "GET", <xref target="GET"/>
    395                  | <x:abnf-char-sequence>"HEAD"</x:abnf-char-sequence>            ; "HEAD", <xref target="HEAD"/>
    396                  | <x:abnf-char-sequence>"POST"</x:abnf-char-sequence>            ; "POST", <xref target="POST"/>
    397                  | <x:abnf-char-sequence>"PUT"</x:abnf-char-sequence>               ; "PUT", <xref target="PUT"/>
    398                  | <x:abnf-char-sequence>"DELETE"</x:abnf-char-sequence>      ; "DELETE", <xref target="DELETE"/>
    399                  | <x:abnf-char-sequence>"TRACE"</x:abnf-char-sequence>         ; "TRACE", <xref target="TRACE"/>
    400                  | <x:abnf-char-sequence>"CONNECT"</x:abnf-char-sequence>   ; "CONNECT", <xref target="CONNECT"/>
    401                  | <x:ref>extension-method</x:ref>
     394                 / <x:abnf-char-sequence>"GET"</x:abnf-char-sequence>               ; "GET", <xref target="GET"/>
     395                 / <x:abnf-char-sequence>"HEAD"</x:abnf-char-sequence>            ; "HEAD", <xref target="HEAD"/>
     396                 / <x:abnf-char-sequence>"POST"</x:abnf-char-sequence>            ; "POST", <xref target="POST"/>
     397                 / <x:abnf-char-sequence>"PUT"</x:abnf-char-sequence>               ; "PUT", <xref target="PUT"/>
     398                 / <x:abnf-char-sequence>"DELETE"</x:abnf-char-sequence>      ; "DELETE", <xref target="DELETE"/>
     399                 / <x:abnf-char-sequence>"TRACE"</x:abnf-char-sequence>         ; "TRACE", <xref target="TRACE"/>
     400                 / <x:abnf-char-sequence>"CONNECT"</x:abnf-char-sequence>   ; "CONNECT", <xref target="CONNECT"/>
     401                 / <x:ref>extension-method</x:ref>
    402402  <x:ref>extension-method</x:ref> = <x:ref>token</x:ref>
    403403</artwork></figure>
    … …  
    454454<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="request-header"/>
    455455  <x:ref>request-header</x:ref> = <x:ref>Accept</x:ref>                   ; &header-accept;
    456                  | <x:ref>Accept-Charset</x:ref>           ; &header-accept-charset;
    457                  | <x:ref>Accept-Encoding</x:ref>          ; &header-accept-encoding;
    458                  | <x:ref>Accept-Language</x:ref>          ; &header-accept-language;
    459                  | <x:ref>Authorization</x:ref>            ; &header-authorization;
    460                  | <x:ref>Expect</x:ref>                   ; <xref target="header.expect"/>
    461                  | <x:ref>From</x:ref>                     ; <xref target="header.from"/>
    462                  | <x:ref>Host</x:ref>                     ; &header-host;
    463                  | <x:ref>If-Match</x:ref>                 ; &header-if-match;
    464                  | <x:ref>If-Modified-Since</x:ref>        ; &header-if-modified-since;
    465                  | <x:ref>If-None-Match</x:ref>            ; &header-if-none-match;
    466                  | <x:ref>If-Range</x:ref>                 ; &header-if-range;
    467                  | <x:ref>If-Unmodified-Since</x:ref>      ; &header-if-unmodified-since;
    468                  | <x:ref>Max-Forwards</x:ref>             ; <xref target="header.max-forwards"/>
    469                  | <x:ref>Proxy-Authorization</x:ref>      ; &header-proxy-authorization;
    470                  | <x:ref>Range</x:ref>                    ; &header-range;
    471                  | <x:ref>Referer</x:ref>                  ; <xref target="header.referer"/>
    472                  | <x:ref>TE</x:ref>                       ; &header-te;
    473                  | <x:ref>User-Agent</x:ref>               ; <xref target="header.user-agent"/>
     456                 / <x:ref>Accept-Charset</x:ref>           ; &header-accept-charset;
     457                 / <x:ref>Accept-Encoding</x:ref>          ; &header-accept-encoding;
     458                 / <x:ref>Accept-Language</x:ref>          ; &header-accept-language;
     459                 / <x:ref>Authorization</x:ref>            ; &header-authorization;
     460                 / <x:ref>Expect</x:ref>                   ; <xref target="header.expect"/>
     461                 / <x:ref>From</x:ref>                     ; <xref target="header.from"/>
     462                 / <x:ref>Host</x:ref>                     ; &header-host;
     463                 / <x:ref>If-Match</x:ref>                 ; &header-if-match;
     464                 / <x:ref>If-Modified-Since</x:ref>        ; &header-if-modified-since;
     465                 / <x:ref>If-None-Match</x:ref>            ; &header-if-none-match;
     466                 / <x:ref>If-Range</x:ref>                 ; &header-if-range;
     467                 / <x:ref>If-Unmodified-Since</x:ref>      ; &header-if-unmodified-since;
     468                 / <x:ref>Max-Forwards</x:ref>             ; <xref target="header.max-forwards"/>
     469                 / <x:ref>Proxy-Authorization</x:ref>      ; &header-proxy-authorization;
     470                 / <x:ref>Range</x:ref>                    ; &header-range;
     471                 / <x:ref>Referer</x:ref>                  ; <xref target="header.referer"/>
     472                 / <x:ref>TE</x:ref>                       ; &header-te;
     473                 / <x:ref>User-Agent</x:ref>               ; <xref target="header.user-agent"/>
    474474</artwork></figure>
    475475<t>
    … …  
    505505  <x:ref>Status-Code</x:ref>    =
    506506         "100"  ; <xref target="status.100"/>: Continue
    507        | "101"  ; <xref target="status.101"/>: Switching Protocols
    508        | "200"  ; <xref target="status.200"/>: OK
    509        | "201"  ; <xref target="status.201"/>: Created
    510        | "202"  ; <xref target="status.202"/>: Accepted
    511        | "203"  ; <xref target="status.203"/>: Non-Authoritative Information
    512        | "204"  ; <xref target="status.204"/>: No Content
    513        | "205"  ; <xref target="status.205"/>: Reset Content
    514        | "206"  ; <xref target="status.206"/>: Partial Content
    515        | "300"  ; <xref target="status.300"/>: Multiple Choices
    516        | "301"  ; <xref target="status.301"/>: Moved Permanently
    517        | "302"  ; <xref target="status.302"/>: Found
    518        | "303"  ; <xref target="status.303"/>: See Other
    519        | "304"  ; <xref target="status.304"/>: Not Modified
    520        | "305"  ; <xref target="status.305"/>: Use Proxy
    521        | "307"  ; <xref target="status.307"/>: Temporary Redirect
    522        | "400"  ; <xref target="status.400"/>: Bad Request
    523        | "401"  ; <xref target="status.401"/>: Unauthorized
    524        | "402"  ; <xref target="status.402"/>: Payment Required
    525        | "403"  ; <xref target="status.403"/>: Forbidden
    526        | "404"  ; <xref target="status.404"/>: Not Found
    527        | "405"  ; <xref target="status.405"/>: Method Not Allowed
    528        | "406"  ; <xref target="status.406"/>: Not Acceptable
    529        | "407"  ; <xref target="status.407"/>: Proxy Authentication Required
    530        | "408"  ; <xref target="status.408"/>: Request Time-out
    531        | "409"  ; <xref target="status.409"/>: Conflict
    532        | "410"  ; <xref target="status.410"/>: Gone
    533        | "411"  ; <xref target="status.411"/>: Length Required
    534        | "412"  ; <xref target="status.412"/>: Precondition Failed
    535        | "413"  ; <xref target="status.413"/>: Request Entity Too Large
    536        | "414"  ; <xref target="status.414"/>: Request-URI Too Large
    537        | "415"  ; <xref target="status.415"/>: Unsupported Media Type
    538        | "416"  ; <xref target="status.416"/>: Requested range not satisfiable
    539        | "417"  ; <xref target="status.417"/>: Expectation Failed
    540        | "500"  ; <xref target="status.500"/>: Internal Server Error
    541        | "501"  ; <xref target="status.501"/>: Not Implemented
    542        | "502"  ; <xref target="status.502"/>: Bad Gateway
    543        | "503"  ; <xref target="status.503"/>: Service Unavailable
    544        | "504"  ; <xref target="status.504"/>: Gateway Time-out
    545        | "505"  ; <xref target="status.505"/>: HTTP Version not supported
    546        | <x:ref>extension-code</x:ref>
     507       / "101"  ; <xref target="status.101"/>: Switching Protocols
     508       / "200"  ; <xref target="status.200"/>: OK
     509       / "201"  ; <xref target="status.201"/>: Created
     510       / "202"  ; <xref target="status.202"/>: Accepted
     511       / "203"  ; <xref target="status.203"/>: Non-Authoritative Information
     512       / "204"  ; <xref target="status.204"/>: No Content
     513       / "205"  ; <xref target="status.205"/>: Reset Content
     514       / "206"  ; <xref target="status.206"/>: Partial Content
     515       / "300"  ; <xref target="status.300"/>: Multiple Choices
     516       / "301"  ; <xref target="status.301"/>: Moved Permanently
     517       / "302"  ; <xref target="status.302"/>: Found
     518       / "303"  ; <xref target="status.303"/>: See Other
     519       / "304"  ; <xref target="status.304"/>: Not Modified
     520       / "305"  ; <xref target="status.305"/>: Use Proxy
     521       / "307"  ; <xref target="status.307"/>: Temporary Redirect
     522       / "400"  ; <xref target="status.400"/>: Bad Request
     523       / "401"  ; <xref target="status.401"/>: Unauthorized
     524       / "402"  ; <xref target="status.402"/>: Payment Required
     525       / "403"  ; <xref target="status.403"/>: Forbidden
     526       / "404"  ; <xref target="status.404"/>: Not Found
     527       / "405"  ; <xref target="status.405"/>: Method Not Allowed
     528       / "406"  ; <xref target="status.406"/>: Not Acceptable
     529       / "407"  ; <xref target="status.407"/>: Proxy Authentication Required
     530       / "408"  ; <xref target="status.408"/>: Request Time-out
     531       / "409"  ; <xref target="status.409"/>: Conflict
     532       / "410"  ; <xref target="status.410"/>: Gone
     533       / "411"  ; <xref target="status.411"/>: Length Required
     534       / "412"  ; <xref target="status.412"/>: Precondition Failed
     535       / "413"  ; <xref target="status.413"/>: Request Entity Too Large
     536       / "414"  ; <xref target="status.414"/>: Request-URI Too Large
     537       / "415"  ; <xref target="status.415"/>: Unsupported Media Type
     538       / "416"  ; <xref target="status.416"/>: Requested range not satisfiable
     539       / "417"  ; <xref target="status.417"/>: Expectation Failed
     540       / "500"  ; <xref target="status.500"/>: Internal Server Error
     541       / "501"  ; <xref target="status.501"/>: Not Implemented
     542       / "502"  ; <xref target="status.502"/>: Bad Gateway
     543       / "503"  ; <xref target="status.503"/>: Service Unavailable
     544       / "504"  ; <xref target="status.504"/>: Gateway Time-out
     545       / "505"  ; <xref target="status.505"/>: HTTP Version not supported
     546       / <x:ref>extension-code</x:ref>
    547547
    548548  <x:ref>extension-code</x:ref> = 3<x:ref>DIGIT</x:ref>
    … …  
    593593<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="response-header"/>
    594594  <x:ref>response-header</x:ref> = <x:ref>Accept-Ranges</x:ref>           ; &header-accept-ranges;
    595                   | <x:ref>Age</x:ref>                     ; &header-age;
    596                   | <x:ref>Allow</x:ref>                   ; <xref target="header.allow"/>
    597                   | <x:ref>ETag</x:ref>                    ; &header-etag;
    598                   | <x:ref>Location</x:ref>                ; <xref target="header.location"/>
    599                   | <x:ref>Proxy-Authenticate</x:ref>      ; &header-proxy-authenticate;
    600                   | <x:ref>Retry-After</x:ref>             ; <xref target="header.retry-after"/>
    601                   | <x:ref>Server</x:ref>                  ; <xref target="header.server"/>
    602                   | <x:ref>Vary</x:ref>                    ; &header-vary;
    603                   | <x:ref>WWW-Authenticate</x:ref>        ; &header-www-authenticate;
     595                  / <x:ref>Age</x:ref>                     ; &header-age;
     596                  / <x:ref>Allow</x:ref>                   ; <xref target="header.allow"/>
     597                  / <x:ref>ETag</x:ref>                    ; &header-etag;
     598                  / <x:ref>Location</x:ref>                ; <xref target="header.location"/>
     599                  / <x:ref>Proxy-Authenticate</x:ref>      ; &header-proxy-authenticate;
     600                  / <x:ref>Retry-After</x:ref>             ; <xref target="header.retry-after"/>
     601                  / <x:ref>Server</x:ref>                  ; <xref target="header.server"/>
     602                  / <x:ref>Vary</x:ref>                    ; &header-vary;
     603                  / <x:ref>WWW-Authenticate</x:ref>        ; &header-www-authenticate;
    604604</artwork></figure>
    605605<t>
    … …  
    18351835  <x:ref>Expect</x:ref>       =  "Expect" ":" 1#<x:ref>expectation</x:ref>
    18361836 
    1837   <x:ref>expectation</x:ref>  =  "100-continue" | <x:ref>expectation-extension</x:ref>
    1838   <x:ref>expectation-extension</x:ref> =  <x:ref>token</x:ref> [ "=" ( <x:ref>token</x:ref> | <x:ref>quoted-string</x:ref> )
     1837  <x:ref>expectation</x:ref>  =  "100-continue" / <x:ref>expectation-extension</x:ref>
     1838  <x:ref>expectation-extension</x:ref> =  <x:ref>token</x:ref> [ "=" ( <x:ref>token</x:ref> / <x:ref>quoted-string</x:ref> )
    18391839                           *<x:ref>expect-params</x:ref> ]
    1840   <x:ref>expect-params</x:ref> =  ";" <x:ref>token</x:ref> [ "=" ( <x:ref>token</x:ref> | <x:ref>quoted-string</x:ref> ) ]
     1840  <x:ref>expect-params</x:ref> =  ";" <x:ref>token</x:ref> [ "=" ( <x:ref>token</x:ref> / <x:ref>quoted-string</x:ref> ) ]
    18411841</artwork></figure>
    18421842<t>
    … …  
    20142014</t>
    20152015<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Referer"/>
    2016   <x:ref>Referer</x:ref>        = "Referer" ":" ( <x:ref>absoluteURI</x:ref> | <x:ref>relativeURI</x:ref> )
     2016  <x:ref>Referer</x:ref>        = "Referer" ":" ( <x:ref>absoluteURI</x:ref> / <x:ref>relativeURI</x:ref> )
    20172017</artwork></figure>
    20182018<t>
    … …  
    20432043</t>
    20442044<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Retry-After"/>
    2045   <x:ref>Retry-After</x:ref>   = "Retry-After" ":" ( <x:ref>HTTP-date</x:ref> | <x:ref>delta-seconds</x:ref> )
     2045  <x:ref>Retry-After</x:ref>   = "Retry-After" ":" ( <x:ref>HTTP-date</x:ref> / <x:ref>delta-seconds</x:ref> )
    20462046</artwork></figure>
    20472047<t anchor="rule.delta-seconds">
    … …  
    20782078</t>
    20792079<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Server"/>
    2080   <x:ref>Server</x:ref>         = "Server" ":" 1*( <x:ref>product</x:ref> | <x:ref>comment</x:ref> )
     2080  <x:ref>Server</x:ref>         = "Server" ":" 1*( <x:ref>product</x:ref> / <x:ref>comment</x:ref> )
    20812081</artwork></figure>
    20822082<t>
    … …  
    21172117</t>
    21182118<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="User-Agent"/>
    2119   <x:ref>User-Agent</x:ref>     = "User-Agent" ":" 1*( <x:ref>product</x:ref> | <x:ref>comment</x:ref> )
     2119  <x:ref>User-Agent</x:ref>     = "User-Agent" ":" 1*( <x:ref>product</x:ref> / <x:ref>comment</x:ref> )
    21202120</artwork></figure>
    21212121<t>
    … …  
    33183318  </list>
    33193319</t>
     3320<t>
     3321  Ongoing work on ABNF conversion (<eref target="http://tools.ietf.org/wg/httpbis/trac/ticket/36"/>):
     3322  <list style="symbols">
     3323    <t>
     3324      Use "/" instead of "|" for alternatives.
     3325    </t>
     3326  </list>
     3327</t>
    33203328</section>
    33213329
Note: See TracChangeset for help on using the changeset viewer.