[lsd0001] branch master updated (8b389e8 -> 8bcb6d4)

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a change to branch master
in repository lsd0001.

    from 8b389e8  GANA procedure update
     new 5ddfbfa  minor
     new 8bcb6d4  conflict merge

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 draft-schanzen-gns.xml | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/draft-schanzen-gns.xml b/draft-schanzen-gns.xml
index 708c2eb..5167f2c 100644
--- a/draft-schanzen-gns.xml
+++ b/draft-schanzen-gns.xml
@@ -356,13 +356,13 @@
 example.000G006K2TJNMD9VTCYRX7BRVV3HAEPS15E6NHDXKPJA1KAJJEG9AFF884
        </sourcecode>
        <t>
-         Now consider the petname "pet" for the example zone
+         Now consider the petname "pet.gns.alt" for the example zone
          of the name above.
          The following name would point to the same record as the
          globally unique name above but it is only valid locally:
        </t>
        <sourcecode>
-example.gns.alt
+example.pet.gns.alt
        </sourcecode>
        <t>
          The delegation of petnames and subsequent resolution of delegation
@@ -2136,14 +2136,14 @@ Example name: www.example.<zTLD>
          The following is a non-normative example mapping of start zones:
        </t>
        <artwork name="" type="" align="left" alt=""><![CDATA[
-Example name: example.xyz.gns.alt
+Example name: www.example.xyz.gns.alt
 Local suffix mappings:
 xyz.gns.alt = zTLD0 := Base32GNS(ztype0||zk0)
 example.xyz.gns.alt = zTLD1 := Base32GNS(ztype1||zk1)
 example.com.gns.alt = zTLD2 := Base32GNS(ztype2||zk2)
 ...
 => Start zone: zk1
-=> Name to resolve from start zone: @
+=> Name to resolve from start zone: www
          ]]></artwork>
        <t>
          The process given above <bcp14>MAY</bcp14> be supplemented with other 
mechanisms if
@@ -2823,11 +2823,13 @@ NICK: john (Supplemental)
            The user or system administrator <bcp14>MAY</bcp14> configure one or
            more unique suffixes for all suffix-to-zone mappings in the spirit
            of <xref target="draft-ietf-dnsop-alt-tld"/>.
-           For this purpose, this draft creates a registry for subdomains under
+           For this purpose, this draft creates a <xref target="GANA"/> 
registry
+           for subdomains under
            the special-use top-level domain ".alt" <xref 
target="draft-ietf-dnsop-alt-tld"/>
            in <xref target="gana"/>, and within it registers the subdomain 
".gns.alt" for use with GNS in particular.
-           The use of the suffix ".gns.alt" is recommended in order to address
-           the issues raised in <xref target="RFC8244"/>.
+           The use of the suffix ".gns.alt" in local suffix-to-zone mappings is
+           recommended in order to address the issues raised in
+           <xref target="RFC8244"/>.
          </t>
        </section>
      </section>
@@ -2871,7 +2873,7 @@ Purpose | Name            | References | Comment
          and describes the actions taken by GANA:
        </t>
        <t>
-         Adding new records is possible after review by any authorized
+         Adding new entries is possible after review by any authorized
          GANA contributor, using a
          first-come-first-served policy for unique name allocation.
          Reviewers are responsible to ensure that the chosen "Name" is
@@ -2918,7 +2920,7 @@ Number | Name    | Contact | References | Comment
          Each entry has the following format:
        </t>
        <ul>
-         <li>Name: The name of the subdomain (in UTF-8).</li>
+         <li>Subdomain: The name of the subdomain (in UTF-8).</li>
          <li>Comment: Optionally, a brief English text describing the purpose 
of
            the subdomain (in UTF-8)</li>
          <li>Contact: Optionally, the contact information of a person to 
contact for
@@ -2932,9 +2934,9 @@ Number | Name    | Contact | References | Comment
          and describes the actions taken by GANA:
        </t>
        <t>
-         Adding new records is possible after review by any authorized
+         Adding new entries is possible after review by any authorized
          GANA contributor, using a
-         first-come-first-served policy for unique name allocation.
+         first-come-first-served policy for unique subdomain allocation.
          Reviewers are responsible to ensure that the chosen "Subdomain" is
          appropriate for the purpose.
        </t>

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.