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

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

File:
1 edited

Legend:

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

    r1604 r1639  
    238238   This specification uses the Augmented Backus-Naur Form (ABNF) notation
    239239   of <xref target="RFC5234"/> with the list rule extension defined in
    240    &notation;.  <xref target="collected.abnf"/> shows the collected ABNF
    241    with the list rule expanded.
     240   &notation;.<!--  <xref target="collected.abnf"/> shows the collected ABNF
     241   with the list rule expanded.-->
    242242</t>
    243243<t>
     
    14081408
    14091409<section title="IANA Considerations" anchor="IANA.considerations">
    1410 <section title="Header Field Registration" anchor="header.field.registration">
    1411 <t>
    1412    The Message Header Field Registry located at <eref target="http://www.iana.org/assignments/message-headers/message-header-index.html"/> shall be updated
    1413    with the permanent registrations below (see <xref target="RFC3864"/>):
    1414 </t>
    1415 <?BEGININC p3-payload.iana-headers ?>
    1416 <!--AUTOGENERATED FROM extract-header-defs.xslt, do not edit manually-->
    1417 <texttable align="left" suppress-title="true" anchor="iana.header.registration.table">
    1418    <ttcol>Header Field Name</ttcol>
    1419    <ttcol>Protocol</ttcol>
    1420    <ttcol>Status</ttcol>
    1421    <ttcol>Reference</ttcol>
    1422 
    1423    <c>Accept</c>
    1424    <c>http</c>
    1425    <c>standard</c>
    1426    <c>
    1427       <xref target="header.accept"/>
    1428    </c>
    1429    <c>Accept-Charset</c>
    1430    <c>http</c>
    1431    <c>standard</c>
    1432    <c>
    1433       <xref target="header.accept-charset"/>
    1434    </c>
    1435    <c>Accept-Encoding</c>
    1436    <c>http</c>
    1437    <c>standard</c>
    1438    <c>
    1439       <xref target="header.accept-encoding"/>
    1440    </c>
    1441    <c>Accept-Language</c>
    1442    <c>http</c>
    1443    <c>standard</c>
    1444    <c>
    1445       <xref target="header.accept-language"/>
    1446    </c>
    1447    <c>Content-Encoding</c>
    1448    <c>http</c>
    1449    <c>standard</c>
    1450    <c>
    1451       <xref target="header.content-encoding"/>
    1452    </c>
    1453    <c>Content-Language</c>
    1454    <c>http</c>
    1455    <c>standard</c>
    1456    <c>
    1457       <xref target="header.content-language"/>
    1458    </c>
    1459    <c>Content-Location</c>
    1460    <c>http</c>
    1461    <c>standard</c>
    1462    <c>
    1463       <xref target="header.content-location"/>
    1464    </c>
    1465    <c>Content-Type</c>
    1466    <c>http</c>
    1467    <c>standard</c>
    1468    <c>
    1469       <xref target="header.content-type"/>
    1470    </c>
    1471    <c>MIME-Version</c>
    1472    <c>http</c>
    1473    <c>standard</c>
    1474    <c>
    1475       <xref target="mime-version"/>
    1476    </c>
    1477 </texttable>
    1478 <!--(END)-->
    1479 <?ENDINC p3-payload.iana-headers ?>
    1480 <t>
    1481    The change controller is: "IETF (iesg@ietf.org) - Internet Engineering Task Force".
    1482 </t>
    1483 </section>
    14841410
    14851411<section title="Content Coding Registry" anchor="content.coding.registration">
     
    15731499</section>
    15741500
    1575 <section title="Acknowledgments" anchor="acks">
    1576 <t>
    1577   See &acks;.
    1578 </t>
    1579 </section>
    15801501</middle>
    15811502<back>
     
    20571978  <seriesInfo name="STD" value="63"/>
    20581979  <seriesInfo name="RFC" value="3629"/>
    2059 </reference>
    2060 
    2061 <reference anchor='RFC3864'>
    2062   <front>
    2063     <title>Registration Procedures for Message Header Fields</title>
    2064     <author initials='G.' surname='Klyne' fullname='G. Klyne'>
    2065       <organization>Nine by Nine</organization>
    2066       <address><email>GK-IETF@ninebynine.org</email></address>
    2067     </author>
    2068     <author initials='M.' surname='Nottingham' fullname='M. Nottingham'>
    2069       <organization>BEA Systems</organization>
    2070       <address><email>mnot@pobox.com</email></address>
    2071     </author>
    2072     <author initials='J.' surname='Mogul' fullname='J. Mogul'>
    2073       <organization>HP Labs</organization>
    2074       <address><email>JeffMogul@acm.org</email></address>
    2075     </author>
    2076     <date year='2004' month='September' />
    2077   </front>
    2078   <seriesInfo name='BCP' value='90' />
    2079   <seriesInfo name='RFC' value='3864' />
    20801980</reference>
    20811981
     
    23812281</section>
    23822282
    2383 <?BEGININC p3-payload.abnf-appendix ?>
    2384 <section xmlns:x="http://purl.org/net/xml2rfc/ext" title="Collected ABNF" anchor="collected.abnf">
    2385 <figure>
    2386 <artwork type="abnf" name="p3-payload.parsed-abnf">
    2387 <x:ref>Accept</x:ref> = [ ( "," / ( media-range [ accept-params ] ) ) *( OWS "," [
    2388  OWS media-range [ accept-params ] ] ) ]
    2389 <x:ref>Accept-Charset</x:ref> = *( "," OWS ) ( charset / "*" ) [ OWS ";" OWS "q="
    2390  qvalue ] *( OWS "," [ OWS ( charset / "*" ) [ OWS ";" OWS "q="
    2391  qvalue ] ] )
    2392 <x:ref>Accept-Encoding</x:ref> = [ ( "," / ( codings [ OWS ";" OWS "q=" qvalue ] ) )
    2393  *( OWS "," [ OWS codings [ OWS ";" OWS "q=" qvalue ] ] ) ]
    2394 <x:ref>Accept-Language</x:ref> = *( "," OWS ) language-range [ OWS ";" OWS "q="
    2395  qvalue ] *( OWS "," [ OWS language-range [ OWS ";" OWS "q=" qvalue ]
    2396  ] )
    2397 
    2398 <x:ref>Content-Encoding</x:ref> = *( "," OWS ) content-coding *( OWS "," [ OWS
    2399  content-coding ] )
    2400 <x:ref>Content-Language</x:ref> = *( "," OWS ) language-tag *( OWS "," [ OWS
    2401  language-tag ] )
    2402 <x:ref>Content-Location</x:ref> = absolute-URI / partial-URI
    2403 <x:ref>Content-Type</x:ref> = media-type
    2404 
    2405 <x:ref>MIME-Version</x:ref> = 1*DIGIT "." 1*DIGIT
    2406 
    2407 <x:ref>OWS</x:ref> = &lt;OWS, defined in [Part1], Section 3.2.1&gt;
    2408 
    2409 <x:ref>absolute-URI</x:ref> = &lt;absolute-URI, defined in [Part1], Section 2.7&gt;
    2410 <x:ref>accept-ext</x:ref> = OWS ";" OWS token [ "=" word ]
    2411 <x:ref>accept-params</x:ref> = OWS ";" OWS "q=" qvalue *accept-ext
    2412 <x:ref>attribute</x:ref> = token
    2413 
    2414 <x:ref>charset</x:ref> = token
    2415 <x:ref>codings</x:ref> = content-coding / "identity" / "*"
    2416 <x:ref>content-coding</x:ref> = token
    2417 
    2418 <x:ref>language-range</x:ref> = &lt;language-range, defined in [RFC4647], Section 2.1&gt;
    2419 <x:ref>language-tag</x:ref> = &lt;Language-Tag, defined in [RFC5646], Section 2.1&gt;
    2420 
    2421 <x:ref>media-range</x:ref> = ( "*/*" / ( type "/*" ) / ( type "/" subtype ) ) *( OWS
    2422  ";" OWS parameter )
    2423 <x:ref>media-type</x:ref> = type "/" subtype *( OWS ";" OWS parameter )
    2424 
    2425 <x:ref>parameter</x:ref> = attribute "=" value
    2426 <x:ref>partial-URI</x:ref> = &lt;partial-URI, defined in [Part1], Section 2.7&gt;
    2427 
    2428 <x:ref>qvalue</x:ref> = &lt;qvalue, defined in [Part1], Section 4.3.1&gt;
    2429 
    2430 <x:ref>subtype</x:ref> = token
    2431 
    2432 <x:ref>token</x:ref> = &lt;token, defined in [Part1], Section 3.2.4&gt;
    2433 <x:ref>type</x:ref> = token
    2434 
    2435 <x:ref>value</x:ref> = word
    2436 
    2437 <x:ref>word</x:ref> = &lt;word, defined in [Part1], Section 3.2.4&gt;
    2438 </artwork>
    2439 </figure>
    2440 <figure><preamble>ABNF diagnostics:</preamble><artwork type="inline">
    2441 ; Accept defined but not used
    2442 ; Accept-Charset defined but not used
    2443 ; Accept-Encoding defined but not used
    2444 ; Accept-Language defined but not used
    2445 ; Content-Encoding defined but not used
    2446 ; Content-Language defined but not used
    2447 ; Content-Location defined but not used
    2448 ; Content-Type defined but not used
    2449 ; MIME-Version defined but not used
    2450 </artwork></figure></section>
    2451 <?ENDINC p3-payload.abnf-appendix ?>
    2452 
    24532283<section title="Change Log (to be removed by RFC Editor before publication)" anchor="change.log">
    24542284
Note: See TracChangeset for help on using the changeset viewer.