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

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • draft-ietf-httpbis/latest/p1-messaging.xml

    r1635 r1643  
    1818  <!ENTITY caching-overview       "<xref target='Part6' x:rel='#caching.overview' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    1919  <!ENTITY cache-incomplete       "<xref target='Part6' x:rel='#response.cacheability' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    20   <!ENTITY payload                "<xref target='Part3' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    21   <!ENTITY media-types            "<xref target='Part3' x:rel='#media.types' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    22   <!ENTITY content-codings        "<xref target='Part3' x:rel='#content.codings' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     20  <!ENTITY payload                "<xref target='Part2' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     21  <!ENTITY media-types            "<xref target='Part2' x:rel='#media.types' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     22  <!ENTITY content-codings        "<xref target='Part2' x:rel='#content.codings' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    2323  <!ENTITY CONNECT                "<xref target='Part2' x:rel='#CONNECT' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    24   <!ENTITY content.negotiation    "<xref target='Part3' x:rel='#content.negotiation' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    25   <!ENTITY diff-mime              "<xref target='Part3' x:rel='#differences.between.http.and.mime' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    26   <!ENTITY representation         "<xref target='Part3' x:rel='#representation' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     24  <!ENTITY content.negotiation    "<xref target='Part2' x:rel='#content.negotiation' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     25  <!ENTITY diff-mime              "<xref target='Part2' x:rel='#differences.between.http.and.mime' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     26  <!ENTITY representation         "<xref target='Part2' x:rel='#representation' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    2727  <!ENTITY header-cache-control   "<xref target='Part6' x:rel='#header.cache-control' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    2828  <!ENTITY header-date            "<xref target='Part2' x:rel='#header.date' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    2929  <!ENTITY header-expect          "<xref target='Part2' x:rel='#header.expect' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    30   <!ENTITY header-mime-version    "<xref target='Part3' x:rel='#mime-version' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     30  <!ENTITY header-mime-version    "<xref target='Part2' x:rel='#mime-version' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    3131  <!ENTITY header-pragma          "<xref target='Part6' x:rel='#header.pragma' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    3232  <!ENTITY header-warning         "<xref target='Part6' x:rel='#header.warning' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     
    40944094</reference>
    40954095
    4096 <reference anchor="Part3">
    4097   <front>
    4098     <title abbrev="HTTP/1.1">HTTP/1.1, part 3: Message Payload and Content Negotiation</title>
    4099     <author initials="R." surname="Fielding" fullname="Roy T. Fielding" role="editor">
    4100       <organization abbrev="Adobe">Adobe Systems Incorporated</organization>
    4101       <address><email>fielding@gbiv.com</email></address>
    4102     </author>
    4103     <author initials="Y." surname="Lafon" fullname="Yves Lafon" role="editor">
    4104       <organization abbrev="W3C">World Wide Web Consortium</organization>
    4105       <address><email>ylafon@w3.org</email></address>
    4106     </author>
    4107     <author initials="J. F." surname="Reschke" fullname="Julian F. Reschke" role="editor">
    4108       <organization abbrev="greenbytes">greenbytes GmbH</organization>
    4109       <address><email>julian.reschke@greenbytes.de</email></address>
    4110     </author>
    4111     <date month="&ID-MONTH;" year="&ID-YEAR;"/>
    4112   </front>
    4113   <seriesInfo name="Internet-Draft" value="draft-ietf-httpbis-p3-payload-&ID-VERSION;"/>
    4114   <x:source href="p3-payload.xml" basename="p3-payload"/>
    4115 </reference>
    4116 
    41174096<reference anchor="Part6">
    41184097  <front>
Note: See TracChangeset for help on using the changeset viewer.