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

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.html (modified) (10 diffs)

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

@@ -460 +460 @@
   } 
   @bottom-center {
-       content: "Expires September 29, 2012"; 
+       content: "Expires October 1, 2012"; 
   } 
   @bottom-right {
@@ -501 +501 @@
       <meta name="dct.creator" content="Reschke, J. F.">
       <meta name="dct.identifier" content="urn:ietf:id:draft-ietf-httpbis-p4-conditional-latest">
-      <meta name="dct.issued" scheme="ISO8601" content="2012-03-28">
+      <meta name="dct.issued" scheme="ISO8601" content="2012-03-30">
       <meta name="dct.replaces" content="urn:ietf:rfc:2616">
       <meta name="dct.abstract" content="The Hypertext Transfer Protocol (HTTP) is an application-level protocol for distributed, collaborative, hypertext information systems. HTTP has been in use by the World Wide Web global information initiative since 1990. This document is Part 4 of the seven-part specification that defines the protocol referred to as &#34;HTTP/1.1&#34; and, taken together, obsoletes RFC 2616. Part 4 defines request header fields for indicating conditional requests and the rules for constructing responses to those requests.">
@@ -527 +527 @@
             </tr>
             <tr>
-               <td class="left">Expires: September 29, 2012</td>
+               <td class="left">Expires: October 1, 2012</td>
                <td class="right">J. Reschke, Editor</td>
             </tr>
@@ -536 +536 @@
             <tr>
                <td class="left"></td>
-               <td class="right">March 28, 2012</td>
+               <td class="right">March 30, 2012</td>
             </tr>
          </tbody>
@@ -566 +566 @@
          in progress”.
       </p>
-      <p>This Internet-Draft will expire on September 29, 2012.</p>
+      <p>This Internet-Draft will expire on October 1, 2012.</p>
       <h1><a id="rfc.copyrightnotice" href="#rfc.copyrightnotice">Copyright Notice</a></h1>
       <p>Copyright © 2012 IETF Trust and the persons identified as the document authors. All rights reserved.</p>
@@ -896 +896 @@
       </div>
       <h3 id="rfc.section.2.3.3"><a href="#rfc.section.2.3.3">2.3.3</a>&nbsp;<a id="example.entity.tag.vs.conneg" href="#example.entity.tag.vs.conneg">Example: Entity-tags varying on Content-Negotiated Resources</a></h3>
-      <p id="rfc.section.2.3.3.p.1">Consider a resource that is subject to content negotiation (<a href="p3-payload.html#content.negotiation" title="Content Negotiation">Section 5</a> of <a href="#Part3" id="rfc.xref.Part3.1"><cite title="HTTP/1.1, part 3: Message Payload and Content Negotiation">[Part3]</cite></a>), and where the representations returned upon a GET request vary based on the Accept-Encoding request header field (<a href="p3-payload.html#header.accept-encoding" title="Accept-Encoding">Section 6.3</a> of <a href="#Part3" id="rfc.xref.Part3.2"><cite title="HTTP/1.1, part 3: Message Payload and Content Negotiation">[Part3]</cite></a>):
+      <p id="rfc.section.2.3.3.p.1">Consider a resource that is subject to content negotiation (<a href="p2-semantics.html#content.negotiation" title="Content Negotiation">Appendix D.4</a> of <a href="#Part2" id="rfc.xref.Part2.3"><cite title="HTTP/1.1, part 2: Message Semantics">[Part2]</cite></a>), and where the representations returned upon a GET request vary based on the Accept-Encoding request header field (<a href="p2-semantics.html#header.accept-encoding" title="Accept-Encoding">Appendix D.5.3</a> of <a href="#Part2" id="rfc.xref.Part2.4"><cite title="HTTP/1.1, part 2: Message Semantics">[Part2]</cite></a>):
       </p>
       <div id="rfc.figure.u.6"></div>
@@ -1123 +1123 @@
          as if it were the payload of a 200 response. The 304 response <em class="bcp14">MUST NOT</em> contain a message-body, and thus is always terminated by the first empty line after the header fields.
       </p>
-      <p id="rfc.section.4.1.p.2">A 304 response <em class="bcp14">MUST</em> include a Date header field (<a href="p2-semantics.html#header.date" title="Date">Section 7.2</a> of <a href="#Part2" id="rfc.xref.Part2.3"><cite title="HTTP/1.1, part 2: Message Semantics">[Part2]</cite></a>) unless the origin server does not have a clock that can provide a reasonable approximation of the current time. If a 200
+      <p id="rfc.section.4.1.p.2">A 304 response <em class="bcp14">MUST</em> include a Date header field (<a href="p2-semantics.html#header.date" title="Date">Section 7.2</a> of <a href="#Part2" id="rfc.xref.Part2.5"><cite title="HTTP/1.1, part 2: Message Semantics">[Part2]</cite></a>) unless the origin server does not have a clock that can provide a reasonable approximation of the current time. If a 200
          response to the same request would have included any of the header fields Cache-Control, Content-Location, ETag, Expires,
          or Vary, then those same header fields <em class="bcp14">MUST</em> be sent in a 304 response.
@@ -1245 +1245 @@
       <h2 id="rfc.references.1"><a href="#rfc.section.8.1" id="rfc.section.8.1">8.1</a> Normative References
       </h2>
-      <table>              
+      <table>            
          <tr>
             <td class="reference"><b id="Part1">[Part1]</b></td>
@@ -1254 +1254 @@
             <td class="reference"><b id="Part2">[Part2]</b></td>
             <td class="top"><a href="mailto:fielding@gbiv.com" title="Adobe Systems Incorporated">Fielding, R., Ed.</a>, <a href="mailto:ylafon@w3.org" title="World Wide Web Consortium">Lafon, Y., Ed.</a>, and <a href="mailto:julian.reschke@greenbytes.de" title="greenbytes GmbH">J. Reschke, Ed.</a>, “<a href="http://tools.ietf.org/html/draft-ietf-httpbis-p2-semantics-latest">HTTP/1.1, part 2: Message Semantics</a>”, Internet-Draft&nbsp;draft-ietf-httpbis-p2-semantics-latest (work in progress), March&nbsp;2012.
-            </td>
-         </tr>
-         <tr>
-            <td class="reference"><b id="Part3">[Part3]</b></td>
-            <td class="top"><a href="mailto:fielding@gbiv.com" title="Adobe Systems Incorporated">Fielding, R., Ed.</a>, <a href="mailto:ylafon@w3.org" title="World Wide Web Consortium">Lafon, Y., Ed.</a>, and <a href="mailto:julian.reschke@greenbytes.de" title="greenbytes GmbH">J. Reschke, Ed.</a>, “<a href="http://tools.ietf.org/html/draft-ietf-httpbis-p3-payload-latest">HTTP/1.1, part 3: Message Payload and Content Negotiation</a>”, Internet-Draft&nbsp;draft-ietf-httpbis-p3-payload-latest (work in progress), March&nbsp;2012.
             </td>
          </tr>
@@ -1428 +1423 @@
                      </ul>
                   </li>
-                  <li><em>Part2</em>&nbsp;&nbsp;<a href="#rfc.xref.Part2.1">1.2</a>, <a href="#rfc.xref.Part2.2">1.2</a>, <a href="#rfc.xref.Part2.3">4.1</a>, <a href="#Part2"><b>8.1</b></a><ul>
+                  <li><em>Part2</em>&nbsp;&nbsp;<a href="#rfc.xref.Part2.1">1.2</a>, <a href="#rfc.xref.Part2.2">1.2</a>, <a href="#rfc.xref.Part2.3">2.3.3</a>, <a href="#rfc.xref.Part2.4">2.3.3</a>, <a href="#rfc.xref.Part2.5">4.1</a>, <a href="#Part2"><b>8.1</b></a><ul>
                         <li><em>Section 6.1</em>&nbsp;&nbsp;<a href="#rfc.xref.Part2.2">1.2</a></li>
-                        <li><em>Section 7.2</em>&nbsp;&nbsp;<a href="#rfc.xref.Part2.3">4.1</a></li>
-                     </ul>
-                  </li>
-                  <li><em>Part3</em>&nbsp;&nbsp;<a href="#rfc.xref.Part3.1">2.3.3</a>, <a href="#rfc.xref.Part3.2">2.3.3</a>, <a href="#Part3"><b>8.1</b></a><ul>
-                        <li><em>Section 5</em>&nbsp;&nbsp;<a href="#rfc.xref.Part3.1">2.3.3</a></li>
-                        <li><em>Section 6.3</em>&nbsp;&nbsp;<a href="#rfc.xref.Part3.2">2.3.3</a></li>
+                        <li><em>Section 7.2</em>&nbsp;&nbsp;<a href="#rfc.xref.Part2.5">4.1</a></li>
+                        <li><em>Appendix D.4</em>&nbsp;&nbsp;<a href="#rfc.xref.Part2.3">2.3.3</a></li>
+                        <li><em>Appendix D.5.3</em>&nbsp;&nbsp;<a href="#rfc.xref.Part2.4">2.3.3</a></li>
                      </ul>
                   </li>