Changeset 1557 for draft-ietf-httpbis/latest/p2-semantics.xml

Timestamp:

03/03/12 23:56:54 (10 years ago)

Author:

fielding@…

Message:

(editorial) Consistently use lowercase for ABNF rule names other than header fields

File:

• draft-ietf-httpbis/latest/p2-semantics.xml (modified) (26 diffs)

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

@@ -401 +401 @@
 
 <section title="Method" anchor="method">
-  <x:anchor-alias value="Method"/>
+  <x:anchor-alias value="method"/>
   <x:anchor-alias value="extension-method"/>
 <t>
-   The Method token indicates the request method to be performed on the target
+   The method token indicates the request method to be performed on the target
    resource (&effective-request-uri;). The method is case-sensitive.
 </t>
-<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Method"/>
-  <x:ref>Method</x:ref>         = <x:ref>token</x:ref>
+<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="method"/>
+  <x:ref>method</x:ref>         = <x:ref>token</x:ref>
 </artwork></figure>
 <t>
@@ -449 +449 @@
 <section title="Method Registry" anchor="method.registry">
 <t>
-  The HTTP Method Registry defines the name space for the Method token in the
+  The HTTP Method Registry defines the name space for the method token in the
   Request line of an HTTP request.
 </t>
@@ -630 +630 @@
 <t>
    The response header fields allow the server to pass additional
-   information about the response which cannot be placed in the Status-Line.
+   information about the response which cannot be placed in the status-line.
    These header fields give information about the server and about
    further access to the target resource (&effective-request-uri;).
@@ -654 +654 @@
 
 <section title="Status Code and Reason Phrase" anchor="status.code.and.reason.phrase">
-  <x:anchor-alias value="Reason-Phrase"/>
-  <x:anchor-alias value="Status-Code"/>
+  <x:anchor-alias value="reason-phrase"/>
+  <x:anchor-alias value="status-code"/>
   <x:anchor-alias value="extension-code"/>
 <t>
-   The Status-Code element is a 3-digit integer result code of the attempt to
+   The status-code element is a 3-digit integer result code of the attempt to
    understand and satisfy the request.
 </t>
 <t>
-   The Reason-Phrase is intended to give a short textual description of the
-   Status-Code and is intended for a human user. The client does not need
-   to examine or display the Reason-Phrase.
-</t>
-<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Status-Code"/><iref primary="true" item="Grammar" subitem="extension-code"/><iref primary="true" item="Grammar" subitem="Reason-Phrase"/>
-  <x:ref>Status-Code</x:ref>    = 3<x:ref>DIGIT</x:ref>
-  <x:ref>Reason-Phrase</x:ref>  = *( <x:ref>HTAB</x:ref> / <x:ref>SP</x:ref> / <x:ref>VCHAR</x:ref> / <x:ref>obs-text</x:ref> )
+   The reason-phrase is intended to give a short textual description of the
+   status-code and is intended for a human user. The client does not need
+   to examine or display the reason-phrase.
+</t>
+<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="status-code"/><iref primary="true" item="Grammar" subitem="extension-code"/><iref primary="true" item="Grammar" subitem="reason-phrase"/>
+  <x:ref>status-code</x:ref>    = 3<x:ref>DIGIT</x:ref>
+  <x:ref>reason-phrase</x:ref>  = *( <x:ref>HTAB</x:ref> / <x:ref>SP</x:ref> / <x:ref>VCHAR</x:ref> / <x:ref>obs-text</x:ref> )
 </artwork></figure>
 <t>
@@ -694 +694 @@
 </t>
 <texttable align="left">
-  <ttcol>Status-Code</ttcol>
-  <ttcol>Reason-Phrase</ttcol>
+  <ttcol>status-code</ttcol>
+  <ttcol>reason-phrase</ttcol>
   <ttcol>Defined in...</ttcol>
   
@@ -752 +752 @@
 <section title="Status Code Registry" anchor="status.code.registry">
 <t>
