1 files changed, 23 insertions, 26 deletions

diff --git a/draft-schanzen-r5n.xml b/draft-schanzen-r5n.xml
index 17e2ebf..841e994 100644
--- a/draft-schanzen-r5n.xml
+++ b/draft-schanzen-r5n.xml
@@ -3116,32 +3116,6 @@ Type    | Name            | References | Description
           is the URL-escaped payload of the address URI without the "://".
         </t>
         <t>
-          For example, consider the following URL:
-        </t>
-        <figure>
-          <artwork type="abnf"><![CDATA[
-gnunet://hello/RH1M20EPK834M6MHZ72\
-G3CMBSF3ECKNY4W0T9VAQP9Z7SZEM6Y3G/\
-NGRTAH6RA04X467CGCH7M7CEXR5F9CV5HT\
-ZFK0G9BWETY3CCE2QWGVT4WA7JN5M9HMWG\
-60A00R71F1PJP8N5628EKGHHBAGA7M8JW3\
-0/1647134480?udp=127.0.0.1%3A2086
-
-FIXME: signature is invalid, should
-maybe generate proper test vector.
-]]>
-        </artwork>
-        </figure>
-        <t>
-          It specifies that the peer with the public key "RH1M...6Y3G"
-          is reachable via "udp" at 127.0.0.1 on port 2086 until
-          1647134480 seconds after the Epoch.  Note that "udp"
-          here is underspecified and just used as a simple example.
-          In practice, the key (addr-name)
-          refers to a scheme supported by a
-          DHT underlay.
-        </t>
-        <t>
           The general syntax of <tt>HELLO</tt> URLs specified using
           Augmented Backus-Naur Form (ABNF) of <xref target="RFC5234"/> is:
         </t>
@@ -3165,6 +3139,29 @@ bchar = *(ALPHA / DIGIT)
          'scheme' is defined in <xref target="RFC3986" /> in Section 3.1.
          'pchar' is defined in <xref target="RFC3986" />, Appendix A.
         </t>
+        <t>
+          For example, consider the following URL:
+        </t>
+        <figure>
+          <artwork type="abnf"><![CDATA[
+          gnunet://hello/1MVZC83SFHXMADVJ5F4
+          S7BSM7CCGFNVJ1SMQPGW9Z7ZQBZ689ECG/
+          CFJD9SY1NY5VM9X8RC5G2X2TAA7BCVCE16
+          726H4JEGTAEB26JNCZKDHBPSN5JD3D60J5
+          GJMHFJ5YGRGY4EYBP0E2FJJ3KFEYN6HYM0G/
+          1708333757?foo=example.com&bar+baz=1.2.3.4%3A5678%2Ffoo
+]]>
+        </artwork>
+        </figure>
+        <t>
+          It specifies that the peer with the <em>pid</em> "1MVZ..."
+          is reachable via "foo" at "example.com" and "bar+baz" at
+          "1.2.3.4" on port 5678 until
+          1708333757 seconds after the Epoch.  Note that "foo"
+          and "bar+baz" here are underspecified and just used as a simple example.
+          In practice, the <em>addr-name</em> refers to a scheme supported by a
+          DHT underlay.
+        </t>
       </section>
     </back>
 </rfc>