Changeset 427 for draft-ietf-httpbis/latest/p1-messaging.xml

Timestamp:

22/11/08 18:21:16 (14 years ago)

Author:

julian.reschke@…

Message:

ABNF appendix: group by first letter, add internal links to definitions (related to #36)

File:

• draft-ietf-httpbis/latest/p1-messaging.xml (modified) (4 diffs)

draft-ietf-httpbis/latest/p1-messaging.xml

@@ -4397 +4397 @@
 </section>
 
-<section title="Collected ABNF" anchor="collected.abnf">
-   <figure>
-      <artwork type="abnf" name="p1-messaging.parsed-abnf">
-BWS = OWS
-Cache-Control = &lt;Cache-Control, defined in [Part6], Section 15.4&gt;
-Chunked-Body = *chunk last-chunk trailer-part CRLF
-Connection = "Connection:" OWS Connection-v
-Connection-v = *( "," OWS ) connection-token *( OWS "," [ OWS
+<section xmlns:x="http://purl.org/net/xml2rfc/ext" title="Collected ABNF" anchor="collected.abnf">
+<figure>
+<artwork type="abnf" name="p1-messaging.parsed-abnf">
+<x:ref>BWS</x:ref> = OWS
+
+<x:ref>Cache-Control</x:ref> = &lt;Cache-Control, defined in [Part6], Section 15.4&gt;
+<x:ref>Chunked-Body</x:ref> = *chunk last-chunk trailer-part CRLF
+<x:ref>Connection</x:ref> = "Connection:" OWS Connection-v
+<x:ref>Connection-v</x:ref> = *( "," OWS ) connection-token *( OWS "," [ OWS
  connection-token ] )
-Content-Length = "Content-Length:" OWS 1*Content-Length-v
-Content-Length-v = 1*DIGIT
-Date = "Date:" OWS Date-v
-Date-v = HTTP-date
+<x:ref>Content-Length</x:ref> = "Content-Length:" OWS 1*Content-Length-v
+<x:ref>Content-Length-v</x:ref> = 1*DIGIT
+
+<x:ref>Date</x:ref> = "Date:" OWS Date-v
+<x:ref>Date-v</x:ref> = HTTP-date
+
 GMT = %x47.4D.54
-HTTP-Prot-Name = %x48.54.54.50
-HTTP-Version = HTTP-Prot-Name "/" 1*DIGIT "." 1*DIGIT
-HTTP-date = rfc1123-date / obsolete-date
-HTTP-message = Request / Response
-Host = "Host:" OWS Host-v
-Host-v = uri-host [ ":" port ]
-Method = token
-OWS = *( [ obs-fold ] WSP )
-Pragma = &lt;Pragma, defined in [Part6], Section 15.4&gt;
-RWS = 1*( [ obs-fold ] WSP )
-Reason-Phrase = *( WSP / VCHAR / obs-text )
-Request = Request-Line *( ( general-header / request-header /
+
+<x:ref>HTTP-Prot-Name</x:ref> = %x48.54.54.50
+<x:ref>HTTP-Version</x:ref> = HTTP-Prot-Name "/" 1*DIGIT "." 1*DIGIT
+<x:ref>HTTP-date</x:ref> = rfc1123-date / obsolete-date
+<x:ref>HTTP-message</x:ref> = Request / Response
+<x:ref>Host</x:ref> = "Host:" OWS Host-v
+<x:ref>Host-v</x:ref> = uri-host [ ":" port ]
+
+<x:ref>Method</x:ref> = token
+
+<x:ref>OWS</x:ref> = *( [ obs-fold ] WSP )
+
+<x:ref>Pragma</x:ref> = &lt;Pragma, defined in [Part6], Section 15.4&gt;
+
+<x:ref>RWS</x:ref> = 1*( [ obs-fold ] WSP )
+<x:ref>Reason-Phrase</x:ref> = *( WSP / VCHAR / obs-text )
+<x:ref>Request</x:ref> = Request-Line *( ( general-header / request-header /
  entity-header ) CRLF ) CRLF [ message-body ]
-Request-Line = Method SP request-target SP HTTP-Version CRLF
-Response = Status-Line *( ( general-header / response-header /
+<x:ref>Request-Line</x:ref> = Method SP request-target SP HTTP-Version CRLF
+<x:ref>Response</x:ref> = Status-Line *( ( general-header / response-header /
  entity-header ) CRLF ) CRLF [ message-body ]
-Status-Code = 3DIGIT
-Status-Line = HTTP-Version SP Status-Code SP Reason-Phrase CRLF
-TE = "TE:" OWS TE-v
-TE-v = [ ( "," / t-codings ) *( OWS "," [ OWS t-codings ] ) ]
-Trailer = "Trailer:" OWS Trailer-v
-Trailer-v = *( "," OWS ) field-name *( OWS "," [ OWS field-name ] )
-Transfer-Encoding = "Transfer-Encoding:" OWS Transfer-Encoding-v
-Transfer-Encoding-v = *( "," OWS ) transfer-coding *( OWS "," [ OWS
+<x:ref>Status-Code</x:ref> = 3DIGIT
+<x:ref>Status-Line</x:ref> = HTTP-Version SP Status-Code SP Reason-Phrase CRLF
+
+<x:ref>TE</x:ref> = "TE:" OWS TE-v
+<x:ref>TE-v</x:ref> = [ ( "," / t-codings ) *( OWS "," [ OWS t-codings ] ) ]
+<x:ref>Trailer</x:ref> = "Trailer:" OWS Trailer-v
+<x:ref>Trailer-v</x:ref> = *( "," OWS ) field-name *( OWS "," [ OWS field-name ] )
+<x:ref>Transfer-Encoding</x:ref> = "Transfer-Encoding:" OWS Transfer-Encoding-v
+<x:ref>Transfer-Encoding-v</x:ref> = *( "," OWS ) transfer-coding *( OWS "," [ OWS
  transfer-coding ] )
-URI = &lt;URI, defined in [RFC3986], Section 3&gt;
-URI-reference = &lt;URI-reference, defined in [RFC3986], Section 4.1&gt;
-Upgrade = "Upgrade:" OWS Upgrade-v
-Upgrade-v = *( "," OWS ) product *( OWS "," [ OWS product ] )
-Via = "Via:" OWS Via-v
-Via-v = *( "," OWS ) received-protocol RWS received-by [ RWS comment
+<x:ref>URI</x:ref> = &lt;URI, defined in [RFC3986], Section 3&gt;
+<x:ref>URI-reference</x:ref> = &lt;URI-reference, defined in [RFC3986], Section 4.1&gt;
+<x:ref>Upgrade</x:ref> = "Upgrade:" OWS Upgrade-v
+<x:ref>Upgrade-v</x:ref> = *( "," OWS ) product *( OWS "," [ OWS product ] )
+
+<x:ref>Via</x:ref> = "Via:" OWS Via-v
+<x:ref>Via-v</x:ref> = *( "," OWS ) received-protocol RWS received-by [ RWS comment
  ] *( OWS "," [ OWS received-protocol RWS received-by [ RWS comment ]
  ] )
-Warning = &lt;Warning, defined in [Part6], Section 15.6&gt;
-absolute-URI = &lt;absolute-URI, defined in [RFC3986], Section 4.3&gt;
-accept-params = &lt;accept-params, defined in [Part3], Section 5.1&gt;
-asctime-date = wkday SP date3 SP time SP 4DIGIT
-attribute = token
-authority = &lt;authority, defined in [RFC3986], Section 3.2&gt;
-chunk = chunk-size *WSP [ chunk-ext ] CRLF chunk-data CRLF
-chunk-data = 1*OCTET
-chunk-ext = *( ";" *WSP chunk-ext-name [ "=" chunk-ext-val ] *WSP )
-chunk-ext-name = token
-chunk-ext-val = token / quoted-string
-chunk-size = 1*HEXDIG
-comment = "(" *( ctext / quoted-pair / comment ) ")"
-connection-token = token
-ctext = *( OWS / %x21-27 / %x2A-7E / obs-text )
-date1 = 2DIGIT SP month SP 4DIGIT
-date2 = 2DIGIT "-" month "-" 2DIGIT
-date3 = month SP ( 2DIGIT / ( SP DIGIT ) )
-entity-body = &lt;entity-body, defined in [Part3], Section 3.2&gt;
-entity-header = &lt;entity-header, defined in [Part3], Section 3.1&gt;
-field-content = *( WSP / VCHAR / obs-text )
-field-name = token
-field-value = *( field-content / OWS )
-fragment = &lt;fragment, defined in [RFC3986], Section 3.5&gt;
-general-header = Cache-Control / Connection / Date / Pragma / Trailer
+<x:ref>Warning</x:ref> = &lt;Warning, defined in [Part6], Section 15.6&gt;
+
+<x:ref>absolute-URI</x:ref> = &lt;absolute-URI, defined in [RFC3986], Section 4.3&gt;
+<x:ref>accept-params</x:ref> = &lt;accept-params, defined in [Part3], Section 5.1&gt;
+<x:ref>asctime-date</x:ref> = wkday SP date3 SP time SP 4DIGIT
+<x:ref>attribute</x:ref> = token
+<x:ref>authority</x:ref> = &lt;authority, defined in [RFC3986], Section 3.2&gt;
+
+<x:ref>chunk</x:ref> = chunk-size *WSP [ chunk-ext ] CRLF chunk-data CRLF
+<x:ref>chunk-data</x:ref> = 1*OCTET
+<x:ref>chunk-ext</x:ref> = *( ";" *WSP chunk-ext-name [ "=" chunk-ext-val ] *WSP )
+<x:ref>chunk-ext-name</x:ref> = token
+<x:ref>chunk-ext-val</x:ref> = token / quoted-string
+<x:ref>chunk-size</x:ref> = 1*HEXDIG
+<x:ref>comment</x:ref> = "(" *( ctext / quoted-pair / comment ) ")"
+<x:ref>connection-token</x:ref> = token
+<x:ref>ctext</x:ref> = *( OWS / %x21-27 / %x2A-7E / obs-text )
+
+<x:ref>date1</x:ref> = 2DIGIT SP month SP 4DIGIT
+<x:ref>date2</x:ref> = 2DIGIT "-" month "-" 2DIGIT
+<x:ref>date3</x:ref> = month SP ( 2DIGIT / ( SP DIGIT ) )
+
+<x:ref>entity-body</x:ref> = &lt;entity-body, defined in [Part3], Section 3.2&gt;
+<x:ref>entity-header</x:ref> = &lt;entity-header, defined in [Part3], Section 3.1&gt;
+
+<x:ref>field-content</x:ref> = *( WSP / VCHAR / obs-text )
+<x:ref>field-name</x:ref> = token
+<x:ref>field-value</x:ref> = *( field-content / OWS )
+<x:ref>fragment</x:ref> = &lt;fragment, defined in [RFC3986], Section 3.5&gt;
+
+<x:ref>general-header</x:ref> = Cache-Control / Connection / Date / Pragma / Trailer
  / Transfer-Encoding / Upgrade / Via / Warning
-generic-message = start-line *( message-header CRLF ) CRLF [
+<x:ref>generic-message</x:ref> = start-line *( message-header CRLF ) CRLF [
  message-body ]
-http-URI = "http://" authority path-abempty [ "?" query ]
+<x:ref>http-URI</x:ref> = "http://" authority path-abempty [ "?" query ]
+
 l-Fri = %x46.72.69.64.61.79
 l-Mon = %x4D.6F.6E.64.61.79
@@ -4480 +4497 @@
 l-Tue = %x54.75.65.73.64.61.79
 l-Wed = %x57.65.64.6E.65.73.64.61.79
-last-chunk = 1*"0" *WSP [ chunk-ext ] CRLF
-message-body = entity-body / &lt;entity-body encoded as per
+<x:ref>last-chunk</x:ref> = 1*"0" *WSP [ chunk-ext ] CRLF
+
+<x:ref>message-body</x:ref> = entity-body / &lt;entity-body encoded as per
  Transfer-Encoding&gt;
-message-header = field-name ":" OWS [ field-value ] OWS
-month = s-Jan / s-Feb / s-Mar / s-Apr / s-May / s-Jun / s-Jul / s-Aug
+<x:ref>message-header</x:ref> = field-name ":" OWS [ field-value ] OWS
+<x:ref>month</x:ref> = s-Jan / s-Feb / s-Mar / s-Apr / s-May / s-Jun / s-Jul / s-Aug
  / s-Sep / s-Oct / s-Nov / s-Dec
-obs-fold = CRLF
-obs-text = %x80-FF
-obsolete-date = rfc850-date / asctime-date
-parameter = attribute BWS "=" BWS value
-partial-URI = relative-part [ "?" query ]
-path-abempty = &lt;path-abempty, defined in [RFC3986], Section 3.3&gt;
-path-absolute = &lt;path-absolute, defined in [RFC3986], Section 3.3&gt;
-port = &lt;port, defined in [RFC3986], Section 3.2.3&gt;
-product = token [ "/" product-version ]
-product-version = token
-protocol-name = token
-protocol-version = token
-pseudonym = token
-qdtext = *( OWS / "!" / %x23-5B / %x5D-7E / obs-text )
-query = &lt;query, defined in [RFC3986], Section 3.4&gt;
-quoted-pair = "\" quoted-text
-quoted-string = DQUOTE *( qdtext / quoted-pair ) DQUOTE
-quoted-text = %x01-09 / %x0B-0C / %x0E-FF
-received-by = ( uri-host [ ":" port ] ) / pseudonym
-received-protocol = [ protocol-name "/" ] protocol-version
-relative-part = &lt;relative-part, defined in [RFC3986], Section 4.2&gt;
-request-header = &lt;request-header, defined in [Part2], Section 3&gt;
-request-target = "*" / absolute-URI / ( path-absolute [ "?" query ] )
+<x:ref>obs-fold</x:ref> = CRLF
+<x:ref>obs-text</x:ref> = %x80-FF
+<x:ref>obsolete-date</x:ref> = rfc850-date / asctime-date
+
+<x:ref>parameter</x:ref> = attribute BWS "=" BWS value
+<x:ref>partial-URI</x:ref> = relative-part [ "?" query ]
+<x:ref>path-abempty</x:ref> = &lt;path-abempty, defined in [RFC3986], Section 3.3&gt;
+<x:ref>path-absolute</x:ref> = &lt;path-absolute, defined in [RFC3986], Section 3.3&gt;
+<x:ref>port</x:ref> = &lt;port, defined in [RFC3986], Section 3.2.3&gt;
+<x:ref>product</x:ref> = token [ "/" product-version ]
+<x:ref>product-version</x:ref> = token
+<x:ref>protocol-name</x:ref> = token
+<x:ref>protocol-version</x:ref> = token
+<x:ref>pseudonym</x:ref> = token
+
+<x:ref>qdtext</x:ref> = *( OWS / "!" / %x23-5B / %x5D-7E / obs-text )
+<x:ref>query</x:ref> = &lt;query, defined in [RFC3986], Section 3.4&gt;
+<x:ref>quoted-pair</x:ref> = "\" quoted-text
+<x:ref>quoted-string</x:ref> = DQUOTE *( qdtext / quoted-pair ) DQUOTE
+<x:ref>quoted-text</x:ref> = %x01-09 / %x0B-0C / %x0E-FF
+
+<x:ref>received-by</x:ref> = ( uri-host [ ":" port ] ) / pseudonym
+<x:ref>received-protocol</x:ref> = [ protocol-name "/" ] protocol-version
+<x:ref>relative-part</x:ref> = &lt;relative-part, defined in [RFC3986], Section 4.2&gt;
+<x:ref>request-header</x:ref> = &lt;request-header, defined in [Part2], Section 3&gt;
+<x:ref>request-target</x:ref> = "*" / absolute-URI / ( path-absolute [ "?" query ] )
  / authority
-response-header = &lt;response-header, defined in [Part2], Section 5&gt;
-rfc1123-date = wkday "," SP date1 SP time SP GMT
-rfc850-date = weekday "," SP date2 SP time SP GMT
+<x:ref>response-header</x:ref> = &lt;response-header, defined in [Part2], Section 5&gt;
+<x:ref>rfc1123-date</x:ref> = wkday "," SP date1 SP time SP GMT
+<x:ref>rfc850-date</x:ref> = weekday "," SP date2 SP time SP GMT
+
 s-Apr = %x41.70.72
 s-Aug = %x41.75.67
@@ -4532 +4554 @@
 s-Tue = %x54.75.65
 s-Wed = %x57.65.64
-start-line = Request-Line / Status-Line
-t-codings = "trailers" / ( transfer-extension [ accept-params ] )
-tchar = "!" / "#" / "$" / "%" / "&amp;" / "'" / "*" / "+" / "-" / "." /
+<x:ref>start-line</x:ref> = Request-Line / Status-Line
+
+<x:ref>t-codings</x:ref> = "trailers" / ( transfer-extension [ accept-params ] )
+<x:ref>tchar</x:ref> = "!" / "#" / "$" / "%" / "&amp;" / "'" / "*" / "+" / "-" / "." /
  "^" / "_" / "`" / "|" / "~" / DIGIT / ALPHA
-time = 2DIGIT ":" 2DIGIT ":" 2DIGIT
-token = 1*tchar
-trailer-part = *( entity-header CRLF )
-transfer-coding = "chunked" / transfer-extension
-transfer-extension = token *( OWS ";" OWS parameter )
-uri-host = &lt;host, defined in [RFC3986], Section 3.2.2&gt;
-value = token / quoted-string
-weekday = l-Mon / l-Tue / l-Wed / l-Thu / l-Fri / l-Sat / l-Sun
-wkday = s-Mon / s-Tue / s-Wed / s-Thu / s-Fri / s-Sat / s-Sun
+<x:ref>time</x:ref> = 2DIGIT ":" 2DIGIT ":" 2DIGIT
+<x:ref>token</x:ref> = 1*tchar
+<x:ref>trailer-part</x:ref> = *( entity-header CRLF )
+<x:ref>transfer-coding</x:ref> = "chunked" / transfer-extension
+<x:ref>transfer-extension</x:ref> = token *( OWS ";" OWS parameter )
+
+<x:ref>uri-host</x:ref> = &lt;host, defined in [RFC3986], Section 3.2.2&gt;
+
+<x:ref>value</x:ref> = token / quoted-string
+
+<x:ref>weekday</x:ref> = l-Mon / l-Tue / l-Wed / l-Thu / l-Fri / l-Sat / l-Sun
+<x:ref>wkday</x:ref> = s-Mon / s-Tue / s-Wed / s-Thu / s-Fri / s-Sat / s-Sun
+
 ; Chunked-Body defined but not used
 ; Content-Length defined but not used
@@ -4556 +4583 @@
 ; http-URI defined but not used
 ; partial-URI defined but not used
+
+
 </artwork>
-   </figure>
+</figure>
 </section>