Changeset 424 for draft-ietf-httpbis/latest/p2-semantics.xml

Timestamp:

21/11/08 17:39:20 (14 years ago)

Author:

julian.reschke@…

Message:

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

File:

• draft-ietf-httpbis/latest/p2-semantics.xml (modified) (11 diffs)

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

@@ -15 +15 @@
   <!ENTITY ID-MONTH "November">
   <!ENTITY ID-YEAR "2008">
+  <!ENTITY notation                   "<xref target='Part1' x:rel='#notation' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
   <!ENTITY messaging                  "<xref target='Part1' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
   <!ENTITY payload                    "<xref target='Part3' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
@@ -286 +287 @@
 </t>
 </section>
-</section>
-
-<section title="Notational Conventions and Generic Grammar" anchor="notation">
+
+<section title="Syntax Notation" anchor="notation">
+<t>
+  This specification uses the ABNF syntax defined in &notation;.
+</t>
+
+<section title="Core Rules" anchor="core.rules">
   <x:anchor-alias value="comment"/>
   <x:anchor-alias value="CR"/>
@@ -301 +306 @@
   <x:anchor-alias value="WSP"/>
 <t>
-  This specification uses the ABNF syntax defined in &notation-abnf; and
-  the core rules defined in &basic-rules;:
+  The core rules below are defined in &basic-rules;:
 </t>
 <figure><artwork type="abnf2616">
@@ -319 +323 @@
   <x:ref>obs-text</x:ref>      = &lt;obs-text, defined in &basic-rules;&gt;
 </artwork></figure>
-<t anchor="abnf.dependencies">
+</section>
+
+<section title="ABNF Rules defined in other Parts of the Specification" anchor="abnf.dependencies">
   <x:anchor-alias value="absolute-URI"/>
   <x:anchor-alias value="Accept"/>
@@ -345 +351 @@
   <x:anchor-alias value="Vary"/>
   <x:anchor-alias value="WWW-Authenticate"/>
+<t>
   The ABNF rules below are defined in other parts: 
 </t>
@@ -393 +400 @@
 </artwork></figure>
 </section>
+</section>
+</section>
 
 <section title="Method" anchor="method">
@@ -3164 +3173 @@
 <section title="Collected ABNF" anchor="collected.abnf">
    <figure>
-      <artwork type="abnf" name="p2-semantics.parsed-abnf">Accept = &lt;Accept, defined in [Part3], Section 6.1&gt;&#xD;
-Accept-Charset = &lt;Accept-Charset, defined in [Part3], Section 6.2&gt;&#xD;
-Accept-Encoding = &lt;Accept-Encoding, defined in [Part3], Section 6.3&gt;&#xD;
-Accept-Language = &lt;Accept-Language, defined in [Part3], Section 6.4&gt;&#xD;
-Accept-Ranges = &lt;Accept-Ranges, defined in [Part5], Section 6.1&gt;&#xD;
-Age = &lt;Age, defined in [Part6], Section 16.1&gt;&#xD;
+      <artwork type="abnf" name="p2-semantics.parsed-abnf">Accept = &lt;Accept, defined in [Part3], Section 5.1&gt;&#xD;
+Accept-Charset = &lt;Accept-Charset, defined in [Part3], Section 5.2&gt;&#xD;
+Accept-Encoding = &lt;Accept-Encoding, defined in [Part3], Section 5.3&gt;&#xD;
+Accept-Language = &lt;Accept-Language, defined in [Part3], Section 5.4&gt;&#xD;
+Accept-Ranges = &lt;Accept-Ranges, defined in [Part5], Section 5.1&gt;&#xD;
+Age = &lt;Age, defined in [Part6], Section 15.1&gt;&#xD;
 Allow = "Allow:" OWS Allow-v&#xD;
 Allow-v = [ ( "," / Method ) *( OWS "," [ OWS Method ] ) ]&#xD;
