[lsd0001] 02/02: conflict merge

[gnunet]

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

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

commit 8bcb6d4aa43249d1c1dbef4690030272c365f846
Merge: 5ddfbfa 8b389e8
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Sat Nov 19 16:22:28 2022 +0900

    conflict merge

 draft-schanzen-gns.xml | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --cc draft-schanzen-gns.xml
index d04810f,708c2eb..5167f2c
--- a/draft-schanzen-gns.xml
+++ b/draft-schanzen-gns.xml
@@@ -2873,17 -2871,15 +2873,15 @@@ Purpose | Name            | References 
           and describes the actions taken by GANA:
         </t>
         <t>
-          <!-- FIXME: Unclear who are the experts how are they selected and
-          by whom? GNUnet e.V. Politbüro? The DAO?
-          Unreserved/Reserved for private use record type range? -->
-          Adding new entries is possible after expert review, using a
 -         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.
-          Experts are responsible to ensure that the chosen "Name" is
+          Reviewers are responsible to ensure that the chosen "Name" is
           appropriate for the record type.
-          The registry will assign a unique number for the entry.
+          The registry will define a unique number for the entry.
         </t>
         <t>
-          The current contact(s) for expert review are reachable at
+          Authorized GANA contributors for review of new entries are reachable 
at
           gns-registry@gnunet.org.
         </t>
         <t>
@@@ -2936,12 -2932,10 +2934,10 @@@ Number | Name    | Contact | Reference
           and describes the actions taken by GANA:
         </t>
         <t>
-          <!-- FIXME: Unclear who are the experts how are they selected and
-          by whom? GNUnet e.V. Politbüro? The DAO?
-          Unreserved/Reserved for private use record type range? -->
-          Adding new entries is possible after expert review, using a
 -         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.
-          Experts are responsible to ensure that the chosen "Subdomain" is
+          Reviewers are responsible to ensure that the chosen "Subdomain" is
           appropriate for the purpose.
         </t>
         <t>

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