Changeset 2061 for draft-ietf-httpbis

Timestamp:

29/12/12 02:18:05 (9 years ago)

Author:

fielding@…

Message:

(editorial) slight rephrasing of 409

Location:

draft-ietf-httpbis/latest

Files:

• p2-semantics.html (modified) (1 diff)
• p2-semantics.xml (modified) (2 diffs)

draft-ietf-httpbis/latest/p2-semantics.html

@@ -2644 +2644 @@
       <h3 id="rfc.section.6.5.8"><a href="#rfc.section.6.5.8">6.5.8</a>&nbsp;<a id="status.409" href="#status.409">409 Conflict</a></h3>
       <p id="rfc.section.6.5.8.p.1">The <dfn>409 (Conflict)</dfn> status code indicates that the request could not be completed due to a conflict with the current state of the resource. This
-         code is only reasonable in situations where it is expected that the user might be able to resolve the conflict and resubmit
-         the request. The server <em class="bcp14">SHOULD</em> generate a payload that includes enough information for the user to recognize the source of the conflict. Ideally, the response
-         would include enough information for the user or user agent to fix the problem; however, that might not be possible and is
-         not required.
+         code is used in situations where the user might be able to resolve the conflict and resubmit the request. The server <em class="bcp14">SHOULD</em> generate a payload that includes enough information for a user to recognize the source of the conflict.
       </p>
       <p id="rfc.section.6.5.8.p.2">Conflicts are most likely to occur in response to a PUT request. For example, if versioning were being used and the representation
-         being PUT included changes to a resource which conflict with those made by an earlier (third-party) request, the server might
-         use the 409 response to indicate that it can't complete the request. In this case, the response representation would likely
-         contain a list of the differences between the two versions.
+         being PUT included changes to a resource which conflict with those made by an earlier (third-party) request, the origin server
+         might use a 409 response to indicate that it can't complete the request. In this case, the response representation would likely
+         contain information useful for merging the differences based on the revision history.
       </p>
       <div id="rfc.iref.74"></div>

draft-ietf-httpbis/latest/p2-semantics.xml

@@ -3219 +3219 @@
    The <x:dfn>409 (Conflict)</x:dfn> status code indicates that the request
    could not be completed due to a conflict with the current state of the
-   resource. This code is only reasonable in situations where it is expected
-   that the user might be able to resolve the conflict and resubmit the
-   request. The server &SHOULD; generate a payload that includes enough
-   information for the user to recognize the source of the conflict. Ideally,
-   the response would include enough information for the user or user agent to
-   fix the problem; however, that might not be possible and is not required.
+   resource. This code is used in situations where the user might be able to
+   resolve the conflict and resubmit the request. The server &SHOULD; generate
+   a payload that includes enough information for a user to recognize the
+   source of the conflict.
 </t>
 <t>
@@ -3230 +3228 @@
    example, if versioning were being used and the representation being PUT
    included changes to a resource which conflict with those made by an
-   earlier (third-party) request, the server might use the 409 response
-   to indicate that it can't complete the request. In this case, the
-   response representation would likely contain a list of the differences
-   between the two versions.
+   earlier (third-party) request, the origin server might use a 409 response
+   to indicate that it can't complete the request. In this case, the response
+   representation would likely contain information useful for merging the
+   differences based on the revision history.
 </t>
 </section>