-  The HTTP Status Code Registry defines the name space for the Status-Code
-  token in the Status-Line of an HTTP response.
+  The HTTP Status Code Registry defines the name space for the status-code
+  token in the status-line of an HTTP response.
 </t>
 <t>
@@ -917 +917 @@
   </rdf:Description>
   <iref primary="true" item="OPTIONS method" x:for-anchor=""/>
-  <iref primary="true" item="Methods" subitem="OPTIONS" x:for-anchor=""/>
+  <iref primary="true" item="methods" subitem="OPTIONS" x:for-anchor=""/>
 <t>
    The OPTIONS method requests information about the
@@ -976 +976 @@
   </rdf:Description>
   <iref primary="true" item="GET method" x:for-anchor=""/>
-  <iref primary="true" item="Methods" subitem="GET" x:for-anchor=""/>
+  <iref primary="true" item="methods" subitem="GET" x:for-anchor=""/>
 <t>
    The GET method requests transfer of a current representation of
@@ -1024 +1024 @@
   </rdf:Description>
   <iref primary="true" item="HEAD method" x:for-anchor=""/>
-  <iref primary="true" item="Methods" subitem="HEAD" x:for-anchor=""/>
+  <iref primary="true" item="methods" subitem="HEAD" x:for-anchor=""/>
 <t>
    The HEAD method is identical to GET except that the server &MUST-NOT;
@@ -1049 +1049 @@
 <section title="POST" anchor="POST">
   <iref primary="true" item="POST method" x:for-anchor=""/>
-  <iref primary="true" item="Methods" subitem="POST" x:for-anchor=""/>
+  <iref primary="true" item="methods" subitem="POST" x:for-anchor=""/>
 <t>
    The POST method requests that the origin server accept the
@@ -1105 +1105 @@
 <section title="PUT" anchor="PUT">
   <iref primary="true" item="PUT method" x:for-anchor=""/>
-  <iref primary="true" item="Methods" subitem="PUT" x:for-anchor=""/>
+  <iref primary="true" item="methods" subitem="PUT" x:for-anchor=""/>
 <t>
    The PUT method requests that the state of the target resource
@@ -1227 +1227 @@
 <section title="DELETE" anchor="DELETE">
   <iref primary="true" item="DELETE method" x:for-anchor=""/>
-  <iref primary="true" item="Methods" subitem="DELETE" x:for-anchor=""/>
+  <iref primary="true" item="methods" subitem="DELETE" x:for-anchor=""/>
 <t>
    The DELETE method requests that the origin server delete the target
@@ -1263 +1263 @@
   </rdf:Description>
   <iref primary="true" item="TRACE method" x:for-anchor=""/>
-  <iref primary="true" item="Methods" subitem="TRACE" x:for-anchor=""/>
+  <iref primary="true" item="methods" subitem="TRACE" x:for-anchor=""/>
 <t>
    The TRACE method requests a remote, application-layer loop-back
@@ -1292 +1292 @@
 <section title="CONNECT" anchor="CONNECT">
   <iref primary="true" item="CONNECT method" x:for-anchor=""/>
-  <iref primary="true" item="Methods" subitem="CONNECT" x:for-anchor=""/>
+  <iref primary="true" item="methods" subitem="CONNECT" x:for-anchor=""/>
 <t>
    The CONNECT method requests that the proxy establish a tunnel
@@ -1372 +1372 @@
 <section title="Status Code Definitions" anchor="status.codes">
 <t>
-   The first digit of the Status-Code defines the class of response. The
+   The first digit of the status-code defines the class of response. The
    last two digits do not have any categorization role. There are 5
    values for the first digit:
@@ -1398 +1398 @@
 </t>
 <t>
-   Each Status-Code is described below, including any metadata required
+   Each status-code is described below, including any metadata required
    in the response.
 </t>
@@ -1410 +1410 @@
 <t>
    This class of status code indicates a provisional response,
-   consisting only of the Status-Line and optional header fields, and is
+   consisting only of the status-line and optional header fields, and is
    terminated by an empty line. There are no required header fields for this
    class of status code. Since HTTP/1.0 did not define any 1xx status
