less base32

1 files changed, 10 insertions, 14 deletions

diff --git a/draft-schanzen-gns.xml b/draft-schanzen-gns.xml
index 75094c9..0760ce3 100644
--- a/draft-schanzen-gns.xml
+++ b/draft-schanzen-gns.xml
@@ -194,16 +194,6 @@
        </dd>
      </dl>
      <t>
-       In this document we use a base-32 data encoding of the binary values,
-       including when they
-         are used in domain names. However, instead of following
-       <xref target="RFC4648"/> we base
-       our character map on the optical character recognition friendly proposal
-       of Crockford <xref target="CrockfordB32"/>.
-       The only difference to Crockford is that the letter
-       "U" decodes to the same base-32 value as the letter "V" (27).
-     </t>
-     <t>
        The "zid" wire format is defined as follows:
      </t>
      <figure anchor="figure_zid">
@@ -218,10 +208,16 @@
        <!--        <postamble>which is a very simple example.</postamble>-->
      </figure>
      <t>
-       The string representation of the "zid" is defined as:
+       For the string representation of the "zid", we use a base-32 encoding
+       "StringEncode".
+       However, instead of following <xref target="RFC4648"/> we base
+       our character map on the optical character recognition friendly
+       proposal of Crockford <xref target="CrockfordB32"/>.
+       The only difference to Crockford is that the letter
+       "U" decodes to the same base-32 value as the letter "V" (27).
      </t>
      <artwork name="" type="" align="left" alt=""><![CDATA[
-zkl := <Base32(zid)>
+zkl := <StringEncode(zid)>
      ]]></artwork>
    <t>
        If "zkl" is less than 63 characters, it is also the "zTLD".
@@ -496,7 +492,7 @@ zTLD := zkl[126:129].zkl[63:125].zkl[0:62]
        </dl>
        <t>
          The "zid" of a PKEY is 32 + 4 bytes in length. This means that
-         a Crockford Base32-encoded "zTLD" will always fit into a single label and does
+         a "zTLD" will always fit into a single label and does
          not need any further conversion.
        </t>
        <t>
@@ -665,7 +661,7 @@ NONCE := HKDF-Expand (PRK_n, label, 32 / 8)
          </dl>
          <t>
            The "zid" of an EDKEY is 32 + 4 bytes in length. This means that
-           a Crockford Base32-encoded "zTLD" will always fit into a single label and does
+           a "zTLD" will always fit into a single label and does
            not need any further conversion.
          </t>
          <t>