Ignore:
Timestamp:
Nov 21, 2008, 9:39:20 AM (11 years ago)
Author:
julian.reschke@…
Message:

reorganize ABNF introductions to match Part1 (related to #36)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • draft-ietf-httpbis/latest/p2-semantics.xml

    r423 r424  
    1515  <!ENTITY ID-MONTH "November">
    1616  <!ENTITY ID-YEAR "2008">
     17  <!ENTITY notation                   "<xref target='Part1' x:rel='#notation' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    1718  <!ENTITY messaging                  "<xref target='Part1' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    1819  <!ENTITY payload                    "<xref target='Part3' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     
    286287</t>
    287288</section>
    288 </section>
    289 
    290 <section title="Notational Conventions and Generic Grammar" anchor="notation">
     289
     290<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">
    291296  <x:anchor-alias value="comment"/>
    292297  <x:anchor-alias value="CR"/>
     
    301306  <x:anchor-alias value="WSP"/>
    302307<t>
    303   This specification uses the ABNF syntax defined in &notation-abnf; and
    304   the core rules defined in &basic-rules;:
     308  The core rules below are defined in &basic-rules;:
    305309</t>
    306310<figure><artwork type="abnf2616">
     
    319323  <x:ref>obs-text</x:ref>      = &lt;obs-text, defined in &basic-rules;&gt;
    320324</artwork></figure>
    321 <t anchor="abnf.dependencies">
     325</section>
     326
     327<section title="ABNF Rules defined in other Parts of the Specification" anchor="abnf.dependencies">
    322328  <x:anchor-alias value="absolute-URI"/>
    323329  <x:anchor-alias value="Accept"/>
     
    345351  <x:anchor-alias value="Vary"/>
    346352  <x:anchor-alias value="WWW-Authenticate"/>
     353<t>
    347354  The ABNF rules below are defined in other parts:
    348355</t>
     
    393400</artwork></figure>
    394401</section>
     402</section>
     403</section>
    395404
    396405<section title="Method" anchor="method">
     
    31643173<section title="Collected ABNF" anchor="collected.abnf">
    31653174   <figure>
    3166       <artwork type="abnf" name="p2-semantics.parsed-abnf">Accept = &lt;Accept, defined in [Part3], Section 6.1&gt;&#xD;
    3167 Accept-Charset = &lt;Accept-Charset, defined in [Part3], Section 6.2&gt;&#xD;
    3168 Accept-Encoding = &lt;Accept-Encoding, defined in [Part3], Section 6.3&gt;&#xD;
    3169 Accept-Language = &lt;Accept-Language, defined in [Part3], Section 6.4&gt;&#xD;
    3170 Accept-Ranges = &lt;Accept-Ranges, defined in [Part5], Section 6.1&gt;&#xD;
    3171 Age = &lt;Age, defined in [Part6], Section 16.1&gt;&#xD;
     3175      <artwork type="abnf" name="p2-semantics.parsed-abnf">Accept = &lt;Accept, defined in [Part3], Section 5.1&gt;&#xD;
     3176Accept-Charset = &lt;Accept-Charset, defined in [Part3], Section 5.2&gt;&#xD;
     3177Accept-Encoding = &lt;Accept-Encoding, defined in [Part3], Section 5.3&gt;&#xD;
     3178Accept-Language = &lt;Accept-Language, defined in [Part3], Section 5.4&gt;&#xD;
     3179Accept-Ranges = &lt;Accept-Ranges, defined in [Part5], Section 5.1&gt;&#xD;
     3180Age = &lt;Age, defined in [Part6], Section 15.1&gt;&#xD;
    31723181Allow = "Allow:" OWS Allow-v&#xD;
    31733182Allow-v = [ ( "," / Method ) *( OWS "," [ OWS Method ] ) ]&#xD;
    3174 Authorization = &lt;Authorization, defined in [Part7], Section 4.1&gt;&#xD;
     3183Authorization = &lt;Authorization, defined in [Part7], Section 3.1&gt;&#xD;
    31753184CR = &lt;CR, defined in [Part1], Section 1.2.2&gt;&#xD;
    31763185DIGIT = &lt;DIGIT, defined in [Part1], Section 1.2.2&gt;&#xD;
    3177 ETag = &lt;ETag, defined in [Part4], Section 7.1&gt;&#xD;
     3186ETag = &lt;ETag, defined in [Part4], Section 6.1&gt;&#xD;
    31783187Expect = "Expect:" OWS Expect-v&#xD;
    31793188Expect-v = *( "," OWS ) expectation *( OWS "," [ OWS expectation ] )&#xD;
     
    31823191HTTP-date = &lt;HTTP-date, defined in [Part1], Section 3.2.1&gt;&#xD;
    31833192Host = &lt;Host, defined in [Part1], Section 2.1&gt;&#xD;
    3184 If-Match = &lt;If-Match, defined in [Part4], Section 7.2&gt;&#xD;
     3193If-Match = &lt;If-Match, defined in [Part4], Section 6.2&gt;&#xD;
    31853194If-Modified-Since = &lt;If-Modified-Since, defined in [Part4], Section&#xD;
    3186  7.3&gt;&#xD;
    3187 If-None-Match = &lt;If-None-Match, defined in [Part4], Section 7.4&gt;&#xD;
    3188 If-Range = &lt;If-Range, defined in [Part5], Section 6.3&gt;&#xD;
     3195 6.3&gt;&#xD;
     3196If-None-Match = &lt;If-None-Match, defined in [Part4], Section 6.4&gt;&#xD;
     3197If-Range = &lt;If-Range, defined in [Part5], Section 5.3&gt;&#xD;
    31893198If-Unmodified-Since = &lt;If-Unmodified-Since, defined in [Part4],&#xD;
    3190  Section 7.5&gt;&#xD;
     3199 Section 6.5&gt;&#xD;
    31913200LF = &lt;LF, defined in [Part1], Section 1.2.2&gt;&#xD;
    31923201Location = "Location:" OWS Location-v&#xD;
     
    31993208OWS = &lt;OWS, defined in [Part1], Section 1.2.2&gt;&#xD;
    32003209Proxy-Authenticate = &lt;Proxy-Authenticate, defined in [Part7], Section&#xD;
    3201  4.2&gt;&#xD;
     3210 3.2&gt;&#xD;
    32023211Proxy-Authorization = &lt;Proxy-Authorization, defined in [Part7],&#xD;
    3203  Section 4.3&gt;&#xD;
     3212 Section 3.3&gt;&#xD;
    32043213RWS = &lt;RWS, defined in [Part1], Section 1.2.2&gt;&#xD;
    3205 Range = &lt;Range, defined in [Part5], Section 6.4&gt;&#xD;
     3214Range = &lt;Range, defined in [Part5], Section 5.4&gt;&#xD;
    32063215Reason-Phrase = *( WSP / VCHAR / obs-text )&#xD;
    32073216Referer = "Referer:" OWS Referer-v&#xD;
     
    32213230User-Agent-v = product *( RWS ( product / comment ) )&#xD;
    32223231VCHAR = &lt;VCHAR, defined in [Part1], Section 1.2.2&gt;&#xD;
    3223 Vary = &lt;Vary, defined in [Part6], Section 16.5&gt;&#xD;
     3232Vary = &lt;Vary, defined in [Part6], Section 15.5&gt;&#xD;
    32243233WSP = &lt;WSP, defined in [Part1], Section 1.2.2&gt;&#xD;
    32253234WWW-Authenticate = &lt;WWW-Authenticate, defined in [Part7], Section&#xD;
    3226  4.4&gt;&#xD;
     3235 3.4&gt;&#xD;
    32273236absolute-URI = &lt;absolute-URI, defined in [Part1], Section 2.1&gt;&#xD;
    32283237comment = &lt;comment, defined in [Part1], Section 1.2.2&gt;&#xD;
     
    34773486  <list style="symbols">
    34783487    <t>
    3479       Add appendix containing collected and expanded ABNF.
     3488      Add appendix containing collected and expanded ABNF, reorganize ABNF introduction.
    34803489    </t>
    34813490  </list>
Note: See TracChangeset for help on using the changeset viewer.