@@ -1937 +1937 @@
   <iref primary="true" item="Status Codes" subitem="405 Method Not Allowed" x:for-anchor=""/>
 <t>
-   The method specified in the Request-Line is not allowed for the target
+   The method specified in the request-line is not allowed for the target
    resource. The response &MUST; include an Allow header field containing a
    list of valid methods for the requested resource.
@@ -2425 +2425 @@
 </t>
 <figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Allow"/>
-  <x:ref>Allow</x:ref> = #<x:ref>Method</x:ref>
+  <x:ref>Allow</x:ref> = #<x:ref>method</x:ref>
 </artwork></figure>
 <t>
@@ -3986 +3986 @@
 <figure>
 <artwork type="abnf" name="p2-semantics.parsed-abnf">
-<x:ref>Allow</x:ref> = [ ( "," / Method ) *( OWS "," [ OWS Method ] ) ]
+<x:ref>Allow</x:ref> = [ ( "," / method ) *( OWS "," [ OWS method ] ) ]
 
 <x:ref>BWS</x:ref> = &lt;BWS, defined in [Part1], Section 3.2.1&gt;
@@ -4003 +4003 @@
 
 <x:ref>Max-Forwards</x:ref> = 1*DIGIT
-<x:ref>Method</x:ref> = token
 
 <x:ref>OWS</x:ref> = &lt;OWS, defined in [Part1], Section 3.2.1&gt;
 
 <x:ref>RWS</x:ref> = &lt;RWS, defined in [Part1], Section 3.2.1&gt;
-<x:ref>Reason-Phrase</x:ref> = *( HTAB / SP / VCHAR / obs-text )
 <x:ref>Referer</x:ref> = absolute-URI / partial-URI
 <x:ref>Retry-After</x:ref> = HTTP-date / delta-seconds
 
 <x:ref>Server</x:ref> = product *( RWS ( product / comment ) )
-<x:ref>Status-Code</x:ref> = 3DIGIT
 
 <x:ref>URI-reference</x:ref> = &lt;URI-reference, defined in [Part1], Section 2.7&gt;
@@ -4052 +4049 @@
 
 <x:ref>mailbox</x:ref> = &lt;mailbox, defined in [RFC5322], Section 3.4&gt;
+<x:ref>method</x:ref> = token
 <x:ref>minute</x:ref> = 2DIGIT
 <x:ref>month</x:ref> = %x4A.61.6E ; Jan
@@ -4075 +4073 @@
 <x:ref>quoted-string</x:ref> = &lt;quoted-string, defined in [Part1], Section 3.2.4&gt;
 
+<x:ref>reason-phrase</x:ref> = *( HTAB / SP / VCHAR / obs-text )
 <x:ref>rfc1123-date</x:ref> = day-name "," SP date1 SP time-of-day SP GMT
 <x:ref>rfc850-date</x:ref> = day-name-l "," SP date2 SP time-of-day SP GMT
 
 <x:ref>second</x:ref> = 2DIGIT
+<x:ref>status-code</x:ref> = 3DIGIT
 
 <x:ref>time-of-day</x:ref> = hour ":" minute ":" second
@@ -4093 +4093 @@
 ; Location defined but not used
 ; Max-Forwards defined but not used
-; Reason-Phrase defined but not used
 ; Referer defined but not used
 ; Retry-After defined but not used
 ; Server defined but not used
-; Status-Code defined but not used
 ; User-Agent defined but not used
+; reason-phrase defined but not used
+; status-code defined but not used
 </artwork></figure></section>
 <?ENDINC p2-semantics.abnf-appendix ?>
@@ -4313 +4313 @@
     <t>
       <eref target="http://tools.ietf.org/wg/httpbis/trac/ticket/94"/>:
-      "Reason-Phrase BNF"
+      "reason-phrase BNF"
     </t>
   </list>
@@ -4522 +4522 @@
     <t>
       <eref target="http://tools.ietf.org/wg/httpbis/trac/ticket/137"/>:
-      "duplicate ABNF for Reason-Phrase"
+      "duplicate ABNF for reason-phrase"
     </t>
     <t>