Changeset 950

Timestamp:

27/07/10 15:26:51 (12 years ago)

Author:

mnot@…

Message:

remove merged text

File:

• draft-ietf-httpbis/latest/p6-cache.xml (modified) (2 diffs)

draft-ietf-httpbis/latest/p6-cache.xml

@@ -856 +856 @@
 </t>
 <t>
-<<<<<<< .mine
    The following HTTP methods &MUST; cause a cache to invalidate the Effective
    Request URI (&effective-request-uri;) as well as the URI(s) in the Location
@@ -865 +864 @@
       <t>POST</t>
    </list>
-=======
-  In a succesful exchange (&status.2xx;), the following HTTP methods &MUST; cause a cache 
-  to invalidate the Effective Request URI (&effective-request-uri;) as well
-  as the URI(s) in the Location and Content-Location headers (if present):
-  <list style="symbols">
-    <t>PUT</t>
-    <t>DELETE</t>
-    <t>POST</t>
-  </list>
->>>>>>> .r948
 </t>
 <t>