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/p4-conditional.xml

    r1625 r1643  
    2424  <!ENTITY messaging                  "<xref target='Part1' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    2525  <!ENTITY caching                    "<xref target='Part6' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    26   <!ENTITY header-accept-encoding     "<xref target='Part3' x:rel='#header.accept-encoding' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     26  <!ENTITY header-accept-encoding     "<xref target='Part2' x:rel='#header.accept-encoding' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    2727  <!ENTITY header-if-range            "<xref target='Part5' x:rel='#header.if-range' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    2828  <!ENTITY header-range               "<xref target='Part5' x:rel='#header.range' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     
    3030  <!ENTITY http-date                  "<xref target='Part2' x:rel='#http.date' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    3131  <!ENTITY transfer-codings           "<xref target='Part1' x:rel='#transfer.codings' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    32   <!ENTITY content-negotiation        "<xref target='Part3' x:rel='#content.negotiation' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
     32  <!ENTITY content-negotiation        "<xref target='Part2' x:rel='#content.negotiation' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
    3333]>
    3434<?rfc toc="yes" ?>
     
    11911191</reference>
    11921192
    1193 <reference anchor="Part3">
    1194   <front>
    1195     <title abbrev="HTTP/1.1">HTTP/1.1, part 3: Message Payload and Content Negotiation</title>
    1196     <author initials="R." surname="Fielding" fullname="Roy T. Fielding" role="editor">
    1197       <organization abbrev="Adobe">Adobe Systems Incorporated</organization>
    1198       <address><email>fielding@gbiv.com</email></address>
    1199     </author>
    1200     <author initials="Y." surname="Lafon" fullname="Yves Lafon" role="editor">
    1201       <organization abbrev="W3C">World Wide Web Consortium</organization>
    1202       <address><email>ylafon@w3.org</email></address>
    1203     </author>
    1204     <author initials="J. F." surname="Reschke" fullname="Julian F. Reschke" role="editor">
    1205       <organization abbrev="greenbytes">greenbytes GmbH</organization>
    1206       <address><email>julian.reschke@greenbytes.de</email></address>
    1207     </author>
    1208     <date month="&ID-MONTH;" year="&ID-YEAR;"/>
    1209   </front>
    1210   <seriesInfo name="Internet-Draft" value="draft-ietf-httpbis-p3-payload-&ID-VERSION;"/>
    1211   <x:source href="p3-payload.xml" basename="p3-payload"/>
    1212 </reference>
    1213 
    12141193<reference anchor="Part5">
    12151194  <front>
Note: See TracChangeset for help on using the changeset viewer.