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

Timestamp:

11/03/11 05:37:52 (11 years ago)

Author:

fielding@…

Message:

editorial consistency:
Use "request method" when talking about HTTP method tokens
unless it is obvious from context.
Make method descriptions a bit more consistent.

File:

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

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

@@ -1405 +1405 @@
    because the associated response header fields (e.g., Transfer-Encoding,
    Content-Length, etc.) only indicate what their values would have been
-   if the method had been GET.  All 1xx (Informational), 204 (No Content),
+   if the request method had been GET.  All 1xx (Informational), 204 (No Content),
    and 304 (Not Modified) responses &MUST-NOT; include a message-body.
    All other responses do include a message-body, although the body
@@ -1604 +1604 @@
   <x:anchor-alias value="Method"/>
 <t>
-   The Method  token indicates the method to be performed on the
-   resource identified by the request-target. The method is case-sensitive.
+   The Method token indicates the request method to be performed on the
+   target resource. The request method is case-sensitive.
 </t>
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Method"/>
@@ -1615 +1615 @@
   <x:anchor-alias value="request-target"/>
 <t>
-   The request-target identifies the resource upon which to apply the request.
+   The request-target identifies the target resource upon which to apply the request.
 </t>
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="request-target"/>
@@ -1630 +1630 @@
    The asterisk "*" ("asterisk form") means that the request does not apply to a
    particular resource, but to the server itself. This is only allowed for the
-   OPTIONS method. Thus, the only valid example is
+   OPTIONS request method. Thus, the only valid example is
 </t>
 <figure><artwork type="message/http; msgtype=&#34;request&#34;" x:indent-with="  ">
@@ -1655 +1655 @@
 </t>
 <t><iref item="authority form (of request-target)"/>
-   The "authority form" is only used by the CONNECT method (&CONNECT;).
+   The "authority form" is only used by the CONNECT request method (&CONNECT;).
 </t>
 <t><iref item="path-absolute form (of request-target)"/>
@@ -1677 +1677 @@
 </t>
 <t>
-   If a proxy receives a request without any path in the request-target and
-   the method specified is capable of supporting the asterisk form of
-   request-target, then the last proxy on the request chain &MUST; forward the
-   request with "*" as the final request-target.
+   If a proxy receives an OPTIONS request without any path in the
+   request-target, then the last proxy on the request chain &MUST;
+   forward the request with "*" as the final request-target.
 </t>
 <figure><preamble>   
@@ -1688 +1687 @@
 </artwork></figure>
 <figure><preamble>   
-  would be forwarded by the proxy as
+  would be forwarded by the final proxy as
 </preamble><artwork type="message/http; msgtype=&#34;request&#34;" x:indent-with="  ">
 OPTIONS * HTTP/1.1
@@ -2525 +2524 @@
 </t>
 <t>
-   Clients &SHOULD-NOT;  pipeline requests using non-idempotent methods or
-   non-idempotent sequences of methods (see &idempotent-methods;). Otherwise, a
+   Clients &SHOULD-NOT; pipeline requests using non-idempotent request methods or
+   non-idempotent sequences of request methods (see &idempotent-methods;). Otherwise, a
    premature termination of the transport connection could lead to
    indeterminate results. A client wishing to send a non-idempotent
@@ -2696 +2695 @@
    transport connection and retransmit the aborted sequence of requests
    without user interaction so long as the request sequence is
-   idempotent (see &idempotent-methods;). Non-idempotent methods or sequences
+   idempotent (see &idempotent-methods;). Non-idempotent request methods or sequences
    &MUST-NOT; be automatically retried, although user agents &MAY; offer a
    human operator the choice of retrying the request(s). Confirmation by
@@ -2804 +2803 @@
         code, it &MAY; close the transport connection or it &MAY; continue
         to read and discard the rest of the request.  It &MUST-NOT;
-        perform the requested method if it returns a final status code.
+        perform the request method if it returns a final status code.
     </t>
     <t> An origin server &SHOULD-NOT;  send a 100 (Continue) response if
@@ -3038 +3037 @@
    The "Content-Length" header field indicates the size of the
    message-body, in decimal number of octets, for any message other than
-   a response to the HEAD method or a response with a status code of 304.
-   In the case of responses to the HEAD method, it indicates the size of
-   the payload body (not including any potential transfer-coding) that
-   would have been sent had the request been a GET.
-   In the case of the 304 (Not Modified) response, it indicates the size of
-   the payload body (not including any potential transfer-coding) that
-   would have been sent in a 200 (OK) response.
+   a response to a HEAD request or a response with a status code of 304.
+   In the case of a response to a HEAD request, Content-Length indicates
+   the size of the payload body (not including any potential transfer-coding)
+   that would have been sent had the request been a GET.
+   In the case of a 304 (Not Modified) response to a GET request,
+   Content-Length indicates the size of the payload body (not including
+   any potential transfer-coding) that would have been sent in a 200 (OK)
+   response.
 </t>
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Content-Length"/><iref primary="true" item="Grammar" subitem="Content-Length-v"/>
@@ -3384 +3384 @@
    supported protocol while indicating to the server that it would like
    to use a "better" protocol if available (where "better" is determined
-   by the server, possibly according to the nature of the method and/or
-   resource being requested).
+   by the server, possibly according to the nature of the request method
+   or target resource).
 </t>
 <t>
@@ -4868 +4868 @@
    since 1990. The first version of HTTP, later referred to as HTTP/0.9,
    was a simple protocol for hypertext data transfer across the Internet
-   with only a single method and no metadata.
+   with only a single request method (GET) and no metadata.
    HTTP/1.0, as defined by <xref target="RFC1945"/>, added a range of request
    methods and MIME-like messaging that could include metadata about the data
@@ -5023 +5023 @@
   Update use of abs_path production from RFC 1808 to the path-absolute + query
   components of RFC 3986. State that the asterisk form is allowed for the OPTIONS
-  method only.
+  request method only.
   (<xref target="request-target"/>)
 </t>