Changeset 1643 for draft-ietf-httpbis/latest/p4-conditional.xml

Timestamp:

30/03/12 15:19:59 (9 years ago)

Author:

julian.reschke@…

Message:

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

File:

• draft-ietf-httpbis/latest/p4-conditional.xml (modified) (3 diffs)

draft-ietf-httpbis/latest/p4-conditional.xml

@@ -24 +24 @@
   <!ENTITY messaging                  "<xref target='Part1' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
   <!ENTITY caching                    "<xref target='Part6' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
-  <!ENTITY header-accept-encoding     "<xref target='Part3' x:rel='#header.accept-encoding' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
+  <!ENTITY header-accept-encoding     "<xref target='Part2' x:rel='#header.accept-encoding' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
   <!ENTITY header-if-range            "<xref target='Part5' x:rel='#header.if-range' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
   <!ENTITY header-range               "<xref target='Part5' x:rel='#header.range' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
@@ -30 +30 @@
   <!ENTITY http-date                  "<xref target='Part2' x:rel='#http.date' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
   <!ENTITY transfer-codings           "<xref target='Part1' x:rel='#transfer.codings' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
-  <!ENTITY content-negotiation        "<xref target='Part3' x:rel='#content.negotiation' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
+  <!ENTITY content-negotiation        "<xref target='Part2' x:rel='#content.negotiation' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
 ]>
 <?rfc toc="yes" ?>
@@ -1191 +1191 @@
 </reference>
 
-<reference anchor="Part3">
-  <front>
-    <title abbrev="HTTP/1.1">HTTP/1.1, part 3: Message Payload and Content Negotiation</title>
-    <author initials="R." surname="Fielding" fullname="Roy T. Fielding" role="editor">
-      <organization abbrev="Adobe">Adobe Systems Incorporated</organization>
-      <address><email>fielding@gbiv.com</email></address>
-    </author>
-    <author initials="Y." surname="Lafon" fullname="Yves Lafon" role="editor">
-      <organization abbrev="W3C">World Wide Web Consortium</organization>
-      <address><email>ylafon@w3.org</email></address>
-    </author>
-    <author initials="J. F." surname="Reschke" fullname="Julian F. Reschke" role="editor">
-      <organization abbrev="greenbytes">greenbytes GmbH</organization>
-      <address><email>julian.reschke@greenbytes.de</email></address>
-    </author>
-    <date month="&ID-MONTH;" year="&ID-YEAR;"/>
-  </front>
-  <seriesInfo name="Internet-Draft" value="draft-ietf-httpbis-p3-payload-&ID-VERSION;"/>
-  <x:source href="p3-payload.xml" basename="p3-payload"/>
-</reference>
-
 <reference anchor="Part5">
   <front>