diff options
author | Martin Schanzenbach <schanzen@gnunet.org> | 2022-11-19 16:22:28 +0900 |
---|---|---|
committer | Martin Schanzenbach <schanzen@gnunet.org> | 2022-11-19 16:22:28 +0900 |
commit | 8bcb6d4aa43249d1c1dbef4690030272c365f846 (patch) | |
tree | c7e0bd1b8664247c7034c6c13e06511d13c4304d | |
parent | 5ddfbfa0182afd17dc778e8ef5ca70147387d0ac (diff) | |
parent | 8b389e861be15721b504556eeb66104afc5dc67b (diff) |
conflict merge
-rw-r--r-- | draft-schanzen-gns.xml | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/draft-schanzen-gns.xml b/draft-schanzen-gns.xml index d04810f..5167f2c 100644 --- a/draft-schanzen-gns.xml +++ b/draft-schanzen-gns.xml @@ -2873,17 +2873,15 @@ Purpose | Name | References | Comment 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 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,17 +2934,15 @@ Number | Name | Contact | References | Comment 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 entries is possible after review by any authorized + GANA contributor, using a 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> - The current contact(s) for expert review are reachable at - gns-registry@gnunet.org. + Authorized GANA contributors for review of new entries are reachable at + alt-registry@gnunet.org. </t> <t> Any request <bcp14>MUST</bcp14> contain a unique subdomain and a point of contact. @@ -2966,7 +2962,7 @@ Subdomain | Contact | References | Comment ----------+---------+------------+---------------------------- gns | (*) | [This.I-D] | The .alt subdomain for GNS. -(*): gns-registry@gnunet.org +(*): alt-registry@gnunet.org ]]></artwork> </figure> </section> |