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

Timestamp:

19/02/11 12:55:03 (12 years ago)

Author:

julian.reschke@…

Message:

Remove duplicated "Method" ABNF by transforming the ABNF-style list in P2 into a table (see #275)

File:

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

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

@@ -433 +433 @@
    resource (&effective-request-uri;). The method is case-sensitive.
 </t>
-<figure><artwork type="abnf2616"><iref primary="true" item="Grammar" subitem="Method"/><iref primary="true" item="Grammar" subitem="extension-method"/>
-  <x:ref>Method</x:ref>         = <x:abnf-char-sequence>"OPTIONS"</x:abnf-char-sequence>   ; "OPTIONS", <xref target="OPTIONS"/>
-                 / <x:abnf-char-sequence>"GET"</x:abnf-char-sequence>               ; "GET", <xref target="GET"/>
-                 / <x:abnf-char-sequence>"HEAD"</x:abnf-char-sequence>            ; "HEAD", <xref target="HEAD"/>
-                 / <x:abnf-char-sequence>"POST"</x:abnf-char-sequence>            ; "POST", <xref target="POST"/>
-                 / <x:abnf-char-sequence>"PUT"</x:abnf-char-sequence>               ; "PUT", <xref target="PUT"/>
-                 / <x:abnf-char-sequence>"DELETE"</x:abnf-char-sequence>      ; "DELETE", <xref target="DELETE"/>
-                 / <x:abnf-char-sequence>"TRACE"</x:abnf-char-sequence>         ; "TRACE", <xref target="TRACE"/>
-                 / <x:abnf-char-sequence>"CONNECT"</x:abnf-char-sequence>   ; "CONNECT", <xref target="CONNECT"/>
-                 / <x:ref>extension-method</x:ref>
-  <x:ref>extension-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>
@@ -459 +450 @@
    in <xref target="method.definitions"/>.
 </t>
+
+<section title="Overview of Methods" anchor="overview.of.methods">
+<t>
+  The methods listed below are defined in <xref target="method.definitions"/>.
+</t>
+<texttable align="left">
+  <ttcol>Method Name</ttcol><ttcol>Defined in...</ttcol>
+  
+  <c>OPTIONS</c> <c><xref target="OPTIONS"/></c>
+  <c>GET</c> <c><xref target="GET"/></c>
+  <c>HEAD</c> <c><xref target="HEAD"/></c>
+  <c>POST</c> <c><xref target="POST"/></c>
+  <c>PUT</c> <c><xref target="PUT"/></c>
+  <c>DELETE</c> <c><xref target="DELETE"/></c>
+  <c>TRACE</c> <c><xref target="TRACE"/></c>
+  <c>CONNECT</c> <c><xref target="CONNECT"/></c>
+</texttable>
+<t>
+  Note that this list is not exhaustive &mdash; it does not include methods defined
+  in other specifications.
+</t>
+</section>
 
 <section title="Method Registry" anchor="method.registry">
@@ -3561 +3574 @@
 <x:ref>Max-Forwards</x:ref> = "Max-Forwards:" OWS Max-Forwards-v
 <x:ref>Max-Forwards-v</x:ref> = 1*DIGIT
-<x:ref>Method</x:ref> = %x4F.50.54.49.4F.4E.53 ; OPTIONS
- / %x47.45.54 ; GET
- / %x48.45.41.44 ; HEAD
- / %x50.4F.53.54 ; POST
- / %x50.55.54 ; PUT
- / %x44.45.4C.45.54.45 ; DELETE
- / %x54.52.41.43.45 ; TRACE
- / %x43.4F.4E.4E.45.43.54 ; CONNECT
- / extension-method
+<x:ref>Method</x:ref> = token
 
 <x:ref>OWS</x:ref> = &lt;OWS, defined in [Part1], Section 1.2.2&gt;
@@ -3611 +3616 @@
 <x:ref>expectation-extension</x:ref> = token [ "=" ( token / quoted-string )
  *expect-params ]
-<x:ref>extension-method</x:ref> = token
 
 <x:ref>mailbox</x:ref> = &lt;mailbox, defined in [RFC5322], Section 3.4&gt;
@@ -4063 +4067 @@
       "PUT side effect: invalidation or just stale?"
     </t>
+    <t>
+      <eref target="http://tools.ietf.org/wg/httpbis/trac/ticket/275"/>:
+      "duplicate ABNF for 'Method'"
+    </t>
   </list>
 </t>