1 files changed, 33 insertions, 27 deletions

diff --git a/draft-schanzen-gns.xml b/draft-schanzen-gns.xml
index f1a9157..9233976 100644
--- a/draft-schanzen-gns.xml
+++ b/draft-schanzen-gns.xml
@@ -154,7 +154,7 @@
        <dt>B</dt>
        <dd>
          is the group generator (X(P),Y(P)) of edwards25519 as defined in
-         <xref target="RFC7748" />.
+        <xref target="RFC7748" />.
        </dd>
        <dt>L</dt>
        <dd>
@@ -164,9 +164,8 @@
        <dd>
          is the ECDSA public key corresponding to d. It is defined in
          <xref target="RFC6979" /> as the curve point d*B where B is the group
-         generator of the elliptic curve.
-         The public key is used to uniquely identify a GNS zone and is referred to
-         as the "zone key".
+         generator of the elliptic curve. The public key is used to uniquely
+         identify a GNS zone and is referred to as the "zone key".
        </dd>
      </dl>
    </section>
@@ -448,8 +447,8 @@
          defines the BOX record format to box up SRV and TLSA records and
          include them in the record set of the label they are associated
          with.  For example, a
-         TLSA record for "_https._tcp.foo.gnu" will be stored in the record set of
-         "foo.gnu" as a BOX record with service (SVC) 443 (https) and protocol (PROTO) 6
+         TLSA record for "_https._tcp.example.org" will be stored in the record set of
+         "example.org" as a BOX record with service (SVC) 443 (https) and protocol (PROTO) 6
          (tcp) and record TYPE "TLSA".
          For reference, see also <xref target="RFC2782" />.
          A BOX DATA entry has the following format:
@@ -582,8 +581,7 @@ q := SHA512 (zk_h)
            is the 256-bit private zone key as defined in <xref target="zones" />.
          </dd>
          <dt>label</dt>
-         <dd>
-           is a UTF-8 string under which the resource records are published.
+         <dd>is a UTF-8 string under which the resource records are published.
          </dd>
          <dt>d_h</dt>
          <dd>
@@ -1070,7 +1068,7 @@ BDATA := TWOFISH(K[32:63], IV[16:31],
          <section anchor="nick_processing" numbered="true" toc="default">
            <name>NICK</name>
            <t>
-             NIICK records are only relevant to the recursive resolver
+             NICK records are only relevant to the recursive resolver
              if the record set in question is the final result which is to
              be returned to the client. The encountered NICK records may either
              be supplemental (see <xref target="rrecords"/>) or
@@ -1086,9 +1084,9 @@ BDATA := TWOFISH(K[32:63], IV[16:31],
            </t>
        <figure>
          <artwork name="" type="" align="left" alt=""><![CDATA[
-Query: alice.doe (type=A)
+Query: alice.example (type=A)
 Result:
-A: 1.2.3.4
+A: 192.0.2.1
 NICK: eve
          ]]></artwork>
         </figure>
@@ -1102,9 +1100,9 @@ NICK: eve
         </t>
        <figure>
          <artwork name="" type="" align="left" alt=""><![CDATA[
-Query: alice.doe (type=A)
+Query: alice.example (type=AAAA)
 Result:
-A: 1.2.3.4
+AAAA: 2001:DB8::1
 NICK: john (Supplemental)
          ]]></artwork>
      </figure>
@@ -1145,16 +1143,24 @@ NICK: john (Supplemental)
          PoW calculations the algorithm is instantiated with the
          following parameters:
        </t>
-       <artwork name="" type="" align="left" alt=""><![CDATA[
-S := "GnsRevocationPow" /* Salt, 16 byte */
-t := 3 /* Iterations */
-m := 1024 /* Memory size, 1 MiB */
-T := 64 /* Tag (=output) length in bytes */
-p := 1 /* Parallelization parameter */
-v := 0x13 /* Version */
-y := 2 /* Type (Argon2id) */
-X, K are unused
-         ]]></artwork>
+       <dl>
+         <dt>S</dt>
+         <dd>The salt. Fixed 16-octet string: "GnsRevocationPow".</dd>
+         <dt>t</dt>
+         <dd>Number of iterations: 3</dd>
+         <dt>m</dt>
+         <dd>Memory size in KiB: 1024</dd>
+         <dt>T</dt>
+         <dd>Output length of hash in bytes: 64</dd>
+         <dt>p</dt>
+         <dd>Parallelization parameter: 1</dd>
+         <dt>v</dt>
+         <dd>Algorithm version: 0x13</dd>
+         <dt>y</dt>
+         <dd>Algorithm type (Argon2id): 2</dd>
+         <dt>X</dt><dd>Unused</dd>
+         <dt>K</dt><dd>Unused</dd>
+       </dl>
        <t>
          The following is the message string "P" on which the PoW is
          calculated:
@@ -1401,7 +1407,7 @@ Example name: www.example.<Base32(zk)>
    resolution SHOULD start from the respective local zone:
        </t>
        <artwork name="" type="" align="left" alt=""><![CDATA[
-Example name: www.example.gnu
+Example name: www.example.org
 Local zones:
 fr = (d0,zk0)
 gnu = (d1,zk1)
@@ -1422,10 +1428,10 @@ com = (d2,zk2)
    for the same suffix, the locally managed zone MUST have priority.
        </t>
        <artwork name="" type="" align="left" alt=""><![CDATA[
-Example name: www.example.gnu
+Example name: www.example.org
 Local suffix mappings:
 gnu = zk0
-example.gnu = zk1
+example.org = zk1
 example.com = zk2
 ...
 => Entry zone: zk1
@@ -1728,7 +1734,7 @@ b7a066dd
        </t>
        <artwork name="" type="" align="left" alt="">
          <![CDATA[
-           Zone private key (d, little-endian scalar):
+Zone private key (d, little-endian scalar):
 90ea2a95cb9ef482b45817dc45b805cae00f387022a065a3674f41ad15173c63
 
 Zone public key (zk):