Changeset 343 for draft-ietf-httpbis

Timestamp:

11/11/08 02:46:38 (14 years ago)

Author:

fielding@…

Message:

condense ABNF core rules

File:

• draft-ietf-httpbis/latest-roy/p1-messaging.xml (modified) (3 diffs)

draft-ietf-httpbis/latest-roy/p1-messaging.xml

@@ -281 +281 @@
 
 <section title="Syntax Notation" anchor="notation">
-<t>
-   This specification uses the Augmented Backus-Naur Form (ABNF) notation
-   of <xref target="RFC5234"/>, including its core ABNF syntax rules:
-   ALPHA (letters), CR (carriage return), DIGIT (decimal digits),
-   DQUOTE (double quote), HEXDIG (hexadecimal digits), LF (line feed),
-   and SP (space).
-</t>
+<iref primary="true" item="Grammar" subitem="ALPHA"/>
+<iref primary="true" item="Grammar" subitem="CHAR"/>
+<iref primary="true" item="Grammar" subitem="CR"/>
+<iref primary="true" item="Grammar" subitem="CRLF"/>
+<iref primary="true" item="Grammar" subitem="CTL"/>
+<iref primary="true" item="Grammar" subitem="DIGIT"/>
+<iref primary="true" item="Grammar" subitem="DQUOTE"/>
+<iref primary="true" item="Grammar" subitem="HEXDIG"/>
+<iref primary="true" item="Grammar" subitem="HTAB"/>
+<iref primary="true" item="Grammar" subitem="LF"/>
+<iref primary="true" item="Grammar" subitem="OCTET"/>
+<iref primary="true" item="Grammar" subitem="SP"/>
 <t anchor="core.rules">
-  <x:anchor-alias value="OCTET"/>
+  <x:anchor-alias value="ALPHA"/>
   <x:anchor-alias value="CHAR"/>
-  <x:anchor-alias value="ALPHA"/>
-  <x:anchor-alias value="DIGIT"/>
   <x:anchor-alias value="CTL"/>
   <x:anchor-alias value="CR"/>
+  <x:anchor-alias value="CRLF"/>
+  <x:anchor-alias value="DIGIT"/>
+  <x:anchor-alias value="DQUOTE"/>
+  <x:anchor-alias value="HEXDIG"/>
+  <x:anchor-alias value="HTAB"/>
   <x:anchor-alias value="LF"/>
+  <x:anchor-alias value="OCTET"/>
   <x:anchor-alias value="SP"/>
-  <x:anchor-alias value="HTAB"/>
-  <x:anchor-alias value="DQUOTE"/>
-   The following rules are used throughout this specification to
-   describe basic parsing constructs. The US-ASCII coded character set
-   is defined by ANSI X3.4-1986 <xref target="USASCII"/>.
-</t>
-<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="OCTET"/><iref primary="true" item="Grammar" subitem="CHAR"/><iref primary="true" item="Grammar" subitem="ALPHA"/><iref primary="true" item="Grammar" subitem="DIGIT"/><iref primary="true" item="Grammar" subitem="CTL"/><iref primary="true" item="Grammar" subitem="CR"/><iref primary="true" item="Grammar" subitem="LF"/><iref primary="true" item="Grammar" subitem="SP"/><iref primary="true" item="Grammar" subitem="HTAB"/><iref primary="true" item="Grammar" subitem="DQUOTE"/>
-  <x:ref>OCTET</x:ref>          = %x00-FF
-                   ; any 8-bit sequence of data
-  <x:ref>CHAR</x:ref>           = %x01-7F
-                   ; any US-ASCII character, excluding NUL
-  <x:ref>ALPHA</x:ref>          = %x41-5A / %x61-7A
-                   ; A-Z / a-z
-  <x:ref>DIGIT</x:ref>          = %x30-39
-                   ; any US-ASCII digit "0".."9"
-  <x:ref>CTL</x:ref>            = %x00-1F / %x7F
-                   ; (octets 0 - 31) and DEL (127)
-  <x:ref>CR</x:ref>             = %x0D
-                   ; US-ASCII CR, carriage return (13)
-  <x:ref>LF</x:ref>             = %x0A
-                   ; US-ASCII LF, linefeed (10)
-  <x:ref>SP</x:ref>             = %x20
-                   ; US-ASCII SP, space (32)
-  <x:ref>HTAB</x:ref>           = %x09
-                   ; US-ASCII HT, horizontal-tab (9)
-  <x:ref>DQUOTE</x:ref>         = %x22
-                   ; US-ASCII double-quote mark (34)
-</artwork></figure>
-
-<section title="Augmented BNF" anchor="notation.abnf">
-<t>
-   All of the mechanisms specified in this document are described in
-   both prose and an augmented Backus-Naur Form (ABNF) based on that
-   defined in <xref target="RFC5234"/>. Implementors will need to be
-   familiar with the notation in order to understand this specification. The
-   extensions to ABNF used in this specification are described below.
+   This specification uses the Augmented Backus-Naur Form (ABNF) notation
+   of <xref target="RFC5234"/>.  The following core rules are included by
+   reference, as defined in <xref target="RFC5234" x:fmt="," x:sec="B.1"/>:
+   ALPHA (letters), CHAR (any <xref target="USASCII"/> character,
+   excluding NUL), CR (carriage return), CRLF (CR LF), CTL (controls),
+   DIGIT (decimal 0-9), DQUOTE (double quote),
+   HEXDIG (hexadecimal 0-9/A-F/a-f), HTAB (horizontal tab),
+   LF (line feed), OCTET (any 8-bit sequence of data), and SP (space).
+</t>
+
+<section title="ABNF Extensions" anchor="notation.abnf">
+<t>
+   Two extensions to the ABNF rules of <xref target="RFC5234"/> are used to
+   improve readability. [The current plan is to remove these extensions prior
+   to the last call draft.]
 </t>
 
@@ -379 +367 @@
 <section title="Basic Rules" anchor="basic.rules">
 <t anchor="rule.CRLF">
-  <x:anchor-alias value="CRLF"/>
-   HTTP/1.1 defines the sequence CR LF as the end-of-line marker for all
+   HTTP/1.1 defines the sequence CRLF as the end-of-line marker for all
    protocol elements except the entity-body (see <xref target="tolerant.applications"/> for
    tolerant applications). The end-of-line marker within an entity-body
    is defined by its associated media type, as described in &media-types;.
 </t>
-<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="CRLF"/>
-  <x:ref>CRLF</x:ref>           = <x:ref>CR</x:ref> LF
-</artwork></figure>
 <t anchor="rule.LWS">
   <x:anchor-alias value="LWS"/>
@@ -416 +400 @@
    replaced with a single SP before interpretation of the TEXT value.
 </t>
-<t anchor="rule.HEXDIG">
-  <x:anchor-alias value="HEXDIG"/>
-   Hexadecimal numeric characters are used in several protocol elements.
-</t>
-<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="HEXDIG"/>
-  <x:ref>HEXDIG</x:ref>         = "A" / "B" / "C" / "D" / "E" / "F"
-                 / "a" / "b" / "c" / "d" / "e" / "f" / <x:ref>DIGIT</x:ref>
-</artwork></figure>
 <t anchor="rule.token.separators">
   <x:anchor-alias value="tchar"/>