Changeset 425 for draft-ietf-httpbis/latest/p5-range.xml

Timestamp:

21/11/08 20:25:09 (14 years ago)

Author:

julian.reschke@…

Message:

reference RFC5234 core rules directly, fix line end bug in appendix generation (related to #36)

File:

• draft-ietf-httpbis/latest/p5-range.xml (modified) (4 diffs)

draft-ietf-httpbis/latest/p5-range.xml

@@ -252 +252 @@
 
 <section title="Syntax Notation" anchor="notation">
+  <x:anchor-alias value="ALPHA"/>
+  <x:anchor-alias value="CHAR"/>
+  <x:anchor-alias value="CR"/>
+  <x:anchor-alias value="DIGIT"/>
+  <x:anchor-alias value="LF"/>
+  <x:anchor-alias value="OCTET"/>
+  <x:anchor-alias value="SP"/>
+  <x:anchor-alias value="VCHAR"/>
+  <x:anchor-alias value="WSP"/>
 <t>
   This specification uses the ABNF syntax defined in &notation;.
+  The following core rules are included by
+  reference, as defined in <xref target="RFC5234" x:fmt="," x:sec="B.1"/>:
+  ALPHA (letters), CR (carriage return), CRLF (CR LF), CTL (controls),
+  DIGIT (decimal 0-9), DQUOTE (double quote),
+  HEXDIG (hexadecimal 0-9/A-F/a-f), LF (line feed),
+  OCTET (any 8-bit sequence of data), SP (space),
+  VCHAR (any visible USASCII character),
+  and WSP (whitespace).
 </t>
 
 <section title="Core Rules" anchor="core.rules">
-  <x:anchor-alias value="CHAR"/>
-  <x:anchor-alias value="DIGIT"/>
-  <x:anchor-alias value="SP"/>
   <x:anchor-alias value="token"/>
   <x:anchor-alias value="OWS"/>
@@ -265 +279 @@
   The core rules below are defined in &basic-rules;:
 </t>
-<figure><artwork type="abnf2616">
-  <x:ref>CHAR</x:ref>       = &lt;CHAR, defined in &basic-rules;&gt;
-  <x:ref>DIGIT</x:ref>      = &lt;DIGIT, defined in &basic-rules;&gt;
-  <x:ref>SP</x:ref>         = &lt;SP, defined in &basic-rules;&gt;
-</artwork></figure>
 <figure><artwork type="abnf2616">
   <x:ref>token</x:ref>      = &lt;token, defined in &basic-rules;&gt;
@@ -1101 +1110 @@
 </reference>
 
+<reference anchor="RFC5234">
+  <front>
+    <title abbrev="ABNF for Syntax Specifications">Augmented BNF for Syntax Specifications: ABNF</title>
+    <author initials="D." surname="Crocker" fullname="Dave Crocker" role="editor">
+      <organization>Brandenburg InternetWorking</organization>
+      <address>
+      <postal>
+      <street>675 Spruce Dr.</street>
+      <city>Sunnyvale</city>
+      <region>CA</region>
+      <code>94086</code>
+      <country>US</country></postal>
+      <phone>+1.408.246.8253</phone>
+      <email>dcrocker@bbiw.net</email></address>  
+    </author>
+    <author initials="P." surname="Overell" fullname="Paul Overell">
+      <organization>THUS plc.</organization>
+      <address>
+      <postal>
+      <street>1/2 Berkeley Square</street>
+      <street>99 Berkely Street</street>
+      <city>Glasgow</city>
+      <code>G3 7HR</code>
+      <country>UK</country></postal>
+      <email>paul.overell@thus.net</email></address>
+    </author>
+    <date month="January" year="2008"/>
+  </front>
+  <seriesInfo name="STD" value="68"/>
+  <seriesInfo name="RFC" value="5234"/>
+</reference>
+
 </references>
 
@@ -1336 +1377 @@
 <section title="Collected ABNF" anchor="collected.abnf">
    <figure>
-      <artwork type="abnf" name="p5-range.parsed-abnf">Accept-Ranges = "Accept-Ranges:" OWS Accept-Ranges-v&#xD;
-Accept-Ranges-v = acceptable-ranges&#xD;
-CHAR = &lt;CHAR, defined in [Part1], Section 1.2.2&gt;&#xD;
-Content-Range = "Content-Range:" OWS Content-Range-v&#xD;
-Content-Range-v = content-range-spec&#xD;
-DIGIT = &lt;DIGIT, defined in [Part1], Section 1.2.2&gt;&#xD;
-HTTP-date = &lt;HTTP-date, defined in [Part1], Section 3.2.1&gt;&#xD;
-If-Range = "If-Range:" OWS If-Range-v&#xD;
-If-Range-v = entity-tag / HTTP-date&#xD;
-OWS = &lt;OWS, defined in [Part1], Section 1.2.2&gt;&#xD;
-Range = "Range:" ranges-specifier&#xD;
-SP = &lt;SP, defined in [Part1], Section 1.2.2&gt;&#xD;
-acceptable-ranges = ( *( "," OWS ) range-unit *( OWS "," [ OWS&#xD;
- range-unit ] ) ) / "none"&#xD;
-byte-content-range-spec = bytes-unit SP byte-range-resp-spec "/" (&#xD;
- instance-length / "*" )&#xD;
-byte-range-resp-spec = ( first-byte-pos "-" last-byte-pos ) / "*"&#xD;
-byte-range-set = ( *( "," OWS ) byte-range-spec ) / (&#xD;
- suffix-byte-range-spec *( OWS "," [ ( OWS byte-range-spec ) /&#xD;
- suffix-byte-range-spec ] ) )&#xD;
-byte-range-spec = first-byte-pos "-" [ last-byte-pos ]&#xD;
-byte-ranges-specifier = bytes-unit "=" byte-range-set&#xD;
-bytes-unit = "bytes"&#xD;
-content-range-spec = byte-content-range-spec /&#xD;
- other-content-range-spec&#xD;
-entity-tag = &lt;entity-tag, defined in [Part4], Section 2&gt;&#xD;
-first-byte-pos = 1*DIGIT&#xD;
-instance-length = 1*DIGIT&#xD;
-last-byte-pos = 1*DIGIT&#xD;
-other-content-range-spec = other-range-unit SP other-range-resp-spec&#xD;
-other-range-resp-spec = *CHAR&#xD;
-other-range-unit = token&#xD;
-other-ranges-specifier = 1*CHAR&#xD;
-range-unit = bytes-unit / other-range-unit&#xD;
-ranges-specifier = byte-ranges-specifier / other-ranges-specifier&#xD;
-suffix-byte-range-spec = "-" suffix-length&#xD;
-suffix-length = 1*DIGIT&#xD;
-token = &lt;token, defined in [Part1], Section 1.2.2&gt;&#xD;
-; Accept-Ranges defined but not used&#xD;
-; Content-Range defined but not used&#xD;
-; If-Range defined but not used&#xD;
-; Range defined but not used&#xD;
+      <artwork type="abnf" name="p5-range.parsed-abnf">
+Accept-Ranges = "Accept-Ranges:" OWS Accept-Ranges-v
+Accept-Ranges-v = acceptable-ranges
+Content-Range = "Content-Range:" OWS Content-Range-v
+Content-Range-v = content-range-spec
+HTTP-date = &lt;HTTP-date, defined in [Part1], Section 3.2.1&gt;
+If-Range = "If-Range:" OWS If-Range-v
+If-Range-v = entity-tag / HTTP-date
+OWS = &lt;OWS, defined in [Part1], Section 1.2.2&gt;
+Range = "Range:" ranges-specifier
+acceptable-ranges = ( *( "," OWS ) range-unit *( OWS "," [ OWS
+ range-unit ] ) ) / "none"
+byte-content-range-spec = bytes-unit SP byte-range-resp-spec "/" (
+ instance-length / "*" )
+byte-range-resp-spec = ( first-byte-pos "-" last-byte-pos ) / "*"
+byte-range-set = ( *( "," OWS ) byte-range-spec ) / (
+ suffix-byte-range-spec *( OWS "," [ ( OWS byte-range-spec ) /
+ suffix-byte-range-spec ] ) )
+byte-range-spec = first-byte-pos "-" [ last-byte-pos ]
+byte-ranges-specifier = bytes-unit "=" byte-range-set
+bytes-unit = "bytes"
+content-range-spec = byte-content-range-spec /
+ other-content-range-spec
+entity-tag = &lt;entity-tag, defined in [Part4], Section 2&gt;
+first-byte-pos = 1*DIGIT
+instance-length = 1*DIGIT
+last-byte-pos = 1*DIGIT
+other-content-range-spec = other-range-unit SP other-range-resp-spec
+other-range-resp-spec = *CHAR
+other-range-unit = token
+other-ranges-specifier = 1*CHAR
+range-unit = bytes-unit / other-range-unit
+ranges-specifier = byte-ranges-specifier / other-ranges-specifier
+suffix-byte-range-spec = "-" suffix-length
+suffix-length = 1*DIGIT
+token = &lt;token, defined in [Part1], Section 1.2.2&gt;
+; Accept-Ranges defined but not used
+; Content-Range defined but not used
+; If-Range defined but not used
+; Range defined but not used
 </artwork>
    </figure>