aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schanzenbach <schanzen@gnunet.org>2022-11-19 16:22:28 +0900
committerMartin Schanzenbach <schanzen@gnunet.org>2022-11-19 16:22:28 +0900
commit8bcb6d4aa43249d1c1dbef4690030272c365f846 (patch)
treec7e0bd1b8664247c7034c6c13e06511d13c4304d
parent5ddfbfa0182afd17dc778e8ef5ca70147387d0ac (diff)
parent8b389e861be15721b504556eeb66104afc5dc67b (diff)
downloadlsd0001-8bcb6d4aa43249d1c1dbef4690030272c365f846.tar.gz
lsd0001-8bcb6d4aa43249d1c1dbef4690030272c365f846.zip
conflict merge
-rw-r--r--draft-schanzen-gns.xml26
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
2873 and describes the actions taken by GANA: 2873 and describes the actions taken by GANA:
2874 </t> 2874 </t>
2875 <t> 2875 <t>
2876 <!-- FIXME: Unclear who are the experts how are they selected and 2876 Adding new entries is possible after review by any authorized
2877 by whom? GNUnet e.V. Politbüro? The DAO? 2877 GANA contributor, using a
2878 Unreserved/Reserved for private use record type range? -->
2879 Adding new entries is possible after expert review, using a
2880 first-come-first-served policy for unique name allocation. 2878 first-come-first-served policy for unique name allocation.
2881 Experts are responsible to ensure that the chosen "Name" is 2879 Reviewers are responsible to ensure that the chosen "Name" is
2882 appropriate for the record type. 2880 appropriate for the record type.
2883 The registry will assign a unique number for the entry. 2881 The registry will define a unique number for the entry.
2884 </t> 2882 </t>
2885 <t> 2883 <t>
2886 The current contact(s) for expert review are reachable at 2884 Authorized GANA contributors for review of new entries are reachable at
2887 gns-registry@gnunet.org. 2885 gns-registry@gnunet.org.
2888 </t> 2886 </t>
2889 <t> 2887 <t>
@@ -2936,17 +2934,15 @@ Number | Name | Contact | References | Comment
2936 and describes the actions taken by GANA: 2934 and describes the actions taken by GANA:
2937 </t> 2935 </t>
2938 <t> 2936 <t>
2939 <!-- FIXME: Unclear who are the experts how are they selected and 2937 Adding new entries is possible after review by any authorized
2940 by whom? GNUnet e.V. Politbüro? The DAO? 2938 GANA contributor, using a
2941 Unreserved/Reserved for private use record type range? -->
2942 Adding new entries is possible after expert review, using a
2943 first-come-first-served policy for unique subdomain allocation. 2939 first-come-first-served policy for unique subdomain allocation.
2944 Experts are responsible to ensure that the chosen "Subdomain" is 2940 Reviewers are responsible to ensure that the chosen "Subdomain" is
2945 appropriate for the purpose. 2941 appropriate for the purpose.
2946 </t> 2942 </t>
2947 <t> 2943 <t>
2948 The current contact(s) for expert review are reachable at 2944 Authorized GANA contributors for review of new entries are reachable at
2949 gns-registry@gnunet.org. 2945 alt-registry@gnunet.org.
2950 </t> 2946 </t>
2951 <t> 2947 <t>
2952 Any request <bcp14>MUST</bcp14> contain a unique subdomain and a point of contact. 2948 Any request <bcp14>MUST</bcp14> contain a unique subdomain and a point of contact.
@@ -2966,7 +2962,7 @@ Subdomain | Contact | References | Comment
2966----------+---------+------------+---------------------------- 2962----------+---------+------------+----------------------------
2967gns | (*) | [This.I-D] | The .alt subdomain for GNS. 2963gns | (*) | [This.I-D] | The .alt subdomain for GNS.
2968 2964
2969(*): gns-registry@gnunet.org 2965(*): alt-registry@gnunet.org
2970 ]]></artwork> 2966 ]]></artwork>
2971 </figure> 2967 </figure>
2972 </section> 2968 </section>