Ignore:
Timestamp:
21/11/08 20:25:09 (14 years ago)
Author:
julian.reschke@…
Message:

reference RFC5234 core rules directly, fix line end bug in appendix generation (related to #36)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • draft-ietf-httpbis/latest/p2-semantics.xml

    r424 r425  
    289289
    290290<section title="Syntax Notation" anchor="notation">
    291 <t>
    292   This specification uses the ABNF syntax defined in &notation;.
    293 </t>
    294 
    295 <section title="Core Rules" anchor="core.rules">
    296   <x:anchor-alias value="comment"/>
    297291  <x:anchor-alias value="CR"/>
    298292  <x:anchor-alias value="DIGIT"/>
    299293  <x:anchor-alias value="LF"/>
     294  <x:anchor-alias value="VCHAR"/>
     295  <x:anchor-alias value="WSP"/>
     296<t>
     297  This specification uses the ABNF syntax defined in &notation;.
     298  The following core rules are included by
     299  reference, as defined in <xref target="RFC5234" x:fmt="," x:sec="B.1"/>:
     300  ALPHA (letters), CR (carriage return), CRLF (CR LF), CTL (controls),
     301  DIGIT (decimal 0-9), DQUOTE (double quote),
     302  HEXDIG (hexadecimal 0-9/A-F/a-f), LF (line feed),
     303  OCTET (any 8-bit sequence of data), SP (space),
     304  VCHAR (any visible USASCII character),
     305  and WSP (whitespace).
     306</t>
     307
     308<section title="Core Rules" anchor="core.rules">
     309  <x:anchor-alias value="comment"/>
    300310  <x:anchor-alias value="obs-text"/>
    301311  <x:anchor-alias value="quoted-string"/>
    … …  
    303313  <x:anchor-alias value="OWS"/>
    304314  <x:anchor-alias value="RWS"/>
    305   <x:anchor-alias value="VCHAR"/>
    306   <x:anchor-alias value="WSP"/>
    307315<t>
    308316  The core rules below are defined in &basic-rules;:
    309317</t>
    310 <figure><artwork type="abnf2616">
    311   <x:ref>CR</x:ref>            = &lt;CR, defined in &basic-rules;&gt;
    312   <x:ref>DIGIT</x:ref>         = &lt;DIGIT, defined in &basic-rules;&gt;
    313   <x:ref>LF</x:ref>            = &lt;LF, defined in &basic-rules;&gt;
    314   <x:ref>VCHAR</x:ref>         = &lt;VCHAR, defined in &basic-rules;&gt;
    315   <x:ref>WSP</x:ref>           = &lt;WSP, defined in &basic-rules;&gt;
    316 </artwork></figure>
    317318<figure><artwork type="abnf2616">
    318319  <x:ref>comment</x:ref>       = &lt;comment, defined in &basic-rules;&gt;
    … …  
    29142915</reference>
    29152916
     2917<reference anchor="RFC5234">
     2918  <front>
     2919    <title abbrev="ABNF for Syntax Specifications">Augmented BNF for Syntax Specifications: ABNF</title>
     2920    <author initials="D." surname="Crocker" fullname="Dave Crocker" role="editor">
     2921      <organization>Brandenburg InternetWorking</organization>
     2922      <address>
     2923      <postal>
     2924      <street>675 Spruce Dr.</street>
     2925      <city>Sunnyvale</city>
     2926      <region>CA</region>
     2927      <code>94086</code>
     2928      <country>US</country></postal>
     2929      <phone>+1.408.246.8253</phone>
     2930      <email>dcrocker@bbiw.net</email></address> 
     2931    </author>
     2932    <author initials="P." surname="Overell" fullname="Paul Overell">
     2933      <organization>THUS plc.</organization>
     2934      <address>
     2935      <postal>
     2936      <street>1/2 Berkeley Square</street>
     2937      <street>99 Berkely Street</street>
     2938      <city>Glasgow</city>
     2939      <code>G3 7HR</code>
     2940      <country>UK</country></postal>
     2941      <email>paul.overell@thus.net</email></address>
     2942    </author>
     2943    <date month="January" year="2008"/>
     2944  </front>
     2945  <seriesInfo name="STD" value="68"/>
     2946  <seriesInfo name="RFC" value="5234"/>
     2947</reference>
     2948
    29162949</references>
    29172950
    … …  
    31733206<section title="Collected ABNF" anchor="collected.abnf">
    31743207   <figure>
    3175       <artwork type="abnf" name="p2-semantics.parsed-abnf">Accept = &lt;Accept, defined in [Part3], Section 5.1&gt;&#xD;
    3176 Accept-Charset = &lt;Accept-Charset, defined in [Part3], Section 5.2&gt;&#xD;
    3177 Accept-Encoding = &lt;Accept-Encoding, defined in [Part3], Section 5.3&gt;&#xD;
    3178 Accept-Language = &lt;Accept-Language, defined in [Part3], Section 5.4&gt;&#xD;
    3179 Accept-Ranges = &lt;Accept-Ranges, defined in [Part5], Section 5.1&gt;&#xD;
    3180 Age = &lt;Age, defined in [Part6], Section 15.1&gt;&#xD;
    3181 Allow = "Allow:" OWS Allow-v&#xD;
    3182 Allow-v = [ ( "," / Method ) *( OWS "," [ OWS Method ] ) ]&#xD;
    3183 Authorization = &lt;Authorization, defined in [Part7], Section 3.1&gt;&#xD;
    3184 CR = &lt;CR, defined in [Part1], Section 1.2.2&gt;&#xD;
    3185 DIGIT = &lt;DIGIT, defined in [Part1], Section 1.2.2&gt;&#xD;
    3186 ETag = &lt;ETag, defined in [Part4], Section 6.1&gt;&#xD;
    3187 Expect = "Expect:" OWS Expect-v&#xD;
    3188 Expect-v = *( "," OWS ) expectation *( OWS "," [ OWS expectation ] )&#xD;
    3189 From = "From:" OWS From-v&#xD;
    3190 From-v = mailbox&#xD;
    3191 HTTP-date = &lt;HTTP-date, defined in [Part1], Section 3.2.1&gt;&#xD;
    3192 Host = &lt;Host, defined in [Part1], Section 2.1&gt;&#xD;
    3193 If-Match = &lt;If-Match, defined in [Part4], Section 6.2&gt;&#xD;
    3194 If-Modified-Since = &lt;If-Modified-Since, defined in [Part4], Section&#xD;
    3195  6.3&gt;&#xD;
    3196 If-None-Match = &lt;If-None-Match, defined in [Part4], Section 6.4&gt;&#xD;
    3197 If-Range = &lt;If-Range, defined in [Part5], Section 5.3&gt;&#xD;
    3198 If-Unmodified-Since = &lt;If-Unmodified-Since, defined in [Part4],&#xD;
    3199  Section 6.5&gt;&#xD;
    3200 LF = &lt;LF, defined in [Part1], Section 1.2.2&gt;&#xD;
    3201 Location = "Location:" OWS Location-v&#xD;
    3202 Location-v = absolute-URI [ "#" fragment ]&#xD;
    3203 Max-Forwards = "Max-Forwards:" OWS Max-Forwards-v&#xD;
    3204 Max-Forwards-v = 1*DIGIT&#xD;
    3205 Method = %x4F.50.54.49.4F.4E.53 / %x47.45.54 / %x48.45.41.44 /&#xD;
    3206  %x50.4F.53.54 / %x50.55.54 / %x44.45.4C.45.54.45 / %x54.52.41.43.45&#xD;
    3207  / %x43.4F.4E.4E.45.43.54 / extension-method&#xD;
    3208 OWS = &lt;OWS, defined in [Part1], Section 1.2.2&gt;&#xD;
    3209 Proxy-Authenticate = &lt;Proxy-Authenticate, defined in [Part7], Section&#xD;
    3210  3.2&gt;&#xD;
    3211 Proxy-Authorization = &lt;Proxy-Authorization, defined in [Part7],&#xD;
    3212  Section 3.3&gt;&#xD;
    3213 RWS = &lt;RWS, defined in [Part1], Section 1.2.2&gt;&#xD;
    3214 Range = &lt;Range, defined in [Part5], Section 5.4&gt;&#xD;
    3215 Reason-Phrase = *( WSP / VCHAR / obs-text )&#xD;
    3216 Referer = "Referer:" OWS Referer-v&#xD;
    3217 Referer-v = absolute-URI / partial-URI&#xD;
    3218 Retry-After = "Retry-After:" OWS Retry-After-v&#xD;
    3219 Retry-After-v = HTTP-date / delta-seconds&#xD;
    3220 Server = "Server:" OWS Server-v&#xD;
    3221 Server-v = product *( RWS ( product / comment ) )&#xD;
    3222 Status-Code = "100" / "101" / "200" / "201" / "202" / "203" / "204" /&#xD;
    3223  "205" / "206" / "300" / "301" / "302" / "303" / "304" / "305" /&#xD;
    3224  "307" / "400" / "401" / "402" / "403" / "404" / "405" / "406" /&#xD;
    3225  "407" / "408" / "409" / "410" / "411" / "412" / "413" / "414" /&#xD;
    3226  "415" / "416" / "417" / "500" / "501" / "502" / "503" / "504" /&#xD;
    3227  "505" / extension-code&#xD;
    3228 TE = &lt;TE, defined in [Part1], Section 8.8&gt;&#xD;
    3229 User-Agent = "User-Agent:" OWS User-Agent-v&#xD;
    3230 User-Agent-v = product *( RWS ( product / comment ) )&#xD;
    3231 VCHAR = &lt;VCHAR, defined in [Part1], Section 1.2.2&gt;&#xD;
    3232 Vary = &lt;Vary, defined in [Part6], Section 15.5&gt;&#xD;
    3233 WSP = &lt;WSP, defined in [Part1], Section 1.2.2&gt;&#xD;
    3234 WWW-Authenticate = &lt;WWW-Authenticate, defined in [Part7], Section&#xD;
    3235  3.4&gt;&#xD;
    3236 absolute-URI = &lt;absolute-URI, defined in [Part1], Section 2.1&gt;&#xD;
    3237 comment = &lt;comment, defined in [Part1], Section 1.2.2&gt;&#xD;
    3238 delta-seconds = 1*DIGIT&#xD;
    3239 expect-params = ";" token [ "=" ( token / quoted-string ) ]&#xD;
    3240 expectation = "100-continue" / expectation-extension&#xD;
    3241 expectation-extension = token [ "=" ( token / quoted-string )&#xD;
    3242  *expect-params ]&#xD;
    3243 extension-code = 3DIGIT&#xD;
    3244 extension-method = token&#xD;
    3245 fragment = &lt;fragment, defined in [Part1], Section 2.1&gt;&#xD;
    3246 mailbox = &lt;mailbox, defined in [RFC5322], Section 3.4&gt;&#xD;
    3247 obs-text = &lt;obs-text, defined in [Part1], Section 1.2.2&gt;&#xD;
    3248 partial-URI = &lt;partial-URI, defined in [Part1], Section 2.1&gt;&#xD;
    3249 product = &lt;product, defined in [Part1], Section 3.4&gt;&#xD;
    3250 quoted-string = &lt;quoted-string, defined in [Part1], Section 1.2.2&gt;&#xD;
    3251 request-header = Accept / Accept-Charset / Accept-Encoding /&#xD;
    3252  Accept-Language / Authorization / Expect / From / Host / If-Match /&#xD;
    3253  If-Modified-Since / If-None-Match / If-Range / If-Unmodified-Since /&#xD;
    3254  Max-Forwards / Proxy-Authorization / Range / Referer / TE /&#xD;
    3255  User-Agent&#xD;
    3256 response-header = Accept-Ranges / Age / Allow / ETag / Location /&#xD;
    3257  Proxy-Authenticate / Retry-After / Server / Vary / WWW-Authenticate&#xD;
    3258 token = &lt;token, defined in [Part1], Section 1.2.2&gt;&#xD;
    3259 ; CR defined but not used&#xD;
    3260 ; LF defined but not used&#xD;
    3261 ; Reason-Phrase defined but not used&#xD;
    3262 ; Status-Code defined but not used&#xD;
    3263 ; request-header defined but not used&#xD;
    3264 ; response-header defined but not used&#xD;
     3208      <artwork type="abnf" name="p2-semantics.parsed-abnf">
     3209Accept = &lt;Accept, defined in [Part3], Section 5.1&gt;
     3210Accept-Charset = &lt;Accept-Charset, defined in [Part3], Section 5.2&gt;
     3211Accept-Encoding = &lt;Accept-Encoding, defined in [Part3], Section 5.3&gt;
     3212Accept-Language = &lt;Accept-Language, defined in [Part3], Section 5.4&gt;
     3213Accept-Ranges = &lt;Accept-Ranges, defined in [Part5], Section 5.1&gt;
     3214Age = &lt;Age, defined in [Part6], Section 15.1&gt;
     3215Allow = "Allow:" OWS Allow-v
     3216Allow-v = [ ( "," / Method ) *( OWS "," [ OWS Method ] ) ]
     3217Authorization = &lt;Authorization, defined in [Part7], Section 3.1&gt;
     3218ETag = &lt;ETag, defined in [Part4], Section 6.1&gt;
     3219Expect = "Expect:" OWS Expect-v
     3220Expect-v = *( "," OWS ) expectation *( OWS "," [ OWS expectation ] )
     3221From = "From:" OWS From-v
     3222From-v = mailbox
     3223HTTP-date = &lt;HTTP-date, defined in [Part1], Section 3.2.1&gt;
     3224Host = &lt;Host, defined in [Part1], Section 2.1&gt;
     3225If-Match = &lt;If-Match, defined in [Part4], Section 6.2&gt;
     3226If-Modified-Since = &lt;If-Modified-Since, defined in [Part4], Section
     3227 6.3&gt;
     3228If-None-Match = &lt;If-None-Match, defined in [Part4], Section 6.4&gt;
     3229If-Range = &lt;If-Range, defined in [Part5], Section 5.3&gt;
     3230If-Unmodified-Since = &lt;If-Unmodified-Since, defined in [Part4],
     3231 Section 6.5&gt;
     3232Location = "Location:" OWS Location-v
     3233Location-v = absolute-URI [ "#" fragment ]
     3234Max-Forwards = "Max-Forwards:" OWS Max-Forwards-v
     3235Max-Forwards-v = 1*DIGIT
     3236Method = %x4F.50.54.49.4F.4E.53 / %x47.45.54 / %x48.45.41.44 /
     3237 %x50.4F.53.54 / %x50.55.54 / %x44.45.4C.45.54.45 / %x54.52.41.43.45
     3238 / %x43.4F.4E.4E.45.43.54 / extension-method
     3239OWS = &lt;OWS, defined in [Part1], Section 1.2.2&gt;
     3240Proxy-Authenticate = &lt;Proxy-Authenticate, defined in [Part7], Section
     3241 3.2&gt;
     3242Proxy-Authorization = &lt;Proxy-Authorization, defined in [Part7],
     3243 Section 3.3&gt;
     3244RWS = &lt;RWS, defined in [Part1], Section 1.2.2&gt;
     3245Range = &lt;Range, defined in [Part5], Section 5.4&gt;
     3246Reason-Phrase = *( WSP / VCHAR / obs-text )
     3247Referer = "Referer:" OWS Referer-v
     3248Referer-v = absolute-URI / partial-URI
     3249Retry-After = "Retry-After:" OWS Retry-After-v
     3250Retry-After-v = HTTP-date / delta-seconds
     3251Server = "Server:" OWS Server-v
     3252Server-v = product *( RWS ( product / comment ) )
     3253Status-Code = "100" / "101" / "200" / "201" / "202" / "203" / "204" /
     3254 "205" / "206" / "300" / "301" / "302" / "303" / "304" / "305" /
     3255 "307" / "400" / "401" / "402" / "403" / "404" / "405" / "406" /
     3256 "407" / "408" / "409" / "410" / "411" / "412" / "413" / "414" /
     3257 "415" / "416" / "417" / "500" / "501" / "502" / "503" / "504" /
     3258 "505" / extension-code
     3259TE = &lt;TE, defined in [Part1], Section 8.8&gt;
     3260User-Agent = "User-Agent:" OWS User-Agent-v
     3261User-Agent-v = product *( RWS ( product / comment ) )
     3262Vary = &lt;Vary, defined in [Part6], Section 15.5&gt;
     3263WWW-Authenticate = &lt;WWW-Authenticate, defined in [Part7], Section
     3264 3.4&gt;
     3265absolute-URI = &lt;absolute-URI, defined in [Part1], Section 2.1&gt;
     3266comment = &lt;comment, defined in [Part1], Section 1.2.2&gt;
     3267delta-seconds = 1*DIGIT
     3268expect-params = ";" token [ "=" ( token / quoted-string ) ]
     3269expectation = "100-continue" / expectation-extension
     3270expectation-extension = token [ "=" ( token / quoted-string )
     3271 *expect-params ]
     3272extension-code = 3DIGIT
     3273extension-method = token
     3274fragment = &lt;fragment, defined in [Part1], Section 2.1&gt;
     3275mailbox = &lt;mailbox, defined in [RFC5322], Section 3.4&gt;
     3276obs-text = &lt;obs-text, defined in [Part1], Section 1.2.2&gt;
     3277partial-URI = &lt;partial-URI, defined in [Part1], Section 2.1&gt;
     3278product = &lt;product, defined in [Part1], Section 3.4&gt;
     3279quoted-string = &lt;quoted-string, defined in [Part1], Section 1.2.2&gt;
     3280request-header = Accept / Accept-Charset / Accept-Encoding /
     3281 Accept-Language / Authorization / Expect / From / Host / If-Match /
     3282 If-Modified-Since / If-None-Match / If-Range / If-Unmodified-Since /
     3283 Max-Forwards / Proxy-Authorization / Range / Referer / TE /
     3284 User-Agent
     3285response-header = Accept-Ranges / Age / Allow / ETag / Location /
     3286 Proxy-Authenticate / Retry-After / Server / Vary / WWW-Authenticate
     3287token = &lt;token, defined in [Part1], Section 1.2.2&gt;
     3288; Reason-Phrase defined but not used
     3289; Status-Code defined but not used
     3290; request-header defined but not used
     3291; response-header defined but not used
    32653292</artwork>
    32663293   </figure>
Note: See TracChangeset for help on using the changeset viewer.