8 files changed, 40 insertions, 4 deletions

diff --git a/gnu-name-system-default-tlds/.gitignore b/gnu-name-system-default-tlds/.gitignore
new file mode 100644
index 0000000..179d990
--- /dev/null
+++ b/gnu-name-system-default-tlds/.gitignore
@@ -0,0 +1 @@
+tlds.conf
diff --git a/gnu-name-system-default-tlds/Makefile b/gnu-name-system-default-tlds/Makefile
index 9523cd2..01ad7d3 100644
--- a/gnu-name-system-default-tlds/Makefile
+++ b/gnu-name-system-default-tlds/Makefile
@@ -1,4 +1,4 @@
-FILES=tlds.conf
+FILES=tlds.conf tlds.rst
 all: check $(FILES)
 
 check:
@@ -16,4 +16,14 @@ tlds.conf.tmp: registry.rec tlds.template
 tlds.conf: tlds.header tlds.conf.tmp
         cat tlds.header tlds.conf.tmp > $@
 
+tlds.rst.tmp: registry.rec rst.template
+        ../format.sh rst.template < registry.rec > $@
+
+rst.header.tmp:
+        cat README POLICY rst.header.template > $@
+
+tlds.rst: rst.header.tmp tlds.rst.tmp
+        cat rst.header.tmp tlds.rst.tmp > $@
+
+
 .PHONY: check clean distclean
diff --git a/gnu-name-system-default-tlds/POLICY b/gnu-name-system-default-tlds/POLICY
index f27599c..a7a863c 100644
--- a/gnu-name-system-default-tlds/POLICY
+++ b/gnu-name-system-default-tlds/POLICY
@@ -1,3 +1,6 @@
+Policy
+^^^^^^
+
 Each registry entry should contain three values: the "Key" of the
 authoritative zone of a TLD, the "Name" of the TLDS, an optional
 "Contact", and a "Reference" with links to further information about the
@@ -11,3 +14,4 @@ GNUnet who will define appropriate bribes on a case-by-case basis.
 
 The current contact(s) for expert review are reachable at
 gns-registry@gnunet.org.
+
diff --git a/gnu-name-system-default-tlds/README b/gnu-name-system-default-tlds/README
index b2a9d4f..cff7486 100644
--- a/gnu-name-system-default-tlds/README
+++ b/gnu-name-system-default-tlds/README
@@ -1,4 +1,8 @@
+GNS Default Top-Level-Domains
+-----------------------------
+
 This registry is the default Top-Level-Domains (TLDs) for the GNU Name System.
 
 This registry is used to ensure that GNS resolvers ship with a default
 configuration of TLDs in order to ease transition and enable instant use.
+
diff --git a/gnu-name-system-default-tlds/registry.rec b/gnu-name-system-default-tlds/registry.rec
index f784878..665d159 100644
--- a/gnu-name-system-default-tlds/registry.rec
+++ b/gnu-name-system-default-tlds/registry.rec
@@ -5,7 +5,7 @@
 
 %rec: GnsTld
 %key: Name
-%typedef: Name_t regexp /^[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-]*$/
+%typedef: Name_t regexp /^[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_.-]*$/
 %type: Name Name_t
 %typedef: Key_t regexp /^[ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789][ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]*$/
 %type: Key Key_t
@@ -17,6 +17,10 @@
 %allowed: References
 %sort: Name Contact References
 
-Name: pin
-Key: 000G001MF6DVMZZ4Y8XRZQDXM1PB3D3VGEK29ZHXBA57EPSNW1QBPKT8J0
+Name: pin.gns.alt
+Key: 000G0522TTKQESZ9KPRT2K0RA9ZC8YMD52D2XYVYVGPDCNPMWHH9QXXF4W
 Comment: The FCFS authority managed by GNUnet e.V.
+
+Name: gnunet.gns.alt
+Key: 000G0522TTKQESZ9KPRT2K0RA9ZC8YMD52D2XYVYVGPDCNPMWHH9QXXF4W
+Comment: The authoritative zone of the GNUnet project
diff --git a/gnu-name-system-default-tlds/rst.footer b/gnu-name-system-default-tlds/rst.footer
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/gnu-name-system-default-tlds/rst.footer
diff --git a/gnu-name-system-default-tlds/rst.header.template b/gnu-name-system-default-tlds/rst.header.template
new file mode 100644
index 0000000..960a85e
--- /dev/null
+++ b/gnu-name-system-default-tlds/rst.header.template
@@ -0,0 +1,10 @@
+Entries
+^^^^^^^
+
+.. list-table:: GNS Default TLDs
+   :widths: auto
+   :header-rows: 1
+
+   * - Name
+     - Zone Key
+     - Comment
diff --git a/gnu-name-system-default-tlds/rst.template b/gnu-name-system-default-tlds/rst.template
new file mode 100644
index 0000000..1adeac0
--- /dev/null
+++ b/gnu-name-system-default-tlds/rst.template
@@ -0,0 +1,3 @@
+   * - {{Name}}
+     - {{Key}}
+     - {{Comment}}