Ignore:
Timestamp:
Mar 30, 2012, 7:52:26 AM (8 years ago)
Author:
julian.reschke@…
Message:

Step 4 of p2/p3-merge (see #351)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • draft-ietf-httpbis/latest/p3-payload.xml

    r1641 r1642  
    134134  <x:anchor-alias value="OCTET"/>
    135135  <x:anchor-alias value="VCHAR"/>
    136 <t>
    137    This specification uses the Augmented Backus-Naur Form (ABNF) notation
    138    of <xref target="RFC5234"/> with the list rule extension defined in
    139    &notation;.<!--  <xref target="collected.abnf"/> shows the collected ABNF
    140    with the list rule expanded.-->
    141 </t>
    142 <t>
    143   The following core rules are included by
    144   reference, as defined in <xref target="RFC5234" x:fmt="," x:sec="B.1"/>:
    145   ALPHA (letters), CR (carriage return), CRLF (CR LF), CTL (controls),
    146   DIGIT (decimal 0-9), DQUOTE (double quote),
    147   HEXDIG (hexadecimal 0-9/A-F/a-f), LF (line feed),
    148   OCTET (any 8-bit sequence of data), SP (space), and
    149   VCHAR (any visible US-ASCII character).
    150 </t>
    151136
    152137<section title="Core Rules" anchor="core.rules">
     
    154139  <x:anchor-alias value="word"/>
    155140  <x:anchor-alias value="OWS"/>
    156 <t>
    157   The core rules below are defined in <xref target="Part1"/>:
    158 </t>
    159 <figure><artwork type="abnf2616">
    160   <x:ref>OWS</x:ref>            = &lt;OWS, defined in &whitespace;&gt;
    161   <x:ref>token</x:ref>          = &lt;token, defined in &field-components;&gt;
    162   <x:ref>word</x:ref>           = &lt;word, defined in &field-components;&gt;
    163 </artwork></figure>
    164141</section>
    165142
     
    168145  <x:anchor-alias value="partial-URI"/>
    169146  <x:anchor-alias value="qvalue"/>
    170 <t>
    171   The ABNF rules below are defined in other parts:
    172 </t>
    173 <figure><!--Part1--><artwork type="abnf2616">
    174   <x:ref>absolute-URI</x:ref>   = &lt;absolute-URI, defined in &uri;&gt;
    175   <x:ref>partial-URI</x:ref>    = &lt;partial-URI, defined in &uri;&gt;
    176   <x:ref>qvalue</x:ref>         = &lt;qvalue, defined in &qvalue;&gt;
    177 </artwork></figure>
    178147</section>
    179148
     
    16311600</reference>
    16321601
    1633 <reference anchor="RFC5234">
    1634   <front>
    1635     <title abbrev="ABNF for Syntax Specifications">Augmented BNF for Syntax Specifications: ABNF</title>
    1636     <author initials="D." surname="Crocker" fullname="Dave Crocker" role="editor">
    1637       <organization>Brandenburg InternetWorking</organization>
    1638       <address>
    1639         <email>dcrocker@bbiw.net</email>
    1640       </address> 
    1641     </author>
    1642     <author initials="P." surname="Overell" fullname="Paul Overell">
    1643       <organization>THUS plc.</organization>
    1644       <address>
    1645         <email>paul.overell@thus.net</email>
    1646       </address>
    1647     </author>
    1648     <date month="January" year="2008"/>
    1649   </front>
    1650   <seriesInfo name="STD" value="68"/>
    1651   <seriesInfo name="RFC" value="5234"/>
    1652 </reference>
    1653 
    16541602<reference anchor='RFC5646'>
    16551603  <front>
Note: See TracChangeset for help on using the changeset viewer.