Changeset 424 for draft-ietf-httpbis/latest/p7-auth.xml

Timestamp:

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

Author:

julian.reschke@…

Message:

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

File:

• draft-ietf-httpbis/latest/p7-auth.xml (modified) (3 diffs)

draft-ietf-httpbis/latest/p7-auth.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'/>">
@@ -238 +239 @@
 </t>
 </section>
-</section>
-
-<section title="Notational Conventions and Generic Grammar" anchor="notation">
-<t>
-  This specification uses the ABNF syntax defined in &notation-abnf;.
-</t>
-<t anchor="abnf.dependencies">
+
+<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="OWS"/>
+<t>
+  The core rules below are defined in &basic-rules;:
+</t>
+<figure><artwork type="abnf2616">
+  <x:ref>OWS</x:ref>         = &lt;OWS, defined in &basic-rules;&gt;
+</artwork></figure>
+</section>
+
+<section title="ABNF Rules defined in other Parts of the Specification" anchor="abnf.dependencies">
   <x:anchor-alias value="challenge"/>
   <x:anchor-alias value="credentials"/>
+<t>
   <x:anchor-alias value="OWS"/>
   The ABNF rules below are defined in other specifications: 
 </t>
-<figure><artwork type="abnf2616">
-  <x:ref>OWS</x:ref>           = &lt;OWS, defined in &basic-rules;&gt;
-</artwork></figure>
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="challenge"/><iref primary="true" item="Grammar" subitem="credentials"/>
   <x:ref>challenge</x:ref>   = &lt;challenge, defined in <xref target="RFC2617" x:fmt="," x:sec="1.2"/>&gt;
   <x:ref>credentials</x:ref> = &lt;credentials, defined in <xref target="RFC2617" x:fmt="," x:sec="1.2"/>&gt;
 </artwork></figure>
+</section>
+
+</section>
+
 </section>
 
@@ -850 +863 @@
   <list style="symbols"> 
     <t>
-      Add appendix containing collected and expanded ABNF.
+      Add appendix containing collected and expanded ABNF, reorganize ABNF introduction.
     </t>
   </list>