Changeset 424 for draft-ietf-httpbis/latest/p3-payload.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/p3-payload.xml (modified) (8 diffs)

draft-ietf-httpbis/latest/p3-payload.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 notation-abnf            "<xref target='Part1' x:rel='#notation.abnf' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
   <!ENTITY basic-rules              "<xref target='Part1' x:rel='#basic.rules' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
@@ -250 +251 @@
 </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="ALPHA"/>
   <x:anchor-alias value="DIGIT"/>
@@ -260 +265 @@
   <x:anchor-alias value="OWS"/>
 <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">
@@ -273 +277 @@
   <x:ref>OWS</x:ref>            = &lt;OWS, 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="Allow"/>
@@ -282 +288 @@
   <x:anchor-alias value="message-header"/>
   <x:anchor-alias value="partial-URI"/>
+<t>
   The ABNF rules below are defined in other parts: 
 </t>
@@ -299 +306 @@
   <x:ref>Expires</x:ref>        = &lt;Expires, defined in &header-expires;&gt;
 </artwork></figure>
+</section>
+
+</section>
+
 </section>
 
@@ -2634 +2645 @@
 Content-MD5 = "Content-MD5:" OWS Content-MD5-v&#xD;
 Content-MD5-v = &lt;base64 of 128 bit MD5 digest as per [RFC1864]&gt;&#xD;
-Content-Range = &lt;Content-Range, defined in [Part5], Section 6.2&gt;&#xD;
+Content-Range = &lt;Content-Range, defined in [Part5], Section 5.2&gt;&#xD;
 Content-Type = "Content-Type:" OWS Content-Type-v&#xD;
 Content-Type-v = media-type&#xD;
 DIGIT = &lt;DIGIT, defined in [Part1], Section 1.2.2&gt;&#xD;
-Expires = &lt;Expires, defined in [Part6], Section 16.3&gt;&#xD;
-Last-Modified = &lt;Last-Modified, defined in [Part4], Section 7.6&gt;&#xD;
+Expires = &lt;Expires, defined in [Part6], Section 15.3&gt;&#xD;
+Last-Modified = &lt;Last-Modified, defined in [Part4], Section 6.6&gt;&#xD;
 MIME-Version = "MIME-Version:" OWS MIME-Version-v&#xD;
 MIME-Version-v = 1*DIGIT "." 1*DIGIT&#xD;
@@ -2868 +2879 @@
   <list style="symbols"> 
     <t>
-      Add appendix containing collected and expanded ABNF.
+      Add appendix containing collected and expanded ABNF, reorganize ABNF introduction.
     </t>
   </list>