From 50aa8ca12e46e06c5078193caa854de30ba38fa8 Mon Sep 17 00:00:00 2001
From: Julian Reschke <julian.reschke@gmx.de>
Date: Tue, 26 May 2015 15:14:28 +0100
Subject: [PATCH] IANA considerations (#746)

---
 draft-ietf-httpbis-http2.xml | 58 ++++++++++++++++++++++++++----------
 1 file changed, 42 insertions(+), 16 deletions(-)

diff --git a/draft-ietf-httpbis-http2.xml b/draft-ietf-httpbis-http2.xml
index a4821e25..2fa0928b 100644
--- a/draft-ietf-httpbis-http2.xml
+++ b/draft-ietf-httpbis-http2.xml
@@ -4010,20 +4010,20 @@ HTTP2-Settings    = token68
       </t>
       <t>
         This document establishes a registry for frame types, settings, and error codes.  These new
-        registries are entered into a new "Hypertext Transfer Protocol (HTTP) 2 Parameters" section.
+        registries appear in the new "Hypertext Transfer Protocol version 2 (HTTP/2) Parameters" section.
       </t>
       <t>
         This document registers the <spanx style="verb">HTTP2-Settings</spanx> header field for
-        use in HTTP; and the 421 (Misdirected Request) status code.
+        use in HTTP; it also registers the 421 (Misdirected Request) status code.
       </t>
       <t>
-        This document registers the <spanx style="verb">PRI</spanx> method for use in HTTP, to avoid
+        This document registers the <spanx style="verb">PRI</spanx> method for use in HTTP to avoid
         collisions with the <xref target="ConnectionHeader">connection preface</xref>.
       </t>
 
       <section anchor="iana-alpn" title="Registration of HTTP/2 Identification Strings">
         <t>
-          This document creates two registrations for the identification of HTTP/2 in the
+          This document creates two registrations for the identification of HTTP/2 (see <xref target="discover-https"/>) in the
           "Application-Layer Protocol Negotiation (ALPN) Protocol IDs" registry established in <xref
           target="TLS-ALPN"/>.
         </t>
@@ -4051,7 +4051,7 @@ HTTP2-Settings    = token68
           Type" registry manages an 8-bit space.  The "HTTP/2 Frame Type" registry operates under
           either of the <xref target="RFC5226">"IETF Review" or "IESG Approval" policies</xref> for
           values between 0x00 and 0xef, with values between 0xf0 and 0xff being reserved for
-          experimental use.
+          Experimental Use.
         </t>
         <t>
           New entries in this registry require the following information:
@@ -4094,7 +4094,7 @@ HTTP2-Settings    = token68
           This document establishes a registry for HTTP/2 settings.  The "HTTP/2 Settings" registry
           manages a 16-bit space.  The "HTTP/2 Settings" registry operates under the <xref
           target="RFC5226">"Expert Review" policy</xref> for values in the range from 0x0000 to
-          0xefff, with values between and 0xf000 and 0xffff being reserved for experimental use.
+          0xefff, with values between and 0xf000 and 0xffff being reserved for Experimental Use.
         </t>
         <t>
           New registrations are advised to provide the following information:
@@ -4114,7 +4114,7 @@ HTTP2-Settings    = token68
           </list>
         </t>
         <t>
-          An initial set of setting registrations can be found in <xref target="SettingValues"/>.
+          The entries in the following table are registered by this document.
         </t>
         <texttable align="left" suppress-title="true">
           <ttcol>Name</ttcol>
@@ -4185,7 +4185,7 @@ HTTP2-Settings    = token68
           <c>Implementation fault</c>
           <c><xref target="ErrorCodes"/></c>
           <c>FLOW_CONTROL_ERROR</c><c>0x3</c>
-          <c>Flow control limits exceeded</c>
+          <c>Flow-control limits exceeded</c>
           <c><xref target="ErrorCodes"/></c>
           <c>SETTINGS_TIMEOUT</c><c>0x4</c>
           <c>Settings not acknowledged</c>
@@ -4224,7 +4224,7 @@ HTTP2-Settings    = token68
       <section title="HTTP2-Settings Header Field Registration">
         <t>
           This section registers the <spanx style="verb">HTTP2-Settings</spanx> header field in the
-          <xref target="BCP90">Permanent Message Header Field Registry</xref>.
+          "Permanent Message Header Field Names" Registry <xref target="BCP90"/>.
           <list style="hanging">
             <t hangText="Header field name:">
               HTTP2-Settings
@@ -4250,19 +4250,19 @@ HTTP2-Settings    = token68
 
       <section title="PRI Method Registration">
         <t>
-          This section registers the <spanx style="verb">PRI</spanx> method in the HTTP Method
-          Registry (<xref target="RFC7231" x:fmt="," x:rel="#method.registry"/>).
+          This section registers the <spanx style="verb">PRI</spanx> method in the "HTTP Method
+          Registry" (<xref target="RFC7231" x:fmt="," x:rel="#method.registry"/>).
           <list style="hanging">
             <t hangText="Method Name:">
               PRI
             </t>
-            <t hangText="Safe">
+            <t hangText="Safe:">
               Yes
             </t>
-            <t hangText="Idempotent">
+            <t hangText="Idempotent:">
               Yes
             </t>
-            <t hangText="Specification document(s)">
+            <t hangText="Specification document(s):">
               <xref target="ConnectionHeader"/> of this document
             </t>
             <t hangText="Related information:">
@@ -4277,8 +4277,8 @@ HTTP2-Settings    = token68
       <section title="The 421 (Misdirected Request) HTTP Status Code"
                anchor="iana-MisdirectedRequest">
         <t>
-          This document registers the 421 (Misdirected Request) HTTP Status code in the Hypertext
-          Transfer Protocol (HTTP) Status Code Registry (<xref target="RFC7231" x:fmt=","
+          This document registers the 421 (Misdirected Request) HTTP status code in the
+          "HTTP Status Codes" registry (<xref target="RFC7231" x:fmt=","
           x:rel="#status.code.registry"/>).
         </t>
         <t>
@@ -4296,6 +4296,32 @@ HTTP2-Settings    = token68
         </t>
       </section>
 
+
+     <section anchor="iana-h2c" title="The h2c Upgrade Token">
+       <t>
+         This document registers the "h2c" upgrade token in the "HTTP
+         Upgrade Tokens" registry (<xref
+         target="RFC7230" x:fmt="," x:rel="#upgrade.token.registry"/>).
+       </t>
+       <t>
+         <list style="hanging">
+           <t hangText="Value:">
+             h2c
+           </t>
+           <t hangText="Description:">
+             Hypertext Transfer Protocol version 2 (HTTP/2)
+           </t>
+           <t hangText="Expected Version Tokens:">
+             None
+           </t>
+           <t hangText="Reference:">
+             <xref target="discover-http"/> of this document
+           </t>
+         </list>
+       </t>
+     </section>
+
+
     </section>
 
   </middle>