-Authorization = &lt;Authorization, defined in [Part7], Section 4.1&gt;&#xD;
+Authorization = &lt;Authorization, defined in [Part7], Section 3.1&gt;&#xD;
 CR = &lt;CR, defined in [Part1], Section 1.2.2&gt;&#xD;
 DIGIT = &lt;DIGIT, defined in [Part1], Section 1.2.2&gt;&#xD;
-ETag = &lt;ETag, defined in [Part4], Section 7.1&gt;&#xD;
+ETag = &lt;ETag, defined in [Part4], Section 6.1&gt;&#xD;
 Expect = "Expect:" OWS Expect-v&#xD;
 Expect-v = *( "," OWS ) expectation *( OWS "," [ OWS expectation ] )&#xD;
@@ -3182 +3191 @@
 HTTP-date = &lt;HTTP-date, defined in [Part1], Section 3.2.1&gt;&#xD;
 Host = &lt;Host, defined in [Part1], Section 2.1&gt;&#xD;
-If-Match = &lt;If-Match, defined in [Part4], Section 7.2&gt;&#xD;
+If-Match = &lt;If-Match, defined in [Part4], Section 6.2&gt;&#xD;
 If-Modified-Since = &lt;If-Modified-Since, defined in [Part4], Section&#xD;
- 7.3&gt;&#xD;
-If-None-Match = &lt;If-None-Match, defined in [Part4], Section 7.4&gt;&#xD;
-If-Range = &lt;If-Range, defined in [Part5], Section 6.3&gt;&#xD;
+ 6.3&gt;&#xD;
+If-None-Match = &lt;If-None-Match, defined in [Part4], Section 6.4&gt;&#xD;
+If-Range = &lt;If-Range, defined in [Part5], Section 5.3&gt;&#xD;
 If-Unmodified-Since = &lt;If-Unmodified-Since, defined in [Part4],&#xD;
- Section 7.5&gt;&#xD;
+ Section 6.5&gt;&#xD;
 LF = &lt;LF, defined in [Part1], Section 1.2.2&gt;&#xD;
 Location = "Location:" OWS Location-v&#xD;
@@ -3199 +3208 @@
 OWS = &lt;OWS, defined in [Part1], Section 1.2.2&gt;&#xD;
 Proxy-Authenticate = &lt;Proxy-Authenticate, defined in [Part7], Section&#xD;
- 4.2&gt;&#xD;
+ 3.2&gt;&#xD;
 Proxy-Authorization = &lt;Proxy-Authorization, defined in [Part7],&#xD;
- Section 4.3&gt;&#xD;
+ Section 3.3&gt;&#xD;
 RWS = &lt;RWS, defined in [Part1], Section 1.2.2&gt;&#xD;
-Range = &lt;Range, defined in [Part5], Section 6.4&gt;&#xD;
+Range = &lt;Range, defined in [Part5], Section 5.4&gt;&#xD;
 Reason-Phrase = *( WSP / VCHAR / obs-text )&#xD;
 Referer = "Referer:" OWS Referer-v&#xD;
@@ -3221 +3230 @@
 User-Agent-v = product *( RWS ( product / comment ) )&#xD;
 VCHAR = &lt;VCHAR, defined in [Part1], Section 1.2.2&gt;&#xD;
-Vary = &lt;Vary, defined in [Part6], Section 16.5&gt;&#xD;
+Vary = &lt;Vary, defined in [Part6], Section 15.5&gt;&#xD;
 WSP = &lt;WSP, defined in [Part1], Section 1.2.2&gt;&#xD;
 WWW-Authenticate = &lt;WWW-Authenticate, defined in [Part7], Section&#xD;
- 4.4&gt;&#xD;
+ 3.4&gt;&#xD;
 absolute-URI = &lt;absolute-URI, defined in [Part1], Section 2.1&gt;&#xD;
 comment = &lt;comment, defined in [Part1], Section 1.2.2&gt;&#xD;
@@ -3477 +3486 @@
   <list style="symbols"> 
     <t>
-      Add appendix containing collected and expanded ABNF.
+      Add appendix containing collected and expanded ABNF, reorganize ABNF introduction.
     </t>
   </list>