diff --git a/draft-ietf-core-groupcomm-proxy.html b/draft-ietf-core-groupcomm-proxy.html
index 338fe38..897e882 100644
--- a/draft-ietf-core-groupcomm-proxy.html
+++ b/draft-ietf-core-groupcomm-proxy.html
@@ -2805,19 +2805,38 @@ <h2 id="name-iana-considerations">
<h3 id="name-coap-option-numbers-registr">
<a href="#section-11.1" class="section-number selfRef">11.1. </a><a href="#name-coap-option-numbers-registr" class="section-name selfRef">CoAP Option Numbers Registry</a>
</h3>
-<p id="section-11.1-1">IANA is asked to enter the following option numbers to the "CoAP Option Numbers" registry within the "CoRE Parameters" registry group.<a href="#section-11.1-1" class="pilcrow">¶</a></p>
-<div class="alignCenter art-text artwork" id="section-11.1-2">
-<pre>
-+--------+---------------------+-------------------+
-| Number | Name | Reference |
-+--------+---------------------+-------------------+
-| TBD1 | Multicast-Timeout | [[this document]] |
-+--------+---------------------+-------------------+
-| TBD2 | Response-Forwarding | [[this document]] |
-+--------+---------------------+-------------------+
-| TBD3 | Group-ETag | [[this document]] |
-+--------+---------------------+-------------------+
-</pre><a href="#section-11.1-2" class="pilcrow">¶</a>
+<p id="section-11.1-1">IANA is asked to enter the following option numbers to the "CoAP Option Numbers" registry within the "Constrained RESTful Environments (CoRE) Parameters" registry group.<a href="#section-11.1-1" class="pilcrow">¶</a></p>
+<span id="name-new-coap-option-numbers"></span><div id="tab-iana-coap-option-numbers">
+<table class="center" id="table-1">
+ <caption>
+<a href="#table-1" class="selfRef">Table 1</a>:
+<a href="#name-new-coap-option-numbers" class="selfRef">New CoAP Option Numbers</a>
+ </caption>
+<thead>
+ <tr>
+ <th class="text-left" rowspan="1" colspan="1">Number</th>
+ <th class="text-left" rowspan="1" colspan="1">Name</th>
+ <th class="text-left" rowspan="1" colspan="1">Reference</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td class="text-left" rowspan="1" colspan="1">TBD1</td>
+ <td class="text-left" rowspan="1" colspan="1">Multicast-Timeout</td>
+ <td class="text-left" rowspan="1" colspan="1">[RFC-XXXX]</td>
+ </tr>
+ <tr>
+ <td class="text-left" rowspan="1" colspan="1">TBD2</td>
+ <td class="text-left" rowspan="1" colspan="1">Response-Forwarding</td>
+ <td class="text-left" rowspan="1" colspan="1">[RFC-XXXX]</td>
+ </tr>
+ <tr>
+ <td class="text-left" rowspan="1" colspan="1">TBD3</td>
+ <td class="text-left" rowspan="1" colspan="1">Group-ETag</td>
+ <td class="text-left" rowspan="1" colspan="1">[RFC-XXXX]</td>
+ </tr>
+ </tbody>
+ </table>
</div>
</section>
</div>
@@ -2826,7 +2845,7 @@ <h3 id="name-coap-option-numbers-registr">
<h3 id="name-coap-transport-information-">
<a href="#section-11.2" class="section-number selfRef">11.2. </a><a href="#name-coap-transport-information-" class="section-name selfRef">CoAP Transport Information Registry</a>
</h3>
-<p id="section-11.2-1">IANA is asked to add the following entries to the "CoAP Transport Information" registry defined in <span><a href="https://datatracker.ietf.org/doc/html/draft-ietf-core-observe-multicast-notifications-07#section-16.5" class="relref">Section 16.5</a> of [<a href="#I-D.ietf-core-observe-multicast-notifications" class="cite xref">I-D.ietf-core-observe-multicast-notifications</a>]</span>.<a href="#section-11.2-1" class="pilcrow">¶</a></p>
+<p id="section-11.2-1">IANA is asked to add the following entries to the "CoAP Transport Information" registry defined in <span><a href="https://datatracker.ietf.org/doc/html/draft-ietf-core-observe-multicast-notifications-07#section-16.5" class="relref">Section 16.5</a> of [<a href="#I-D.ietf-core-observe-multicast-notifications" class="cite xref">I-D.ietf-core-observe-multicast-notifications</a>]</span>, within the "Constrained RESTful Environments (CoRE) Parameters" registry group.<a href="#section-11.2-1" class="pilcrow">¶</a></p>
<div class="alignCenter art-text artwork" id="section-11.2-2">
<pre>
+------------+-------------+-------+----------+-----------+-----------+
@@ -2865,22 +2884,38 @@ <h3 id="name-coap-transport-information-">
<h3 id="name-hypertext-transfer-protocol">
<a href="#section-11.3" class="section-number selfRef">11.3. </a><a href="#name-hypertext-transfer-protocol" class="section-name selfRef">Hypertext Transfer Protocol (HTTP) Field Name Registry</a>
</h3>
-<p id="section-11.3-1">IANA is asked to enter the following HTTP header fields to the "Hypertext Transfer Protocol (HTTP) Field Name Registry" registry.<a href="#section-11.3-1" class="pilcrow">¶</a></p>
-<div class="alignCenter art-text artwork" id="section-11.3-2">
-<pre>
-+---------------------+-----------+-----------+
-| Field Name | Status | Reference |
-+---------------------+-----------+-----------+
-| Multicast-Timeout | permanent | [This |
-| | | document] |
-+---------------------+-----------+-----------+
-| Response-Forwarding | permanent | [This |
-| | | document] |
-+---------------------+-----------+-----------+
-| Group-ETag | permanent | [This |
-| | | document] |
-+---------------------+-----------+-----------+
-</pre><a href="#section-11.3-2" class="pilcrow">¶</a>
+<p id="section-11.3-1">IANA is asked to enter the following HTTP header fields to the "Hypertext Transfer Protocol (HTTP) Field Name" Registry registry.<a href="#section-11.3-1" class="pilcrow">¶</a></p>
+<span id="name-new-http-field-names"></span><div id="tab-iana-http-field-names">
+<table class="center" id="table-2">
+ <caption>
+<a href="#table-2" class="selfRef">Table 2</a>:
+<a href="#name-new-http-field-names" class="selfRef">New HTTP Field Names</a>
+ </caption>
+<thead>
+ <tr>
+ <th class="text-left" rowspan="1" colspan="1">Field Name</th>
+ <th class="text-left" rowspan="1" colspan="1">Status</th>
+ <th class="text-left" rowspan="1" colspan="1">Reference</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td class="text-left" rowspan="1" colspan="1">Multicast-Timeout</td>
+ <td class="text-left" rowspan="1" colspan="1">permanent</td>
+ <td class="text-left" rowspan="1" colspan="1">[RFC-XXXX]</td>
+ </tr>
+ <tr>
+ <td class="text-left" rowspan="1" colspan="1">Response-Forwarding</td>
+ <td class="text-left" rowspan="1" colspan="1">permanent</td>
+ <td class="text-left" rowspan="1" colspan="1">[RFC-XXXX]</td>
+ </tr>
+ <tr>
+ <td class="text-left" rowspan="1" colspan="1">Group-ETag</td>
+ <td class="text-left" rowspan="1" colspan="1">permanent</td>
+ <td class="text-left" rowspan="1" colspan="1">[RFC-XXXX]</td>
+ </tr>
+ </tbody>
+ </table>
</div>
</section>
</div>
diff --git a/draft-ietf-core-groupcomm-proxy.txt b/draft-ietf-core-groupcomm-proxy.txt
index e485af5..b538d36 100644
--- a/draft-ietf-core-groupcomm-proxy.txt
+++ b/draft-ietf-core-groupcomm-proxy.txt
@@ -2171,23 +2171,27 @@ Table of Contents
11.1. CoAP Option Numbers Registry
IANA is asked to enter the following option numbers to the "CoAP
- Option Numbers" registry within the "CoRE Parameters" registry group.
-
- +--------+---------------------+-------------------+
- | Number | Name | Reference |
- +--------+---------------------+-------------------+
- | TBD1 | Multicast-Timeout | [[this document]] |
- +--------+---------------------+-------------------+
- | TBD2 | Response-Forwarding | [[this document]] |
- +--------+---------------------+-------------------+
- | TBD3 | Group-ETag | [[this document]] |
- +--------+---------------------+-------------------+
+ Option Numbers" registry within the "Constrained RESTful Environments
+ (CoRE) Parameters" registry group.
+
+ +========+=====================+============+
+ | Number | Name | Reference |
+ +========+=====================+============+
+ | TBD1 | Multicast-Timeout | [RFC-XXXX] |
+ +--------+---------------------+------------+
+ | TBD2 | Response-Forwarding | [RFC-XXXX] |
+ +--------+---------------------+------------+
+ | TBD3 | Group-ETag | [RFC-XXXX] |
+ +--------+---------------------+------------+
+
+ Table 1: New CoAP Option Numbers
11.2. CoAP Transport Information Registry
IANA is asked to add the following entries to the "CoAP Transport
Information" registry defined in Section 16.5 of
- [I-D.ietf-core-observe-multicast-notifications].
+ [I-D.ietf-core-observe-multicast-notifications], within the
+ "Constrained RESTful Environments (CoRE) Parameters" registry group.
+------------+-------------+-------+----------+-----------+-----------+
| Transport | Description | Value | Srv Addr | Req Info | Reference |
@@ -2220,20 +2224,19 @@ Table of Contents
11.3. Hypertext Transfer Protocol (HTTP) Field Name Registry
IANA is asked to enter the following HTTP header fields to the
- "Hypertext Transfer Protocol (HTTP) Field Name Registry" registry.
-
- +---------------------+-----------+-----------+
- | Field Name | Status | Reference |
- +---------------------+-----------+-----------+
- | Multicast-Timeout | permanent | [This |
- | | | document] |
- +---------------------+-----------+-----------+
- | Response-Forwarding | permanent | [This |
- | | | document] |
- +---------------------+-----------+-----------+
- | Group-ETag | permanent | [This |
- | | | document] |
- +---------------------+-----------+-----------+
+ "Hypertext Transfer Protocol (HTTP) Field Name" Registry registry.
+
+ +=====================+===========+============+
+ | Field Name | Status | Reference |
+ +=====================+===========+============+
+ | Multicast-Timeout | permanent | [RFC-XXXX] |
+ +---------------------+-----------+------------+
+ | Response-Forwarding | permanent | [RFC-XXXX] |
+ +---------------------+-----------+------------+
+ | Group-ETag | permanent | [RFC-XXXX] |
+ +---------------------+-----------+------------+
+
+ Table 2: New HTTP Field Names
12. References