Changeset 1643 for draft-ietf-httpbis/latest/p1-messaging.xml

Timestamp:

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

Author:

julian.reschke@…

Message:

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

File:

• draft-ietf-httpbis/latest/p1-messaging.xml (modified) (2 diffs)

draft-ietf-httpbis/latest/p1-messaging.xml

@@ -18 +18 @@
   <!ENTITY caching-overview       "<xref target='Part6' x:rel='#caching.overview' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
   <!ENTITY cache-incomplete       "<xref target='Part6' x:rel='#response.cacheability' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
-  <!ENTITY payload                "<xref target='Part3' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
-  <!ENTITY media-types            "<xref target='Part3' x:rel='#media.types' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
-  <!ENTITY content-codings        "<xref target='Part3' x:rel='#content.codings' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
+  <!ENTITY payload                "<xref target='Part2' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
+  <!ENTITY media-types            "<xref target='Part2' x:rel='#media.types' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
+  <!ENTITY content-codings        "<xref target='Part2' x:rel='#content.codings' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
   <!ENTITY CONNECT                "<xref target='Part2' x:rel='#CONNECT' 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 diff-mime              "<xref target='Part3' x:rel='#differences.between.http.and.mime' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
-  <!ENTITY representation         "<xref target='Part3' x:rel='#representation' 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'/>">
+  <!ENTITY diff-mime              "<xref target='Part2' x:rel='#differences.between.http.and.mime' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
+  <!ENTITY representation         "<xref target='Part2' x:rel='#representation' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
   <!ENTITY header-cache-control   "<xref target='Part6' x:rel='#header.cache-control' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
   <!ENTITY header-date            "<xref target='Part2' x:rel='#header.date' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
   <!ENTITY header-expect          "<xref target='Part2' x:rel='#header.expect' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
-  <!ENTITY header-mime-version    "<xref target='Part3' x:rel='#mime-version' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
+  <!ENTITY header-mime-version    "<xref target='Part2' x:rel='#mime-version' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
   <!ENTITY header-pragma          "<xref target='Part6' x:rel='#header.pragma' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
   <!ENTITY header-warning         "<xref target='Part6' x:rel='#header.warning' xmlns:x='http://purl.org/net/xml2rfc/ext'/>">
@@ -4094 +4094 @@
 </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="Part6">
   <front>