Changeset 424 for draft-ietf-httpbis/latest/p4-conditional.xml

Timestamp:

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

Author:

julian.reschke@…

Message:

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

File:

• draft-ietf-httpbis/latest/p4-conditional.xml (modified) (5 diffs)

draft-ietf-httpbis/latest/p4-conditional.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'/>">
@@ -249 +250 @@
 </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="quoted-string"/>
   <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">
@@ -262 +266 @@
   <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="HTTP-date"/>
+<t>
   The ABNF rules below are defined in other parts: 
 </t>
@@ -269 +276 @@
   <x:ref>HTTP-date</x:ref>     = &lt;HTTP-date, defined in &full-date;&gt;
 </artwork></figure>
+</section>
+
+</section>
+
 </section>
 
@@ -1459 +1470 @@
   <list style="symbols"> 
     <t>
-      Add appendix containing collected and expanded ABNF.
+      Add appendix containing collected and expanded ABNF, reorganize ABNF introduction.
     </t>
   </list>