155 files changed, 5428 insertions, 232 deletions

diff --git a/.buildbot/build.sh b/.buildbot/build.sh
new file mode 100755
index 0000000..2aad486
--- /dev/null
+++ b/.buildbot/build.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+make
diff --git a/.buildbot/firefly-x86_64-amdepyc_deploy.sh b/.buildbot/firefly-x86_64-amdepyc_deploy.sh
new file mode 100755
index 0000000..a7f8ea5
--- /dev/null
+++ b/.buildbot/firefly-x86_64-amdepyc_deploy.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Deploy rest api from buildbot
+
+chmod -R ag+rX _build
+rsync --exclude=".*" --exclude="Makefile" --exclude="conf.py" -a --delete ./_build/ handbook@firefly.gnunet.org:~/gana/_build/
diff --git a/.gitignore b/.gitignore
index b25c15b..48ed587 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,6 @@
+__pycache__
+_build
 *~
+*.h
+*.tmp
+*/*.rst
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..ca57b10
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,61 @@
+# Minimal makefile for Sphinx documentation
+#
+
+REGISTRIES = dot-alt \
+                                                 gnu-name-system-default-tlds \
+                                                 gnu-name-system-record-flags \
+                                                 gnu-name-system-record-types \
+                                                 gnu-taler-db-events \
+                                                 gnu-taler-error-codes \
+                                                 gnu-taler-extensions \
+                                                 gnu-taler-kyc-attributes \
+                                                 gnunet-dht-block-types \
+                                                 gnunet-error-codes \
+                                                 gnunet-protocols \
+                                                 gnunet-signatures \
+                                                 http-status-codes \
+                                                 payto-payment-target-types \
+                                                 gns-protocol-numbers \
+                                                 gns-service-port-numbers
+
+# You can set these variables from the command line, and also
+# from the environment for the first two.
+SPHINXOPTS    ?=
+SPHINXBUILD   ?= sphinx-build
+SOURCEDIR     = .
+BUILDDIR      = _build
+
+
+all: rsts html
+
+# Put it first so that "make" without argument is like "make help".
+help:
+        @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: all clean help texinfo info Makefile
+
+rsts:
+        for dir in $(REGISTRIES); do \
+        $(MAKE) -C $$dir; \
+  done
+
+html:
+        @$(SPHINXBUILD) -M html "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+texinfo:
+        @$(SPHINXBUILD) -M texinfo "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+info:
+        @$(SPHINXBUILD) -M info "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+clean:
+        rm -rf $(BUILDDIR)
+        for dir in $(REGISTRIES); do \
+        $(MAKE) -C $$dir; \
+  done
+
+distclean: clean
+
+# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+#%: Makefile
+#       @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
diff --git a/README b/README
index ccad190..dda0881 100644
--- a/README
+++ b/README
@@ -8,6 +8,21 @@ protocols.  If you need to open a new registry, please feel free
 to contact us at gana@gnunet.org.
 
 
+Contributors
+============
+
+If you have Git access to GANA, you are generally authorized to add
+new entries to the registries.  Most registries are under a simple
+first-come first-use policy. If you are unsure about the registration
+policy of a particular registry, do ask gana@gnunet.org before making
+changes.
+
+Deleting or modifying existing entries (except improving comments)
+should be done particularly carefully, so if unsure you might want to
+double-check with gana@gnunet.org before changing or deleting
+anything.
+
+
 History
 =======
 
diff --git a/_exts/httpdomain/__init__.py b/_exts/httpdomain/__init__.py
new file mode 100644
index 0000000..b5a7dc2
--- /dev/null
+++ b/_exts/httpdomain/__init__.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+"""
+    sphinxcontrib
+    ~~~~~~~~~~~~~
+
+    This package is a namespace package that contains all extensions
+    distributed in the ``sphinx-contrib`` distribution.
+
+    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+__import__('pkg_resources').declare_namespace(__name__)
+
diff --git a/_exts/httpdomain/autohttp/__init__.py b/_exts/httpdomain/autohttp/__init__.py
new file mode 100644
index 0000000..95372d4
--- /dev/null
+++ b/_exts/httpdomain/autohttp/__init__.py
@@ -0,0 +1,11 @@
+"""
+    sphinxcontrib.autohttp
+    ~~~~~~~~~~~~~~~~~~~~~~
+
+    The sphinx.ext.autodoc-style HTTP API reference builder
+    for sphinxcontrib.httpdomain.
+
+    :copyright: Copyright 2011 by Hong Minhee
+    :license: BSD, see LICENSE for details.
+
+"""
diff --git a/_exts/httpdomain/autohttp/bottle.py b/_exts/httpdomain/autohttp/bottle.py
new file mode 100644
index 0000000..d8c1859
--- /dev/null
+++ b/_exts/httpdomain/autohttp/bottle.py
@@ -0,0 +1,114 @@
+"""
+    sphinxcontrib.autohttp.bottle
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    The sphinx.ext.autodoc-style HTTP API reference builder (from Bottle)
+    for sphinxcontrib.httpdomain.
+
+    :copyright: Copyright 2012 by Jameel Al-Aziz
+    :license: BSD, see LICENSE for details.
+
+"""
+
+import re
+import six
+
+from docutils import nodes
+from docutils.parsers.rst import directives
+from docutils.statemachine import ViewList
+
+from sphinx.util import force_decode
+from sphinx.util.compat import Directive
+from sphinx.util.nodes import nested_parse_with_titles
+from sphinx.util.docstrings import prepare_docstring
+from sphinx.pycode import ModuleAnalyzer
+
+from sphinxcontrib import httpdomain
+from sphinxcontrib.autohttp.common import http_directive, import_object
+
+
+def translate_bottle_rule(app, rule):
+    buf = six.StringIO()
+    if hasattr(app.router, "parse_rule"):
+        iterator = app.router.parse_rule(rule)  # bottle 0.11
+    else:
+        iterator = app.router._itertokens(rule)  # bottle 0.12
+    for name, filter, conf in iterator:
+        if filter:
+            buf.write('(')
+            buf.write(name)
+            if (filter != app.router.default_filter and filter != 'default')\
+                    or conf:
+                buf.write(':')
+                buf.write(filter)
+            if conf:
+                buf.write(':')
+                buf.write(conf)
+            buf.write(')')
+        else:
+            buf.write(name)
+    return buf.getvalue()
+
+
+def get_routes(app):
+    for route in app.routes:
+        path = translate_bottle_rule(app, route.rule)
+        yield route.method, path, route
+
+
+class AutobottleDirective(Directive):
+
+    has_content = True
+    required_arguments = 1
+    option_spec = {'endpoints': directives.unchanged,
+                   'undoc-endpoints': directives.unchanged,
+                   'include-empty-docstring': directives.unchanged}
+
+    @property
+    def endpoints(self):
+        endpoints = self.options.get('endpoints', None)
+        if not endpoints:
+            return None
+        return frozenset(re.split(r'\s*,\s*', endpoints))
+
+    @property
+    def undoc_endpoints(self):
+        undoc_endpoints = self.options.get('undoc-endpoints', None)
+        if not undoc_endpoints:
+            return frozenset()
+        return frozenset(re.split(r'\s*,\s*', undoc_endpoints))
+
+    def make_rst(self):
+        app = import_object(self.arguments[0])
+        for method, path, target in get_routes(app):
+            endpoint = target.name or target.callback.__name__
+            if self.endpoints and endpoint not in self.endpoints:
+                continue
+            if endpoint in self.undoc_endpoints:
+                continue
+            view = target.callback
+            docstring = view.__doc__ or ''
+            if not isinstance(docstring, six.text_type):
+                analyzer = ModuleAnalyzer.for_module(view.__module__)
+                docstring = force_decode(docstring, analyzer.encoding)
+            if not docstring and 'include-empty-docstring' not in self.options:
+                continue
+            docstring = prepare_docstring(docstring)
+            for line in http_directive(method, path, docstring):
+                yield line
+
+    def run(self):
+        node = nodes.section()
+        node.document = self.state.document
+        result = ViewList()
+        for line in self.make_rst():
+            result.append(line, '<autobottle>')
+        nested_parse_with_titles(self.state, result, node)
+        return node.children
+
+
+def setup(app):
+    if 'http' not in app.domains:
+        httpdomain.setup(app)
+    app.add_directive('autobottle', AutobottleDirective)
+
diff --git a/_exts/httpdomain/autohttp/common.py b/_exts/httpdomain/autohttp/common.py
new file mode 100644
index 0000000..199e297
--- /dev/null
+++ b/_exts/httpdomain/autohttp/common.py
@@ -0,0 +1,36 @@
+"""
+    sphinxcontrib.autohttp.common
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    The common functions for web framework reflection.
+
+    :copyright: Copyright 2011 by Hong Minhee
+    :license: BSD, see LICENSE for details.
+
+"""
+import six
+from six.moves import builtins
+from six.moves import reduce
+
+def import_object(import_name):
+    module_name, expr = import_name.split(':', 1)
+    mod = __import__(module_name)
+    mod = reduce(getattr, module_name.split('.')[1:], mod)
+    globals = builtins
+    if not isinstance(globals, dict):
+        globals = globals.__dict__
+    return eval(expr, globals, mod.__dict__)
+
+
+def http_directive(method, path, content):
+    method = method.lower().strip()
+    if isinstance(content, six.string_types):
+        content = content.splitlines()
+    yield ''
+    paths = [path] if isinstance(path, six.string_types) else path
+    for path in paths:
+        yield '.. http:{method}:: {path}'.format(**locals())
+    yield ''
+    for line in content:
+        yield '   ' + line
+    yield ''
diff --git a/_exts/httpdomain/autohttp/flask.py b/_exts/httpdomain/autohttp/flask.py
new file mode 100644
index 0000000..4bd5232
--- /dev/null
+++ b/_exts/httpdomain/autohttp/flask.py
@@ -0,0 +1,48 @@
+"""
+    sphinxcontrib.autohttp.flask
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    The sphinx.ext.autodoc-style HTTP API reference builder (from Flask)
+    for sphinxcontrib.httpdomain.
+
+    :copyright: Copyright 2011 by Hong Minhee
+    :license: BSD, see LICENSE for details.
+
+"""
+from __future__ import absolute_import
+
+import re
+import itertools
+import six
+
+from docutils import nodes
+from docutils.parsers.rst import directives
+from docutils.statemachine import ViewList
+
+from sphinx.util import force_decode
+from sphinx.util.compat import Directive
+from sphinx.util.nodes import nested_parse_with_titles
+from sphinx.util.docstrings import prepare_docstring
+from sphinx.pycode import ModuleAnalyzer
+
+from sphinxcontrib import httpdomain
+from sphinxcontrib.autohttp.common import http_directive, import_object
+
+from .flask_base import AutoflaskBase
+
+class AutoflaskDirective(AutoflaskBase):
+
+    def run(self):
+        node = nodes.section()
+        node.document = self.state.document
+        result = ViewList()
+        for line in self.make_rst():
+            result.append(line, '<autoflask>')
+        nested_parse_with_titles(self.state, result, node)
+        return node.children
+
+
+def setup(app):
+    if 'http' not in app.domains:
+        httpdomain.setup(app)
+    app.add_directive('autoflask', AutoflaskDirective)
diff --git a/_exts/httpdomain/autohttp/flask_base.py b/_exts/httpdomain/autohttp/flask_base.py
new file mode 100644
index 0000000..50454fe
--- /dev/null
+++ b/_exts/httpdomain/autohttp/flask_base.py
@@ -0,0 +1,215 @@
+"""
+    sphinxcontrib.autohttp.flask
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    The sphinx.ext.autodoc-style HTTP API reference builder (from Flask)
+    for sphinxcontrib.httpdomain.
+
+    :copyright: Copyright 2011 by Hong Minhee
+    :license: BSD, see LICENSE for details.
+
+"""
+
+import re
+import itertools
+import six
+
+from docutils import nodes
+from docutils.parsers.rst import directives
+from docutils.statemachine import ViewList
+
+from sphinx.util import force_decode
+from sphinx.util.compat import Directive
+from sphinx.util.nodes import nested_parse_with_titles
+from sphinx.util.docstrings import prepare_docstring
+from sphinx.pycode import ModuleAnalyzer
+
+from sphinxcontrib import httpdomain
+from sphinxcontrib.autohttp.common import http_directive, import_object
+
+
+def translate_werkzeug_rule(rule):
+    from werkzeug.routing import parse_rule
+    buf = six.StringIO()
+    for conv, arg, var in parse_rule(rule):
+        if conv:
+            buf.write('(')
+            if conv != 'default':
+                buf.write(conv)
+                buf.write(':')
+            buf.write(var)
+            buf.write(')')
+        else:
+            buf.write(var)
+    return buf.getvalue()
+
+
+def get_routes(app, endpoint=None, order=None):
+    endpoints = []
+    for rule in app.url_map.iter_rules(endpoint):
+        url_with_endpoint = (
+            six.text_type(next(app.url_map.iter_rules(rule.endpoint))),
+            rule.endpoint
+        )
+        if url_with_endpoint not in endpoints:
+            endpoints.append(url_with_endpoint)
+    if order == 'path':
+        endpoints.sort()
+    endpoints = [e for _, e in endpoints]
+    for endpoint in endpoints:
+        methodrules = {}
+        for rule in app.url_map.iter_rules(endpoint):
+            methods = rule.methods.difference(['OPTIONS', 'HEAD'])
+            path = translate_werkzeug_rule(rule.rule)
+            for method in methods:
+                if method in methodrules:
+                    methodrules[method].append(path)
+                else:
+                    methodrules[method] = [path]
+        for method, paths in methodrules.items():
+            yield method, paths, endpoint
+
+
+def quickref_directive(method, path, content):
+    rcomp = re.compile("^\s*.. :quickref:\s*(?P<quick>.*)$")
+    method = method.lower().strip()
+    if isinstance(content, six.string_types):
+         content = content.splitlines()
+    description=""
+    name=""
+    ref = path.replace("<","(").replace(">",")").replace("/","-").replace(":","-")
+    for line in content:
+         qref = rcomp.match(line)
+         if qref:
+            quickref = qref.group("quick")
+            parts = quickref.split(";",1)
+            if len(parts)>1:
+                name = parts[0]
+                description= parts[1]
+            else:
+                description= quickref
+            break
+
+    row ={}
+    row['name'] = name
+    row['operation'] = '      - `%s %s <#%s-%s>`_' % (method.upper(), path, method.lower(), ref)
+    row['description'] = description
+
+    return row
+
+class AutoflaskBase(Directive):
+
+    has_content = True
+    required_arguments = 1
+    option_spec = {'endpoints': directives.unchanged,
+                   'blueprints': directives.unchanged,
+                   'modules': directives.unchanged,
+                   'order': directives.unchanged,
+                   'undoc-endpoints': directives.unchanged,
+                   'undoc-blueprints': directives.unchanged,
+                   'undoc-modules': directives.unchanged,
+                   'undoc-static': directives.unchanged,
+                   'include-empty-docstring': directives.unchanged}
+
+    @property
+    def endpoints(self):
+        endpoints = self.options.get('endpoints', None)
+        if not endpoints:
+            return None
+        return re.split(r'\s*,\s*', endpoints)
+
+    @property
+    def undoc_endpoints(self):
+        undoc_endpoints = self.options.get('undoc-endpoints', None)
+        if not undoc_endpoints:
+            return frozenset()
+        return frozenset(re.split(r'\s*,\s*', undoc_endpoints))
+
+    @property
+    def blueprints(self):
+        blueprints = self.options.get('blueprints', None)
+        if not blueprints:
+            return None
+        return frozenset(re.split(r'\s*,\s*', blueprints))
+
+    @property
+    def undoc_blueprints(self):
+        undoc_blueprints = self.options.get('undoc-blueprints', None)
+        if not undoc_blueprints:
+            return frozenset()
+        return frozenset(re.split(r'\s*,\s*', undoc_blueprints))
+
+    @property
+    def modules(self):
+        modules = self.options.get('modules', None)
+        if not modules:
+            return frozenset()
+        return frozenset(re.split(r'\s*,\s*', modules))
+
+    @property
+    def undoc_modules(self):
+        undoc_modules = self.options.get('undoc-modules', None)
+        if not undoc_modules:
+            return frozenset()
+        return frozenset(re.split(r'\s*,\s*', undoc_modules))
+
+    @property
+    def order(self):
+        order = self.options.get('order', None)
+        if order not in (None, 'path'):
+            raise ValueError('Invalid value for :order:')
+        return order
+
+    def make_rst(self, qref=False):
+        app = import_object(self.arguments[0])
+        if self.endpoints:
+            routes = itertools.chain(*[get_routes(app, endpoint, self.order)
+                    for endpoint in self.endpoints])
+        else:
+            routes = get_routes(app, order=self.order)
+        for method, paths, endpoint in routes:
+            try:
+                blueprint, _, endpoint_internal = endpoint.rpartition('.')
+                if self.blueprints and blueprint not in self.blueprints:
+                    continue
+                if blueprint in self.undoc_blueprints:
+                    continue
+            except ValueError:
+                pass  # endpoint is not within a blueprint
+
+            if endpoint in self.undoc_endpoints:
+                continue
+            try:
+                static_url_path = app.static_url_path # Flask 0.7 or higher
+            except AttributeError:
+                static_url_path = app.static_path # Flask 0.6 or under
+            if ('undoc-static' in self.options and endpoint == 'static' and
+                static_url_path + '/(path:filename)' in paths):
+                continue
+            view = app.view_functions[endpoint]
+
+            if self.modules and view.__module__ not in self.modules:
+                continue
+
+            if self.undoc_modules and view.__module__ in self.modules:
+                continue
+
+            docstring = view.__doc__ or ''
+            if hasattr(view, 'view_class'):
+                meth_func = getattr(view.view_class, method.lower(), None)
+                if meth_func and meth_func.__doc__:
+                    docstring = meth_func.__doc__
+            if not isinstance(docstring, six.text_type):
+                analyzer = ModuleAnalyzer.for_module(view.__module__)
+                docstring = force_decode(docstring, analyzer.encoding)
+
+            if not docstring and 'include-empty-docstring' not in self.options:
+                continue
+            docstring = prepare_docstring(docstring)
+            if qref == True:
+                for path in paths:
+                    row = quickref_directive(method, path, docstring)
+                    yield row
+            else:
+                for line in http_directive(method, paths, docstring):
+                    yield line
diff --git a/_exts/httpdomain/autohttp/flaskqref.py b/_exts/httpdomain/autohttp/flaskqref.py
new file mode 100644
index 0000000..c28bb15
--- /dev/null
+++ b/_exts/httpdomain/autohttp/flaskqref.py
@@ -0,0 +1,80 @@
+"""
+    sphinxcontrib.autohttp.flaskqref
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    The sphinx.ext.autodoc-style HTTP API quick reference 
+    builder (from Flask)
+    for sphinxcontrib.httpdomain.
+
+    :copyright: Copyright 2011 by Hong Minhee
+    :license: BSD, see LICENSE for details.
+
+"""
+
+from docutils import nodes
+from docutils.statemachine import ViewList
+
+from sphinxcontrib import httpdomain
+from sphinx.util.nodes import nested_parse_with_titles
+
+from .flask import AutoflaskBase
+
+
+class QuickReferenceFlaskDirective(AutoflaskBase):
+
+
+    header = [ '',
+              '.. list-table::',
+              '    :widths: 20 45 35',
+              '    :header-rows: 1',
+              '',
+              '    * - Resource',
+              '      - Operation',
+              '      - Description'
+            ]
+
+    def run(self):
+        node = nodes.section()
+        node.document = self.state.document
+        result = ViewList()
+        for line in QuickReferenceFlaskDirective.header:
+            result.append(line, '<qrefflask>') 
+        table={}
+        table_sorted_names=[]
+        
+        for table_row in self.make_rst(qref=True):
+            name = table_row['name']
+            if table.get(name) is None:
+                table[name]=[]
+            table[name].append(table_row) 
+            if name not in table_sorted_names:
+                table_sorted_names.append(name)
+
+        table_sorted_names.sort()
+
+        for name in table_sorted_names:
+            # Keep table display clean by not repeating duplicate
+            # resource names and descriptions
+            display_name = name
+            previous_description=None
+            for row in table[name]:
+                result.append('    * - %s' % display_name, '<qrefflask>')
+                display_name =""
+                result.append(row['operation'], '<qrefflask>')
+                description = row['description']
+                if previous_description is not None and previous_description == description:
+                    description =""
+                else:
+                    previous_description = description
+
+                result.append('      - %s' % description,  '<qrefflask>')
+
+        result.append('', '<qrefflask>')
+        nested_parse_with_titles(self.state, result, node)
+        return node.children
+        
+def setup(app):
+    if 'http' not in app.domains:
+        httpdomain.setup(app)
+    app.add_directive('qrefflask', QuickReferenceFlaskDirective)
+
diff --git a/_exts/httpdomain/autohttp/tornado.py b/_exts/httpdomain/autohttp/tornado.py
new file mode 100644
index 0000000..9a514fe
--- /dev/null
+++ b/_exts/httpdomain/autohttp/tornado.py
@@ -0,0 +1,128 @@
+"""
+    sphinxcontrib.autohttp.tornado
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    The sphinx.ext.autodoc-style HTTP API reference builder (from Tornado)
+    for sphinxcontrib.httpdomain.
+
+    :copyright: Copyright 2013 by Rodrigo Machado
+    :license: BSD, see LICENSE for details.
+
+"""
+
+import inspect
+import re
+import six
+
+from docutils import nodes
+from docutils.parsers.rst import directives
+from docutils.statemachine import ViewList
+
+from sphinx.util import force_decode
+from sphinx.util.compat import Directive
+from sphinx.util.nodes import nested_parse_with_titles
+from sphinx.util.docstrings import prepare_docstring
+from sphinx.pycode import ModuleAnalyzer
+
+from sphinxcontrib import httpdomain
+from sphinxcontrib.autohttp.common import http_directive, import_object
+
+
+def translate_tornado_rule(app, rule):
+    buf = six.StringIO()
+    for name, filter, conf in app.router.parse_rule(rule):
+        if filter:
+            buf.write('(')
+            buf.write(name)
+            if filter != app.router.default_filter or conf:
+                buf.write(':')
+                buf.write(filter)
+            if conf:
+                buf.write(':')
+                buf.write(conf)
+            buf.write(')')
+        else:
+            buf.write(name)
+    return buf.getvalue()
+
+
+def get_routes(app):
+    for spec in app.handlers[0][1]:
+        handler = spec.handler_class
+        doc_methods = list(handler.SUPPORTED_METHODS)
+        if 'HEAD' in doc_methods:
+            doc_methods.remove('HEAD')
+        if 'OPTIONS' in doc_methods:
+            doc_methods.remove('OPTIONS')
+
+        for method in doc_methods:
+            maybe_method = getattr(handler, method.lower(), None)
+            if (inspect.isfunction(maybe_method) or
+                    inspect.ismethod(maybe_method)):
+                yield method.lower(), spec.regex.pattern, handler
+
+
+def normalize_path(path):
+    if path.endswith('$'):
+        path = path[:-1]
+    return path
+
+
+class AutoTornadoDirective(Directive):
+
+    has_content = True
+    required_arguments = 1
+    option_spec = {'endpoints': directives.unchanged,
+                   'undoc-endpoints': directives.unchanged,
+                   'include-empty-docstring': directives.unchanged}
+
+    @property
+    def endpoints(self):
+        endpoints = self.options.get('endpoints', None)
+        if not endpoints:
+            return None
+        return frozenset(re.split(r'\s*,\s*', endpoints))
+
+    @property
+    def undoc_endpoints(self):
+        undoc_endpoints = self.options.get('undoc-endpoints', None)
+        if not undoc_endpoints:
+            return frozenset()
+        return frozenset(re.split(r'\s*,\s*', undoc_endpoints))
+
+    def make_rst(self):
+        app = import_object(self.arguments[0])
+        for method, path, handler in get_routes(app):
+            class_name = handler.__name__
+            method_name = getattr(handler, method).__name__
+            endpoint = '.'.join((class_name, method_name))
+
+            if self.endpoints and endpoint not in self.endpoints:
+                continue
+            if endpoint in self.undoc_endpoints:
+                continue
+
+            docstring = getattr(handler, method).__doc__ or ''
+            #if not isinstance(docstring, unicode):
+            #    analyzer = ModuleAnalyzer.for_module(view.__module__)
+            #    docstring = force_decode(docstring, analyzer.encoding)
+            if not docstring and 'include-empty-docstring' not in self.options:
+                continue
+            docstring = prepare_docstring(docstring)
+            for line in http_directive(method, normalize_path(path), docstring):
+                yield line
+
+    def run(self):
+        node = nodes.section()
+        node.document = self.state.document
+        result = ViewList()
+        for line in self.make_rst():
+            result.append(line, '<autotornado>')
+        nested_parse_with_titles(self.state, result, node)
+        return node.children
+
+
+def setup(app):
+    if 'http' not in app.domains:
+        httpdomain.setup(app)
+    app.add_directive('autotornado', AutoTornadoDirective)
diff --git a/_exts/httpdomain/httpdomain.py b/_exts/httpdomain/httpdomain.py
new file mode 100644
index 0000000..b31142b
--- /dev/null
+++ b/_exts/httpdomain/httpdomain.py
@@ -0,0 +1,773 @@
+"""
+    sphinxcontrib.httpdomain
+    ~~~~~~~~~~~~~~~~~~~~~~~~
+
+    The HTTP domain for documenting RESTful HTTP APIs.
+
+    :copyright: Copyright 2011 by Hong Minhee
+    :license: BSD, see LICENSE for details.
+
+"""
+
+import re
+
+from docutils import nodes
+
+from pygments.lexer import RegexLexer, bygroups
+from pygments.lexers import get_lexer_by_name
+from pygments.token import Literal, Text, Operator, Keyword, Name, Number
+from pygments.util import ClassNotFound
+
+from sphinx import addnodes
+from sphinx.roles import XRefRole
+from sphinx.domains import Domain, ObjType, Index
+from sphinx.directives import ObjectDescription, directives
+from sphinx.util.nodes import make_refnode
+from sphinx.util.docfields import GroupedField, TypedField
+
+# The env.get_doctree() lookup results in a pickle.load() call which is
+# expensive enough to dominate the runtime entirely when the number of endpoints
+# and references is large enough. The doctrees are generated during the read-
+# phase and we can cache their lookup during the write-phase significantly
+# improving performance.
+# Currently sphinxcontrib-httpdomain does not declare to support parallel read
+# support (parallel_read_safe is the default False) so we can simply use a
+# module global to hold the cache.
+_doctree_cache = {}
+
+
+class DocRef(object):
+    """Represents a reference to an abstract specification."""
+
+    def __init__(self, base_url, anchor, section):
+        self.base_url = base_url
+        self.anchor = anchor
+        self.section = section
+
+    def __repr__(self):
+        """Returns the URL onto related specification section for the related
+        object."""
+        return '{0}#{1}{2}'.format(self.base_url, self.anchor, self.section)
+
+
+class RFC2616Ref(DocRef):
+    """Represents a reference to RFC2616.
+    In 2014, RFC2616 was replaced by multiple RFCs (7230-7237)."""
+
+    def __init__(self, section):
+        url = 'http://www.w3.org/Protocols/rfc2616/rfc2616-sec{0:d}.html'
+        url = url.format(int(section))
+        super(RFC2616Ref, self).__init__(url, 'sec', section)
+
+
+class IETFRef(DocRef):
+    """Represents a reference to the specific IETF RFC."""
+
+    def __init__(self, rfc, section):
+        url = 'https://tools.ietf.org/html/rfc{0:d}'.format(rfc)
+        super(IETFRef, self).__init__(url, 'section-', section)
+
+
+class EventSourceRef(DocRef):
+
+    def __init__(self, section):
+        url = 'http://www.w3.org/TR/eventsource/'
+        super(EventSourceRef, self).__init__(url, section, '')
+
+
+class CORSRef(DocRef):
+    """Represents a reference to W3 Cross-Origin Resource Sharing recommendation."""
+
+    def __init__(self, name, type):
+        url = 'http://www.w3.org/TR/cors/'
+        super(CORSRef, self).__init__(url, name, '-' + type)
+
+
+#: Mapping from lowercase HTTP method name to :class:`DocRef` object which
+#: maintains the URL which points to the section of the RFC which defines that
+#: HTTP method.
+METHOD_REFS = {
+    'patch': IETFRef(5789, 2),
+    'options': IETFRef(7231, '4.3.7'),
+    'get': IETFRef(7231, '4.3.1'),
+    'head': IETFRef(7231, '4.3.2'),
+    'post': IETFRef(7231, '4.3.3'),
+    'put': IETFRef(7231, '4.3.4'),
+    'delete': IETFRef(7231, '4.3.5'),
+    'trace': IETFRef(7231, '4.3.8'),
+    'connect': IETFRef(7231, '4.3.6'),
+    'copy': IETFRef(2518, 8.8),
+    'any': ''
+}
+
+
+#: Mapping from HTTP header name to :class:`DocRef` object which
+#: maintains the URL which points to the related section of the RFC.
+HEADER_REFS = {
+    'Accept': IETFRef(7231, '5.3.2'),
+    'Accept-Charset': IETFRef(7231, '5.3.3'),
+    'Accept-Encoding': IETFRef(7231, '5.3.4'),
+    'Accept-Language': IETFRef(7231, '5.3.5'),
+    'Accept-Ranges': IETFRef(7233, 2.3),
+    'Age': IETFRef(7234, 5.1),
+    'Allow': IETFRef(7231, '7.4.1'),
+    'Authorization': IETFRef(7235, 4.2),
+    'Cache-Control': IETFRef(7234, 5.2),
+    'Connection': IETFRef(7230, 6.1),
+    'Content-Encoding': IETFRef(7231, '3.1.2.2'),
+    'Content-Language': IETFRef(7231, '3.1.3.2'),
+    'Content-Length': IETFRef(7230, '3.3.2'),
+    'Content-Location': IETFRef(7231, '3.1.4.2'),
+    'Content-MD5': RFC2616Ref(14.15), # removed
+    'Content-Range': IETFRef(7233, 4.2),
+    'Content-Type': IETFRef(7231, '3.1.1.5'),
+    'Cookie': IETFRef(2109, '4.3.4'), # also RFC6265 section 5.4
+    'Date': IETFRef(7231, '7.1.1.2'),
+    'Destination': IETFRef(2518, 9.3),
+    'ETag': IETFRef(7232, 2.3),
+    'Expect': IETFRef(7231, '5.1.1'),
+    'Expires': IETFRef(7234, 5.3),
+    'From': IETFRef(7231, '5.5.2'),
+    'Host': IETFRef(7230, 5.4),
+    'If-Match': IETFRef(7232, 3.1),
+    'If-Modified-Since': IETFRef(7232, 3.3),
+    'If-None-Match': IETFRef(7232, 3.2),
+    'If-Range': IETFRef(7233, 3.2),
+    'If-Unmodified-Since': IETFRef(7232, 3.4),
+    'Last-Event-ID': EventSourceRef('last-event-id'),
+    'Last-Modified': IETFRef(7232, 2.2),
+    'Link': IETFRef(5988, '5'),
+    'Location': IETFRef(7231, '7.1.2'),
+    'Max-Forwards': IETFRef(7231, '5.1.2'),
+    'Pragma': IETFRef(7234, 5.4),
+    'Proxy-Authenticate': IETFRef(7235, 4.3),
+    'Proxy-Authorization': IETFRef(7235, 4.4),
+    'Range': IETFRef(7233, 3.1),
+    'Referer': IETFRef(7231, '5.5.2'),
+    'Retry-After': IETFRef(7231, '7.1.3'),
+    'Server': IETFRef(7231, '7.4.2'),
+    'Set-Cookie': IETFRef(2109, '4.2.2'),
+    'TE': IETFRef(7230, 4.3),
+    'Trailer': IETFRef(7230, 4.4),
+    'Transfer-Encoding': IETFRef(7230, '3.3.1'),
+    'Upgrade': IETFRef(7230, 6.7),
+    'User-Agent': IETFRef(7231, '5.5.3'),
+    'Vary': IETFRef(7231, '7.1.4'),
+    'Via': IETFRef(7230, '5.7.1'),
+    'Warning': IETFRef(7234, 5.5),
+    'WWW-Authenticate': IETFRef(7235, 4.1),
+    'Access-Control-Allow-Origin': CORSRef('access-control-allow-origin',
+                                           'response-header'),
+    'Access-Control-Allow-Credentials': CORSRef('access-control-allow-credentials',
+                                                'response-header'),
+    'Access-Control-Expose-Headers': CORSRef('access-control-expose-headers',
+                                             'response-header'),
+    'Access-Control-Max-Age': CORSRef('access-control-max-age',
+                                      'response-header'),
+    'Access-Control-Allow-Methods': CORSRef('access-control-allow-methods',
+                                            'response-header'),
+    'Access-Control-Allow-Headers': CORSRef('access-control-allow-headers',
+                                            'response-header'),
+    'Origin': CORSRef('origin', 'request-header'),
+    'Access-Control-Request-Method': CORSRef('access-control-request-method',
+                                             'response-header'),
+    'Access-Control-Request-Headers': CORSRef('access-control-request-headers',
+                                              'response-header'),
+}
+
+
+HTTP_STATUS_CODES = {
+    100: 'Continue',
+    101: 'Switching Protocols',
+    102: 'Processing',
+    200: 'OK',
+    201: 'Created',
+    202: 'Accepted',
+    203: 'Non Authoritative Information',
+    204: 'No Content',
+    205: 'Reset Content',
+    206: 'Partial Content',
+    207: 'Multi Status',
+    226: 'IM Used',              # see RFC 3229
+    300: 'Multiple Choices',
+    301: 'Moved Permanently',
+    302: 'Found',
+    303: 'See Other',
+    304: 'Not Modified',
+    305: 'Use Proxy',
+    307: 'Temporary Redirect',
+    308: 'Permanent Redirect',
+    400: 'Bad Request',
+    401: 'Unauthorized',
+    402: 'Payment Required',     # unused
+    403: 'Forbidden',
+    404: 'Not Found',
+    405: 'Method Not Allowed',
+    406: 'Not Acceptable',
+    407: 'Proxy Authentication Required',
+    408: 'Request Timeout',
+    409: 'Conflict',
+    410: 'Gone',
+    411: 'Length Required',
+    412: 'Precondition Failed',
+    413: 'Request Entity Too Large',
+    414: 'Request URI Too Long',
+    415: 'Unsupported Media Type',
+    416: 'Requested Range Not Satisfiable',
+    417: 'Expectation Failed',
+    418: "I'm a teapot",        # see RFC 2324
+    422: 'Unprocessable Entity',
+    423: 'Locked',
+    424: 'Failed Dependency',
+    425: 'Too Early',           # RFC 8470
+    426: 'Upgrade Required',
+    429: 'Too Many Requests',
+    449: 'Retry With',           # proprietary MS extension
+    451: 'Unavailable For Legal Reasons',
+    500: 'Internal Server Error',
+    501: 'Not Implemented',
+    502: 'Bad Gateway',
+    503: 'Service Unavailable',
+    504: 'Gateway Timeout',
+    505: 'HTTP Version Not Supported',
+    507: 'Insufficient Storage',
+    510: 'Not Extended'
+}
+
+WEBDAV_STATUS_CODES = [207, 422, 423, 424, 507]
+
+http_sig_param_re = re.compile(r'\((?:(?P<type>[^:)]+):)?(?P<name>[\w_]+)\)',
+                               re.VERBOSE)
+
+
+def sort_by_method(entries):
+    def cmp(item):
+        order = ['HEAD', 'GET', 'POST', 'PUT', 'DELETE', 'PATCH',
+                 'OPTIONS', 'TRACE', 'CONNECT', 'COPY', 'ANY']
+        method = item[0].split(' ', 1)[0]
+        if method in order:
+            return order.index(method)
+        return 100
+    return sorted(entries, key=cmp)
+
+
+def http_resource_anchor(method, path):
+    path = re.sub(r'[{}]', '', re.sub(r'[<>:/]', '-', path))
+    return method.lower() + '-' + path
+
+
+class HTTPResource(ObjectDescription):
+
+    doc_field_types = [
+        TypedField('parameter', label='Parameters',
+                   names=('param', 'parameter', 'arg', 'argument'),
+                   typerolename='obj', typenames=('paramtype', 'type')),
+        TypedField('jsonparameter', label='JSON Parameters',
+                   names=('jsonparameter', 'jsonparam', 'json'),
+                   typerolename='obj', typenames=('jsonparamtype', 'jsontype')),
+        TypedField('requestjsonobject', label='Request JSON Object',
+                   names=('reqjsonobj', 'reqjson', '<jsonobj', '<json'),
+                   typerolename='obj', typenames=('reqjsonobj', '<jsonobj')),
+        TypedField('requestjsonarray', label='Request JSON Array of Objects',
+                   names=('reqjsonarr', '<jsonarr'),
+                   typerolename='obj',
+                   typenames=('reqjsonarrtype', '<jsonarrtype')),
+        TypedField('responsejsonobject', label='Response JSON Object',
+                   names=('resjsonobj', 'resjson', '>jsonobj', '>json'),
+                   typerolename='obj', typenames=('resjsonobj', '>jsonobj')),
+        TypedField('responsejsonarray', label='Response JSON Array of Objects',
+                   names=('resjsonarr', '>jsonarr'),
+                   typerolename='obj',
+                   typenames=('resjsonarrtype', '>jsonarrtype')),
+        TypedField('queryparameter', label='Query Parameters',
+                   names=('queryparameter', 'queryparam', 'qparam', 'query'),
+                   typerolename='obj',
+                   typenames=('queryparamtype', 'querytype', 'qtype')),
+        GroupedField('formparameter', label='Form Parameters',
+                     names=('formparameter', 'formparam', 'fparam', 'form')),
+        GroupedField('requestheader', label='Request Headers',
+                     rolename='header',
+                     names=('<header', 'reqheader', 'requestheader')),
+        GroupedField('responseheader', label='Response Headers',
+                     rolename='header',
+                     names=('>header', 'resheader', 'responseheader')),
+        GroupedField('statuscode', label='Status Codes',
+                     rolename='statuscode',
+                     names=('statuscode', 'status', 'code'))
+    ]
+
+    option_spec = {
+        'deprecated': directives.flag,
+        'noindex': directives.flag,
+        'synopsis': lambda x: x,
+    }
+
+    method = NotImplemented
+
+    def handle_signature(self, sig, signode):
+        method = self.method.upper() + ' '
+        signode += addnodes.desc_name(method, method)
+        offset = 0
+        path = None
+        for match in http_sig_param_re.finditer(sig):
+            path = sig[offset:match.start()]
+            signode += addnodes.desc_name(path, path)
+            params = addnodes.desc_parameterlist()
+            typ = match.group('type')
+            if typ:
+                typ += ': '
+                params += addnodes.desc_annotation(typ, typ)
+            name = match.group('name')
+            params += addnodes.desc_parameter(name, name)
+            signode += params
+            offset = match.end()
+        if offset < len(sig):
+            path = sig[offset:len(sig)]
+            signode += addnodes.desc_name(path, path)
+        assert path is not None, 'no matches for sig: %s' % sig
+        fullname = self.method.upper() + ' ' + path
+        signode['method'] = self.method
+        signode['path'] = sig
+        signode['fullname'] = fullname
+        return (fullname, self.method, sig)
+
+    def needs_arglist(self):
+        return False
+
+    def add_target_and_index(self, name_cls, sig, signode):
+        signode['ids'].append(http_resource_anchor(*name_cls[1:]))
+        if 'noindex' not in self.options:
+            self.env.domaindata['http'][self.method][sig] = (
+                self.env.docname,
+                self.options.get('synopsis', ''),
+                'deprecated' in self.options)
+
+    def get_index_text(self, modname, name):
+        return ''
+
+
+class HTTPOptions(HTTPResource):
+
+    method = 'options'
+
+
+class HTTPHead(HTTPResource):
+
+    method = 'head'
+
+
+class HTTPPatch(HTTPResource):
+
+    method = 'patch'
+
+
+class HTTPPost(HTTPResource):
+
+    method = 'post'
+
+
+class HTTPGet(HTTPResource):
+
+    method = 'get'
+
+
+class HTTPPut(HTTPResource):
+
+    method = 'put'
+
+
+class HTTPDelete(HTTPResource):
+
+    method = 'delete'
+
+
+class HTTPTrace(HTTPResource):
+
+    method = 'trace'
+
+
+class HTTPConnect(HTTPResource):
+
+    method = 'connect'
+
+
+class HTTPCopy(HTTPResource):
+
+    method = 'copy'
+
+
+class HTTPAny(HTTPResource):
+
+    method = 'any'
+
+
+class HTTPXRefRole(XRefRole):
+
+    def __init__(self, method, **kwargs):
+        XRefRole.__init__(self, **kwargs)
+        self.method = method
+
+    def process_link(self, env, refnode, has_explicit_title, title, target):
+        if not has_explicit_title:
+            title = self.method.upper() + ' ' + title
+        return title, target
+
+
+class HTTPXRefMethodRole(XRefRole):
+
+    def result_nodes(self, document, env, node, is_ref):
+        method = node[0][0].lower()
+        rawsource = node[0].rawsource
+        config = env.domains['http'].env.config
+        if method not in METHOD_REFS:
+            if not config['http_strict_mode']:
+                return [nodes.emphasis(method, method)], []
+            reporter = document.reporter
+            msg = reporter.error('%s is not valid HTTP method' % method,
+                                 line=node.line)
+            prb = nodes.problematic(method, method)
+            return [prb], [msg]
+        url = str(METHOD_REFS[method])
+        if not url:
+            return [nodes.emphasis(method, method)], []
+        node = nodes.reference(rawsource, method.upper(), refuri=url)
+        return [node], []
+
+
+class HTTPXRefStatusRole(XRefRole):
+
+    def result_nodes(self, document, env, node, is_ref):
+        def get_code_status(text):
+            if text.isdigit():
+                code = int(text)
+                return code, HTTP_STATUS_CODES.get(code)
+            else:
+                try:
+                    code, status = re.split(r'\s', text.strip(), 1)
+                    code = int(code)
+                except ValueError:
+                    return None, None
+                known_status = HTTP_STATUS_CODES.get(code)
+                if known_status is None:
+                    return code, None
+                elif known_status.lower() != status.lower():
+                    return code, None
+                else:
+                    return code, status
+
+        def report_unknown_code():
+            if not config['http_strict_mode']:
+                return [nodes.emphasis(text, text)], []
+            reporter = document.reporter
+            msg = reporter.error('%d is unknown HTTP status code' % code,
+                                 line=node.line)
+            prb = nodes.problematic(text, text)
+            return [prb], [msg]
+
+        def report_invalid_code():
+            if not config['http_strict_mode']:
+                return [nodes.emphasis(text, text)], []
+            reporter = document.reporter
+            msg = reporter.error(
+                'HTTP status code must be an integer (e.g. `200`) or '
+                'start with an integer (e.g. `200 OK`); %r is invalid' %
+                text,
+                line=node.line
+            )
+            prb = nodes.problematic(text, text)
+            return [prb], [msg]
+
+        text = node[0][0]
+        rawsource = node[0].rawsource
+        config = env.domains['http'].env.config
+
+        code, status = get_code_status(text)
+        if code is None:
+            return report_invalid_code()
+        elif status is None:
+            return report_unknown_code()
+        elif code == 226:
+            url = 'http://www.ietf.org/rfc/rfc3229.txt'
+        elif code == 418:
+            url = 'http://www.ietf.org/rfc/rfc2324.txt'
+        elif code == 429:
+            url = 'http://tools.ietf.org/html/rfc6585#section-4'
+        elif code == 449:
+            url = 'http://msdn.microsoft.com/en-us/library/dd891478(v=prot.10).aspx'
+        elif code == 451:
+            url = 'http://www.ietf.org/rfc/rfc7725.txt'
+        elif code in WEBDAV_STATUS_CODES:
+            url = 'http://tools.ietf.org/html/rfc4918#section-11.%d' % (WEBDAV_STATUS_CODES.index(code) + 1)
+        elif code in HTTP_STATUS_CODES:
+            url = 'http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html' \
+                  '#sec10.' + ('%d.%d' % (code // 100, 1 + code % 100))
+        else:
+            url = ''
+        node = nodes.reference(rawsource, '%d %s' % (code, status), refuri=url)
+        return [node], []
+
+
+class HTTPXRefHeaderRole(XRefRole):
+
+    def result_nodes(self, document, env, node, is_ref):
+        header = node[0][0]
+        rawsource = node[0].rawsource
+        if header not in HEADER_REFS:
+            _header = '-'.join(map(lambda i: i.title(), header.split('-')))
+            if _header not in HEADER_REFS:
+                return [nodes.emphasis(header, header)], []
+        url = str(HEADER_REFS[header])
+        node = nodes.reference(rawsource, header, refuri=url)
+        return [node], []
+
+
+class HTTPIndex(Index):
+
+    name = 'routingtable'
+    localname = 'HTTP Routing Table'
+    shortname = 'routing table'
+
+    def __init__(self, *args, **kwargs):
+        super(HTTPIndex, self).__init__(*args, **kwargs)
+
+        self.ignore = [
+            [l for l in x.split('/') if l]
+            for x in self.domain.env.config['http_index_ignore_prefixes']]
+        self.ignore.sort(reverse=True)
+
+        # During HTML generation these values pick from class,
+        # not from instance so we have a little hack the system
+        cls = self.__class__
+        cls.shortname = self.domain.env.config['http_index_shortname']
+        cls.localname = self.domain.env.config['http_index_localname']
+
+    def grouping_prefix(self, path):
+        letters = [x for x in path.split('/') if x]
+        for prefix in self.ignore:
+            if letters[:len(prefix)] == prefix:
+                return '/' + '/'.join(letters[:len(prefix) + 1])
+        return '/%s' % (letters[0] if letters else '',)
+
+    def generate(self, docnames=None):
+        content = {}
+        items = ((method, path, info)
+                 for method, routes in self.domain.routes.items()
+                 for path, info in routes.items())
+        items = sorted(items, key=lambda item: item[1])
+        for method, path, info in items:
+            entries = content.setdefault(self.grouping_prefix(path), [])
+            entries.append([
+                method.upper() + ' ' + path, 0, info[0],
+                http_resource_anchor(method, path),
+                '', 'Deprecated' if info[2] else '', info[1]
+            ])
+        items = sorted(
+            (path, sort_by_method(entries))
+            for path, entries in content.items()
+        )
+        return (items, True)
+
+
+class HTTPDomain(Domain):
+    """HTTP domain."""
+
+    name = 'http'
+    label = 'HTTP'
+
+    object_types = {
+        'options': ObjType('options', 'options', 'obj'),
+        'head': ObjType('head', 'head', 'obj'),
+        'post': ObjType('post', 'post', 'obj'),
+        'get': ObjType('get', 'get', 'obj'),
+        'put': ObjType('put', 'put', 'obj'),
+        'patch': ObjType('patch', 'patch', 'obj'),
+        'delete': ObjType('delete', 'delete', 'obj'),
+        'trace': ObjType('trace', 'trace', 'obj'),
+        'connect': ObjType('connect', 'connect', 'obj'),
+        'copy': ObjType('copy', 'copy', 'obj'),
+        'any': ObjType('any', 'any', 'obj')
+    }
+
+    directives = {
+        'options': HTTPOptions,
+        'head': HTTPHead,
+        'post': HTTPPost,
+        'get': HTTPGet,
+        'put': HTTPPut,
+        'patch': HTTPPatch,
+        'delete': HTTPDelete,
+        'trace': HTTPTrace,
+        'connect': HTTPConnect,
+        'copy': HTTPCopy,
+        'any': HTTPAny
+    }
+
+    roles = {
+        'options': HTTPXRefRole('options'),
+        'head': HTTPXRefRole('head'),
+        'post': HTTPXRefRole('post'),
+        'get': HTTPXRefRole('get'),
+        'put': HTTPXRefRole('put'),
+        'patch': HTTPXRefRole('patch'),
+        'delete': HTTPXRefRole('delete'),
+        'trace': HTTPXRefRole('trace'),
+        'connect': HTTPXRefRole('connect'),
+        'copy': HTTPXRefRole('copy'),
+        'any': HTTPXRefRole('any'),
+        'statuscode': HTTPXRefStatusRole(),
+        'method': HTTPXRefMethodRole(),
+        'header': HTTPXRefHeaderRole()
+    }
+
+    initial_data = {
+        'options': {},  # path: (docname, synopsis)
+        'head': {},
+        'post': {},
+        'get': {},
+        'put': {},
+        'patch': {},
+        'delete': {},
+        'trace': {},
+        'connect': {},
+        'copy': {},
+        'any': {}
+    }
+
+    indices = []
+
+    @property
+    def routes(self):
+        return dict((key, self.data[key]) for key in self.object_types)
+
+    def clear_doc(self, docname):
+        for typ, routes in self.routes.items():
+            for path, info in list(routes.items()):
+                if info[0] == docname:
+                    del routes[path]
+
+    def resolve_xref(self, env, fromdocname, builder, typ, target,
+                     node, contnode):
+        try:
+            info = self.data[str(typ)][target]
+        except KeyError:
+            text = contnode.rawsource
+            role = self.roles.get(typ)
+            if role is None:
+                return None
+
+            if fromdocname not in _doctree_cache:
+                _doctree_cache[fromdocname] = env.get_doctree(fromdocname)
+            doctree = _doctree_cache[fromdocname]
+
+            resnode = role.result_nodes(doctree, env, node, None)[0][0]
+            if isinstance(resnode, addnodes.pending_xref):
+                text = node[0][0]
+                reporter = doctree.reporter
+                reporter.warning('Cannot resolve reference to %r' % text,
+                                 line=node.line)
+                return None
+            return resnode
+        else:
+            anchor = http_resource_anchor(typ, target)
+            title = typ.upper() + ' ' + target
+            return make_refnode(builder, fromdocname, info[0], anchor,
+                                contnode, title)
+
+    def resolve_any_xref(self, env, fromdocname, builder, target, node, contnode):
+        """Resolve the pending_xref *node* with the given *target*.
+
+        The reference comes from an "any" or similar role, which means that Sphinx
+        don't know the type.
+
+        For now sphinxcontrib-httpdomain doesn't resolve any xref nodes.
+
+        :return:
+           list of tuples ``('domain:role', newnode)``, where ``'domain:role'``
+           is the name of a role that could have created the same reference,
+        """
+        return []
+
+    def get_objects(self):
+        for method, routes in self.routes.items():
+            for path, info in routes.items():
+                anchor = http_resource_anchor(method, path)
+                yield (path, path, method, info[0], anchor, 1)
+
+
+class HTTPLexer(RegexLexer):
+    """Lexer for HTTP sessions."""
+
+    name = 'HTTP'
+    aliases = ['http']
+
+    flags = re.DOTALL
+
+    def header_callback(self, match):
+        if match.group(1).lower() == 'content-type':
+            content_type = match.group(5).strip()
+            if ';' in content_type:
+                content_type = content_type[:content_type.find(';')].strip()
+            self.content_type = content_type
+        yield match.start(1), Name.Attribute, match.group(1)
+        yield match.start(2), Text, match.group(2)
+        yield match.start(3), Operator, match.group(3)
+        yield match.start(4), Text, match.group(4)
+        yield match.start(5), Literal, match.group(5)
+        yield match.start(6), Text, match.group(6)
+
+    def continuous_header_callback(self, match):
+        yield match.start(1), Text, match.group(1)
+        yield match.start(2), Literal, match.group(2)
+        yield match.start(3), Text, match.group(3)
+
+    def content_callback(self, match):
+        content_type = getattr(self, 'content_type', None)
+        content = match.group()
+        offset = match.start()
+        if content_type:
+            from pygments.lexers import get_lexer_for_mimetype
+            try:
+                lexer = get_lexer_for_mimetype(content_type)
+            except ClassNotFound:
+                pass
+            else:
+                for idx, token, value in lexer.get_tokens_unprocessed(content):
+                    yield offset + idx, token, value
+                return
+        yield offset, Text, content
+
+    tokens = {
+        'root': [
+            (r'(GET|POST|PUT|PATCH|DELETE|HEAD|OPTIONS|TRACE|COPY)( +)([^ ]+)( +)'
+             r'(HTTPS?)(/)(1\.[01])(\r?\n|$)',
+             bygroups(Name.Function, Text, Name.Namespace, Text,
+                      Keyword.Reserved, Operator, Number, Text),
+             'headers'),
+            (r'(HTTPS?)(/)(1\.[01])( +)(\d{3})( +)([^\r\n]+)(\r?\n|$)',
+             bygroups(Keyword.Reserved, Operator, Number, Text, Number,
+                      Text, Name.Exception, Text),
+             'headers'),
+        ],
+        'headers': [
+            (r'([^\s:]+)( *)(:)( *)([^\r\n]+)(\r?\n|$)', header_callback),
+            (r'([\t ]+)([^\r\n]+)(\r?\n|$)', continuous_header_callback),
+            (r'\r?\n', Text, 'content')
+        ],
+        'content': [
+            (r'.+', content_callback)
+        ]
+    }
+
+
+def setup(app):
+    app.add_domain(HTTPDomain)
+
+    try:
+        get_lexer_by_name('http')
+    except ClassNotFound:
+        app.add_lexer('http', HTTPLexer())
+    app.add_config_value('http_index_ignore_prefixes', [], None)
+    app.add_config_value('http_index_shortname', 'routing table', True)
+    app.add_config_value('http_index_localname', 'HTTP Routing Table', True)
+    app.add_config_value('http_strict_mode', True, None)
+    app.add_config_value('http_headers_ignore_prefixes', ['X-'], None)
diff --git a/_exts/typescriptdomain.py b/_exts/typescriptdomain.py
new file mode 100644
index 0000000..50ffdc0
--- /dev/null
+++ b/_exts/typescriptdomain.py
@@ -0,0 +1,587 @@
+"""
+TypeScript domain.
+
+:copyright: Copyright 2019 by Taler Systems SA
+:license: LGPLv3+
+:author: Florian Dold
+"""
+
+import re
+
+from pathlib import Path
+
+from docutils import nodes
+from typing import List, Optional, Iterable, Dict, Tuple
+from typing import cast
+
+from pygments.lexers import get_lexer_by_name
+from pygments.filter import Filter
+from pygments.token import Literal, Text, Operator, Keyword, Name, Number
+from pygments.token import Comment, Token, _TokenType
+from pygments.token import *
+from pygments.lexer import RegexLexer, bygroups, include
+from pygments.formatters import HtmlFormatter
+
+from docutils import nodes
+from docutils.nodes import Element, Node
+
+from sphinx.roles import XRefRole
+from sphinx.domains import Domain, ObjType, Index
+from sphinx.directives import directives
+from sphinx.util.docutils import SphinxDirective
+from sphinx.util.nodes import make_refnode
+from sphinx.util import logging
+from sphinx.highlighting import PygmentsBridge
+from sphinx.builders.html import StandaloneHTMLBuilder
+from sphinx.pygments_styles import SphinxStyle
+
+logger = logging.getLogger(__name__)
+
+
+class TypeScriptDefinition(SphinxDirective):
+    """
+    Directive for a code block with special highlighting or line numbering
+    settings.
+    """
+
+    has_content = True
+    required_arguments = 1
+    optional_arguments = 0
+    final_argument_whitespace = False
+    option_spec = {
+        "force": directives.flag,
+        "linenos": directives.flag,
+        "dedent": int,
+        "lineno-start": int,
+        "emphasize-lines": directives.unchanged_required,
+        "caption": directives.unchanged_required,
+        "class": directives.class_option,
+    }
+
+    def run(self) -> List[Node]:
+        document = self.state.document
+        code = "\n".join(self.content)
+        location = self.state_machine.get_source_and_line(self.lineno)
+
+        linespec = self.options.get("emphasize-lines")
+        if linespec:
+            try:
+                nlines = len(self.content)
+                hl_lines = parselinenos(linespec, nlines)
+                if any(i >= nlines for i in hl_lines):
+                    logger.warning(
+                        __("line number spec is out of range(1-%d): %r")
+                        % (nlines, self.options["emphasize-lines"]),
+                        location=location,
+                    )
+
+                hl_lines = [x + 1 for x in hl_lines if x < nlines]
+            except ValueError as err:
+                return [document.reporter.warning(err, line=self.lineno)]
+        else:
+            hl_lines = None
+
+        if "dedent" in self.options:
+            location = self.state_machine.get_source_and_line(self.lineno)
+            lines = code.split("\n")
+            lines = dedent_lines(lines, self.options["dedent"], location=location)
+            code = "\n".join(lines)
+
+        literal = nodes.literal_block(code, code)  # type: Element
+        if "linenos" in self.options or "lineno-start" in self.options:
+            literal["linenos"] = True
+        literal["classes"] += self.options.get("class", [])
+        literal["force"] = "force" in self.options
+        literal["language"] = "tsref"
+        extra_args = literal["highlight_args"] = {}
+        if hl_lines is not None:
+            extra_args["hl_lines"] = hl_lines
+        if "lineno-start" in self.options:
+            extra_args["linenostart"] = self.options["lineno-start"]
+        self.set_source_info(literal)
+
+        caption = self.options.get("caption")
+        if caption:
+            try:
+                literal = container_wrapper(self, literal, caption)
+            except ValueError as exc:
+                return [document.reporter.warning(exc, line=self.lineno)]
+
+        tsid = "tsref-type-" + self.arguments[0]
+        literal["ids"].append(tsid)
+
+        tsname = self.arguments[0]
+        ts = self.env.get_domain("ts")
+        ts.add_object("type", tsname, self.env.docname, tsid)
+
+        return [literal]
+
+
+class TypeScriptDomain(Domain):
+    """TypeScript domain."""
+
+    name = "ts"
+    label = "TypeScript"
+
+    directives = {
+        "def": TypeScriptDefinition,
+    }
+
+    roles = {
+        "type": XRefRole(
+            lowercase=False, warn_dangling=True, innernodeclass=nodes.inline
+        ),
+    }
+
+    dangling_warnings = {
+        "type": "undefined TypeScript type: %(target)s",
+    }
+
+    def resolve_xref(self, env, fromdocname, builder, typ, target, node, contnode):
+        try:
+            info = self.objects[(str(typ), str(target))]
+        except KeyError:
+            logger.warn("type {}/{} not found".format(typ, target))
+            return None
+        else:
+            anchor = "tsref-type-{}".format(str(target))
+            title = typ.upper() + " " + target
+            return make_refnode(builder, fromdocname, info[0], anchor, contnode, title)
+
+    def resolve_any_xref(self, env, fromdocname, builder, target, node, contnode):
+        """Resolve the pending_xref *node* with the given *target*.
+
+        The reference comes from an "any" or similar role, which means that Sphinx
+        don't know the type.
+
+        For now sphinxcontrib-httpdomain doesn't resolve any xref nodes.
+
+        :return:
+           list of tuples ``('domain:role', newnode)``, where ``'domain:role'``
+           is the name of a role that could have created the same reference,
+        """
+        ret = []
+        try:
+            info = self.objects[("type", str(target))]
+        except KeyError:
+            pass
+        else:
+            anchor = "tsref-type-{}".format(str(target))
+            title = "TYPE" + " " + target
+            node = make_refnode(builder, fromdocname, info[0], anchor, contnode, title)
+            ret.append(("ts:type", node))
+        return ret
+
+    @property
+    def objects(self) -> Dict[Tuple[str, str], Tuple[str, str]]:
+        return self.data.setdefault(
+            "objects", {}
+        )  # (objtype, name) -> docname, labelid
+
+    def add_object(self, objtype: str, name: str, docname: str, labelid: str) -> None:
+        self.objects[objtype, name] = (docname, labelid)
+
+
+class BetterTypeScriptLexer(RegexLexer):
+    """
+    For `TypeScript <https://www.typescriptlang.org/>`_ source code.
+    """
+
+    name = "TypeScript"
+    aliases = ["ts"]
+    filenames = ["*.ts"]
+    mimetypes = ["text/x-typescript"]
+
+    flags = re.DOTALL
+    tokens = {
+        "commentsandwhitespace": [
+            (r"\s+", Text),
+            (r"<!--", Comment),
+            (r"//.*?\n", Comment.Single),
+            (r"/\*.*?\*/", Comment.Multiline),
+        ],
+        "slashstartsregex": [
+            include("commentsandwhitespace"),
+            (
+                r"/(\\.|[^[/\\\n]|\[(\\.|[^\]\\\n])*])+/" r"([gim]+\b|\B)",
+                String.Regex,
+                "#pop",
+            ),
+            (r"(?=/)", Text, ("#pop", "badregex")),
+            (r"", Text, "#pop"),
+        ],
+        "badregex": [(r"\n", Text, "#pop")],
+        "typeexp": [
+            (r"[a-zA-Z0-9_?.$]+", Keyword.Type),
+            (r"\s+", Text),
+            (r"[|]", Text),
+            (r"\n", Text, "#pop"),
+            (r";", Text, "#pop"),
+            (r"", Text, "#pop"),
+        ],
+        "root": [
+            (r"^(?=\s|/|<!--)", Text, "slashstartsregex"),
+            include("commentsandwhitespace"),
+            (
+                r"\+\+|--|~|&&|\?|:|\|\||\\(?=\n)|"
+                r"(<<|>>>?|==?|!=?|[-<>+*%&\|\^/])=?",
+                Operator,
+                "slashstartsregex",
+            ),
+            (r"[{(\[;,]", Punctuation, "slashstartsregex"),
+            (r"[})\].]", Punctuation),
+            (
+                r"(for|in|while|do|break|return|continue|switch|case|default|if|else|"
+                r"throw|try|catch|finally|new|delete|typeof|instanceof|void|"
+                r"this)\b",
+                Keyword,
+                "slashstartsregex",
+            ),
+            (
+                r"(var|let|const|with|function)\b",
+                Keyword.Declaration,
+                "slashstartsregex",
+            ),
+            (
+                r"(abstract|boolean|byte|char|class|const|debugger|double|enum|export|"
+                r"extends|final|float|goto|implements|import|int|interface|long|native|"
+                r"package|private|protected|public|short|static|super|synchronized|throws|"
+                r"transient|volatile)\b",
+                Keyword.Reserved,
+            ),
+            (r"(true|false|null|NaN|Infinity|undefined)\b", Keyword.Constant),
+            (
+                r"(Array|Boolean|Date|Error|Function|Math|netscape|"
+                r"Number|Object|Packages|RegExp|String|sun|decodeURI|"
+                r"decodeURIComponent|encodeURI|encodeURIComponent|"
+                r"Error|eval|isFinite|isNaN|parseFloat|parseInt|document|this|"
+                r"window)\b",
+                Name.Builtin,
+            ),
+            # Match stuff like: module name {...}
+            (
+                r"\b(module)(\s*)(\s*[a-zA-Z0-9_?.$][\w?.$]*)(\s*)",
+                bygroups(Keyword.Reserved, Text, Name.Other, Text),
+                "slashstartsregex",
+            ),
+            # Match variable type keywords
+            (r"\b(string|bool|number)\b", Keyword.Type),
+            # Match stuff like: constructor
+            (r"\b(constructor|declare|interface|as|AS)\b", Keyword.Reserved),
+            # Match stuff like: super(argument, list)
+            (
+                r"(super)(\s*)\(([a-zA-Z0-9,_?.$\s]+\s*)\)",
+                bygroups(Keyword.Reserved, Text),
+                "slashstartsregex",
+            ),
+            # Match stuff like: function() {...}
+            (r"([a-zA-Z_?.$][\w?.$]*)\(\) \{", Name.Other, "slashstartsregex"),
+            # Match stuff like: (function: return type)
+            (
+                r"([a-zA-Z0-9_?.$][\w?.$]*)(\s*:\s*)",
+                bygroups(Name.Other, Text),
+                "typeexp",
+            ),
+            # Match stuff like: type Foo = Bar | Baz
+            (
+                r"\b(type)(\s*)([a-zA-Z0-9_?.$]+)(\s*)(=)(\s*)",
+                bygroups(Keyword.Reserved, Text, Name.Other, Text, Operator, Text),
+                "typeexp",
+            ),
+            (r"[$a-zA-Z_][a-zA-Z0-9_]*", Name.Other),
+            (r"[0-9][0-9]*\.[0-9]+([eE][0-9]+)?[fd]?", Number.Float),
+            (r"0x[0-9a-fA-F]+", Number.Hex),
+            (r"[0-9]+", Number.Integer),
+            (r'"(\\\\|\\"|[^"])*"', String.Double),
+            (r"'(\\\\|\\'|[^'])*'", String.Single),
+        ],
+    }
+
+
+# Map from token id to props.
+# Properties can't be added to tokens
+# since they derive from Python's tuple.
+token_props = {}
+
+
+class LinkFilter(Filter):
+    def __init__(self, app, **options):
+        self.app = app
+        Filter.__init__(self, **options)
+
+    def _filter_one_literal(self, ttype, value):
+        last = 0
+        for m in re.finditer(literal_reg, value):
+            pre = value[last : m.start()]
+            if pre:
+                yield ttype, pre
+            t = copy_token(ttype)
+            tok_setprop(t, "is_literal", True)
+            yield t, m.group(1)
+            last = m.end()
+        post = value[last:]
+        if post:
+            yield ttype, post
+
+    def filter(self, lexer, stream):
+        for ttype, value in stream:
+            if ttype in Token.Keyword.Type:
+                t = copy_token(ttype)
+                tok_setprop(t, "xref", value.strip())
+                tok_setprop(t, "is_identifier", True)
+                yield t, value
+            elif ttype in Token.Comment:
+                last = 0
+                for m in re.finditer(link_reg, value):
+                    pre = value[last : m.start()]
+                    if pre:
+                        yield from self._filter_one_literal(ttype, pre)
+                    t = copy_token(ttype)
+                    x1, x2 = m.groups()
+                    x0 = m.group(0)
+                    if x2 is None:
+                        caption = x1.strip()
+                        xref = x1.strip()
+                    else:
+                        caption = x1.strip()
+                        xref = x2.strip()
+                    tok_setprop(t, "xref", xref)
+                    tok_setprop(t, "caption", caption)
+                    if x0.endswith("_"):
+                        tok_setprop(t, "trailing_underscore", True)
+                    yield t, m.group(1)
+                    last = m.end()
+                post = value[last:]
+                if post:
+                    yield from self._filter_one_literal(ttype, post)
+            else:
+                yield ttype, value
+
+
+_escape_html_table = {
+    ord("&"): u"&amp;",
+    ord("<"): u"&lt;",
+    ord(">"): u"&gt;",
+    ord('"'): u"&quot;",
+    ord("'"): u"&#39;",
+}
+
+
+class LinkingHtmlFormatter(HtmlFormatter):
+    def __init__(self, **kwargs):
+        super(LinkingHtmlFormatter, self).__init__(**kwargs)
+        self._builder = kwargs["_builder"]
+        self._bridge = kwargs["_bridge"]
+
+    def _get_value(self, value, tok):
+        xref = tok_getprop(tok, "xref")
+        caption = tok_getprop(tok, "caption")
+
+        if tok_getprop(tok, "is_literal"):
+            return '<span style="font-weight: bolder">%s</span>' % (value,)
+
+        if tok_getprop(tok, "trailing_underscore"):
+            logger.warn(
+                "{}:{}: code block contains xref to '{}' with unsupported trailing underscore".format(
+                    self._bridge.path, self._bridge.line, xref
+                )
+            )
+
+        if tok_getprop(tok, "is_identifier"):
+            if xref.startswith('"'):
+                return value
+            if re.match("^[0-9]+$", xref) is not None:
+                return value
+            if xref in (
+                "number",
+                "object",
+                "string",
+                "boolean",
+                "any",
+                "true",
+                "false",
+                "null",
+                "undefined",
+                "Array",
+                "unknown",
+            ):
+                return value
+
+        if self._bridge.docname is None:
+            return value
+        if xref is None:
+            return value
+        content = caption if caption is not None else value
+        ts = self._builder.env.get_domain("ts")
+        r1 = ts.objects.get(("type", xref), None)
+        if r1 is not None:
+            rel_uri = (
+                self._builder.get_relative_uri(self._bridge.docname, r1[0])
+                + "#"
+                + r1[1]
+            )
+            return (
+                '<a style="color:inherit;text-decoration:underline" href="%s">%s</a>'
+                % (rel_uri, content)
+            )
+
+        std = self._builder.env.get_domain("std")
+        r2 = std.labels.get(xref.lower(), None)
+        if r2 is not None:
+            rel_uri = (
+                self._builder.get_relative_uri(self._bridge.docname, r2[0])
+                + "#"
+                + r2[1]
+            )
+            return (
+                '<a style="color:inherit;text-decoration:underline" href="%s">%s</a>'
+                % (rel_uri, content)
+            )
+        r3 = std.anonlabels.get(xref.lower(), None)
+        if r3 is not None:
+            rel_uri = (
+                self._builder.get_relative_uri(self._bridge.docname, r3[0])
+                + "#"
+                + r3[1]
+            )
+            return (
+                '<a style="color:inherit;text-decoration:underline" href="%s">%s</a>'
+                % (rel_uri, content)
+            )
+
+        logger.warn(
+            "{}:{}: code block contains unresolved xref '{}'".format(
+                self._bridge.path, self._bridge.line, xref
+            )
+        )
+
+        return value
+
+    def _fmt(self, value, tok):
+        cls = self._get_css_class(tok)
+        value = self._get_value(value, tok)
+        if cls is None or cls == "":
+            return value
+        return '<span class="%s">%s</span>' % (cls, value)
+
+    def _format_lines(self, tokensource):
+        """
+        Just format the tokens, without any wrapping tags.
+        Yield individual lines.
+        """
+        lsep = self.lineseparator
+        escape_table = _escape_html_table
+
+        line = ""
+        for ttype, value in tokensource:
+            link = get_annotation(ttype, "link")
+
+            parts = value.translate(escape_table).split("\n")
+
+            if len(parts) == 0:
+                # empty token, usually should not happen
+                pass
+            elif len(parts) == 1:
+                # no newline before or after token
+                line += self._fmt(parts[0], ttype)
+            else:
+                line += self._fmt(parts[0], ttype)
+                yield 1, line + lsep
+                for part in parts[1:-1]:
+                    yield 1, self._fmt(part, ttype) + lsep
+                line = self._fmt(parts[-1], ttype)
+
+        if line:
+            yield 1, line + lsep
+
+
+class MyPygmentsBridge(PygmentsBridge):
+    def __init__(self, builder, trim_doctest_flags):
+        self.dest = "html"
+        self.trim_doctest_flags = trim_doctest_flags
+        self.formatter_args = {
+            "style": SphinxStyle,
+            "_builder": builder,
+            "_bridge": self,
+        }
+        self.formatter = LinkingHtmlFormatter
+        self.builder = builder
+        self.path = None
+        self.line = None
+        self.docname = None
+
+    def highlight_block(
+        self, source, lang, opts=None, force=False, location=None, **kwargs
+    ):
+        if isinstance(location, tuple):
+            docname, line = location
+            self.line = line
+            self.path = self.builder.env.doc2path(docname)
+            self.docname = docname
+        elif isinstance(location, Element):
+            self.line = location.line
+            self.path = location.source
+            self.docname = self.builder.env.path2doc(self.path)
+        return super().highlight_block(source, lang, opts, force, location, **kwargs)
+
+
+class MyHtmlBuilder(StandaloneHTMLBuilder):
+    name = "html-linked"
+
+    def init_highlighter(self):
+        if self.config.pygments_style is not None:
+            style = self.config.pygments_style
+        elif self.theme:
+            style = self.theme.get_confstr("theme", "pygments_style", "none")
+        else:
+            style = "sphinx"
+        self.highlighter = MyPygmentsBridge(self, self.config.trim_doctest_flags)
+        self.dark_highlighter = None
+
+
+def get_annotation(tok, key):
+    if not hasattr(tok, "kv"):
+        return None
+    return tok.kv.get(key)
+
+
+def copy_token(tok):
+    new_tok = _TokenType(tok)
+    # This part is very fragile against API changes ...
+    new_tok.subtypes = set(tok.subtypes)
+    new_tok.parent = tok.parent
+    return new_tok
+
+
+def tok_setprop(tok, key, value):
+    tokid = id(tok)
+    e = token_props.get(tokid)
+    if e is None:
+        e = token_props[tokid] = (tok, {})
+    _, kv = e
+    kv[key] = value
+
+
+def tok_getprop(tok, key):
+    tokid = id(tok)
+    e = token_props.get(tokid)
+    if e is None:
+        return None
+    _, kv = e
+    return kv.get(key)
+
+
+link_reg = re.compile(r"(?<!`)`([^`<]+)\s*(?:<([^>]+)>)?\s*`_?")
+literal_reg = re.compile(r"``([^`]+)``")
+
+
+def setup(app):
+
+    class TsrefLexer(BetterTypeScriptLexer):
+        def __init__(self, **options):
+            super().__init__(**options)
+            self.add_filter(LinkFilter(app))
+
+    app.add_lexer("tsref", TsrefLexer)
+    app.add_domain(TypeScriptDomain)
+    app.add_builder(MyHtmlBuilder)
diff --git a/_static/css/custom.css b/_static/css/custom.css
new file mode 100644
index 0000000..05db767
--- /dev/null
+++ b/_static/css/custom.css
@@ -0,0 +1,3 @@
+div.wy-side-nav-search {
+  background: transparent !important;
+}
diff --git a/about.rst b/about.rst
new file mode 100644
index 0000000..5f581a8
--- /dev/null
+++ b/about.rst
@@ -0,0 +1,52 @@
+About GANA
+==========
+
+The GNUnet Assigned Numbers Authority (GANA) contains various registries
+we maintain, for GNUnet other projects that need names and numbers for
+use in network protocols. If you need to open a new registry, please
+feel free to contact us at gana@gnunet.org.
+
+The registry sources can be found here: https://git.gnunet.org/gana.git
+
+History
+-------
+
+Barry Leiba `wrote on April 4th 2020 <https://datatracker.ietf.org/doc/conflict-review-dold-payto/ballot/>`_ that “Neither IANA nor participants
+in the IETF will have any necessary expertise to evaluate registration
+requests in the sort of registry described, and no one will be well
+served by the creation of such a registry at IANA. It would be far
+better to have a registration process be described in this document
+involving experts from the industry as reviewers and maintenance of the
+registrations by an industry organization, rather than by IANA.”
+
+So here we are. As IETF/IANA “lack the necessary expertise to operate a
+registry” for names and numbers used in network protocols, the GNUnet
+project is happy to step up.
+
+License
+-------
+
+The GANA database is licensed under the GPL. See ``COPYING`` in the Git
+repository.
+
+Design
+------
+
+Each registry must have a unique name and all associated information
+lives in a directory under that unique name in the Git repository.
+
+Each registry must include at least the following files:
+
+-  ``README[.*]``: document describing the purpose of the registry in
+   English
+-  ``POLICY[.*]``: registration policy, explaining required fields and
+   the procedure for adding, updating and deleting entries
+-  ``registry.rec``: GNU recutils data file with all of the current
+   entries in the registry
+-  ``Makefile``: GNU make makefile with a ``make check`` target to run
+   the validation logic. Ideally, the registry.rec should be written
+   such that the ``check`` target is simply invoking
+   ``recfix --check registry.rec``. Additional targets to convert
+   ``data.rec`` to various formats may be defined. In particular, see
+   ``format.sh`` in the root directory of the Git repository (try
+   ``--help``).
diff --git a/conf.py b/conf.py
new file mode 100644
index 0000000..8b8ef69
--- /dev/null
+++ b/conf.py
@@ -0,0 +1,120 @@
+# Configuration file for the Sphinx documentation builder.
+#
+# This file only contains a selection of the most common options. For a full
+# list see the documentation:
+# https://www.sphinx-doc.org/en/master/usage/configuration.html
+
+# -- Path setup --------------------------------------------------------------
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#
+# import os
+# import sys
+# sys.path.insert(0, os.path.abspath('.'))
+
+
+# -- Project information -----------------------------------------------------
+import sys
+import os
+
+project = 'GANA'
+copyright = '2024, GNUnet Project'
+author = 'GNUnet Project'
+
+sys.path.append(os.path.abspath("_exts"))
+
+# -- General configuration ---------------------------------------------------
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+  'httpdomain.httpdomain',
+  'typescriptdomain',
+  'sphinx.ext.todo',
+  #'sphinx_book_theme',
+  #'breathe'
+]
+
+#breathe_projects = {
+#    "gnunet": "../gnunet/doc/doxygen/xml/",
+#}
+
+#breathe_default_project = "gnunet"
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This pattern also affects html_static_path and html_extra_path.
+exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+
+
+# -- Options for HTML output -------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+html_theme = 'sphinx_rtd_theme'
+
+html_sidebars = {
+    #"**": ["navbar-logo.html", "sbt-sidebar-nav.html", "search-field.html"]
+    "**": ["search-field.html", "sbt-sidebar-nav.html"]
+}
+
+html_theme_options = {
+    #'logo_only': True,
+    #'display_version': False,
+    #'prev_next_buttons_location': 'bottom',
+    #'style_external_links': False,
+    #'vcs_pageview_mode': '',
+    #'style_nav_header_background': 'transparent', # Possibly problematic with our CSP
+    # Toc options
+    #'collapse_navigation': True,
+    #'sticky_navigation': True,
+    #'navigation_depth': 4,
+    #'includehidden': True,
+    #'titles_only': False
+    #"navbar_start": ["navbar-logo"],
+    #"header_links_before_dropdown": 8,
+    #"article_header_start": ["breadcrumbs.html"],
+    #"navbar_center": ["navbar-nav"],
+    #"navbar_end": [],
+    #"navbar_persistent": [],
+}
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# These paths are either relative to html_static_path
+# or fully qualified paths (eg. https://...)
+#html_css_files = [
+#    'css/custom.css',
+#]
+
+html_logo = "images/gnunet-blue.png"
+
+# Display to-do items in docs
+todo_include_todos = True
+
+primary_domain = "c"
+
+highlight_language = "c"
+
+rst_prolog = f"""
+.. role:: c(code)
+   :language: c
+
+.. role:: bolditalic
+   :class: bolditalic
+"""
+
+rst_epilog = """
+"""
+
+
diff --git a/dot-alt/Makefile b/dot-alt/Makefile
new file mode 100644
index 0000000..cff05b7
--- /dev/null
+++ b/dot-alt/Makefile
@@ -0,0 +1,22 @@
+FILES=dot_alt.rst
+all: check $(FILES)
+
+check:
+        recfix --check registry.rec
+
+distclean:
+
+        rm -f *.tmp
+clean:
+        rm -f $(FILES) *.tmp
+
+dot_alt.rst.tmp: registry.rec rst.template
+        ../format.sh rst.template < registry.rec > $@
+
+rst.header.tmp:
+        cat README POLICY rst.header.template > $@
+
+dot_alt.rst: rst.header.tmp dot_alt.rst.tmp
+        cat rst.header.tmp dot_alt.rst.tmp > $@
+
+.PHONY: check
diff --git a/dot-alt/POLICY b/dot-alt/POLICY
new file mode 100644
index 0000000..f586333
--- /dev/null
+++ b/dot-alt/POLICY
@@ -0,0 +1,13 @@
+Policy
+^^^^^^
+
+The "Label" must be unique in the entire registry.  The value must be a
+case insensitive `LDH label <https://www.rfc-editor.org/rfc/rfc5890#section-2.3.1>`__
+following the restrictions on DNS names.
+
+Adding records can be done on a first-come first-served basis after GANA
+committer review.
+
+The current contact(s) for review are reachable at
+alt-registry@gnunet.org.
+
diff --git a/dot-alt/README b/dot-alt/README
new file mode 100644
index 0000000..828eca6
--- /dev/null
+++ b/dot-alt/README
@@ -0,0 +1,8 @@
+.alt Subdomains
+---------------
+
+This registry is for the `.alt Top-Level-Domains (TLDs) of the Domain Name System (RFC 9476) <https://www.rfc-editor.org/rfc/rfc9476.html>`__.
+
+This registry is used to ensure that names of alternative name systems
+do not conflict with DNS names or with each other.
+
diff --git a/dot-alt/registry.rec b/dot-alt/registry.rec
new file mode 100644
index 0000000..715f491
--- /dev/null
+++ b/dot-alt/registry.rec
@@ -0,0 +1,36 @@
+# -*- mode: rec -*-
+#
+# Registry for ".ALT" Top-Level-Domain
+#
+
+%rec: AltTld
+%key: Label
+%typedef: Label_t regexp /^[abcdefghijklmnopqrstuvwxyz0123456789][abcdefghijklmnopqrstuvwxyz0123456789-]*$/
+%type: Label Label_t
+%unique: Label
+%mandatory: Label
+%mandatory: Description
+%allowed: Contact
+%allowed: References
+%allowed: UnicodeLabel
+%sort: Name Contact References
+
+Label: gns
+UnicodeLabel: gns
+Contact: Martin Schanzenbach <schanzen@gnunet.org>
+References: RFC 9498
+Description: The .alt subdomain for GNS
+
+Label: i2p
+UnicodeLabel: i2p
+Contact: zzz <zzz AT i2pmail DOT org>
+References: https://geti2p.net/en/docs/naming
+Description: I2P is a P2P network implementing its own name resolution mechanism
+
+# Unreserved unicode example
+Label: xn--fsq
+UnicodeLabel: 例
+Contact: Martin Schanzenbach <schanzen@gnunet.org>
+References: None
+Description: Unreserved unicode example
+
diff --git a/dot-alt/rst.header.template b/dot-alt/rst.header.template
new file mode 100644
index 0000000..b37550e
--- /dev/null
+++ b/dot-alt/rst.header.template
@@ -0,0 +1,11 @@
+Entries
+^^^^^^^
+
+.. list-table:: .alt Subdomains
+   :widths: 10 20 10 60
+   :header-rows: 1
+
+   * - Label
+     - Contact
+     - References
+     - Description
diff --git a/dot-alt/rst.template b/dot-alt/rst.template
new file mode 100644
index 0000000..9c0fdbc
--- /dev/null
+++ b/dot-alt/rst.template
@@ -0,0 +1,4 @@
+   * - {{Label}}
+     - {{Contact}}
+     - {{References}}
+     - {{Description}}
diff --git a/format.sh b/format.sh
index 1cdee4f..a8f2265 100755
--- a/format.sh
+++ b/format.sh
@@ -12,7 +12,8 @@
 ##
 me=$(basename $0)
 
-version='1.3'
+version='1.4'
+# 1.4  -- create $TMPDIR if it does not exist
 # 1.3  -- add support for optional arg SELEXP
 # 1.2  -- add check for required arg TEMPLATE
 # 1.1  -- add --help/--version support
diff --git a/gns-protocol-numbers/.gitignore b/gns-protocol-numbers/.gitignore
new file mode 100644
index 0000000..0a437d0
--- /dev/null
+++ b/gns-protocol-numbers/.gitignore
@@ -0,0 +1 @@
+gnu-name-system-record-types.h
diff --git a/gns-protocol-numbers/Makefile b/gns-protocol-numbers/Makefile
new file mode 100644
index 0000000..a491d11
--- /dev/null
+++ b/gns-protocol-numbers/Makefile
@@ -0,0 +1,28 @@
+FILES=gnu_name_system_protocols.h gnu_name_system_protocols.rst
+all: check $(FILES)
+
+check:
+        recfix --check registry.rec
+
+distclean:
+        rm -f *.tmp
+clean:
+        rm -f $(FILES) *.tmp
+
+gnu_name_system_protocols.h.tmp: registry.rec h.template
+        ../format.sh h.template < registry.rec > $@
+
+gnu_name_system_protocols.h: h.header gnu_name_system_protocols.h.tmp h.footer
+        cat h.header gnu_name_system_protocols.h.tmp h.footer > $@
+
+gnu_name_system_protocols.rst.tmp: registry.rec rst.template
+        ../format.sh rst.template < registry.rec > $@
+
+rst.header.tmp:
+        cat README POLICY rst.header.template > $@
+
+gnu_name_system_protocols.rst: rst.header.tmp gnu_name_system_protocols.rst.tmp rst.footer
+        cat rst.header.tmp gnu_name_system_protocols.rst.tmp rst.footer > $@
+
+
+.PHONY: check clean distclean
diff --git a/gns-protocol-numbers/POLICY b/gns-protocol-numbers/POLICY
new file mode 100644
index 0000000..3972d5d
--- /dev/null
+++ b/gns-protocol-numbers/POLICY
@@ -0,0 +1,20 @@
+Policy
+^^^^^^
+
+Each registry entry should contain three values: the port "Number" of the
+protocol, which must be above 255,
+the "Name" of the protocol, and a "Reference" with links
+to further information about the record type.
+
+The "Name" must be unique in the entire registry.  The value must be a
+case insensitive ASCII string and is restricted to alphanumeric
+characters.
+
+Adding protocols is possible after expert review, using a
+first-come-first-served policy for unique "Name" allocation.
+Experts are responsible to ensure that the chosen "Name" is
+appropriate for the record type.
+
+The current contact(s) for expert review are reachable at
+gns-registry@gnunet.org.
+
diff --git a/gns-protocol-numbers/README b/gns-protocol-numbers/README
new file mode 100644
index 0000000..e34ad25
--- /dev/null
+++ b/gns-protocol-numbers/README
@@ -0,0 +1,8 @@
+GNS Protocol Numbers
+--------------------
+
+This registry is for protocol number mappings for GNS names that are BOXed.
+
+Some "_"-labels map to protocol numbers, but others do not.
+For common "_"-labels, we provide a number mapping in this registry.
+
diff --git a/gns-protocol-numbers/h.footer b/gns-protocol-numbers/h.footer
new file mode 100644
index 0000000..15aade3
--- /dev/null
+++ b/gns-protocol-numbers/h.footer
@@ -0,0 +1,42 @@
+  {
+    .name = NULL,
+    .number = 0
+  }
+};
+
+uint16_t
+GNUNET_GNS_protocol_name_to_number (const char *name)
+{
+  int i = 0;
+  while (NULL != GNUNET_GNS_Protocols[i].name)
+  {
+    if (0 == strcmp (name, GNUNET_GNS_Protocols[i].name))
+      return GNUNET_GNS_Protocols[i].number;
+    i++;
+  }
+  return 0;
+}
+
+
+const char*
+GNUNET_GNS_protocol_number_to_name (uint16_t number)
+{
+  int i = 0;
+  while (NULL != GNUNET_GNS_Protocols[i].name)
+  {
+    if (number == GNUNET_GNS_Protocols[i].number)
+      return GNUNET_GNS_Protocols[i].name;
+    i++;
+  }
+  return NULL;
+}
+
+
+#if 0 /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/gns-protocol-numbers/h.header b/gns-protocol-numbers/h.header
new file mode 100644
index 0000000..54c4b00
--- /dev/null
+++ b/gns-protocol-numbers/h.header
@@ -0,0 +1,46 @@
+/*
+     This file is part of GNUnet
+     Copyright (C) 2012-2023 GNUnet e.V.
+
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Affero General Public License for more details.
+
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+#ifndef GNUNET_GNS_PROTOCOLS_H
+#define GNUNET_GNS_PROTOCOLS_H
+
+/**
+ * WARNING:
+ * This header is generated!
+ * In order to add GNS service ports, you must register
+ * them in GANA, and then use the header generation script
+ * to create an update of this file. You may then replace this
+ * file with the update.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
+struct GNUNET_GNS_Protocol
+{
+  const char *name;
+
+  uint16_t number;
+};
+
+struct GNUNET_GNS_Protocol GNUNET_GNS_Protocols[] = {
diff --git a/gns-protocol-numbers/h.template b/gns-protocol-numbers/h.template
new file mode 100644
index 0000000..08cdb3b
--- /dev/null
+++ b/gns-protocol-numbers/h.template
@@ -0,0 +1,8 @@
+  /**
+   * {{Comment}}
+   */
+  {
+    .name = "{{Name}}",
+    .number = {{Number}}
+  },
+
diff --git a/gns-protocol-numbers/registry.rec b/gns-protocol-numbers/registry.rec
new file mode 100644
index 0000000..96770ff
--- /dev/null
+++ b/gns-protocol-numbers/registry.rec
@@ -0,0 +1,22 @@
+# -*- mode: rec -*-
+#
+# Registry for GNS protocols
+#
+
+%rec: GnsProtocol
+%key: Number
+%type: Number int
+%mandatory: Number
+%typedef: Name_t regexp /^[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-]*$/
+%type: Name Name_t
+%unique: Name
+%mandatory: Name
+%mandatory: Comment
+%allowed: Contact
+%allowed: References
+%sort: Number Name Contact References
+
+Number: 49152
+Name: trust
+Comment: LIGHTest trust policy scheme
+References: TODO
diff --git a/gns-protocol-numbers/rst.footer b/gns-protocol-numbers/rst.footer
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/gns-protocol-numbers/rst.footer
diff --git a/gns-protocol-numbers/rst.header.template b/gns-protocol-numbers/rst.header.template
new file mode 100644
index 0000000..11b34a1
--- /dev/null
+++ b/gns-protocol-numbers/rst.header.template
@@ -0,0 +1,11 @@
+Entries
+^^^^^^^
+
+.. list-table:: GNS Protocol Numbers
+   :widths: auto
+   :header-rows: 1
+
+   * - Name
+     - Number
+     - References
+     - Comment
diff --git a/gns-protocol-numbers/rst.template b/gns-protocol-numbers/rst.template
new file mode 100644
index 0000000..11468c9
--- /dev/null
+++ b/gns-protocol-numbers/rst.template
@@ -0,0 +1,4 @@
+   * - {{Name}}
+     - {{Number}}
+     - {{References}}
+     - {{Comment}}
diff --git a/gns-service-port-numbers/.gitignore b/gns-service-port-numbers/.gitignore
new file mode 100644
index 0000000..0a437d0
--- /dev/null
+++ b/gns-service-port-numbers/.gitignore
@@ -0,0 +1 @@
+gnu-name-system-record-types.h
diff --git a/gns-service-port-numbers/Makefile b/gns-service-port-numbers/Makefile
new file mode 100644
index 0000000..be25889
--- /dev/null
+++ b/gns-service-port-numbers/Makefile
@@ -0,0 +1,28 @@
+FILES=gnu_name_system_service_ports.h gnu_name_system_service_ports.rst
+all: check $(FILES)
+
+check:
+        recfix --check registry.rec
+
+distclean:
+        rm -f *.tmp
+clean:
+        rm -f $(FILES) *.tmp
+
+gnu_name_system_service_ports.h.tmp: registry.rec h.template
+        ../format.sh h.template < registry.rec > $@
+
+gnu_name_system_service_ports.h: h.header gnu_name_system_service_ports.h.tmp h.footer
+        cat h.header gnu_name_system_service_ports.h.tmp h.footer > $@
+
+gnu_name_system_service_ports.rst.tmp: registry.rec rst.template
+        ../format.sh rst.template < registry.rec > $@
+
+rst.header.tmp:
+        cat README POLICY rst.header.template > $@
+
+gnu_name_system_service_ports.rst: rst.header.tmp gnu_name_system_service_ports.rst.tmp rst.footer
+        cat rst.header.tmp gnu_name_system_service_ports.rst.tmp rst.footer > $@
+
+
+.PHONY: check clean distclean
diff --git a/gns-service-port-numbers/POLICY b/gns-service-port-numbers/POLICY
new file mode 100644
index 0000000..3dbb6dc
--- /dev/null
+++ b/gns-service-port-numbers/POLICY
@@ -0,0 +1,20 @@
+Policy
+^^^^^^
+
+Each registry entry should contain three values: the port "Number" of the
+service, which must be above 49151 (private/dynamic port range),
+the "Name" of the service, and a "Reference" with links
+to further information about the record type.
+
+The "Name" must be unique in the entire registry.  The value must be a
+case insensitive ASCII string and is restricted to alphanumeric
+characters.
+
+Adding records is possible after expert review, using a
+first-come-first-served policy for unique "Name" allocation.
+Experts are responsible to ensure that the chosen "Name" is
+appropriate for the record type.
+
+The current contact(s) for expert review are reachable at
+gns-registry@gnunet.org.
+
diff --git a/gns-service-port-numbers/README b/gns-service-port-numbers/README
new file mode 100644
index 0000000..0babc89
--- /dev/null
+++ b/gns-service-port-numbers/README
@@ -0,0 +1,8 @@
+GNS Service Ports
+-----------------
+
+This registry is for service-to-port mappings for GNS names that are BOXed.
+
+Some "_"-labels map to service ports (RFC 6335), but others do not.
+For common "_"-labels, we provide a number mapping in this registry.
+
diff --git a/gns-service-port-numbers/h.footer b/gns-service-port-numbers/h.footer
new file mode 100644
index 0000000..e2f02f9
--- /dev/null
+++ b/gns-service-port-numbers/h.footer
@@ -0,0 +1,42 @@
+  {
+    .name = NULL,
+    .port = 0
+  }
+};
+
+uint16_t
+GNUNET_GNS_service_port_name_to_number (const char *name)
+{
+  int i = 0;
+  while (NULL != GNUNET_GNS_ServicePorts[i].name)
+  {
+    if (0 == strcmp (name, GNUNET_GNS_ServicePorts[i].name))
+      return GNUNET_GNS_ServicePorts[i].port;
+    i++;
+  }
+  return 0;
+}
+
+
+const char*
+GNUNET_GNS_service_port_number_to_name (uint16_t port)
+{
+  int i = 0;
+  while (NULL != GNUNET_GNS_ServicePorts[i].name)
+  {
+    if (port == GNUNET_GNS_ServicePorts[i].port)
+      return GNUNET_GNS_ServicePorts[i].name;
+    i++;
+  }
+  return NULL;
+}
+
+
+#if 0 /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/gns-service-port-numbers/h.header b/gns-service-port-numbers/h.header
new file mode 100644
index 0000000..6cedfe8
--- /dev/null
+++ b/gns-service-port-numbers/h.header
@@ -0,0 +1,46 @@
+/*
+     This file is part of GNUnet
+     Copyright (C) 2012-2023 GNUnet e.V.
+
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Affero General Public License for more details.
+
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+#ifndef GNUNET_GNS_SERVICE_PORTS_H
+#define GNUNET_GNS_SERVICE_PORTS_H
+
+/**
+ * WARNING:
+ * This header is generated!
+ * In order to add GNS service ports, you must register
+ * them in GANA, and then use the header generation script
+ * to create an update of this file. You may then replace this
+ * file with the update.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
+struct GNUNET_GNS_ServicePort
+{
+  const char *name;
+
+  uint16_t port;
+};
+
+struct GNUNET_GNS_ServicePort GNUNET_GNS_ServicePorts[] = {
diff --git a/gns-service-port-numbers/h.template b/gns-service-port-numbers/h.template
new file mode 100644
index 0000000..a7c0a60
--- /dev/null
+++ b/gns-service-port-numbers/h.template
@@ -0,0 +1,8 @@
+  /**
+   * {{Comment}}
+   */
+  {
+    .name = "{{Name}}",
+    .port = {{Number}}
+  },
+
diff --git a/gns-service-port-numbers/registry.rec b/gns-service-port-numbers/registry.rec
new file mode 100644
index 0000000..9a5725e
--- /dev/null
+++ b/gns-service-port-numbers/registry.rec
@@ -0,0 +1,27 @@
+# -*- mode: rec -*-
+#
+# Registry for GNS service ports
+#
+
+%rec: GnsServicePort
+%key: Number
+%type: Number int
+%mandatory: Number
+%typedef: Name_t regexp /^[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-]*$/
+%type: Name Name_t
+%unique: Name
+%mandatory: Name
+%mandatory: Comment
+%allowed: Contact
+%allowed: References
+%sort: Number Name Contact References
+
+Number: 49152
+Name: scheme
+Comment: Used by Trust Scheme Authorities to publish information about Trust Schemes (LIGHTest)
+References: TODO
+
+Number: 49153
+Name: translation
+Comment: Used Trust Translation Authorities to publish information about Trust Translations (LIGHTest)
+References: TODO
\ No newline at end of file
diff --git a/gns-service-port-numbers/rst.footer b/gns-service-port-numbers/rst.footer
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/gns-service-port-numbers/rst.footer
diff --git a/gns-service-port-numbers/rst.header.template b/gns-service-port-numbers/rst.header.template
new file mode 100644
index 0000000..9da49e7
--- /dev/null
+++ b/gns-service-port-numbers/rst.header.template
@@ -0,0 +1,11 @@
+Entries
+^^^^^^^
+
+.. list-table:: GNS Service Ports
+   :widths: auto
+   :header-rows: 1
+
+   * - Name
+     - Number
+     - References
+     - Comment
diff --git a/gns-service-port-numbers/rst.template b/gns-service-port-numbers/rst.template
new file mode 100644
index 0000000..11468c9
--- /dev/null
+++ b/gns-service-port-numbers/rst.template
@@ -0,0 +1,4 @@
+   * - {{Name}}
+     - {{Number}}
+     - {{References}}
+     - {{Comment}}
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}}
diff --git a/gnu-name-system-record-flags/.gitignore b/gnu-name-system-record-flags/.gitignore
new file mode 100644
index 0000000..0a437d0
--- /dev/null
+++ b/gnu-name-system-record-flags/.gitignore
@@ -0,0 +1 @@
+gnu-name-system-record-types.h
diff --git a/gnu-name-system-record-flags/Makefile b/gnu-name-system-record-flags/Makefile
new file mode 100644
index 0000000..9166ba5
--- /dev/null
+++ b/gnu-name-system-record-flags/Makefile
@@ -0,0 +1,28 @@
+FILES=gnu_name_system_record_flags.h gnu_name_system_record_flags.rst
+all: check $(FILES)
+
+check:
+        recfix --check registry.rec
+
+distclean:
+        rm -f *.tmp
+clean:
+        rm -f $(FILES) *.tmp
+
+gnu_name_system_record_flags.h.tmp: registry.rec h.template
+        ../format.sh h.template < registry.rec > $@
+
+gnu_name_system_record_flags.h: h.header gnu_name_system_record_flags.h.tmp h.footer
+        cat h.header gnu_name_system_record_flags.h.tmp h.footer > $@
+
+gnu_name_system_record_flags.rst.tmp: registry.rec rst.template
+        ../format.sh rst.template < registry.rec > $@
+
+rst.header.tmp:
+        cat README POLICY rst.header.template > $@
+
+gnu_name_system_record_flags.rst: rst.header.tmp gnu_name_system_record_flags.rst.tmp rst.footer
+        cat rst.header.tmp gnu_name_system_record_flags.rst.tmp rst.footer > $@
+
+
+.PHONY: check clean distclean
diff --git a/gnu-name-system-record-flags/POLICY b/gnu-name-system-record-flags/POLICY
new file mode 100644
index 0000000..f9607ee
--- /dev/null
+++ b/gnu-name-system-record-flags/POLICY
@@ -0,0 +1,20 @@
+Policy
+^^^^^^
+
+Each registry entry should contain three values: the "Number" of the
+record flags, which must be between 0 and 15,
+the "Name" of the record flag, and a "Reference" with links
+to further information about the record flag.
+
+The "Name" must be unique in the entire registry.  The value must be a
+case insensitive ASCII string and is restricted to alphanumeric
+characters.
+
+Adding flags is possible after expert review, using a
+first-come-first-served policy for unique "Name" allocation.
+Experts are responsible to ensure that the chosen "Name" is
+appropriate for the record flag.
+
+The current contact(s) for expert review are reachable at
+gns-registry@gnunet.org.
+
diff --git a/gnu-name-system-record-flags/README b/gnu-name-system-record-flags/README
new file mode 100644
index 0000000..6cb5f1b
--- /dev/null
+++ b/gnu-name-system-record-flags/README
@@ -0,0 +1,13 @@
+GNS Record Flags
+----------------
+
+This registry is for GNU Name System Record Flags.
+
+GNU Name System Record flags uniquely identify the different kinds
+of key-value pairs that can be used as flags of a GNU Name System record.
+
+This registry is used to ensure that the names and numeric values
+used to identify record flags are uniquely defined and to
+allow GNS resolvers implementors to find out details about the
+respective semantics and human-readable syntax.
+
diff --git a/gnu-name-system-record-flags/h.footer b/gnu-name-system-record-flags/h.footer
new file mode 100644
index 0000000..7b5140e
--- /dev/null
+++ b/gnu-name-system-record-flags/h.footer
@@ -0,0 +1,11 @@
+
+};
+
+#if 0 /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/gnu-name-system-record-flags/h.header b/gnu-name-system-record-flags/h.header
new file mode 100644
index 0000000..c641893
--- /dev/null
+++ b/gnu-name-system-record-flags/h.header
@@ -0,0 +1,49 @@
+/*
+     This file is part of GNUnet
+     Copyright (C) 2012-2022 GNUnet e.V.
+
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Affero General Public License for more details.
+
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+#ifndef GNU_NAME_SYSTEM_RECORD_FLAGS_H
+#define GNU_NAME_SYSTEM_RECORD_FLAGS_H
+
+/**
+ * WARNING:
+ * This header is generated!
+ * In order to add GNS record flags, you must register
+ * them in GANA, and then use the header generation script
+ * to create an update of this file. You may then replace this
+ * file with the update.
+ */
+
+/**
+ * Flags that can be set for a record.
+ * The numbers in the registry correspond to the bit index as specified in
+ * LSD0001 Chapter "Resource Records".
+ * Each enum member represents the 16-bit integer value of the flags field if
+ * only that particular flag was set.
+ * The value can be used to efficiently compare the bitmask setting for the
+ * record flag in C.
+ * WARNING: The values are in host byte order! In order to correctly check
+ * against the flags field a record, the respective fields must
+ * also be converted to HBO (or the enum value to NBO).
+ */
+enum GNUNET_GNSRECORD_Flags
+{
+  /**
+   * Entry for no flags / cleared flags.
+   */
+  GNUNET_GNSRECORD_RF_NONE = 0,
diff --git a/gnu-name-system-record-flags/h.template b/gnu-name-system-record-flags/h.template
new file mode 100644
index 0000000..d90329b
--- /dev/null
+++ b/gnu-name-system-record-flags/h.template
@@ -0,0 +1,6 @@
+
+
+  /**
+   * {{Comment}}
+   */
+  GNUNET_GNSRECORD_RF_{{Name}} = 1 << (15 - {{Number}}),
diff --git a/gnu-name-system-record-flags/registry.rec b/gnu-name-system-record-flags/registry.rec
new file mode 100644
index 0000000..22aa750
--- /dev/null
+++ b/gnu-name-system-record-flags/registry.rec
@@ -0,0 +1,43 @@
+# -*- mode: rec -*-
+#
+# Registry for GNU Name System record flags
+#
+
+%rec: RecordType
+%key: Number
+%typedef: FlagRange_t range 0 15
+%type: Number FlagRange_t
+%mandatory: Number
+%typedef: Name_t regexp /^[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-]*$/
+%type: Name Name_t
+%unique: Name
+%mandatory: Name
+%mandatory: Comment
+%allowed: Contact
+%allowed: References
+%sort: Number Name Contact References
+
+Number: 15
+Name: CRITICAL
+Comment: This record is critical. If it cannot be processed (for example because the record type is unknown) resolution MUST fail
+References: https://lsd.gnunet.org/lsd0001
+
+Number: 14
+Name: SHADOW
+Comment: This record should not be used unless all (other) records in the set with an absolute expiration time have expired.
+References: https://lsd.gnunet.org/lsd0001
+
+Number: 13
+Name: SUPPLEMENTAL
+Comment: This is a supplemental record.
+References: https://lsd.gnunet.org/lsd0001
+
+Number: 1
+Name: RELATIVE_EXPIRATION
+Comment: This expiration time of the record is a relative time (not an absolute time). Used in GNUnet implementation.
+References: https://git.gnunet.org/gnunet.git
+
+Number: 0
+Name: PRIVATE
+Comment: This is a private record of this peer and it should thus not be published.
+References: https://git.gnunet.org/gnunet.git
diff --git a/gnu-name-system-record-flags/rst.footer b/gnu-name-system-record-flags/rst.footer
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/gnu-name-system-record-flags/rst.footer
diff --git a/gnu-name-system-record-flags/rst.header.template b/gnu-name-system-record-flags/rst.header.template
new file mode 100644
index 0000000..76d353f
--- /dev/null
+++ b/gnu-name-system-record-flags/rst.header.template
@@ -0,0 +1,11 @@
+Entries
+^^^^^^^
+
+.. list-table:: GNS Record Flags
+   :widths: auto
+   :header-rows: 1
+
+   * - Name
+     - Number
+     - References
+     - Comment
diff --git a/gnu-name-system-record-flags/rst.template b/gnu-name-system-record-flags/rst.template
new file mode 100644
index 0000000..11468c9
--- /dev/null
+++ b/gnu-name-system-record-flags/rst.template
@@ -0,0 +1,4 @@
+   * - {{Name}}
+     - {{Number}}
+     - {{References}}
+     - {{Comment}}
diff --git a/gnu-name-system-record-types/Makefile b/gnu-name-system-record-types/Makefile
index bda8cdf..79c7b2d 100644
--- a/gnu-name-system-record-types/Makefile
+++ b/gnu-name-system-record-types/Makefile
@@ -1,4 +1,4 @@
-FILES=gnu_name_system_record_types.h
+FILES=gnu_name_system_record_types.h gnu_name_system_record_types.rst
 all: check $(FILES)
 
 check:
@@ -15,4 +15,14 @@ gnu_name_system_record_types.h.tmp: registry.rec h.template
 gnu_name_system_record_types.h: h.header gnu_name_system_record_types.h.tmp h.footer
         cat h.header gnu_name_system_record_types.h.tmp h.footer > $@
 
+gnu_name_system_record_types.rst.tmp: registry.rec rst.template
+        ../format.sh rst.template < registry.rec > $@
+
+rst.header.tmp:
+        cat README POLICY rst.header.template > $@
+
+gnu_name_system_record_types.rst: rst.header.tmp gnu_name_system_record_types.rst.tmp rst.footer
+        cat rst.header.tmp gnu_name_system_record_types.rst.tmp rst.footer > $@
+
+
 .PHONY: check clean distclean
diff --git a/gnu-name-system-record-types/POLICY b/gnu-name-system-record-types/POLICY
index 89edf47..4e0e2d2 100644
--- a/gnu-name-system-record-types/POLICY
+++ b/gnu-name-system-record-types/POLICY
@@ -1,3 +1,6 @@
+Policy
+^^^^^^
+
 Each registry entry should contain three values: the "Number" of the
 record type, which must be above 65535 (to avoid conflicts with legacy
 DNS record types), the "Name" of the record type, and a "Reference" with links
@@ -12,5 +15,8 @@ first-come-first-served policy for unique "Name" allocation.
 Experts are responsible to ensure that the chosen "Name" is
 appropriate for the record type.
 
+Numbers above 0xFFFF0000 non-exclusively indicate record types for private use.
+
 The current contact(s) for expert review are reachable at
 gns-registry@gnunet.org.
+
diff --git a/gnu-name-system-record-types/README b/gnu-name-system-record-types/README
index c67e01d..94db280 100644
--- a/gnu-name-system-record-types/README
+++ b/gnu-name-system-record-types/README
@@ -1,3 +1,6 @@
+GNS Record Types
+----------------
+
 This registry is for GNU Name System Record Types.
 
 GNU Name System Record types uniquely identify the different kinds
@@ -7,3 +10,4 @@ This registry is used to ensure that the names and numeric values
 used to identify record types are uniquely defined and to
 allow GNS resolvers implementors to find out details about the
 respective semantics and human-readable syntax.
+
diff --git a/gnu-name-system-record-types/registry.rec b/gnu-name-system-record-types/registry.rec
index 8fc0c77..ee53077 100644
--- a/gnu-name-system-record-types/registry.rec
+++ b/gnu-name-system-record-types/registry.rec
@@ -18,33 +18,33 @@
 
 Number: 65536
 Name: PKEY
-Comment: GNS zone transfer
-References: LSD0001
+Comment: GNS zone delegation (PKEY)
+References: RFC 9498
 
 Number: 65537
 Name: NICK
-Comment: GNS nick names
-References: LSD0001
+Comment: GNS zone nickname
+References: RFC 9498
 
 Number: 65538
 Name: LEHO
-Comment: legacy hostnames
-References: LSD0001
+Comment: GNS legacy hostname
+References: RFC 9498
 
 Number: 65539
 Name: VPN
 Comment: VPN resolution
-References: LSD0001
+References:
 
 Number: 65540
 Name: GNS2DNS
 Comment: Delegation to DNS
-References: LSD0001
+References: RFC 9498
 
 Number: 65541
 Name: BOX
-Comment: Boxed records (see TLSA/SRV handling in GNS)
-References: LSD0001
+Comment: Box record
+References: RFC 9498
 
 Number: 65542
 Name: PLACE
@@ -66,6 +66,12 @@ Name: RECLAIM_TICKET
 Comment: local ticket reference
 Contact: schanzen@gnunet.org
 
+Number: 65547
+Name: SBOX
+Comment: SBox record
+Contact: sebastian.nadler@tum.de
+References: LSD 0008
+
 Number: 65548
 Name: DELEGATE
 Comment: For ABD policies
@@ -83,8 +89,8 @@ Contact: schanzen@gnunet.org
 
 Number: 65551
 Name: REDIRECT
-Comment: Resolver redirects
-Contact: LSD0001
+Comment: Redirection record
+Contact: RFC 9498
 
 Number: 65552
 Name: RECLAIM_OIDC_CLIENT
@@ -109,7 +115,7 @@ Contact: schanzen@gnunet.org
 
 Number: 65556
 Name: EDKEY
-Comment: Record type for EDKEY zone delegations.
+Comment: GNS zone delegation (EDKEY)
 
 Number: 65557
 Name: ERIS_READ_CAPABILITY
@@ -130,3 +136,14 @@ Number: 65560
 Name: MESSENGER_ROOM_DETAILS
 Comment: Record type to store details about a messenger room
 Contact: thejackimonster@gmail.com
+
+Number: 65561
+Name: DID_DOCUMENT
+Comment: Record type to store DID Documents
+Contact: schanzen@gnunet.orgNumber: 65561
+
+# Private range started from 0xFFFF0000
+Number: 4294901760
+Name: GNS_REGISTRAR_METADATA
+Comment: Private metadata for a delegation registration
+Contact: schanzen@gnunet.org
diff --git a/gnu-name-system-record-types/rst.footer b/gnu-name-system-record-types/rst.footer
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/gnu-name-system-record-types/rst.footer
diff --git a/gnu-name-system-record-types/rst.header.template b/gnu-name-system-record-types/rst.header.template
new file mode 100644
index 0000000..9ec6044
--- /dev/null
+++ b/gnu-name-system-record-types/rst.header.template
@@ -0,0 +1,11 @@
+Entries
+^^^^^^^
+
+.. list-table:: GNS Record Types
+   :widths: auto
+   :header-rows: 1
+
+   * - Name
+     - Number
+     - References
+     - Comment
diff --git a/gnu-name-system-record-types/rst.template b/gnu-name-system-record-types/rst.template
new file mode 100644
index 0000000..11468c9
--- /dev/null
+++ b/gnu-name-system-record-types/rst.template
@@ -0,0 +1,4 @@
+   * - {{Name}}
+     - {{Number}}
+     - {{References}}
+     - {{Comment}}
diff --git a/gnu-taler-db-events/Makefile b/gnu-taler-db-events/Makefile
index 194ba50..58fc0e8 100644
--- a/gnu-taler-db-events/Makefile
+++ b/gnu-taler-db-events/Makefile
@@ -1,4 +1,4 @@
-FILES=taler_dbevents.h
+FILES=taler_dbevents.h taler_dbevents.rst
 
 all: check $(FILES)
 
@@ -17,4 +17,10 @@ taler_dbevents.h.tmp: registry.rec h.template
 taler_dbevents.h: h.header taler_dbevents.h.tmp h.footer
         cat $^ > $@
 
+taler_dbevents.rst.tmp: registry.rec rst.template
+        ../format.sh rst.template < registry.rec > $@
+
+taler_dbevents.rst: rst.header taler_dbevents.rst.tmp rst.footer
+        cat rst.header taler_dbevents.rst.tmp rst.footer > $@
+
 .PHONY: check clean distclean
diff --git a/gnu-taler-db-events/registry.rec b/gnu-taler-db-events/registry.rec
index b36fb49..4f668bf 100644
--- a/gnu-taler-db-events/registry.rec
+++ b/gnu-taler-db-events/registry.rec
@@ -48,6 +48,15 @@ Value: 1006
 Name: EXCHANGE_PURSE_DEPOSITED
 Description: Event triggered when coins are deposited into a purse.
 
+Value: 1007
+Name: EXCHANGE_DEPOSIT_STATUS_CHANGED
+Description: Event triggered when the tracking status for a deposit has changed.
+
+Value: 1008
+Name: EXCHANGE_PURSE_REFUNDED
+Description: Event triggered when any purse was refunded.
+
+
 # 1100-1199: For Taler Merchant
 
 Value: 1100
@@ -74,9 +83,66 @@ Value: 1105
 Name: MERCHANT_ORDERS_CHANGE
 Description: Event triggered when the set of orders or their state changes.
 
+Value: 1106
+Name: MERCHANT_WEBHOOK_PENDING
+Description: Event triggered when a new pending webhook is ready to be run.
+
+Value: 1107
+Name: MERCHANT_REWARD_PICKUP
+Description: Event triggered when a reward is being picked up.
+
+Value: 1108
+Name: MERCHANT_WIRE_TRANSFER_CONFIRMED
+Description: Event triggered when a wire transfer is confirmed. Triggers interaction with the exchange to download details about which payments were aggregated.
+
+Value: 1109
+Name: MERCHANT_ACCOUNTS_CHANGED
+Description: Event triggered when the set of accounts has changed. Triggers restart of taler-merchant-wirewatch.
+
+Value: 1110
+Name: MERCHANT_EXCHANGE_KEYS
+Description: Event triggered when we downloaded "/keys" from an exchange and stored it in the database. Extra argument must be the exchange base URL.
+
+Value: 1111
+Name: MERCHANT_NEW_WIRE_DEADLINE
+Description: Event triggered upon successful (batch) deposit. Notifies taler-merchant-depositcheck about a potentially relevant wire deadline to wake up for. Argument is a 64-bit absolute time in network byte order.
+
+
+# 1200+: For auditor
+Value: 1200
+Name: EXCHANGE_AUDITOR_NEW_DEPOSIT_CONFIRMATION
+Description: Event triggered when there is a new deposit confirmation available.
+
+
 
 # 2000-2099: For Anastasis
 
 Value: 2000
 Name: ANASTASIS_AUTH_IBAN_TRANSFER
 Description: A wire transfer from the target account with the correct wire transfer subject was received.
+
+# 3000-3099: For Libeufin
+
+Value: 3000
+Name: LIBEUFIN_TALER_INCOMING
+Description: A wire transfer with a valid reserve public key was received.
+
+# This event signals that a payment was persisted in the database,
+# and it carries the direction in its payload.  Note: the direction
+# is expressed the CaMt way: CRDT or DBIT.
+Value: 3001
+Name: LIBEUFIN_REGIO_TX
+Description: A new transactions internal to Sandbox was made.
+
+# In the context of regional currencies, this event triggers the
+# wire transfer from "admin" to the exchange, in order to start a
+# Taler withdrawal.
+Value: 3002
+Name: LIBEUFIN_SANDBOX_FIAT_INCOMING
+Description: A new fiat transaction can trigger actions in Sandbox.
+
+# A fiat payment was ingested for a particular bank account.  The
+# payload communicates the direction: CRDT or DBIT.
+Value: 3003
+Name: LIBEUFIN_NEXUS_TX
+Description: A new transaction was successfully ingested by Nexus.
diff --git a/gnu-taler-db-events/rst.footer b/gnu-taler-db-events/rst.footer
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/gnu-taler-db-events/rst.footer
diff --git a/gnu-taler-db-events/rst.header b/gnu-taler-db-events/rst.header
new file mode 100644
index 0000000..cd944ce
--- /dev/null
+++ b/gnu-taler-db-events/rst.header
@@ -0,0 +1,13 @@
+Taler DB Events
+---------------
+
+Entries
+^^^^^^^
+
+.. list-table:: Taler DB Events
+   :widths: auto
+   :header-rows: 1
+
+   * - Name
+     - Value
+     - Description
diff --git a/gnu-taler-db-events/rst.template b/gnu-taler-db-events/rst.template
new file mode 100644
index 0000000..e47c564
--- /dev/null
+++ b/gnu-taler-db-events/rst.template
@@ -0,0 +1,3 @@
+   * - {{Name}}
+     - {{Value}}
+     - {{Description}}
diff --git a/gnu-taler-error-codes/.gitignore b/gnu-taler-error-codes/.gitignore
index 2eed484..ded8f45 100644
--- a/gnu-taler-error-codes/.gitignore
+++ b/gnu-taler-error-codes/.gitignore
@@ -4,3 +4,4 @@
 *.tmp
 *.ts
 taler_error_codes.py
+*.go
diff --git a/gnu-taler-error-codes/Makefile b/gnu-taler-error-codes/Makefile
index b7885f5..9e59810 100644
--- a/gnu-taler-error-codes/Makefile
+++ b/gnu-taler-error-codes/Makefile
@@ -2,7 +2,9 @@ FILES=taler_error_codes.h \
   taler_error_codes.c \
   taler_error_codes.ts \
   taler_error_codes.py \
-  taler_error_codes.kt
+  taler_error_codes.kt \
+  taler_error_codes.go \
+        taler_error_codes.rst
 
 all: check $(FILES)
 
@@ -23,7 +25,7 @@ prep:
 # if nothing changed, we use 'diff' to make sure that 'recsel'
 # actually changed the result.
 combined.tmp: registry.rec prep
-        recsel -t TalerErrorCode -j HttpStatus -p Description,Name,Value,HttpStatus,HttpStatus.Value,HttpStatus.Identifier ../http-status-codes/registry.rec registry.rec > combined.xtmp
+        recsel --sort=Value -t TalerErrorCode -j HttpStatus -p Description,Name,Value,HttpStatus,HttpStatus.Value,HttpStatus.Identifier ../http-status-codes/registry.rec registry.rec > combined.xtmp
         if ! diff $@ combined.xtmp > /dev/null; then mv combined.xtmp $@; else rm combined.xtmp; fi
 
 combined-escaped.tmp: combined.tmp
@@ -36,7 +38,7 @@ taler_error_codes.h.tmp: combined.tmp h.template
         ../format.sh h.template < combined.tmp > $@
 
 taler_error_codes.h: h.header taler_error_codes.h.tmp h.footer
-        cat $^ > $@
+        cat $^ | sed -e "s/= 0000/= 0/" -e "s/= 000/= /" -e "s/= 00/= /" > $@
 
 taler_error_codes.c.tmp: combined-escaped.tmp c.template
         ../format.sh c.template < combined-escaped.tmp > $@
@@ -51,7 +53,7 @@ taler_error_codes.ts.tmp: combined.tmp ts.template
         ../format.sh ts.template < combined.tmp > $@
 
 taler_error_codes.ts: ts.header taler_error_codes.ts.tmp ts.footer
-        cat $^ > $@
+        cat $^ | sed -e "s/= 0000/= 0/" -e "s/= 000/= /" -e "s/= 00/= /" > $@
 
 taler_error_codes.kt.tmp: combined.tmp kt.template
         ../format.sh kt.template < combined.tmp > $@
@@ -62,8 +64,19 @@ taler_error_codes.kt: kt.header taler_error_codes.kt.tmp kt.footer
 taler_error_codes.py.tmp: combined.tmp py.template
         ../format.sh py.template < combined.tmp > $@
 
-taler_error_codes.py: py.header taler_error_codes.py.tmp 
+taler_error_codes.py: py.header taler_error_codes.py.tmp
         cat $^ > $@
 
+taler_error_codes.go.tmp: combined.tmp go.template
+        ../format.sh go.template < combined.tmp > $@
+
+taler_error_codes.go: go.header taler_error_codes.go.tmp go.footer
+        cat $^ > $@
+
+taler_error_codes.rst.tmp: combined.tmp rst.template
+        ../format.sh rst.template < combined.tmp > $@
+
+taler_error_codes.rst: rst.header taler_error_codes.rst.tmp rst.footer
+        cat $^ > $@
 
 .PHONY: check clean distclean prep
diff --git a/gnu-taler-error-codes/go.footer b/gnu-taler-error-codes/go.footer
new file mode 100644
index 0000000..bea8cd1
--- /dev/null
+++ b/gnu-taler-error-codes/go.footer
@@ -0,0 +1 @@
+)
diff --git a/gnu-taler-error-codes/go.header b/gnu-taler-error-codes/go.header
new file mode 100644
index 0000000..e6aefe3
--- /dev/null
+++ b/gnu-taler-error-codes/go.header
@@ -0,0 +1,26 @@
+/*
+  This file is part of GNU Taler
+  Copyright (C) 2012-2022 Taler Systems SA
+
+  GNU Taler is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published
+  by the Free Software Foundation, either version 3 of the License,
+  or (at your option) any later version.
+
+  GNU Taler is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+  SPDX-License-Identifier: LGPL3.0-or-later
+
+  Note: the LGPL does not apply to all components of GNU Taler,
+  but it does apply to this file.
+ */
+
+package gana
+
+const (
diff --git a/gnu-taler-error-codes/go.template b/gnu-taler-error-codes/go.template
new file mode 100644
index 0000000..1566025
--- /dev/null
+++ b/gnu-taler-error-codes/go.template
@@ -0,0 +1,8 @@
+
+
+  /**
+   * {{Description}}
+   * Returned with an HTTP status code of #MHD_HTTP_{{HttpStatus_Identifier}} ({{HttpStatus_Value}}).
+   * (A value of 0 indicates that the error is generated client-side).
+   */
+  {{Name}} = {{Value}}
diff --git a/gnu-taler-error-codes/kt.template b/gnu-taler-error-codes/kt.template
index 9934b7e..9470655 100644
--- a/gnu-taler-error-codes/kt.template
+++ b/gnu-taler-error-codes/kt.template
@@ -5,4 +5,4 @@
    * Returned with an HTTP status code of #MHD_HTTP_{{HttpStatus_Identifier}} ({{HttpStatus_Value}}).
    * (A value of 0 indicates that the error is generated client-side).
    */
-  TALER_EC_{{Name}}({{Value}}),
+  {{Name}}({{Value}}),
diff --git a/gnu-taler-error-codes/registry.rec b/gnu-taler-error-codes/registry.rec
index b94a3b0..b9be57d 100644
--- a/gnu-taler-error-codes/registry.rec
+++ b/gnu-taler-error-codes/registry.rec
@@ -4,7 +4,9 @@
 #
 %rec: TalerErrorCode
 %key: Value
+%singular: Value
 %typedef: ValueRange_t range 0 9999
+%typedef: ValueRange_t regexp /^[0123456789][0123456789][0123456789][0123456789]$/
 %constraint: ( Value < 100 ) || ( Value > 999 )
 %type: Value ValueRange_t
 %mandatory: Value
@@ -15,6 +17,7 @@
 %type: Name Name_t
 %unique: Name
 %mandatory: Name
+%singular: Name
 # A status of 0 means not an HTTP status (i.e. created client-side)
 %type: HttpStatus rec HttpStatusCode
 %mandatory: HttpStatus
@@ -22,200 +25,248 @@
 
 # 0 - 99: Reserved for GENERIC error codes
 
-Value: 0
+Value: 0000
 Name: NONE
 Description: Special code to indicate success (no error).
 HttpStatus: 0
 
 # We could not get the error code.
-
-Value: 1
+Value: 0001
 Name: INVALID
-Description: A non-integer error code was returned in the JSON response.
+Description: An error response did not include an error code in the format expected by the client. Most likely, the server does not speak the GNU Taler protocol. Check the URL and/or the network connection to the server.
 HttpStatus: 0
 
-Value: 2
+Value: 0002
 Name: GENERIC_CLIENT_INTERNAL_ERROR
-Description: An internal failure happened on the client side.
+Description: An internal failure happened on the client side. Details should be in the local logs. Check if you are using the latest available version or file a report with the developers.
 HttpStatus: 0
 
 # Fundamental problems detected client-side (10-19)
 
-Value: 10
+Value: 0010
 Name: GENERIC_INVALID_RESPONSE
-Description: The response we got from the server was not even in JSON format.
+Description: The response we got from the server was not in the expected format. Most likely, the server does not speak the GNU Taler protocol. Check the URL and/or the network connection to the server.
 HttpStatus: 0
 
-Value: 11
+Value: 0011
 Name: GENERIC_TIMEOUT
-Description: An operation timed out.
+Description: The operation timed out. Trying again might help. Check the network connection.
 HttpStatus: 0
 
-Value: 12
+Value: 0012
 Name: GENERIC_VERSION_MALFORMED
-Description: The version string given does not follow the expected CURRENT:REVISION:AGE Format.
+Description: The protocol version given by the server does not follow the required format. Most likely, the server does not speak the GNU Taler protocol. Check the URL and/or the network connection to the server.
 HttpStatus: 0
 
-Value: 13
+Value: 0013
 Name: GENERIC_REPLY_MALFORMED
-Description: The service responded with a reply that was in JSON but did not satsify the protocol. Note that invalid cryptographic signatures should have signature-specific error codes.
+Description: The service responded with a reply that was in the right data format, but the content did not satisfy the protocol. Please file a bug report.
 HttpStatus: 0
 
-Value: 14
+Value: 0014
 Name: GENERIC_CONFIGURATION_INVALID
-Description: There is an error in the client-side configuration, for example the base URL specified is malformed.
+Description: There is an error in the client-side configuration, for example an option is set to an invalid value. Check the logs and fix the local configuration.
 HttpStatus: 0
 
-Value: 15
+Value: 0015
 Name: GENERIC_UNEXPECTED_REQUEST_ERROR
-Description: The client made a request to a service, but received an error response it does not know how to handle.
+Description: The client made a request to a service, but received an error response it does not know how to handle. Please file a bug report.
 HttpStatus: 0
 
+Value: 0016
+Name: GENERIC_TOKEN_PERMISSION_INSUFFICIENT
+Description: The token used by the client to authorize the request does not grant the required permissions for the request. Check the requirements and obtain a suitable authorization token to proceed.
+HttpStatus: 403
+
 # Fundamental client-side protocol problems (20-29)
 # (fundamental: cannot be helped, client is very broken)
 
-Value: 20
+Value: 0020
 Name: GENERIC_METHOD_INVALID
-Description: The HTTP method used is invalid for this endpoint.
+Description: The HTTP method used is invalid for this endpoint. This is likely a bug in the client implementation. Check if you are using the latest available version and/or file a report with the developers.
 HttpStatus: 405
 
-Value: 21
+Value: 0021
 Name: GENERIC_ENDPOINT_UNKNOWN
-Description: There is no endpoint defined for the URL provided by the client.
+Description: There is no endpoint defined for the URL provided by the client. Check if you used the correct URL and/or file a report with the developers of the client software.
 HttpStatus: 404
 
-Value: 22
+Value: 0022
 Name: GENERIC_JSON_INVALID
-Description: The JSON in the client's request was malformed (generic parse error).
+Description: The JSON in the client's request was malformed. This is likely a bug in the client implementation. Check if you are using the latest available version and/or file a report with the developers.
 HttpStatus: 400
 
-Value: 23
+Value: 0023
 Name: GENERIC_HTTP_HEADERS_MALFORMED
-Description: Some of the HTTP headers provided by the client caused the server to not be able to handle the request.
+Description: Some of the HTTP headers provided by the client were malformed and caused the server to not be able to handle the request. This is likely a bug in the client implementation. Check if you are using the latest available version and/or file a report with the developers.
 HttpStatus: 400
 
-Value: 24
+Value: 0024
 Name: GENERIC_PAYTO_URI_MALFORMED
-Description: The payto:// URI provided by the client is malformed.
+Description: The payto:// URI provided by the client is malformed. Check that you are using the correct syntax as of RFC 8905 and/or that you entered the bank account number correctly.
 HttpStatus: 400
 
-Value: 25
+Value: 0025
 Name: GENERIC_PARAMETER_MISSING
-Description: A required parameter in the request was missing.
+Description: A required parameter in the request was missing. This is likely a bug in the client implementation. Check if you are using the latest available version and/or file a report with the developers.
 HttpStatus: 400
 
-Value: 26
+Value: 0026
 Name: GENERIC_PARAMETER_MALFORMED
-Description: A parameter in the request was malformed.
+Description: A parameter in the request was malformed. This is likely a bug in the client implementation. Check if you are using the latest available version and/or file a report with the developers.
 HttpStatus: 400
 
+Value: 0027
+Name: GENERIC_RESERVE_PUB_MALFORMED
+Description: The reserve public key was malformed.
+HttpStatus: 400
+FIXME: Fold with 26?
+
+Value: 0028
+Name: GENERIC_COMPRESSION_INVALID
+Description: The body in the request could not be decompressed by the server. This is likely a bug in the client implementation. Check if you are using the latest available version and/or file a report with the developers.
+HttpStatus: 400
 
 # Circumstantial client-side protocol problems (30-39)
 # (Circumstantial == may work with another server, but not this one)
 
-Value: 30
+Value: 0030
 Name: GENERIC_CURRENCY_MISMATCH
-Description: The currencies involved in the operation do not match.
+Description: The currency involved in the operation is not acceptable for this server. Check your configuration and make sure the currency specified for a given service provider is one of the currencies supported by that provider.
 HttpStatus: 400
 
-Value: 31
+Value: 0031
 Name: GENERIC_URI_TOO_LONG
-Description: The URI is longer than the longest URI the HTTP server is willing to parse.
+Description: The URI is longer than the longest URI the HTTP server is willing to parse. If you believe this was a legitimate request, contact the server administrators and/or the software developers to increase the limit.
 HttpStatus: 414
 
-Value: 32
+Value: 0032
 Name: GENERIC_UPLOAD_EXCEEDS_LIMIT
-Description: The body is too large to be permissible for the endpoint.
+Description: The body is too large to be permissible for the endpoint. If you believe this was a legitimate request, contact the server administrators and/or the software developers to increase the limit.
 HttpStatus: 413
 
 
-# 40-49: available for future use
+# 40-49: access control issues
+Value: 0040
+Name: GENERIC_UNAUTHORIZED
+Description: The service refused the request due to lack of proper authorization.
+HttpStatus: 401
+
+Value: 0041
+Name: GENERIC_TOKEN_UNKNOWN
+Description: The service refused the request as the given authorization token is unknown.
+HttpStatus: 401
 
+Value: 0042
+Name: GENERIC_TOKEN_EXPIRED
+Description: The service refused the request as the given authorization token expired.
+HttpStatus: 401
 
+Value: 0043
+Name: GENERIC_TOKEN_MALFORMED
+Description: The service refused the request as the given authorization token is malformed.
+HttpStatus: 401
+
+Value: 0044
+Name: GENERIC_FORBIDDEN
+Description: The service refused the request due to lack of proper rights on the resource.
+HttpStatus: 403
 
 # Server-side database problems (50-59)
 
-Value: 50
+Value: 0050
 Name: GENERIC_DB_SETUP_FAILED
-Description: The service failed initialize its connection to the database.
+Description: The service failed initialize its connection to the database. The system administrator should check that the service has permissions to access the database and that the database is running.
 HttpStatus: 500
 
-Value: 51
+Value: 0051
 Name: GENERIC_DB_START_FAILED
-Description: The service encountered an error event to just start the database transaction.
+Description: The service encountered an error event to just start the database transaction. The system administrator should check that the database is running.
 HttpStatus: 500
 
-Value: 52
+Value: 0052
 Name: GENERIC_DB_STORE_FAILED
-Description: The service failed to store information in its database.
+Description: The service failed to store information in its database. The system administrator should check that the database is running and review the service logs.
 HttpStatus: 500
 
-Value: 53
+Value: 0053
 Name: GENERIC_DB_FETCH_FAILED
-Description: The service failed to fetch information from its database.
+Description: The service failed to fetch information from its database. The system administrator should check that the database is running and review the service logs.
 HttpStatus: 500
 
-Value: 54
+Value: 0054
 Name: GENERIC_DB_COMMIT_FAILED
-Description: The service encountered an error event to commit the database transaction (hard, unrecoverable error).
+Description: The service encountered an unrecoverable error trying to commit a transaction to the database. The system administrator should check that the database is running and review the service logs.
 HttpStatus: 500
 
-Value: 55
+Value: 0055
 Name: GENERIC_DB_SOFT_FAILURE
-Description: The service encountered an error event to commit the database transaction, even after repeatedly retrying it there was always a conflicting transaction. (This indicates a repeated serialization error; should only happen if some client maliciously tries to create conflicting concurrent transactions.)
+Description: The service encountered an error event to commit the database transaction, even after repeatedly retrying it there was always a conflicting transaction. This indicates a repeated serialization error; it should only happen if some client maliciously tries to create conflicting concurrent transactions. It could also be a sign of a missing index. Check if you are using the latest available version and/or file a report with the developers.
 HttpStatus: 500
 
-Value: 56
+Value: 0056
 Name: GENERIC_DB_INVARIANT_FAILURE
-Description: The service's database is inconsistent and violates service-internal invariants.
+Description: The service's database is inconsistent and violates service-internal invariants. Check if you are using the latest available version and/or file a report with the developers.
 HttpStatus: 500
 
 
 # Server-side computational problems (60-69)
 
-Value: 60
+Value: 0060
 Name: GENERIC_INTERNAL_INVARIANT_FAILURE
-Description: The HTTP server experienced an internal invariant failure (bug).
+Description: The HTTP server experienced an internal invariant failure (bug). Check if you are using the latest available version and/or file a report with the developers.
 HttpStatus: 500
 
-Value: 61
+Value: 0061
 Name: GENERIC_FAILED_COMPUTE_JSON_HASH
-Description: The service could not compute a cryptographic hash over some JSON value.
+Description: The service could not compute a cryptographic hash over some JSON value. Check if you are using the latest available version and/or file a report with the developers.
 HttpStatus: 500
 
-Value: 62
+Value: 0062
 Name: GENERIC_FAILED_COMPUTE_AMOUNT
-Description: The service could not compute an amount.
+Description: The service could not compute an amount. Check if you are using the latest available version and/or file a report with the developers.
 HttpStatus: 500
 
 
 # Server-side resource problems (70-79)
 
-Value: 70
+Value: 0070
 Name: GENERIC_PARSER_OUT_OF_MEMORY
-Description: The HTTP server had insufficient memory to parse the request.
+Description: The HTTP server had insufficient memory to parse the request. Restarting services periodically can help, especially if Postgres is using excessive amounts of memory. Check with the system administrator to investigate.
 HttpStatus: 500
 
-Value: 71
+Value: 0071
 Name: GENERIC_ALLOCATION_FAILURE
-Description: The HTTP server failed to allocate memory.
+Description: The HTTP server failed to allocate memory. Restarting services periodically can help, especially if Postgres is using excessive amounts of memory. Check with the system administrator to investigate.
 HttpStatus: 500
 
-Value: 72
+Value: 0072
 Name: GENERIC_JSON_ALLOCATION_FAILURE
-Description: The HTTP server failed to allocate memory for building JSON reply.
+Description: The HTTP server failed to allocate memory for building JSON reply. Restarting services periodically can help, especially if Postgres is using excessive amounts of memory. Check with the system administrator to investigate.
 HttpStatus: 500
 
-Value: 73
+Value: 0073
 Name: GENERIC_CURL_ALLOCATION_FAILURE
-Description: The HTTP server failed to allocate memory for making a CURL request.
+Description: The HTTP server failed to allocate memory for making a CURL request. Restarting services periodically can help, especially if Postgres is using excessive amounts of memory. Check with the system administrator to investigate.
+HttpStatus: 500
+
+Value: 0074
+Name: GENERIC_FAILED_TO_LOAD_TEMPLATE
+Description: The backend could not locate a required template to generate an HTML reply. The system administrator should check if the resource files are installed in the correct location and are readable to the service.
 HttpStatus: 500
 
-# 80-99: available for future use
+Value: 0075
+Name: GENERIC_FAILED_TO_EXPAND_TEMPLATE
+Description: The backend could not expand the template to generate an HTML reply. The system administrator should investigate the logs and check if the templates are well-formed.
+HttpStatus: 500
+
+
 
+# 0080-0099: available for future use
 
 
-# 100 - 999: VERBOTEN due to confusion with HTTP status codes (at least 100-599).
+
+# 0100 - 0999: VERBOTEN due to confusion with HTTP status codes (at least 100-599).
 
 # 1000 - 1999: Reserved for exchange
 # 1000 - 1099: Reserved for EXCHANGE_GENERIC
@@ -316,9 +367,9 @@ Description: The number of denominations specified in the request exceeds the li
 HttpStatus: 400
 
 Value: 1019
-Name: EXCHANGE_GENERIC_RESERVE_PUB_MALFORMED
-Description: The reserve public key was malformed.
-HttpStatus: 400
+Name: EXCHANGE_GENERIC_COIN_UNKNOWN
+Description: The coin is not known to the exchange (yet).
+HttpStatus: 404
 
 Value: 1020
 Name: EXCHANGE_GENERIC_CLOCK_SKEW
@@ -355,6 +406,61 @@ Name: EXCHANGE_GENERIC_PURSE_EXPIRED
 Description: The purse has expired.
 HttpStatus: 410
 
+Value: 1027
+Name: EXCHANGE_GENERIC_RESERVE_UNKNOWN
+Description: The exchange has no information about the "reserve_pub" that was given.
+HttpStatus: 404
+
+Value: 1028
+Name: EXCHANGE_GENERIC_KYC_REQUIRED
+Description: The exchange is not allowed to proceed with the operation until the client has satisfied a KYC check.
+HttpStatus: 451
+
+Value: 1029
+Name: EXCHANGE_PURSE_DEPOSIT_COIN_CONFLICTING_ATTEST_VS_AGE_COMMITMENT
+Description: Inconsistency between provided age commitment and attest: either none or both must be provided
+HttpStatus: 400
+
+Value: 1030
+Name: EXCHANGE_PURSE_DEPOSIT_COIN_AGE_ATTESTATION_FAILURE
+Description: The provided attestation for the minimum age couldn't be verified by the exchange.
+HttpStatus: 400
+
+Value: 1031
+Name: EXCHANGE_GENERIC_PURSE_DELETED
+Description: The purse was deleted.
+HttpStatus: 410
+
+Value: 1032
+Name: EXCHANGE_GENERIC_AML_OFFICER_PUB_MALFORMED
+Description: The public key of the AML officer in the URL was malformed.
+HttpStatus: 400
+
+Value: 1033
+Name: EXCHANGE_GENERIC_AML_OFFICER_GET_SIGNATURE_INVALID
+Description: The signature affirming the GET request of the AML officer is invalid.
+HttpStatus: 403
+
+Value: 1034
+Name: EXCHANGE_GENERIC_AML_OFFICER_ACCESS_DENIED
+Description: The specified AML officer does not have access at this time.
+HttpStatus: 403
+
+Value: 1035
+Name: EXCHANGE_GENERIC_AML_PENDING
+Description: The requested operation is denied pending the resolution of an anti-money laundering investigation by the exchange operator. This is a manual process, please wait and retry later.
+HttpStatus: 451
+
+Value: 1036
+Name: EXCHANGE_GENERIC_AML_FROZEN
+Description: The requested operation is denied as the account was frozen on suspicion of money laundering. Please contact the exchange operator.
+HttpStatus: 451
+
+Value: 1037
+Name: EXCHANGE_GENERIC_KYC_CONVERTER_FAILED
+Description: The exchange failed to start a KYC attribute conversion helper process. It is likely configured incorrectly.
+HttpStatus: 500
+
 
 Value: 1100
 Name: EXCHANGE_DEPOSITS_GET_NOT_FOUND
@@ -391,15 +497,20 @@ Name: EXCHANGE_DEPOSITS_GET_MERCHANT_SIGNATURE_INVALID
 Description: The signature of the merchant is invalid.
 HttpStatus: 403
 
+Value: 1107
+Name: EXCHANGE_DEPOSITS_POLICY_NOT_ACCEPTED
+Description: The provided policy data was not accepted
+HttpStatus: 400
+
 Value: 1150
 Name: EXCHANGE_WITHDRAW_INSUFFICIENT_FUNDS
 Description: The given reserve does not have sufficient funds to admit the requested withdraw operation at this time.  The response includes the current "balance" of the reserve as well as the transaction "history" that lead to this balance.
 HttpStatus: 409
 
 Value: 1151
-Name: EXCHANGE_WITHDRAW_RESERVE_UNKNOWN
-Description: The exchange has no information about the "reserve_pub" that was given.
-HttpStatus: 404
+Name: EXCHANGE_AGE_WITHDRAW_INSUFFICIENT_FUNDS
+Description: The given reserve does not have sufficient funds to admit the requested age-withdraw operation at this time.  The response includes the current "balance" of the reserve as well as the transaction "history" that lead to this balance.
+HttpStatus: 409
 
 Value: 1152
 Name: EXCHANGE_WITHDRAW_AMOUNT_FEE_OVERFLOW
@@ -417,10 +528,15 @@ Description: The signature of the reserve is not valid.
 HttpStatus: 403
 
 Value: 1155
-Name: EXCHANGE_WITHDRAW_HISTORY_ERROR_INSUFFICIENT_FUNDS
+Name: EXCHANGE_RESERVE_HISTORY_ERROR_INSUFFICIENT_FUNDS
 Description: When computing the reserve history, we ended up with a negative overall balance, which should be impossible.
 HttpStatus: 500
 
+Value: 1156
+Name: EXCHANGE_GET_RESERVE_HISTORY_ERROR_INSUFFICIENT_BALANCE
+Description: The reserve did not have sufficient funds in it to pay for a full reserve history statement.
+HttpStatus: 409
+
 Value: 1158
 Name: EXCHANGE_WITHDRAW_DENOMINATION_KEY_LOST
 Description: Withdraw period of the coin to be withdrawn is in the past.
@@ -434,8 +550,33 @@ HttpStatus: 0
 Value: 1160
 Name: EXCHANGE_WITHDRAW_NONCE_REUSE
 Description: The client re-used a withdraw nonce, which is not allowed.
+HttpStatus: 409
+
+Value: 1161
+Name: EXCHANGE_AGE_WITHDRAW_COMMITMENT_UNKNOWN
+Description: The client provided an unknown commitment for an age-withdraw request.
+HttpStatus: 400
+
+Value: 1162
+Name: EXCHANGE_AGE_WITHDRAW_AMOUNT_OVERFLOW
+Description: The total sum of amounts from the denominations did overflow.
+HttpStatus: 500
+
+Value: 1163
+Name: EXCHANGE_AGE_WITHDRAW_AMOUNT_INCORRECT
+Description: The total sum of value and fees from the denominations differs from the committed amount with fees.
 HttpStatus: 400
 
+Value: 1164
+Name: EXCHANGE_AGE_WITHDRAW_REVEAL_INVALID_HASH
+Description: The original commitment differs from the calculated hash
+HttpStatus: 400
+
+Value: 1165
+Name: EXCHANGE_AGE_WITHDRAW_MAXIMUM_AGE_TOO_LARGE
+Description: The maximum age in the commitment is too large for the reserve
+HttpStatus: 409
+
 Value: 1175
 Name: EXCHANGE_WITHDRAW_BATCH_IDEMPOTENT_PLANCHET
 Description: The batch withdraw included a planchet that was already withdrawn. This is not allowed.
@@ -487,18 +628,19 @@ Description: The deposited amount is smaller than the deposit fee, which would r
 HttpStatus: 400
 
 
-Value: 1250
-Name: EXCHANGE_RESERVES_STATUS_UNKNOWN
-Description: The reserve balance, status or history was requested for a reserve which is not known to the exchange.
-HttpStatus: 404
+Value: 1240
+Name: EXCHANGE_EXTENSIONS_INVALID_FULFILLMENT
+Description: The proof of policy fulfillment was invalid.
+HttpStatus: 400
+
 
 Value: 1251
-Name: EXCHANGE_RESERVES_STATUS_BAD_SIGNATURE
-Description: The reserve status was requested with a bad signature.
+Name: EXCHANGE_COIN_HISTORY_BAD_SIGNATURE
+Description: The coin history was requested with a bad signature.
 HttpStatus: 403
 
 Value: 1252
-Name: EXCHANGE_RESERVES_HISTORY_BAD_SIGNATURE
+Name: EXCHANGE_RESERVE_HISTORY_BAD_SIGNATURE
 Description: The reserve history was requested with a bad signature.
 HttpStatus: 403
 
@@ -775,11 +917,25 @@ Name: EXCHANGE_RESERVES_PURSE_FEE_TOO_LOW
 Description: The purse fee specified for the request is lower than the purse fee charged by the exchange at this time.
 HttpStatus: 400
 
+Value: 1679
+Name: EXCHANGE_PURSE_DELETE_ALREADY_DECIDED
+Description: The payment request cannot be deleted anymore, as it either already completed or timed out.
+HttpStatus: 409
+
+Value: 1680
+Name: EXCHANGE_PURSE_DELETE_SIGNATURE_INVALID
+Description: The signature affirming the purse deletion is invalid.
+HttpStatus: 403
+
+Value: 1681
+Name: EXCHANGE_RESERVES_AGE_RESTRICTION_REQUIRED
+Description: Withdrawal from the reserve requires age restriction to be set.
+HttpStatus: 403
 
 Value: 1700
 Name: EXCHANGE_DENOMINATION_HELPER_UNAVAILABLE
-Description: The exchange failed to talk to the process responsible for its private denomination keys.
-HttpStatus: 500
+Description: The exchange failed to talk to the process responsible for its private denomination keys or the helpers had no denominations (properly) configured.
+HttpStatus: 502
 
 Value: 1701
 Name: EXCHANGE_DENOMINATION_HELPER_BUG
@@ -800,7 +956,7 @@ HttpStatus: 0
 Value: 1750
 Name: EXCHANGE_SIGNKEY_HELPER_UNAVAILABLE
 Description: The exchange failed to talk to the process responsible for its private signing keys.
-HttpStatus: 500
+HttpStatus: 502
 
 Value: 1751
 Name: EXCHANGE_SIGNKEY_HELPER_BUG
@@ -833,7 +989,30 @@ Name: EXCHANGE_RESERVES_RESERVE_MERGE_SIGNATURE_INVALID
 Description: The signature by the reserve affirming the merge is invalid.
 HttpStatus: 403
 
+Value: 1785
+Name: EXCHANGE_RESERVES_OPEN_BAD_SIGNATURE
+Description: The signature by the reserve affirming the open operation is invalid.
+HttpStatus: 403
 
+Value: 1786
+Name: EXCHANGE_RESERVES_CLOSE_BAD_SIGNATURE
+Description: The signature by the reserve affirming the close operation is invalid.
+HttpStatus: 403
+
+Value: 1787
+Name: EXCHANGE_RESERVES_ATTEST_BAD_SIGNATURE
+Description: The signature by the reserve affirming the attestion request is invalid.
+HttpStatus: 403
+
+Value: 1788
+Name: EXCHANGE_RESERVES_CLOSE_NO_TARGET_ACCOUNT
+Description: The exchange does not know an origin account to which the remaining reserve balance could be wired to, and the wallet failed to provide one.
+HttpStatus: 409
+
+Value: 1789
+Name: EXCHANGE_RESERVES_OPEN_INSUFFICIENT_FUNDS
+Description: The reserve balance is insufficient to pay for the open operation.
+HttpStatus: 409
 
 Value: 1800
 Name: EXCHANGE_MANAGEMENT_AUDITOR_NOT_FOUND
@@ -925,6 +1104,44 @@ Name: EXCHANGE_MANAGEMENT_GLOBAL_FEE_SIGNATURE_INVALID
 Description: The signature affirming the fee structure is invalid.
 HttpStatus: 403
 
+Value: 1818
+Name: EXCHANGE_MANAGEMENT_DRAIN_PROFITS_SIGNATURE_INVALID
+Description: The signature affirming the profit drain is invalid.
+HttpStatus: 403
+
+Value: 1825
+Name: EXCHANGE_AML_DECISION_ADD_SIGNATURE_INVALID
+Description: The signature affirming the AML decision is invalid.
+HttpStatus: 403
+
+Value: 1826
+Name: EXCHANGE_AML_DECISION_INVALID_OFFICER
+Description: The AML officer specified is not allowed to make AML decisions right now.
+HttpStatus: 403
+
+Value: 1827
+Name: EXCHANGE_AML_DECISION_MORE_RECENT_PRESENT
+Description: There is a more recent AML decision on file. The decision was rejected as timestamps of AML decisions must be monotonically increasing.
+HttpStatus: 409
+
+Value: 1828
+Name: EXCHANGE_AML_DECISION_UNKNOWN_CHECK
+Description: There AML decision would impose an AML check of a type that is not provided by any KYC provider known to the exchange.
+HttpStatus: 400
+
+Value: 1830
+Name: EXCHANGE_MANAGEMENT_UPDATE_AML_OFFICER_SIGNATURE_INVALID
+Description: The signature affirming the change in the AML officer status is invalid.
+HttpStatus: 403
+
+Value: 1831
+Name: EXCHANGE_MANAGEMENT_AML_OFFICERS_MORE_RECENT_PRESENT
+Description: A more recent decision about the AML officer status is known to the exchange.
+HttpStatus: 409
+
+
+
+
 Value: 1850
 Name: EXCHANGE_PURSE_CREATE_CONFLICTING_META_DATA
 Description: The purse was previously created with different meta data.
@@ -953,12 +1170,12 @@ HttpStatus: 400
 Value: 1855
 Name: EXCHANGE_PURSE_CREATE_SIGNATURE_INVALID
 Description: The purse signature over the purse meta data is invalid.
-HttpStatus: 400
+HttpStatus: 403
 
 Value: 1856
 Name: EXCHANGE_PURSE_ECONTRACT_SIGNATURE_INVALID
 Description: The signature over the encrypted contract is invalid.
-HttpStatus: 400
+HttpStatus: 403
 
 Value: 1857
 Name: EXCHANGE_PURSE_CREATE_EXCHANGE_SIGNATURE_INVALID
@@ -983,12 +1200,12 @@ HttpStatus: 400
 Value: 1876
 Name: EXCHANGE_PURSE_MERGE_INVALID_MERGE_SIGNATURE
 Description: The signature using the merge key is invalid.
-HttpStatus: 400
+HttpStatus: 403
 
 Value: 1877
 Name: EXCHANGE_PURSE_MERGE_INVALID_RESERVE_SIGNATURE
 Description: The signature using the reserve key is invalid.
-HttpStatus: 400
+HttpStatus: 403
 
 Value: 1878
 Name: EXCHANGE_PURSE_NOT_FULL
@@ -1003,7 +1220,17 @@ HttpStatus: 0
 Value: 1880
 Name: EXCHANGE_MERGE_PURSE_PARTNER_UNKNOWN
 Description: The exchange of the target account is not a partner of this exchange.
-HttpStatus: 400
+HttpStatus: 404
+
+Value: 1890
+Name: EXCHANGE_MANAGEMENT_ADD_PARTNER_SIGNATURE_INVALID
+Description: The signature affirming the new partner is invalid.
+HttpStatus: 403
+
+Value: 1891
+Name: EXCHANGE_MANAGEMENT_ADD_PARTNER_DATA_CONFLICT
+Description: Conflicting data for the partner already exists with the exchange.
+HttpStatus: 409
 
 
 Value: 1900
@@ -1041,11 +1268,58 @@ Name: EXCHANGE_KYC_PROOF_BACKEND_AUTHORIZATION_FAILED
 Description: The backend signaled an authorization failure.
 HttpStatus: 403
 
+Value: 1929
+Name: EXCHANGE_KYC_PROOF_REQUEST_UNKNOWN
+Description: The exchange is unaware of having made an the authorization request.
+HttpStatus: 404
+
 Value: 1930
 Name: EXCHANGE_KYC_CHECK_AUTHORIZATION_FAILED
 Description: The payto-URI hash did not match. Hence the request was denied.
 HttpStatus: 403
 
+Value: 1931
+Name: EXCHANGE_KYC_GENERIC_LOGIC_UNKNOWN
+Description: The request used a logic specifier that is not known to the exchange.
+HttpStatus: 404
+
+Value: 1932
+Name: EXCHANGE_KYC_GENERIC_LOGIC_GONE
+Description: The request requires a logic which is no longer configured at the exchange.
+HttpStatus: 500
+
+Value: 1933
+Name: EXCHANGE_KYC_GENERIC_LOGIC_BUG
+Description: The logic plugin had a bug in its interaction with the KYC provider.
+HttpStatus: 500
+
+Value: 1934
+Name: EXCHANGE_KYC_GENERIC_PROVIDER_ACCESS_REFUSED
+Description: The exchange could not process the request with its KYC provider because the provider refused access to the service. This indicates some configuration issue at the Taler exchange operator.
+HttpStatus: 511
+
+Value: 1935
+Name: EXCHANGE_KYC_GENERIC_PROVIDER_TIMEOUT
+Description: There was a timeout in the interaction between the exchange and the KYC provider. The most likely cause is some networking problem. Trying again later might succeed.
+HttpStatus: 504
+
+Value: 1936
+Name: EXCHANGE_KYC_GENERIC_PROVIDER_UNEXPECTED_REPLY
+Description: The KYC provider responded with a status that was completely unexpected by the KYC logic of the exchange.
+HttpStatus: 502
+
+Value: 1937
+Name: EXCHANGE_KYC_GENERIC_PROVIDER_RATE_LIMIT_EXCEEDED
+Description: The rate limit of the exchange at the KYC provider has been exceeded. Trying much later might work.
+HttpStatus: 503
+
+Value: 1938
+Name: EXCHANGE_KYC_WEBHOOK_UNAUTHORIZED
+Description: The request to the webhook lacked proper authorization or authentication data.
+HttpStatus: 401
+
+
+
 Value: 1950
 Name: EXCHANGE_CONTRACTS_UNKNOWN
 Description: The exchange does not know a contract under the given contract public key.
@@ -1076,6 +1350,18 @@ Name: EXCHANGE_PURSE_DEPOSIT_COIN_SIGNATURE_INVALID
 Description: A coin signature for a deposit into the purse is invalid.
 HttpStatus: 403
 
+Value: 1976
+Name: EXCHANGE_PURSE_DEPOSIT_DECIDED_ALREADY
+Description: It is too late to deposit coins into the purse.
+HttpStatus: 410
+
+
+
+Value: 1980
+Name: EXCHANGE_TOTP_KEY_INVALID
+Description: TOTP key is not valid.
+HttpStatus: 0
+
 
 
 
@@ -1093,19 +1379,9 @@ Description: The start and end-times in the wire fee structure leave a hole. Thi
 HttpStatus: 0
 
 Value: 2002
-Name: MERCHANT_GENERIC_RESERVE_PUB_MALFORMED
-Description: The reserve key of given to a /reserves/ handler was malformed.
-HttpStatus: 400
-
-Value: 2003
-Name: MERCHANT_GENERIC_FAILED_TO_LOAD_TEMPLATE
-Description: The backend could not locate a required template to generate an HTML reply.
-HttpStatus: 406
-
-Value: 2004
-Name: MERCHANT_GENERIC_FAILED_TO_EXPAND_TEMPLATE
-Description: The backend could not expand the template to generate an HTML reply.
-HttpStatus: 500
+Name: MERCHANT_GENERIC_EXCHANGE_WIRE_REQUEST_FAILED
+Description: The merchant was unable to obtain a valid answer to /wire from the exchange.
+HttpStatus: 502
 
 Value: 2005
 Name: MERCHANT_GENERIC_ORDER_UNKNOWN
@@ -1118,8 +1394,8 @@ Description: The order provided to the backend could not be completed, because a
 HttpStatus: 404
 
 Value: 2007
-Name: MERCHANT_GENERIC_TIP_ID_UNKNOWN
-Description: The tip ID is unknown.  This could happen if the tip has expired.
+Name: MERCHANT_GENERIC_REWARD_ID_UNKNOWN
+Description: The reward ID is unknown.  This could happen if the reward has expired.
 HttpStatus: 404
 
 Value: 2008
@@ -1172,6 +1448,40 @@ Name: MERCHANT_GENERIC_TRANSFER_UNKNOWN
 Description: The backend could not find the inbound wire transfer specified in the request.
 HttpStatus: 404
 
+Value: 2018
+Name: MERCHANT_GENERIC_TEMPLATE_UNKNOWN
+Description: The backend could not find the template(id) because it is not exist.
+HttpStatus: 404
+
+Value: 2019
+Name: MERCHANT_GENERIC_WEBHOOK_UNKNOWN
+Description: The backend could not find the webhook(id) because it is not exist.
+HttpStatus: 404
+
+Value: 2020
+Name: MERCHANT_GENERIC_PENDING_WEBHOOK_UNKNOWN
+Description: The backend could not find the webhook(serial) because it is not exist.
+HttpStatus: 404
+
+Value: 2021
+Name: MERCHANT_GENERIC_OTP_DEVICE_UNKNOWN
+Description: The backend could not find the OTP device(id) because it is not exist.
+HttpStatus: 404
+
+Value: 2022
+Name: MERCHANT_GENERIC_ACCOUNT_UNKNOWN
+Description: The account is not known to the backend.
+HttpStatus: 404
+
+Value: 2023
+Name: MERCHANT_GENERIC_H_WIRE_MALFORMED
+Description: The wire hash was malformed.
+HttpStatus: 400
+
+Value: 2024
+Name: MERCHANT_GENERIC_CURRENCY_MISMATCH
+Description: The currency specified in the operation does not work with the current state of the given resource.
+HttpStatus: 409
 
 # 2100-2499: public API
 # 2100-2149: get orders endpoint
@@ -1181,7 +1491,6 @@ Name: MERCHANT_GET_ORDERS_EXCHANGE_TRACKING_FAILURE
 Description: The exchange failed to provide a valid answer to the tracking request, thus those details are not in the response.
 HttpStatus: 200
 
-
 Value: 2103
 Name: MERCHANT_GET_ORDERS_ID_EXCHANGE_REQUEST_FAILURE
 Description: The merchant backend failed to construct the request for tracking to the exchange, thus tracking details are not in the response.
@@ -1232,12 +1541,12 @@ HttpStatus: 400
 Value: 2155
 Name: MERCHANT_POST_ORDERS_ID_PAY_INSUFFICIENT_DUE_TO_FEES
 Description: After considering deposit and wire fees, the payment is insufficient to satisfy the required amount for the contract.  The client should revisit the logic used to calculate fees it must cover.
-HttpStatus: 406
+HttpStatus: 400
 
 Value: 2156
 Name: MERCHANT_POST_ORDERS_ID_PAY_PAYMENT_INSUFFICIENT
 Description: Even if we do not consider deposit and wire fees, the payment is insufficient to satisfy the required amount for the contract.
-HttpStatus: 406
+HttpStatus: 400
 
 Value: 2157
 Name: MERCHANT_POST_ORDERS_ID_PAY_COIN_SIGNATURE_INVALID
@@ -1254,6 +1563,11 @@ Name: MERCHANT_POST_ORDERS_ID_PAY_REFUND_DEADLINE_PAST_WIRE_TRANSFER_DEADLINE
 Description: The refund deadline in the contract is after the transfer deadline.
 HttpStatus: 500
 
+Value: 2160
+Name: MERCHANT_POST_ORDERS_ID_PAY_ALREADY_PAID
+Description: The order was already paid (maybe by another wallet).
+HttpStatus: 409
+
 Value: 2161
 Name: MERCHANT_POST_ORDERS_ID_PAY_OFFER_EXPIRED
 Description: The payment is too late, the offer has expired.
@@ -1314,7 +1628,48 @@ Name: MERCHANT_POST_ORDERS_ID_PAY_AGE_VERIFICATION_FAILED
 Description: The payment required a minimum age but one of the coins provided a minimum_age_sig that couldn't be verified with the given age_commitment for that particular minimum age.
 HttpStatus: 400
 
-# 2200-2249: post orders ID paid endpoint
+Value: 2174
+Name: MERCHANT_POST_ORDERS_ID_PAY_AGE_COMMITMENT_HASH_MISSING
+Description: The payment required no minimum age but one of the coins (of a denomination with support for age restriction) did not provide the required h_age_commitment.
+HttpStatus: 400
+
+Value: 2175
+Name: MERCHANT_POST_ORDERS_ID_PAY_WIRE_METHOD_UNSUPPORTED
+Description: The exchange does not support the selected bank account of the merchant. Likely the merchant had stale data on the bank accounts of the exchange and thus selected an inappropriate exchange when making the offer.
+HttpStatus: 409
+
+Value: 2176
+Name: MERCHANT_POST_ORDERS_ID_PAY_CHOICE_INDEX_MISSING
+Description: The payment requires the wallet to select a choice from the choices array and pass it in the 'choice_index' field of the request.
+HttpStatus: 400
+
+Value: 2177
+Name: MERCHANT_POST_ORDERS_ID_PAY_CHOICE_INDEX_OUT_OF_BOUNDS
+Description: The 'choice_index' field is invalid.
+HttpStatus: 400
+
+Value: 2178
+Name: MERCHANT_POST_ORDERS_ID_PAY_INPUT_TOKENS_MISMATCH
+Description: The provided 'tokens' array does not match with the required input tokens of the order.
+HttpStatus: 400
+
+Value: 2179
+Name: MERCHANT_POST_ORDERS_ID_PAY_TOKEN_ISSUE_SIG_INVALID
+Description: Invalid token issue signature (blindly signed by merchant) for provided token.
+HttpStatus: 400
+
+Value: 2180
+Name: MERCHANT_POST_ORDERS_ID_PAY_TOKEN_USE_SIG_INVALID
+Description: Invalid token use signature (EdDSA, signed by wallet) for provided token.
+HttpStatus: 400
+
+Value: 2181
+Name: MERCHANT_POST_ORDERS_ID_PAY_TOKEN_COUNT_MISMATCH
+Description: The provided number of tokens does not match the required number.
+HttpStatus: 400
+
+
+# 2200-2224: post orders ID paid endpoint
 
 Value: 2200
 Name: MERCHANT_POST_ORDERS_ID_PAID_CONTRACT_HASH_MISMATCH
@@ -1326,8 +1681,20 @@ Name: MERCHANT_POST_ORDERS_ID_PAID_COIN_SIGNATURE_INVALID
 Description: The signature of the merchant is not valid for the given contract hash.
 HttpStatus: 403
 
-# 2250-2299: post orders ID abort endpoint
+# 2225-2249: token families endpoints
+
+Value: 2225
+Name: MERCHANT_POST_TOKEN_FAMILY_CONFLICT
+Description: A token family with this ID but conflicting data exists.
+HttpStatus: 409
+
+Value: 2226
+Name: MERCHANT_PATCH_TOKEN_FAMILY_NOT_FOUND
+Description: The backend is unaware of a token family with the given ID.
+HttpStatus: 404
+
 
+# 2250-2256: post orders ID abort endpoint
 
 Value: 2251
 Name: MERCHANT_POST_ORDERS_ID_ABORT_EXCHANGE_REFUND_FAILED
@@ -1359,6 +1726,44 @@ Name: MERCHANT_POST_ORDERS_ID_ABORT_COINS_ARRAY_EMPTY
 Description: The array of coins cannot be empty.
 HttpStatus: 400
 
+Value: 2258
+Name: MERCHANT_EXCHANGE_TRANSFERS_AWAITING_KEYS
+Description: We are waiting for the exchange to provide us with key material before checking the wire transfer.
+HttpStatus: 202
+
+Value: 2259
+Name: MERCHANT_EXCHANGE_TRANSFERS_AWAITING_LIST
+Description: We are waiting for the exchange to provide us with the list of aggregated transactions.
+HttpStatus: 202
+
+
+Value: 2260
+Name: MERCHANT_EXCHANGE_TRANSFERS_FATAL_NO_EXCHANGE
+Description: The endpoint indicated in the wire transfer does not belong to a GNU Taler exchange.
+HttpStatus: 200
+
+Value: 2261
+Name: MERCHANT_EXCHANGE_TRANSFERS_FATAL_NOT_FOUND
+Description: The exchange indicated in the wire transfer claims to know nothing about the wire transfer.
+HttpStatus: 0
+
+Value: 2262
+Name: MERCHANT_EXCHANGE_TRANSFERS_RATE_LIMITED
+Description: The interaction with the exchange is delayed due to rate limiting.
+HttpStatus: 202
+
+Value: 2263
+Name: MERCHANT_EXCHANGE_TRANSFERS_TRANSIENT_FAILURE
+Description: We experienced a transient failure in our interaction with the exchange.
+HttpStatus: 202
+
+Value: 2264
+Name: MERCHANT_EXCHANGE_TRANSFERS_HARD_FAILURE
+Description: The response from the exchange was unacceptable and should be reviewed with an auditor.
+HttpStatus: 200
+
+
+
 # 2300-2349: post orders ID claim endpoint
 
 Value: 2300
@@ -1383,38 +1788,38 @@ Name: MERCHANT_POST_ORDERS_ID_REFUND_SIGNATURE_FAILED
 Description: The backend failed to sign the refund request.
 HttpStatus: 0
 
-# 2400-2449: tip pickup endpoint
+# 2400-2449: reward pickup endpoint
 
 Value: 2400
-Name: MERCHANT_TIP_PICKUP_UNBLIND_FAILURE
+Name: MERCHANT_REWARD_PICKUP_UNBLIND_FAILURE
 Description: The client failed to unblind the signature returned by the merchant.
 HttpStatus: 0
 
 
 
 Value: 2403
-Name: MERCHANT_TIP_PICKUP_EXCHANGE_ERROR
+Name: MERCHANT_REWARD_PICKUP_EXCHANGE_ERROR
 Description: The exchange returned a failure code for the withdraw operation.
 HttpStatus: 502
 
 
 Value: 2404
-Name: MERCHANT_TIP_PICKUP_SUMMATION_FAILED
+Name: MERCHANT_REWARD_PICKUP_SUMMATION_FAILED
 Description: The merchant failed to add up the amounts to compute the pick up value.
 HttpStatus: 500
 
 Value: 2405
-Name: MERCHANT_TIP_PICKUP_HAS_EXPIRED
-Description: The tip expired.
+Name: MERCHANT_REWARD_PICKUP_HAS_EXPIRED
+Description: The reward expired.
 HttpStatus: 410
 
 Value: 2406
-Name: MERCHANT_TIP_PICKUP_AMOUNT_EXCEEDS_TIP_REMAINING
+Name: MERCHANT_REWARD_PICKUP_AMOUNT_EXCEEDS_REWARD_REMAINING
 Description: The requested withdraw amount exceeds the amount remaining to be picked up.
 HttpStatus: 400
 
 Value: 2407
-Name: MERCHANT_TIP_PICKUP_DENOMINATION_UNKNOWN
+Name: MERCHANT_REWARD_PICKUP_DENOMINATION_UNKNOWN
 Description: The merchant did not find the specified denomination key in the exchange's key set.
 HttpStatus: 409
 
@@ -1425,39 +1830,54 @@ HttpStatus: 409
 
 Value: 2500
 Name: MERCHANT_PRIVATE_POST_ORDERS_INSTANCE_CONFIGURATION_LACKS_WIRE
-Description: The backend lacks a wire transfer method configuration option for the given instance. Thus, this instance is unavailable (not findable for creating new orders).
+Description: The merchant instance has no active bank accounts configured. However, at least one bank account must be available to create new orders.
 HttpStatus: 404
 
 Value: 2501
 Name: MERCHANT_PRIVATE_POST_ORDERS_NO_LOCALTIME
-Description: The proposal had no timestamp and the backend failed to obtain the local time. Likely to be an internal error.
+Description: The proposal had no timestamp and the merchant backend failed to obtain the current local time.
 HttpStatus: 500
 
 Value: 2502
 Name: MERCHANT_PRIVATE_POST_ORDERS_PROPOSAL_PARSE_ERROR
-Description: The order provided to the backend could not be parsed, some required fields were missing or ill-formed.
+Description: The order provided to the backend could not be parsed; likely some required fields were missing or ill-formed.
 HttpStatus: 400
 
 Value: 2503
 Name: MERCHANT_PRIVATE_POST_ORDERS_ALREADY_EXISTS
-Description: The backend encountered an error: the proposal already exists.
+Description: A conflicting order (sharing the same order identifier) already exists at this merchant backend instance.
 HttpStatus: 409
 
 Value: 2504
 Name: MERCHANT_PRIVATE_POST_ORDERS_REFUND_AFTER_WIRE_DEADLINE
-Description: The request is invalid: the wire deadline is before the refund deadline.
+Description: The order creation request is invalid because the given wire deadline is before the refund deadline.
 HttpStatus: 400
 
 Value: 2505
 Name: MERCHANT_PRIVATE_POST_ORDERS_DELIVERY_DATE_IN_PAST
-Description: The request is invalid: a delivery date was given, but it is in the past.
+Description: The order creation request is invalid because the delivery date given is in the past.
 HttpStatus: 400
 
 Value: 2506
 Name: MERCHANT_PRIVATE_POST_ORDERS_WIRE_DEADLINE_IS_NEVER
-Description: The request is invalid: the wire deadline for the order would be "never".
+Description: The order creation request is invalid because a wire deadline of "never" is not allowed.
+HttpStatus: 400
+
+Value: 2507
+Name: MERCHANT_PRIVATE_POST_ORDERS_PAY_DEADLINE_IN_PAST
+Description: The order creation request is invalid because the given payment deadline is in the past.
 HttpStatus: 400
 
+Value: 2508
+Name: MERCHANT_PRIVATE_POST_ORDERS_REFUND_DEADLINE_IN_PAST
+Description: The order creation request is invalid because the given refund deadline is in the past.
+HttpStatus: 400
+
+Value: 2509
+Name: MERCHANT_PRIVATE_POST_ORDERS_NO_EXCHANGES_FOR_WIRE_METHOD
+Description: The backend does not trust any exchange that would allow funds to be wired to any bank account of this instance using the wire method specified with the order. Note that right now, we do not support the use of exchange bank accounts with mandatory currency conversion.
+HttpStatus: 409
+
 Value: 2510
 Name: MERCHANT_PRIVATE_PATCH_ORDERS_ID_FORGET_PATH_SYNTAX_INCORRECT
 Description: One of the paths to forget is malformed.
@@ -1470,24 +1890,34 @@ HttpStatus: 409
 
 Value: 2520
 Name: MERCHANT_PRIVATE_DELETE_ORDERS_AWAITING_PAYMENT
-Description: The order provided to the backend could not be deleted, our offer is still valid and awaiting payment.
+Description: The order provided to the backend could not be deleted, our offer is still valid and awaiting payment. Deletion may work later after the offer has expired if it remains unpaid.
+HttpStatus: 409
+
+Value: 2521
+Name: MERCHANT_PRIVATE_DELETE_ORDERS_ALREADY_PAID
+Description: The order provided to the backend could not be deleted as the order was already paid.
 HttpStatus: 409
 
 Value: 2530
 Name: MERCHANT_PRIVATE_POST_ORDERS_ID_REFUND_INCONSISTENT_AMOUNT
-Description: The amount to be refunded is inconsistent: either is lower than the previous amount being awarded, or it is too big to be paid back. In this second case, the fault stays on the business dept. side.
+Description: The amount to be refunded is inconsistent: either is lower than the previous amount being awarded, or it exceeds the original price paid by the customer.
 HttpStatus: 409
 
 Value: 2531
 Name: MERCHANT_PRIVATE_POST_ORDERS_ID_REFUND_ORDER_UNPAID
-Description: The frontend gave an unpaid order id to issue the refund to.
+Description: Only paid orders can be refunded, and the frontend specified an unpaid order to issue a refund for.
 HttpStatus: 409
 
 Value: 2532
 Name: MERCHANT_PRIVATE_POST_ORDERS_ID_REFUND_NOT_ALLOWED_BY_CONTRACT
-Description: The refund delay was set to 0 and thus no refunds are allowed for this order.
+Description: The refund delay was set to 0 and thus no refunds are ever allowed for this order.
 HttpStatus: 403
 
+Value: 2533
+Name: MERCHANT_PRIVATE_POST_ORDERS_TOKEN_FAMILY_SLUG_UNKNOWN
+Description: The token family slug provided in this order could not be found in the merchant database.
+HttpStatus: 404
+
 
 
 # 2550-2599: transfer operations
@@ -1532,6 +1962,11 @@ Name: MERCHANT_PRIVATE_POST_TRANSFERS_CONFLICTING_SUBMISSION
 Description: The backend was previously informed about a wire transfer with the same ID but a different amount. Multiple wire transfers with the same ID are not allowed. If the new amount is correct, the old transfer should first be deleted.
 HttpStatus: 409
 
+Value: 2563
+Name: MERCHANT_EXCHANGE_TRANSFERS_CONFLICTING_TRANSFERS
+Description: The amount transferred differs between what was submitted and what the exchange claimed.
+HttpStatus: 0
+
 
 # 2600-2649: instance operations
 
@@ -1560,6 +1995,16 @@ Name: MERCHANT_PRIVATE_PATCH_INSTANCES_PURGE_REQUIRED
 Description: The merchant backend cannot update an instance under the given identifier, the previous one was deleted but must be purged first.
 HttpStatus: 409
 
+Value: 2626
+Name: MERCHANT_PRIVATE_ACCOUNT_DELETE_UNKNOWN_ACCOUNT
+Description: The bank account referenced in the requested operation was not found.
+HttpStatus: 404
+
+Value: 2627
+Name: MERCHANT_PRIVATE_ACCOUNT_EXISTS
+Description: The bank account specified in the request already exists at the merchant.
+HttpStatus: 409
+
 
 # 2650-2699: product operations
 
@@ -1605,31 +2050,36 @@ Name: MERCHANT_PRIVATE_POST_RESERVES_UNSUPPORTED_WIRE_METHOD
 Description: The requested wire method is not supported by the exchange.
 HttpStatus: 409
 
+Value: 2701
+Name: MERCHANT_PRIVATE_POST_RESERVES_REWARDS_NOT_ALLOWED
+Description: The requested exchange does not allow rewards.
+HttpStatus: 409
+
 Value: 2710
 Name: MERCHANT_PRIVATE_DELETE_RESERVES_NO_SUCH_RESERVE
 Description: The reserve could not be deleted because it is unknown.
 HttpStatus: 404
 
-# 2750-2799: tip authorization
+# 2750-2799: reward authorization
 
 Value: 2750
-Name: MERCHANT_PRIVATE_POST_TIP_AUTHORIZE_RESERVE_EXPIRED
-Description: The reserve that was used to fund the tips has expired.
+Name: MERCHANT_PRIVATE_POST_REWARD_AUTHORIZE_RESERVE_EXPIRED
+Description: The reserve that was used to fund the rewards has expired.
 HttpStatus: 410
 
 Value: 2751
-Name: MERCHANT_PRIVATE_POST_TIP_AUTHORIZE_RESERVE_UNKNOWN
-Description: The reserve that was used to fund the tips was not found in the DB.
+Name: MERCHANT_PRIVATE_POST_REWARD_AUTHORIZE_RESERVE_UNKNOWN
+Description: The reserve that was used to fund the rewards was not found in the DB.
 HttpStatus: 503
 
 Value: 2752
-Name: MERCHANT_PRIVATE_POST_TIP_AUTHORIZE_INSUFFICIENT_FUNDS
-Description: The backend knows the instance that was supposed to support the tip, and it was configured for tipping. However, the funds remaining are insufficient to cover the tip, and the merchant should top up the reserve.
+Name: MERCHANT_PRIVATE_POST_REWARD_AUTHORIZE_INSUFFICIENT_FUNDS
+Description: The backend knows the instance that was supposed to support the reward, and it was configured for rewardping. However, the funds remaining are insufficient to cover the reward, and the merchant should top up the reserve.
 HttpStatus: 0
 
 Value: 2753
-Name: MERCHANT_PRIVATE_POST_TIP_AUTHORIZE_RESERVE_NOT_FOUND
-Description: The backend failed to find a reserve needed to authorize the tip.
+Name: MERCHANT_PRIVATE_POST_REWARD_AUTHORIZE_RESERVE_NOT_FOUND
+Description: The backend failed to find a reserve needed to authorize the reward.
 HttpStatus: 503
 
 Value: 2800
@@ -1637,6 +2087,53 @@ Name: MERCHANT_PRIVATE_GET_ORDERS_ID_AMOUNT_ARITHMETIC_FAILURE
 Description: The merchant backend encountered a failure in computing the deposit total.
 HttpStatus: 200
 
+# 2850-2899: template and OTP device operations
+
+Value: 2850
+Name: MERCHANT_PRIVATE_POST_TEMPLATES_CONFLICT_TEMPLATE_EXISTS
+Description: The template ID already exists.
+HttpStatus: 409
+
+Value: 2851
+Name: MERCHANT_PRIVATE_POST_OTP_DEVICES_CONFLICT_OTP_DEVICE_EXISTS
+Description: The OTP device ID already exists.
+HttpStatus: 409
+
+Value: 2860
+Name: MERCHANT_POST_USING_TEMPLATES_AMOUNT_CONFLICT_TEMPLATES_CONTRACT_AMOUNT
+Description: Amount given in the using template and in the template contract. There is a conflict.
+HttpStatus: 409
+
+Value: 2861
+Name: MERCHANT_POST_USING_TEMPLATES_SUMMARY_CONFLICT_TEMPLATES_CONTRACT_SUBJECT
+Description: Subject given in the using template and in the template contract. There is a conflict.
+HttpStatus: 409
+
+Value: 2862
+Name: MERCHANT_POST_USING_TEMPLATES_NO_AMOUNT
+Description: Amount not given in the using template and in the template contract. There is a conflict.
+HttpStatus: 409
+
+Value: 2863
+Name: MERCHANT_POST_USING_TEMPLATES_NO_SUMMARY
+Description: Subject not given in the using template and in the template contract. There is a conflict.
+HttpStatus: 409
+
+
+
+# 2900-2949: webhook operations
+
+Value: 2900
+Name: MERCHANT_PRIVATE_POST_WEBHOOKS_CONFLICT_WEBHOOK_EXISTS
+Description: The webhook ID elready exists.
+HttpStatus: 409
+
+Value: 2910
+Name: MERCHANT_PRIVATE_POST_PENDING_WEBHOOKS_CONFLICT_PENDING_WEBHOOK_EXISTS
+Description: The webhook serial elready exists.
+HttpStatus: 409
+
+
 
 
 
@@ -1653,6 +2150,16 @@ Name: AUDITOR_EXCHANGE_SIGNING_KEY_REVOKED
 Description: The exchange key used for the signature on the deposit confirmation was revoked.
 HttpStatus: 410
 
+Value: 3102
+Name: AUDITOR_RESOURCE_NOT_FOUND
+Description: The requested resource could not be found.
+HttpStatus: 404
+
+Value: 3103
+Name: AUDITOR_URI_MISSING_PATH_COMPONENT
+Description: The URI is missing a path component.
+HttpStatus: 400
+
 
 # 5000 - 5999: Reserved for bank
 # 5000 - 5099: Reserved for BANK_GENERIC
@@ -1660,57 +2167,52 @@ HttpStatus: 410
 Value: 5101
 Name: BANK_SAME_ACCOUNT
 Description: Wire transfer attempted with credit and debit party being the same bank account.
-HttpStatus: 0
+HttpStatus: 400
 
 Value: 5102
 Name: BANK_UNALLOWED_DEBIT
 Description: Wire transfer impossible, due to financial limitation of the party that attempted the payment.
-HttpStatus: 0
+HttpStatus: 409
 
 Value: 5103
 Name: BANK_NEGATIVE_NUMBER_AMOUNT
-Description: Negative number was used (as value and/or fraction) to initiate a Amount object.
-HttpStatus: 0
+Description: Negative numbers are not allowed (as value and/or fraction) to instantiate an amount object.
+HttpStatus: 400
 
 Value: 5104
 Name: BANK_NUMBER_TOO_BIG
-Description: A number too big was used (as value and/or fraction) to initiate a amount object.
-HttpStatus: 0
-
-Value: 5105
-Name: BANK_LOGIN_FAILED
-Description: Could not login for the requested operation.
-HttpStatus: 0
+Description: A too big number was used (as value and/or fraction) to instantiate an amount object.
+HttpStatus: 400
 
 Value: 5106
 Name: BANK_UNKNOWN_ACCOUNT
-Description: The bank account referenced in the requested operation was not found. Returned along "400 Not found".
-HttpStatus: 0
+Description: The bank account referenced in the requested operation was not found.
+HttpStatus: 404
 
 Value: 5107
 Name: BANK_TRANSACTION_NOT_FOUND
 Description: The transaction referenced in the requested operation (typically a reject operation), was not found.
-HttpStatus: 0
+HttpStatus: 404
 
 Value: 5108
 Name: BANK_BAD_FORMAT_AMOUNT
 Description: Bank received a malformed amount string.
-HttpStatus: 0
+HttpStatus: 400
 
 Value: 5109
 Name: BANK_REJECT_NO_RIGHTS
-Description: The client does not own the account credited by the transaction which is to be rejected, so it has no rights do reject it.  To be returned along HTTP 403 Forbidden.
-HttpStatus: 0
+Description: The client does not own the account credited by the transaction which is to be rejected, so it has no rights do reject it.
+HttpStatus: 403
 
 Value: 5110
 Name: BANK_UNMANAGED_EXCEPTION
-Description: This error code is returned when no known exception types captured the exception, and comes along with a 500 Internal Server Error.
-HttpStatus: 0
+Description: This error code is returned when no known exception types captured the exception.
+HttpStatus: 500
 
 Value: 5111
 Name: BANK_SOFT_EXCEPTION
-Description: This error code is used for all those exceptions that do not really need a specific error code to return to the client, but need to signal the middleware that the bank is not responding with 500 Internal Server Error.  Used for example when a client is trying to register with a unavailable username.
-HttpStatus: 0
+Description: This error code is used for all those exceptions that do not really need a specific error code to return to the client. Used for example when a client is trying to register with a unavailable username.
+HttpStatus: 500
 
 Value: 5112
 Name: BANK_TRANSFER_REQUEST_UID_REUSED
@@ -1727,6 +2229,160 @@ Name: BANK_DUPLICATE_RESERVE_PUB_SUBJECT
 Description: The wire transfer subject duplicates an existing reserve public key. But wire transfer subjects must be unique.
 HttpStatus: 409
 
+Value: 5115
+Name: BANK_ANCIENT_TRANSACTION_GONE
+Description: The client requested a transaction that is so far in the past, that it has been forgotten by the bank.
+HttpStatus: 410
+
+Value: 5116
+Name: BANK_ABORT_CONFIRM_CONFLICT
+Description: The client attempted to abort a transaction that was already confirmed.
+HttpStatus: 409
+
+Value: 5117
+Name: BANK_CONFIRM_ABORT_CONFLICT
+Description: The client attempted to confirm a transaction that was already aborted.
+HttpStatus: 409
+
+Value: 5118
+Name: BANK_REGISTER_CONFLICT
+Description: The client attempted to register an account with the same name.
+HttpStatus: 409
+
+Value: 5119
+Name: BANK_POST_WITHDRAWAL_OPERATION_REQUIRED
+Description: The client attempted to confirm a withdrawal operation before the wallet posted the required details.
+HttpStatus: 400
+
+Value: 5120
+Name: BANK_RESERVED_USERNAME_CONFLICT
+Description: The client tried to register a new account under a reserved username (like 'admin' for example).
+HttpStatus: 409
+
+Value: 5121
+Name: BANK_REGISTER_USERNAME_REUSE
+Description: The client tried to register a new account with an username already in use.
+HttpStatus: 409
+
+Value: 5122
+Name: BANK_REGISTER_PAYTO_URI_REUSE
+Description: The client tried to register a new account with a payto:// URI already in use.
+HttpStatus: 409
+
+Value: 5123
+Name: BANK_ACCOUNT_BALANCE_NOT_ZERO
+Description: The client tried to delete an account with a non null balance.
+HttpStatus: 409
+
+Value: 5124
+Name: BANK_UNKNOWN_CREDITOR
+Description: The client tried to create a transaction or an operation that credit an unknown account.
+HttpStatus: 409
+
+Value: 5125
+Name: BANK_UNKNOWN_DEBTOR
+Description: The client tried to create a transaction or an operation that debit an unknown account.
+HttpStatus: 409
+
+Value: 5126
+Name: BANK_ACCOUNT_IS_EXCHANGE
+Description: The client tried to perform an action prohibited for exchange accounts.
+HttpStatus: 409
+
+Value: 5127
+Name: BANK_ACCOUNT_IS_NOT_EXCHANGE
+Description: The client tried to perform an action reserved for exchange accounts.
+HttpStatus: 409
+
+Value: 5128
+Name: BANK_BAD_CONVERSION
+Description: Received currency conversion is wrong.
+HttpStatus: 409
+
+Value: 5129
+Name: BANK_MISSING_TAN_INFO
+Description: The account referenced in this operation is missing tan info for the chosen channel.
+HttpStatus: 409
+
+Value: 5130
+Name: BANK_CONFIRM_INCOMPLETE
+Description: The client attempted to confirm a transaction with incomplete info.
+HttpStatus: 409
+
+Value: 5131
+Name: BANK_TAN_RATE_LIMITED
+Description: The request rate is too high. The server is refusing requests to guard against brute-force attacks.
+HttpStatus: 429
+
+Value: 5132
+Name: BANK_TAN_CHANNEL_NOT_SUPPORTED
+Description: This TAN channel is not supported.
+HttpStatus: 501
+
+Value: 5133
+Name: BANK_TAN_CHANNEL_SCRIPT_FAILED
+Description: Failed to send TAN using the helper script. Either script is not found, or script timeout, or script terminated with a non-successful result.
+HttpStatus: 500
+
+Value: 5134
+Name: BANK_TAN_CHALLENGE_FAILED
+Description: The client's response to the challenge was invalid.
+HttpStatus: 403
+
+Value: 5135
+Name: BANK_NON_ADMIN_PATCH_LEGAL_NAME
+Description: A non-admin user has tried to change their legal name.
+HttpStatus: 409
+
+Value: 5136
+Name: BANK_NON_ADMIN_PATCH_DEBT_LIMIT
+Description: A non-admin user has tried to change their debt limit.
+HttpStatus: 409
+
+Value: 5137
+Name: BANK_NON_ADMIN_PATCH_MISSING_OLD_PASSWORD
+Description: A non-admin user has tried to change their password whihout providing the current one.
+HttpStatus: 409
+
+Value: 5138
+Name: BANK_PATCH_BAD_OLD_PASSWORD
+Description: Provided old password does not match current password.
+HttpStatus: 409
+
+Value: 5139
+Name: BANK_PATCH_ADMIN_EXCHANGE
+Description: An admin user has tried to become an exchange.
+HttpStatus: 409
+
+Value: 5140
+Name: BANK_NON_ADMIN_PATCH_CASHOUT
+Description: A non-admin user has tried to change their cashout account.
+HttpStatus: 409
+
+Value: 5141
+Name: BANK_NON_ADMIN_PATCH_CONTACT
+Description: A non-admin user has tried to change their contact info.
+HttpStatus: 409
+
+Value: 5142
+Name: BANK_ADMIN_CREDITOR
+Description: The client tried to create a transaction that credit the admin account.
+HttpStatus: 409
+
+Value: 5143
+Name: BANK_CHALLENGE_NOT_FOUND
+Description: The referenced challenge was not found.
+HttpStatus: 404
+
+Value: 5144
+Name: BANK_TAN_CHALLENGE_EXPIRED
+Description: The referenced challenge has expired.
+HttpStatus: 409
+
+Value: 5145
+Name: BANK_NON_ADMIN_SET_TAN_CHANNEL
+Description: A non-admin user has tried to create an account with 2fa.
+HttpStatus: 409
 
 # 6000 - 6999: Reserved for sync
 # 6000 - 6099: Reserved for SYNC_GENERIC
@@ -1796,6 +2452,17 @@ Name: SYNC_MISSING_CONTENT_LENGTH
 Description: The "Content-length" field for the upload is missing.
 HttpStatus: 400
 
+Value: 6113
+Name: SYNC_GENERIC_BACKEND_ERROR
+Description: Sync had problems communicating with its payment backend.
+HttpStatus: 502
+
+Value: 6114
+Name: SYNC_GENERIC_BACKEND_TIMEOUT
+Description: Sync experienced a timeout communicating with its payment backend.
+HttpStatus: 504
+
+
 
 # 7000 - 7999: Reserved for wallet
 
@@ -1880,8 +2547,8 @@ Description: A group of withdrawal operations (typically for the same reserve at
 HttpStatus: 0
 
 Value: 7016
-Name: WALLET_TIPPING_COIN_SIGNATURE_INVALID
-Description: The signature on a coin by the exchange's denomination key (obtained through the merchant via tipping) is invalid after unblinding it.
+Name: WALLET_REWARD_COIN_SIGNATURE_INVALID
+Description: The signature on a coin by the exchange's denomination key (obtained through the merchant via a reward) is invalid after unblinding it.
 HttpStatus: 0
 
 Value: 7017
@@ -1909,7 +2576,82 @@ Name: WALLET_PENDING_OPERATION_FAILED
 Description: A pending operation failed, and thus the request can't be completed.
 HttpStatus: 0
 
-# 8000 - 8999: Reserved for Anastasis
+Value: 7022
+Name: WALLET_PAY_MERCHANT_SERVER_ERROR
+Description: A payment was attempted, but the merchant had an internal server error (5xx).
+HttpStatus: 0
+
+Value: 7023
+Name: WALLET_CRYPTO_WORKER_ERROR
+Description: The crypto worker failed.
+HttpStatus: 0
+
+Value: 7024
+Name: WALLET_CRYPTO_WORKER_BAD_REQUEST
+Description: The crypto worker received a bad request.
+HttpStatus: 0
+
+Value: 7025
+Name: WALLET_WITHDRAWAL_KYC_REQUIRED
+Description: A KYC step is required before withdrawal can proceed.
+HttpStatus: 0
+
+Value: 7026
+Name: WALLET_DEPOSIT_GROUP_INSUFFICIENT_BALANCE
+Description: The wallet does not have sufficient balance to create a deposit group.
+HttpStatus: 0
+
+Value: 7027
+Name: WALLET_PEER_PUSH_PAYMENT_INSUFFICIENT_BALANCE
+Description: The wallet does not have sufficient balance to create a peer push payment.
+HttpStatus: 0
+
+Value: 7028
+Name: WALLET_PEER_PULL_PAYMENT_INSUFFICIENT_BALANCE
+Description: The wallet does not have sufficient balance to pay for an invoice.
+HttpStatus: 0
+
+Value: 7029
+Name: WALLET_REFRESH_GROUP_INCOMPLETE
+Description: A group of refresh operations has errors and will be tried again later.
+HttpStatus: 0
+
+Value: 7030
+Name: WALLET_EXCHANGE_BASE_URL_MISMATCH
+Description: The exchange's self-reported base URL does not match the one that the wallet is using.
+HttpStatus: 0
+
+Value: 7031
+Name: WALLET_ORDER_ALREADY_PAID
+Description: The order has already been paid by another wallet.
+HttpStatus: 0
+
+Value: 7032
+Name: WALLET_EXCHANGE_UNAVAILABLE
+Description: An exchange that is required for some request is currently not available.
+HttpStatus: 0
+
+Value: 7033
+Name: WALLET_EXCHANGE_ENTRY_USED
+Description: An exchange entry is still used by the exchange, thus it can't be deleted without purging.
+HttpStatus: 0
+
+Value: 7034
+Name: WALLET_DB_UNAVAILABLE
+Description: The wallet database is unavailable and the wallet thus is not operational.
+HttpStatus: 0
+
+Value: 7035
+Name: WALLET_TALER_URI_MALFORMED
+Description: A taler:// URI is malformed and can't be parsed.
+HttpStatus: 0
+
+Value: 7036
+Name: WALLET_CORE_REQUEST_CANCELLED
+Description: A wallet-core request was cancelled and thus can't provide a response.
+HttpStatus: 0
+
+# 8000 - 8499: Reserved for Anastasis
 
 Value: 8000
 Name: ANASTASIS_GENERIC_BACKEND_TIMEOUT
@@ -2251,8 +2993,31 @@ Name: ANASTASIS_REDUCER_PROVIDERS_ALREADY_SYNCED
 Description: The reducer already synchronized with all providers.
 HttpStatus: 0
 
+# 8500 - 8600: Frosix
+
+# 8600 - 8700: Donau
+
+Value: 8607
+Name: DONAU_GENERIC_KEYS_MISSING
+Description: The Donau failed to perform the operation as it could not find the private keys. This is a problem with the Donau setup, not with the client's request.
+HttpStatus: 503
+
+Value: 8608
+Name: DONAU_CHARITY_SIGNATURE_INVALID
+Description: The signature of the charity key is not valid.
+HttpStatus: 403
+
+Value: 8609
+Name: DONAU_CHARITY_NOT_FOUND
+Description: The charity is unknown.
+HttpStatus: 404
+
+Value: 8610
+Name: DONAU_EXCEEDING_DONATION_LIMIT
+Description: The donation amount specified in the request exceeds the limit of the charity.
+HttpStatus: 400
 
-# 9000 - 9998: LibEuFin.
+# 9000 - 9599: LibEuFin.
 
 Value: 9000
 Name: LIBEUFIN_NEXUS_GENERIC_ERROR
@@ -2274,7 +3039,70 @@ Name: LIBEUFIN_SANDBOX_UNCAUGHT_EXCEPTION
 Description: An uncaught exception happened in the LibEuFin sandbox service.
 HttpStatus: 500
 
+# 9600 - 9749: Taldir
+Value: 9600
+Name: TALDIR_METHOD_NOT_SUPPORTED
+Description: This validation method is not supported by the service.
+HttpStatus: 404
+
+Value: 9601
+Name: TALDIR_REGISTER_RATE_LIMITED
+Description: Number of allowed attempts for initiating a challenge exceeded.
+HttpStatus: 429
+
+# 9750-9999: Challenger
+Value: 9750
+Name: CHALLENGER_GENERIC_CLIENT_UNKNOWN
+Description: The client is unknown or unauthorized.
+HttpStatus: 404
+
+Value: 9751
+Name: CHALLENGER_GENERIC_CLIENT_FORBIDDEN_BAD_REDIRECT_URI
+Description: The client is not authorized to use the given redirect URI.
+HttpStatus: 403
+
+Value: 9752
+Name: CHALLENGER_HELPER_EXEC_FAILED
+Description: The service failed to execute its helper process to send the challenge.
+HttpStatus: 500
+
+Value: 9753
+Name: CHALLENGER_GRANT_UNKNOWN
+Description: The grant is unknown to the service (it could also have expired).
+HttpStatus: 404
+
+Value: 9754
+Name: CHALLENGER_CLIENT_FORBIDDEN_BAD_CODE
+Description: The code given is not even well-formed.
+HttpStatus: 403
+
+Value: 9755
+Name: CHALLENGER_GENERIC_VALIDATION_UNKNOWN
+Description: The service is not aware of the referenced validation process.
+HttpStatus: 404
+
+Value: 9756
+Name: CHALLENGER_CLIENT_FORBIDDEN_INVALID_CODE
+Description: The code given is not valid.
+HttpStatus: 403
+
+Value: 9757
+Name: CHALLENGER_TOO_MANY_ATTEMPTS
+Description: Too many attempts have been made, validation is temporarily disabled for this address.
+HttpStatus: 429
+
+Value: 9758
+Name: CHALLENGER_INVALID_PIN
+Description: The PIN code provided is incorrect.
+HttpStatus: 403
+
+Value: 9759
+Name: CHALLENGER_MISSING_ADDRESS
+Description: The token cannot be valid as no address was ever provided by the client.
+HttpStatus: 409
+
 
+# Some of our build systems expect the range to be < 10k, so let's keep it like this for now.
 Value: 9999
 Name: END
 Description: End of error code range.
diff --git a/gnu-taler-error-codes/rst.footer b/gnu-taler-error-codes/rst.footer
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/gnu-taler-error-codes/rst.footer
diff --git a/gnu-taler-error-codes/rst.header b/gnu-taler-error-codes/rst.header
new file mode 100644
index 0000000..0b30d8a
--- /dev/null
+++ b/gnu-taler-error-codes/rst.header
@@ -0,0 +1,14 @@
+GNU Taler Error Codes
+---------------------
+
+Entries
+^^^^^^^
+
+.. list-table:: GNU Taler Error Codes
+   :widths: auto
+   :header-rows: 1
+
+   * - Name
+     - Value
+     - HTTP Status
+     - Description
diff --git a/gnu-taler-error-codes/rst.template b/gnu-taler-error-codes/rst.template
new file mode 100644
index 0000000..9bff06c
--- /dev/null
+++ b/gnu-taler-error-codes/rst.template
@@ -0,0 +1,4 @@
+   * - {{Name}}
+     - {{Value}}
+     - {{HttpStatus_Value}} ({{HttpStatus_Identifier}})
+     - {{Description}}
diff --git a/gnu-taler-extensions/registry.rec b/gnu-taler-extensions/registry.rec
index 81dc913..d9b4eff 100644
--- a/gnu-taler-extensions/registry.rec
+++ b/gnu-taler-extensions/registry.rec
@@ -24,10 +24,20 @@ Critical: true
 Contact: oec-taler@kesim.org
 References: Design document 24
 
-Identifier: P2P_PAYMENTS
-Description: Support for payments directly between wallets.
+Identifier: POLICY_REFUND
+Description: Support for refund in payments.
 Critical: false
 Contact: team@taler.net
 References: Design document 13
 
+Identifier: POLICY_AUCTION
+Description: Auction support via libbrandt
+Critical: false
+Contact: oec-taler@kesim.org
+References: Design document 32
 
+Identifier: POLICY_ESCROW
+Description: Escrow functionality provided by the exchange.  Deposited coins can be put into escrow for a specified time interval, potentially in the future.  If the owner of the coins and the merchant both sign the contract within the interval, the coins' value will be transferred to the merchant's account. Otherwise, the coins can be refreshed by the owner.
+Critical: false
+Contact: oec-taler@kesim.org
+References: NOT YET
diff --git a/gnu-taler-extensions/rst.footer b/gnu-taler-extensions/rst.footer
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/gnu-taler-extensions/rst.footer
diff --git a/gnu-taler-extensions/rst.header b/gnu-taler-extensions/rst.header
new file mode 100644
index 0000000..a172030
--- /dev/null
+++ b/gnu-taler-extensions/rst.header
@@ -0,0 +1,4 @@
+GNS Default Top-Level-Domains
+-----------------------------
+
+
diff --git a/gnu-taler-extensions/rst.template b/gnu-taler-extensions/rst.template
new file mode 100644
index 0000000..6d757b7
--- /dev/null
+++ b/gnu-taler-extensions/rst.template
@@ -0,0 +1,9 @@
+
+
+=================== ===========================================================
+Suffix              {{Name}}
+------------------- -----------------------------------------------------------
+Zone Key            {{Key}}
+Comment             {{Comment}}
+=================== ===========================================================
+
diff --git a/gnu-taler-kyc-attributes/Makefile b/gnu-taler-kyc-attributes/Makefile
new file mode 100644
index 0000000..edb88bb
--- /dev/null
+++ b/gnu-taler-kyc-attributes/Makefile
@@ -0,0 +1,6 @@
+all: check 
+
+check: registry.rec
+        recfix --check registry.rec
+
+.PHONY: all check 
diff --git a/gnu-taler-kyc-attributes/registry.rec b/gnu-taler-kyc-attributes/registry.rec
new file mode 100644
index 0000000..af71f4c
--- /dev/null
+++ b/gnu-taler-kyc-attributes/registry.rec
@@ -0,0 +1,66 @@
+# -*- mode: rec -*-
+#
+# Registry for GNU Taler attributes, as per Design document 31
+#
+%rec: TalerAttributes
+%key: Identifier
+%typedef: Identifier_t regexp /^[ABCDEFGHIJKLMNOPQRSTUVWXYZ_][ABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789:\.]*$/
+%type: Identifier Identifier_t
+%unique: Identifier
+%mandatory: Identifier
+%typedef: Description_t regexp |^[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_\(\)\.,;!"':#\/ -]*$|
+%type: Description Description_t
+%mandatory: Description
+%typedef: Category_t enum individual business both
+%type: Category Category_t
+%mandatory: Category
+%allowed: Contact
+%allowed: References
+%allowed: Comment
+%sort: Identifier Description Contact References
+
+
+Identifier: BUSINESS_NAME
+Description: Full legal name of the business.
+Category: business
+
+Identifier: BUSINESS_TAX_ID
+Description: Tax identifier of the business.
+Category: business
+Comment: Format may depend on the country of residence of the business.
+
+Identifier: FULL_NAME
+Description: Full legal name of an individual.
+Category: individual
+
+Identifier: CONTACT_EMAIL
+Description: E-mail address to contact the individual or business.
+Category: both
+Comment: Can be validated via E-mail with TAN.
+
+Identifier: CONTACT_PHONE
+Description: Phone number to contact the individual or business.
+Category: both
+Comment: Can be validated via SMS-TAN or phone call.
+
+Identifier: CONTACT_DNS_DOMAIN
+Description: DNS domain name owned by the individual or business.
+Category: both
+Comment: Can be validated by having the owner set an appropriate DNS TXT record.
+
+Identifier: CONTACT_WEB_DOMAIN
+Description: Web site owned by the individual or business.
+Category: both
+Comment: Can be validated by having the owner serve an appropriate well-known page.
+
+Identifier: ADDRESS_STREET
+Description: Street address (including house number) of the individual or business.
+Category: both
+
+Identifier: ADDRESS_CITY
+Description: Name of the city where the individual or business resides.
+Category: both
+
+Identifier: ADDRESS_COUNTRY
+Description: Name of the country where the individual or business resides.
+Category: both
diff --git a/gnunet-dht-block-types/.gitignore b/gnunet-dht-block-types/.gitignore
new file mode 100644
index 0000000..0a437d0
--- /dev/null
+++ b/gnunet-dht-block-types/.gitignore
@@ -0,0 +1 @@
+gnu-name-system-record-types.h
diff --git a/gnunet-dht-block-types/Makefile b/gnunet-dht-block-types/Makefile
index f402c2d..7ac5f54 100644
--- a/gnunet-dht-block-types/Makefile
+++ b/gnunet-dht-block-types/Makefile
@@ -1,4 +1,4 @@
-FILES=gnunet_dht_block_types.h
+FILES=gnunet_dht_block_types.h gnunet_dht_block_types.rst
 all: check $(FILES)
 
 check:
@@ -15,4 +15,14 @@ gnunet_dht_block_types.h.tmp: registry.rec h.template
 gnunet_dht_block_types.h: h.header gnunet_dht_block_types.h.tmp h.footer
         cat h.header gnunet_dht_block_types.h.tmp h.footer > $@
 
+gnunet_dht_block_types.rst.tmp: registry.rec rst.template
+        ../format.sh rst.template < registry.rec > $@
+
+rst.header.tmp:
+        cat README POLICY rst.header.template > $@
+
+gnunet_dht_block_types.rst: rst.header.tmp gnunet_dht_block_types.rst.tmp rst.footer
+        cat rst.header.tmp gnunet_dht_block_types.rst.tmp rst.footer > $@
+
+
 .PHONY: check clean distclean
diff --git a/gnunet-dht-block-types/POLICY b/gnunet-dht-block-types/POLICY
new file mode 100644
index 0000000..4308df6
--- /dev/null
+++ b/gnunet-dht-block-types/POLICY
@@ -0,0 +1,11 @@
+Policy
+^^^^^^
+
+Developers working on GNUnet or packages based on GNUnet should
+feel free to extend this registry. Entries may be deleted if
+no code using them is still expected to be in production anywhere.
+
+Updating the name of the package or subsystem is allowed provided
+that the code using the signature is being moved, as those fields
+are merely informational or used for code generation.
+
diff --git a/gnunet-dht-block-types/README b/gnunet-dht-block-types/README
index e11fe42..844d7e2 100644
--- a/gnunet-dht-block-types/README
+++ b/gnunet-dht-block-types/README
@@ -1,3 +1,6 @@
+R5N DHT Block Types
+-------------------
+
 This registry is for GNUnet DHT Block Types.
 
 DHT Block Types types uniquely identify the different kinds
@@ -7,3 +10,4 @@ This registry is used to ensure that the names and numeric values
 used to identify block types are uniquely defined and to
 allow DHT implementors to find out details about the
 respective semantics and human-readable syntax.
+
diff --git a/gnunet-dht-block-types/registry.rec b/gnunet-dht-block-types/registry.rec
index e2366d3..e73dea4 100644
--- a/gnunet-dht-block-types/registry.rec
+++ b/gnunet-dht-block-types/registry.rec
@@ -37,8 +37,8 @@ Comment: Type of a block representing a block to be encoded on demand from disk.
 References: None
 
 Number: 7
-Name: DHT_HELLO
-Comment: Type of a block that contains a HELLO for a peer.
+Name: LEGACY_HELLO
+Comment: Legacy type of a block that contains a HELLO for a peer.
 References: None
 
 Number: 8
@@ -67,9 +67,9 @@ Comment: Block type for a revocation message by which a key is revoked.
 References: None
 
 Number: 13
-Name: DHT_URL_HELLO
+Name: DHT_HELLO
 Comment: Type of a block that contains a DHT-NG HELLO for a peer.
-References: None
+References: LSD-0004
 
 Number: 22
 Name: REGEX
diff --git a/gnunet-dht-block-types/rst.footer b/gnunet-dht-block-types/rst.footer
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/gnunet-dht-block-types/rst.footer
diff --git a/gnunet-dht-block-types/rst.header.template b/gnunet-dht-block-types/rst.header.template
new file mode 100644
index 0000000..a577b68
--- /dev/null
+++ b/gnunet-dht-block-types/rst.header.template
@@ -0,0 +1,11 @@
+Entries
+^^^^^^^
+
+.. list-table:: R5N Block Types
+   :widths: auto
+   :header-rows: 1
+
+   * - Name
+     - Number
+     - References
+     - Comment
diff --git a/gnunet-dht-block-types/rst.template b/gnunet-dht-block-types/rst.template
new file mode 100644
index 0000000..11468c9
--- /dev/null
+++ b/gnunet-dht-block-types/rst.template
@@ -0,0 +1,4 @@
+   * - {{Name}}
+     - {{Number}}
+     - {{References}}
+     - {{Comment}}
diff --git a/gnunet-error-codes/.gitignore b/gnunet-error-codes/.gitignore
new file mode 100644
index 0000000..f6c67c1
--- /dev/null
+++ b/gnunet-error-codes/.gitignore
@@ -0,0 +1,3 @@
+gnunet_error_codes.c
+gnunet_error_codes.go
+gnunet_error_codes.ts
diff --git a/gnunet-error-codes/Makefile b/gnunet-error-codes/Makefile
new file mode 100644
index 0000000..14fd480
--- /dev/null
+++ b/gnunet-error-codes/Makefile
@@ -0,0 +1,71 @@
+FILES=gnunet_error_codes.h \
+  gnunet_error_codes.c \
+  gnunet_error_codes.ts \
+  gnunet_error_codes.go \
+        gnunet_error_codes.rst
+
+all: check $(FILES)
+
+check: registry.rec
+        recfix --check registry.rec
+
+distclean:
+        rm -f *.tmp
+
+clean:
+        rm -f $(FILES) *.tmp
+
+prep:
+        cd ../http-status-codes; make ; cd -
+
+# Because prep is phony, this rule always triggers. To avoid
+# combined.tmp cascading into triggering the other rules even
+# if nothing changed, we use 'diff' to make sure that 'recsel'
+# actually changed the result.
+combined.tmp: registry.rec prep
+        recsel -t GnunetErrorCode -j HttpStatus -p Description,Name,Value,HttpStatus,HttpStatus.Value,HttpStatus.Identifier ../http-status-codes/registry.rec registry.rec > combined.xtmp
+        if ! diff $@ combined.xtmp > /dev/null; then mv combined.xtmp $@; else rm combined.xtmp; fi
+
+combined-escaped.tmp: combined.tmp
+        sed 's/"/\\"/g' combined.tmp > $@
+
+length.tmp: combined.tmp
+        recsel -p "Count(Description):ECS_LENGTH" combined.tmp > $@
+
+gnunet_error_codes.h.tmp: combined.tmp h.template
+        ../format.sh h.template < combined.tmp > $@
+
+gnunet_error_codes.h: h.header gnunet_error_codes.h.tmp h.footer
+        cat h.header gnunet_error_codes.h.tmp h.footer > $@
+
+gnunet_error_codes.c.tmp: combined-escaped.tmp c.template
+        ../format.sh c.template < combined-escaped.tmp > $@
+
+gnunet_error_codes-length.c.tmp: length.tmp c-length.template
+        ../format.sh c-length.template < length.tmp > $@
+
+gnunet_error_codes.c: c.header gnunet_error_codes.c.tmp gnunet_error_codes-length.c.tmp c.footer
+        cat c.header gnunet_error_codes.c.tmp gnunet_error_codes-length.c.tmp c.footer > $@
+
+gnunet_error_codes.ts.tmp: combined.tmp ts.template
+        ../format.sh ts.template < combined.tmp > $@
+
+gnunet_error_codes.ts: ts.header gnunet_error_codes.ts.tmp ts.footer
+        cat ts.header gnunet_error_codes.ts.tmp ts.footer > $@
+
+gnunet_error_codes.go.tmp: combined.tmp go.template
+        ../format.sh go.template < combined.tmp > $@
+
+gnunet_error_codes.go: go.header gnunet_error_codes.go.tmp go.footer
+        cat go.header gnunet_error_codes.go.tmp go.footer > $@
+
+gnunet_error_codes.rst.tmp: combined.tmp rst.template
+        ../format.sh rst.template < combined.tmp > $@
+
+rst.header.tmp:
+        cat README POLICY rst.header.template > $@
+
+gnunet_error_codes.rst: rst.header.tmp gnunet_error_codes.rst.tmp rst.footer
+        cat rst.header.tmp gnunet_error_codes.rst.tmp rst.footer > $@
+
+.PHONY: check clean distclean prep
diff --git a/gnunet-error-codes/POLICY b/gnunet-error-codes/POLICY
new file mode 100644
index 0000000..4308df6
--- /dev/null
+++ b/gnunet-error-codes/POLICY
@@ -0,0 +1,11 @@
+Policy
+^^^^^^
+
+Developers working on GNUnet or packages based on GNUnet should
+feel free to extend this registry. Entries may be deleted if
+no code using them is still expected to be in production anywhere.
+
+Updating the name of the package or subsystem is allowed provided
+that the code using the signature is being moved, as those fields
+are merely informational or used for code generation.
+
diff --git a/gnunet-error-codes/README b/gnunet-error-codes/README
new file mode 100644
index 0000000..6fce4a8
--- /dev/null
+++ b/gnunet-error-codes/README
@@ -0,0 +1,5 @@
+GNUnet Error Codes
+------------------
+
+GNUnet error code registry.
+
diff --git a/gnunet-error-codes/c-length.template b/gnunet-error-codes/c-length.template
new file mode 100644
index 0000000..24e3e41
--- /dev/null
+++ b/gnunet-error-codes/c-length.template
@@ -0,0 +1,9 @@
+
+
+};
+
+
+/**
+ * The length of @e code_hint_pairs.
+ */
+static const unsigned int code_hint_pairs_length = {{ECS_LENGTH}};
diff --git a/gnunet-error-codes/c.footer b/gnunet-error-codes/c.footer
new file mode 100644
index 0000000..ad326ec
--- /dev/null
+++ b/gnunet-error-codes/c.footer
@@ -0,0 +1,66 @@
+
+
+
+const char *
+GNUNET_ErrorCode_get_hint (enum GNUNET_ErrorCode ec)
+{
+  unsigned int lower = 0;
+  unsigned int upper = code_hint_pairs_length - 1;
+  unsigned int mid = upper / 2;
+  while (lower <= upper)
+  {
+    mid = (upper + lower) / 2;
+    if (code_hint_pairs[mid].ec < ec)
+    {
+      lower = mid + 1;
+    }
+    else if (code_hint_pairs[mid].ec > ec)
+    {
+      upper = mid - 1;
+    }
+    else
+    {
+      return code_hint_pairs[mid].hint;
+    }
+  }
+  return "<no hint found>";
+}
+
+
+unsigned int
+GNUNET_ErrorCode_get_http_status (enum GNUNET_ErrorCode ec)
+{
+  unsigned int lower = 0;
+  unsigned int upper = code_hint_pairs_length - 1;
+  unsigned int mid = upper / 2;
+  while (lower <= upper)
+  {
+    mid = (upper + lower) / 2;
+    if (code_hint_pairs[mid].ec < ec)
+    {
+      lower = mid + 1;
+    }
+    else if (code_hint_pairs[mid].ec > ec)
+    {
+      upper = mid - 1;
+    }
+    else
+    {
+      return code_hint_pairs[mid].http_code;
+    }
+  }
+  return UINT_MAX;
+}
+
+
+unsigned int
+GNUNET_ErrorCode_get_http_status_safe (enum GNUNET_ErrorCode ec)
+{
+  unsigned int hc;
+
+  hc = GNUNET_ErrorCode_get_http_status (ec);
+  if ( (0 == hc) ||
+       (UINT_MAX == hc) )
+    return MHD_HTTP_INTERNAL_SERVER_ERROR;
+  return hc;
+}
diff --git a/gnunet-error-codes/c.header b/gnunet-error-codes/c.header
new file mode 100644
index 0000000..9539ef3
--- /dev/null
+++ b/gnunet-error-codes/c.header
@@ -0,0 +1,55 @@
+/*
+     This file is part of GNUnet
+     Copyright (C) 2012-2022 GNUnet e.V.
+
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Affero General Public License for more details.
+
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+#include "gnunet_error_codes.h"
+#include <stddef.h>
+#include <microhttpd.h>
+#include <gettext.h>
+
+/**
+ * MHD does not define our value for 0 (client-side generated code).
+ */
+#define MHD_HTTP_UNINITIALIZED 0
+
+/**
+ * A pair containing an error code and its hint.
+ */
+struct ErrorCodeAndHint
+{
+  /**
+   * The error code.
+   */
+  enum GNUNET_ErrorCode ec;
+
+  /**
+   * The hint.
+   */
+  const char *hint;
+
+  /**
+   * The HTTP status code.
+   */
+  unsigned int http_code;
+};
+
+
+/**
+ * The list of all error codes with their hints.
+ */
+static const struct ErrorCodeAndHint code_hint_pairs[] = {
diff --git a/gnunet-error-codes/c.template b/gnunet-error-codes/c.template
new file mode 100644
index 0000000..140f09f
--- /dev/null
+++ b/gnunet-error-codes/c.template
@@ -0,0 +1,6 @@
+
+  {
+    .ec = GNUNET_EC_{{Name}},
+    .hint = gettext_noop ("{{Description}}"),
+    .http_code = MHD_HTTP_{{HttpStatus_Identifier}}
+  },
diff --git a/gnunet-error-codes/go.footer b/gnunet-error-codes/go.footer
new file mode 100644
index 0000000..bea8cd1
--- /dev/null
+++ b/gnunet-error-codes/go.footer
@@ -0,0 +1 @@
+)
diff --git a/gnunet-error-codes/go.header b/gnunet-error-codes/go.header
new file mode 100644
index 0000000..9c5d1e7
--- /dev/null
+++ b/gnunet-error-codes/go.header
@@ -0,0 +1,23 @@
+/*
+  This file is part of GNUnet
+  Copyright (C) 2012-2022 GNUnet e.V.
+
+  GNUnet is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License,
+  or (at your option) any later version.
+
+  GNUnet is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+  SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+package gana
+
+const (
diff --git a/gnunet-error-codes/go.template b/gnunet-error-codes/go.template
new file mode 100644
index 0000000..fd4ba79
--- /dev/null
+++ b/gnunet-error-codes/go.template
@@ -0,0 +1,7 @@
+
+
+  /**
+   * {{Description}}
+   * Returned with an HTTP status code of #MHD_HTTP_{{HttpStatus_Identifier}} ({{HttpStatus_Value}}).
+   */
+  {{Name}} = {{Value}}
diff --git a/gnunet-error-codes/h.footer b/gnunet-error-codes/h.footer
new file mode 100644
index 0000000..fcd44d7
--- /dev/null
+++ b/gnunet-error-codes/h.footer
@@ -0,0 +1,45 @@
+
+
+};
+
+
+/**
+ * Returns a hint for a given error code.
+ *
+ * @param ec the error code.
+ * @return the hint if it could be found, otherwise "<no hint found>"
+ */
+const char *
+GNUNET_ErrorCode_get_hint (enum GNUNET_ErrorCode ec);
+
+
+/**
+ * Return HTTP status for a given error code.
+ *
+ * @param ec the error code.
+ * @return the HTTP status code for the given @a ec, UINT_MAX if not found
+ */
+unsigned int
+GNUNET_ErrorCode_get_http_status (enum GNUNET_ErrorCode ec);
+
+
+/**
+ * Return HTTP status for a given error code that is guaranteed
+ * to work (no corner cases).
+ *
+ * @param ec the error code.
+ * @return the HTTP status code for the given @a ec, 500 if
+ *         the @a ec is not found or is a client-side code
+ */
+unsigned int
+GNUNET_ErrorCode_get_http_status_safe (enum GNUNET_ErrorCode ec);
+
+
+#if 0 /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/gnunet-error-codes/h.header b/gnunet-error-codes/h.header
new file mode 100644
index 0000000..92debba
--- /dev/null
+++ b/gnunet-error-codes/h.header
@@ -0,0 +1,43 @@
+/*
+     This file is part of GNUnet
+     Copyright (C) 2012-2022 GNUnet e.V.
+
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Affero General Public License for more details.
+
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+ /**
+  * @file include/taler_error_codes.h
+  * @brief GNUnet error codes, generated via https://gana.gnunet.org/
+  *
+  * Do NOT edit this file, it is generated!
+  */
+#ifndef GNUNET_ERROR_CODES_H
+#define GNUNET_ERROR_CODES_H
+
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
+#include <limits.h>
+
+
+/**
+ * Taler error codes.
+ */
+enum GNUNET_ErrorCode
+{
diff --git a/gnunet-error-codes/h.template b/gnunet-error-codes/h.template
new file mode 100644
index 0000000..b79bf6c
--- /dev/null
+++ b/gnunet-error-codes/h.template
@@ -0,0 +1,7 @@
+
+
+  /**
+   * {{Description}}
+   * Returned with an HTTP status code of #MHD_HTTP_{{HttpStatus_Identifier}} ({{HttpStatus_Value}}).
+   */
+  GNUNET_EC_{{Name}} = {{Value}},
diff --git a/gnunet-error-codes/registry.rec b/gnunet-error-codes/registry.rec
new file mode 100644
index 0000000..e833bb5
--- /dev/null
+++ b/gnunet-error-codes/registry.rec
@@ -0,0 +1,136 @@
+# -*- mode: rec -*-
+#
+# Registry for GNUnet errors.
+#
+%rec: GnunetErrorCode
+%key: Value
+%typedef: ValueRange_t range 0 9999
+%type: Value ValueRange_t
+%mandatory: Value
+%typedef: Description_t regexp |^[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_\(\)\.,;!"':#\/ -]*$|
+%type: Description Description_t
+%mandatory: Description
+%typedef: Name_t regexp /^[ABCDEFGHIJKLMNOPQRSTUVWXYZ_][ABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789]*$/
+%type: Name Name_t
+%unique: Name
+%mandatory: Name
+# A status of 0 means no HTTP status is associated
+%type: HttpStatus rec HttpStatusCode
+%mandatory: HttpStatus
+%sort: Value
+
+Value: 0
+Name: NONE
+Description: No error (success).
+HttpStatus: 0
+
+Value: 1
+Name: UNKNOWN
+Description: Unknown and unspecified error.
+HttpStatus: 500
+
+Value: 101
+Name: SERVICE_COMMUNICATION_FAILED
+Description: Communication with service failed.
+HttpStatus: 500
+
+# IDENTITY Error Codes
+
+Value: 200
+Name: IDENTITY_NOT_FOUND
+Description: Ego not found.
+HttpStatus: 404
+
+Value: 201
+Name: IDENTITY_NAME_CONFLICT
+Description: Identifier already in use for another ego.
+HttpStatus: 409
+
+Value: 202
+Name: IDENTITY_INVALID
+Description: The given ego is invalid or malformed.
+HttpStatus: 500
+
+# NAMESTORE Error Codes
+
+Value: 5000
+Name: NAMESTORE_UNKNOWN
+Description: Unknown namestore error.
+HttpStatus: 500
+
+Value: 5001
+Name: NAMESTORE_ITERATION_FAILED
+Description: Zone iteration failed.
+HttpStatus: 500
+
+Value: 5002
+Name: NAMESTORE_ZONE_NOT_FOUND
+Description: Zone not found.
+HttpStatus: 404
+
+Value: 5003
+Name: NAMESTORE_RECORD_NOT_FOUND
+Description: Record not found.
+HttpStatus: 404
+
+Value: 5004
+Name: NAMESTORE_RECORD_DELETE_FAILED
+Description: Zone iteration failed.
+HttpStatus: 500
+
+Value: 5005
+Name: NAMESTORE_ZONE_EMPTY
+Description: Zone does not contain any records.
+HttpStatus: 404
+
+Value: 5006
+Name: NAMESTORE_LOOKUP_ERROR
+Description: Failed to lookup record.
+HttpStatus: 500
+
+Value: 5007
+Name: NAMESTORE_NO_RECORDS_GIVEN
+Description: No records given.
+HttpStatus: 400
+
+Value: 5008
+Name: NAMESTORE_RECORD_DATA_INVALID
+Description: Record data invalid.
+HttpStatus: 400
+
+Value: 5009
+Name: NAMESTORE_NO_LABEL_GIVEN
+Description: No label given.
+HttpStatus: 400
+
+Value: 5010
+Name: NAMESTORE_NO_RESULTS
+Description: No results given.
+HttpStatus: 404
+
+Value: 5011
+Name: NAMESTORE_RECORD_EXISTS
+Description: Record already exists.
+HttpStatus: 409
+
+Value: 5012
+Name: NAMESTORE_RECORD_TOO_BIG
+Description: Record size exceeds maximum limit.
+HttpStatus: 500
+
+Value: 5013
+Name: NAMESTORE_BACKEND_FAILED
+Description: There was an error in the database backend.
+HttpStatus: 500
+
+Value: 5014
+Name: NAMESTORE_STORE_FAILED
+Description: Failed to store the given records.
+HttpStatus: 500
+
+Value: 5015
+Name: NAMESTORE_LABEL_INVALID
+Description: Label invalid or malformed.
+HttpStatus: 400
+
+
diff --git a/gnunet-error-codes/rst.footer b/gnunet-error-codes/rst.footer
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/gnunet-error-codes/rst.footer
diff --git a/gnunet-error-codes/rst.header.template b/gnunet-error-codes/rst.header.template
new file mode 100644
index 0000000..2c4ddcf
--- /dev/null
+++ b/gnunet-error-codes/rst.header.template
@@ -0,0 +1,11 @@
+Entries
+^^^^^^^
+
+.. list-table:: GNUnet Error Codes
+   :widths: auto
+   :header-rows: 1
+
+   * - Name
+     - Value
+     - HttpStatus
+     - Description
diff --git a/gnunet-error-codes/rst.template b/gnunet-error-codes/rst.template
new file mode 100644
index 0000000..9bff06c
--- /dev/null
+++ b/gnunet-error-codes/rst.template
@@ -0,0 +1,4 @@
+   * - {{Name}}
+     - {{Value}}
+     - {{HttpStatus_Value}} ({{HttpStatus_Identifier}})
+     - {{Description}}
diff --git a/gnunet-error-codes/ts.footer b/gnunet-error-codes/ts.footer
new file mode 100644
index 0000000..b285e7d
--- /dev/null
+++ b/gnunet-error-codes/ts.footer
@@ -0,0 +1,3 @@
+
+
+}
diff --git a/gnunet-error-codes/ts.header b/gnunet-error-codes/ts.header
new file mode 100644
index 0000000..1438b99
--- /dev/null
+++ b/gnunet-error-codes/ts.header
@@ -0,0 +1,21 @@
+/*
+  This file is part of GNUnet
+  Copyright (C) 2012-2022 GNUnet e.V.
+
+  GNUnet is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License,
+  or (at your option) any later version.
+
+  GNUnet is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+  SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+export enum GnunetErrorCode {
diff --git a/gnunet-error-codes/ts.template b/gnunet-error-codes/ts.template
new file mode 100644
index 0000000..ee72f88
--- /dev/null
+++ b/gnunet-error-codes/ts.template
@@ -0,0 +1,7 @@
+
+
+  /**
+   * {{Description}}
+   * Returned with an HTTP status code of #MHD_HTTP_{{HttpStatus_Identifier}} ({{HttpStatus_Value}}).
+   */
+  {{Name}} = {{Value}},
diff --git a/gnunet-protocols/.gitignore b/gnunet-protocols/.gitignore
new file mode 100644
index 0000000..0a437d0
--- /dev/null
+++ b/gnunet-protocols/.gitignore
@@ -0,0 +1 @@
+gnu-name-system-record-types.h
diff --git a/gnunet-protocols/Makefile b/gnunet-protocols/Makefile
new file mode 100644
index 0000000..f87c482
--- /dev/null
+++ b/gnunet-protocols/Makefile
@@ -0,0 +1,30 @@
+FILES=gnunet_overlay_protocols.h gnunet_overlay_protocols.rst
+all: check $(FILES)
+
+check:
+        recfix --check registry.rec
+
+distclean:
+        rm -f *.tmp
+clean:
+        rm -f $(FILES) *.tmp
+
+gnunet_overlay_protocols.h.tmp: registry.rec h.template
+        ../format.sh h.template < registry.rec > $@
+
+gnunet_overlay_protocols.h: h.header gnunet_overlay_protocols.h.tmp h.footer
+        cat h.header gnunet_overlay_protocols.h.tmp h.footer > $@
+
+gnunet_overlay_protocols.rst.tmp: registry.rec rst.template
+        ../format.sh rst.template < registry.rec > $@
+
+rst.header.tmp:
+        cat rst.header.template README POLICY > $@
+        echo "Entries" >> $@
+        echo "^^^^^^^" >> $@
+
+gnunet_overlay_protocols.rst: rst.header.tmp gnunet_overlay_protocols.rst.tmp rst.footer
+        cat rst.header.tmp gnunet_overlay_protocols.rst.tmp rst.footer > $@
+
+
+.PHONY: check clean distclean
diff --git a/gnunet-protocols/POLICY b/gnunet-protocols/POLICY
new file mode 100644
index 0000000..24ebdf3
--- /dev/null
+++ b/gnunet-protocols/POLICY
@@ -0,0 +1,20 @@
+Policy
+^^^^^^
+
+Each registry entry should contain three values: the "Number" of the
+protocol, which must be above 255 (to avoid conflicts with legacy
+Internet protocols), the "Name" of the protocol, and a "Reference" with links
+to further information about the record type.
+
+The "Name" must be unique in the entire registry.  The value must be a
+case insensitive ASCII string and is restricted to alphanumeric
+characters.
+
+Adding protocols is possible after expert review, using a
+first-come-first-served policy for unique "Name" allocation.
+Experts are responsible to ensure that the chosen "Name" is
+appropriate for the record type.
+
+The current contact(s) for expert review are reachable at
+gns-registry@gnunet.org.
+
diff --git a/gnunet-protocols/README b/gnunet-protocols/README
new file mode 100644
index 0000000..e335357
--- /dev/null
+++ b/gnunet-protocols/README
@@ -0,0 +1,10 @@
+This registry is for overlay protocols.
+
+Overlay protocol numbers uniquely identify the different kinds
+of protocols implemented to realize overlay service communication.
+
+This registry is used to ensure that the names and numeric values
+used to identify the protocols are uniquely defined and to
+allow implementors to find out details about the respective semantics and
+specifications.
+
diff --git a/gnunet-protocols/h.footer b/gnunet-protocols/h.footer
new file mode 100644
index 0000000..adccc7a
--- /dev/null
+++ b/gnunet-protocols/h.footer
@@ -0,0 +1,11 @@
+
+
+
+#if 0 /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/gnunet-protocols/h.header b/gnunet-protocols/h.header
new file mode 100644
index 0000000..8bbba29
--- /dev/null
+++ b/gnunet-protocols/h.header
@@ -0,0 +1,30 @@
+/*
+     This file is part of GNUnet
+     Copyright (C) 2012-2022 GNUnet e.V.
+
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Affero General Public License for more details.
+
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+#ifndef GNUNET_OVERLAY_PROTOCOLS_H
+#define GNUNET_OVERLAY_PROTOCOLS_H
+
+/**
+ * WARNING:
+ * This header is generated!
+ * In order to add overlay protocols, you must register
+ * them in GANA, and then use the header generation script
+ * to create an update of this file. You may then replace this
+ * file with the update.
+ */
diff --git a/gnunet-protocols/h.template b/gnunet-protocols/h.template
new file mode 100644
index 0000000..2d7e828
--- /dev/null
+++ b/gnunet-protocols/h.template
@@ -0,0 +1,6 @@
+
+
+/**
+ * {{Comment}}
+ */
+#define GNUNET_OVERLAY_PROTOCOL_{{Name}} {{Number}}
diff --git a/gnunet-protocols/registry.rec b/gnunet-protocols/registry.rec
new file mode 100644
index 0000000..96c8dcb
--- /dev/null
+++ b/gnunet-protocols/registry.rec
@@ -0,0 +1,23 @@
+# -*- mode: rec -*-
+#
+# Registry for overlay protocols
+#
+
+%rec: OverlayProtocol
+%key: Number
+%typedef: NumberRange_t range 256 65535
+%type: Number NumberRange_t
+%mandatory: Number
+%typedef: Name_t regexp /^[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-]*$/
+%type: Name Name_t
+%unique: Name
+%mandatory: Name
+%mandatory: Comment
+%allowed: Contact
+%allowed: References
+%sort: Number Name Contact References
+
+Number: 256
+Name: CADET
+Comment: CADET protocol.
+References: https://git.gnunet.org/bibliography.git/plain/docs/cadet.pdf
diff --git a/gnunet-protocols/rst.footer b/gnunet-protocols/rst.footer
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/gnunet-protocols/rst.footer
diff --git a/gnunet-protocols/rst.header.template b/gnunet-protocols/rst.header.template
new file mode 100644
index 0000000..f6e68fa
--- /dev/null
+++ b/gnunet-protocols/rst.header.template
@@ -0,0 +1,4 @@
+GNUnet Overlay Protocols
+------------------------
+
+
diff --git a/gnunet-protocols/rst.template b/gnunet-protocols/rst.template
new file mode 100644
index 0000000..e032a7f
--- /dev/null
+++ b/gnunet-protocols/rst.template
@@ -0,0 +1,10 @@
+
+
+=================== ===========================================================
+Name                GNUNET_OVERLAY_PROTOCOL_{{Name}}
+------------------- -----------------------------------------------------------
+Number              {{Number}}
+Comment             {{Comment}}
+References          {{References}}
+=================== ===========================================================
+
diff --git a/gnunet-signatures/Makefile b/gnunet-signatures/Makefile
index d3eef80..509febf 100644
--- a/gnunet-signatures/Makefile
+++ b/gnunet-signatures/Makefile
@@ -1,4 +1,4 @@
-FILES=gnunet_signatures.h
+FILES=gnunet_signatures.h gnunet_signatures.rst
 all: check $(FILES)
 check:
         recfix --check registry.rec
@@ -12,4 +12,14 @@ gnunet_signatures.h.tmp: registry.rec h.template
 gnunet_signatures.h: h.header gnunet_signatures.h.tmp h.footer
         cat h.header gnunet_signatures.h.tmp h.footer > $@
 
+gnunet_signatures.rst.tmp: registry.rec rst.template
+        ../format.sh rst.template 'Package = "GNUnet"' < registry.rec > $@
+
+rst.header.tmp:
+        cat README POLICY rst.header.template > $@
+
+gnunet_signatures.rst: rst.header.tmp gnunet_signatures.rst.tmp rst.footer
+        cat rst.header.tmp gnunet_signatures.rst.tmp rst.footer > $@
+
+
 .PHONY: check clean distclean
diff --git a/gnunet-signatures/POLICY b/gnunet-signatures/POLICY
new file mode 100644
index 0000000..4308df6
--- /dev/null
+++ b/gnunet-signatures/POLICY
@@ -0,0 +1,11 @@
+Policy
+^^^^^^
+
+Developers working on GNUnet or packages based on GNUnet should
+feel free to extend this registry. Entries may be deleted if
+no code using them is still expected to be in production anywhere.
+
+Updating the name of the package or subsystem is allowed provided
+that the code using the signature is being moved, as those fields
+are merely informational or used for code generation.
+
diff --git a/gnunet-signatures/README b/gnunet-signatures/README
index 99587b7..b68b960 100644
--- a/gnunet-signatures/README
+++ b/gnunet-signatures/README
@@ -1,3 +1,6 @@
+GNUnet Signature Purposes
+-------------------------
+
 GNUnet signature purpose registry.
 
 Every time a signature is created or verified with libgnunetutil's
@@ -5,3 +8,4 @@ signature functions, the signer must provide a "purpose" that provides
 the context for the signature.  By signing over the "purpose", it is
 not possible for an adversary to use a signature made in one context
 in another context.
+
diff --git a/gnunet-signatures/registry.rec b/gnunet-signatures/registry.rec
index d9bb568..d3a2a12 100644
--- a/gnunet-signatures/registry.rec
+++ b/gnunet-signatures/registry.rec
@@ -39,10 +39,10 @@ Package: GNUnet
 Subsystem: GNUnet-TRANSPORT
 
 Number: 3
-Name: REVOCATION
-Comment: Signature for confirming a key revocation.
+Name: GNS_REVOCATION
+Comment: GNS zone key revocation
 Package: GNUnet
-Subsystem: GNUnet-Revocation
+Subsystem: GNS
 
 Number: 4
 Name: NAMESPACE_ADVERTISEMENT
@@ -94,9 +94,9 @@ Subsystem: GNUnet-NSE
 
 Number: 15
 Name: GNS_RECORD_SIGN
-Comment: Signature of a gnunet naming system record block
+Comment: GNS record set signature
 Package: GNUnet
-Subsystem: GNUnet-GNSRECORD
+Subsystem: GNS
 
 Number: 16
 Name: SET_ECC_KEY
@@ -219,12 +219,27 @@ Package: GNUnet
 Subsystem: GNUnet-TRANSPORT-TCP
 
 #-----------------------------------------------------------------------------
-# GNU Taler
+# GNU Taler, >= 1000
 
 #
 # Exchange offline signatures (with master key)
 #
 
+Number: 1017
+Name: MASTER_AML_KEY
+Comment: Initialize or update the status of an AML key for an AML officer
+Package: GNU Taler
+
+Number: 1018
+Name: MASTER_DRAIN_PROFIT
+Comment: Affirm wiring of exchange profits to operator account.
+Package: GNU Taler
+
+Number: 1019
+Name: MASTER_PARTNER_DETAILS
+Comment: Signature affirming a partner configuration for wads.
+Package: GNU Taler
+
 Number: 1020
 Name: MASTER_SIGNING_KEY_REVOKED
 Comment: The given revocation key was revoked and must no longer be used.
@@ -285,10 +300,6 @@ Name: MASTER_EXTENSION
 Comment: Set the configuration of an extension (age-restriction or peer2peer)
 Package: GNU Taler
 
-Number: 1048
-Name: MASTER_PARTNER_DETAILS
-Comment: Signature affirming a partner configuration for wads.
-Package: GNU Taler
 
 #
 # Exchange online signatures (with signing key)
@@ -374,6 +385,21 @@ Name: EXCHANGE_PURSE_STATUS
 Comment: Purpose for the state of a purse, signed by the exchange's signing key.
 Package: GNU Taler
 
+Number: 1048
+Name: EXCHANGE_RESERVE_ATTEST_DETAILS
+Comment: Signature by which the exchange attests identity attributes of a particular reserve owner.
+Package: GNU Taler
+
+Number: 1049
+Name: EXCHANGE_CONFIRM_PURSE_REFUND
+Comment: Signature by which the exchange confirms that a purse expired and a coin was refunded.
+Package: GNU Taler
+
+Number: 1050
+Name: EXCHANGE_CONFIRM_AGE_WITHDRAW
+Comment: Signature where the Exchange confirms an age-withdraw.
+Package: GNU Taler
+
 #
 # Auditor signatures
 #
@@ -418,7 +444,7 @@ Package: GNU Taler
 
 Number: 1200
 Name: WALLET_RESERVE_WITHDRAW
-Comment: Signature where the reserve key confirms a withdraw request.
+Comment: Signature where the reserve key confirms a withdraw request. Signed with the reserve private key.
 Package: GNU Taler
 
 Number: 1201
@@ -428,17 +454,17 @@ Package: GNU Taler
 
 Number: 1202
 Name: WALLET_COIN_MELT
-Comment: Signature using a coin key confirming the melting of a coin.
+Comment: Signature using a coin key confirming the melting of a coin. Signed with the coin's private key.
 Package: GNU Taler
 
 Number: 1203
 Name: WALLET_COIN_RECOUP
-Comment: Signature using a coin key requesting recoup.
+Comment: Signature using a coin key requesting recoup. Signed with the coin's private key.
 Package: GNU Taler
 
 Number: 1204
 Name: WALLET_COIN_LINK
-Comment: Signature using a coin key authenticating link data.
+Comment: Signature using a coin key authenticating link data. Signed with the old coin's private key.
 Package: GNU Taler
 
 Number: 1205
@@ -448,7 +474,7 @@ Package: GNU Taler
 
 Number: 1206
 Name: WALLET_COIN_RECOUP_REFRESH
-Comment: Signature using a coin key requesting recoup-refresh.
+Comment: Signature using a coin key requesting recoup-refresh. Signed with the coin private key.
 Package: GNU Taler
 
 Number: 1207
@@ -458,47 +484,72 @@ Package: GNU Taler
 
 Number: 1208
 Name: WALLET_RESERVE_HISTORY
-Comment: Request full reserve history and pay for it.
+Comment: Request full or partial reserve history. Signed with the reserve private key.
 Package: GNU Taler
 
 Number: 1209
-Name: WALLET_RESERVE_STATUS
-Comment: Request detailed account status (for free).
+Name: WALLET_COIN_HISTORY
+Comment: Request full or partial coin history. Signed with the coin private key.
 Package: GNU Taler
 
 Number: 1210
 Name: WALLET_PURSE_CREATE
-Comment: Request purse creation (without reserve).
+Comment: Request purse creation (without reserve). Signed by the purse private key.
 Package: GNU Taler
 
 Number: 1211
 Name: WALLET_PURSE_DEPOSIT
-Comment: Request coin to be deposited into a purse.
+Comment: Request coin to be deposited into a purse. Signed with the coin private key.
 Package: GNU Taler
 
 Number: 1212
 Name: WALLET_PURSE_STATUS
-Comment: Request purse status.
+Comment: Request purse status. Signed with the purse private key.
 Package: GNU Taler
 
 Number: 1213
 Name: WALLET_PURSE_MERGE
-Comment: Request purse to be merged with a reserve (by purse).
+Comment: Request purse to be merged with a reserve. Signed with the purse private key.
 Package: GNU Taler
 
 Number: 1214
 Name: WALLET_ACCOUNT_MERGE
-Comment: Request purse to be merged with a reserve (by account).
+Comment: Request purse to be merged with a reserve. Signed by the reserve private key.
 Package: GNU Taler
 
 Number: 1215
 Name: WALLET_RESERVE_CLOSE
-Comment: Request account to be closed.
+Comment: Request account to be closed. Signed with the reserve private key.
 Package: GNU Taler
 
 Number: 1216
 Name: WALLET_PURSE_ECONTRACT
-Comment: Associates encrypted contract with a purse.
+Comment: Associates encrypted contract with a purse. Signed with the purse private key.
+Package: GNU Taler
+
+Number: 1217
+Name: WALLET_RESERVE_OPEN
+Comment: Request reserve to be kept open. Signed with the reserve private key.
+Package: GNU Taler
+
+Number: 1218
+Name: WALLET_RESERVE_OPEN_DEPOSIT
+Comment: Request coin to be used to pay for reserve to be kept open. Signed with the coin private key.
+Package: GNU Taler
+
+Number: 1219
+Name: WALLET_RESERVE_ATTEST_DETAILS
+Comment: Request attestation about reserve owner. Signed by the reserve private key.
+Package: GNU Taler
+
+Number: 1220
+Name: WALLET_PURSE_DELETE
+Comment: Signature by which a wallet requests a purse to be deleted.
+Package: GNU Taler
+
+Number: 1221
+Name: WALLET_RESERVE_AGE_WITHDRAW
+Comment: Signature where the reserve key confirms an age-withdraw request. Signed with the reserve private key.
 Package: GNU Taler
 
 #
@@ -535,7 +586,22 @@ Comment: EdDSA test signature.
 Package: GNU Taler
 
 #
-# Anastasis signatures
+# AML officer signatures
+#
+
+Number: 1350
+Name: AML_DECISION
+Comment: Signature by which an AML officer signs an AML decision.
+Package: GNU Taler
+
+Number: 1351
+Name: AML_QUERY
+Comment: Signature by which an AML officer requests AML data.
+Package: GNU Taler
+
+
+#
+# GNU Anastasis signatures, >= 1400
 #
 
 Number: 1400
@@ -544,10 +610,25 @@ Comment: EdDSA signature for a policy upload.
 Package: GNU Taler
 
 #
-# Sync signatures
+# Sync signatures, >= 1450
 #
 
 Number: 1450
 Name: SYNC_BACKUP_UPLOAD
 Comment: EdDSA signature for a backup upload.
 Package: GNU Taler
+
+
+#
+# Donau signatures, >= 1500
+#
+
+Number: 1500
+Name: DONAU_DONATION_STATEMENT
+Comment: The signature is done by the Donau. The Donau signes over the total amount of the corresponding year, the corresponding year and the donation identifier of a specific donor. The statement confirms that the donor made this total in donations for the given year.
+Package: Donau
+
+Number: 1501
+Name: CHARITY_DONATION_CONFIRMATION
+Comment: The signature is made by a charity and shows that the charity is in agreement with the donation request which it sends to the Donau. The charity signs over all blinded identifiers and key pairs which it has received from the donor. The signature affirms that the charity wants the donation receipts to be issued on its behalf.
+Package: Donau
diff --git a/gnunet-signatures/rst.footer b/gnunet-signatures/rst.footer
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/gnunet-signatures/rst.footer
diff --git a/gnunet-signatures/rst.header.template b/gnunet-signatures/rst.header.template
new file mode 100644
index 0000000..1f2f336
--- /dev/null
+++ b/gnunet-signatures/rst.header.template
@@ -0,0 +1,12 @@
+Entries
+^^^^^^^
+
+.. list-table:: GNS Signature Purposes
+   :widths: auto
+   :header-rows: 1
+
+   * - Name
+     - Number
+     - Package
+     - Subsystem
+     - Comment
diff --git a/gnunet-signatures/rst.template b/gnunet-signatures/rst.template
new file mode 100644
index 0000000..7e4af96
--- /dev/null
+++ b/gnunet-signatures/rst.template
@@ -0,0 +1,5 @@
+   * - {{Name}}
+     - {{Number}}
+     - {{Package}}
+     - {{Subsystem}}
+     - {{Comment}}
diff --git a/http-status-codes/Makefile b/http-status-codes/Makefile
index cea962b..1cc83de 100644
--- a/http-status-codes/Makefile
+++ b/http-status-codes/Makefile
@@ -5,14 +5,14 @@ check: registry.rec
 
 # http-status-codes-1.csv is from IANA!
 iana.tmp: http-status-codes-1.csv
-        cat $^ | grep -v Unassigned | csv2rec > $@
+        cat http-status-codes-1.csv | grep -v Unassigned | csv2rec > $@
 
 # extend by all-caps descriptions suitable for C-style identifier generation
 iana-extended.tmp: iana.tmp
-        ./extend.sh $@ $^
+        ./extend.sh $@ iana.tmp
 
 registry.rec: types.rec iana-extended.tmp extras.rec
-        cat $^ > $@
+        cat types.rec iana-extended.tmp extras.rec > $@
 
 distclean:
         rm -f *.tmp
@@ -25,7 +25,7 @@ http-status-codes.h.tmp: registry.rec h.template
         ../format.sh h.template < registry.rec > $@
 
 http-status-codes.h: h.header http-status-codes.h.tmp h.footer
-        cat $^ > $@
+        cat h.header http-status-codes.h.tmp h.footer > $@
 
 
 .PHONY: check clean distclean
diff --git a/http-status-codes/POLICY b/http-status-codes/POLICY
new file mode 100644
index 0000000..79d1e37
--- /dev/null
+++ b/http-status-codes/POLICY
@@ -0,0 +1,5 @@
+The main registry is populated from the IANA registry.
+
+The 'extras.rec' may be populated with additional status
+codes that have significant usage and do not conflict with
+IANA registry entries.
\ No newline at end of file
diff --git a/http-status-codes/extend.sh b/http-status-codes/extend.sh
index db09f6b..91a600e 100755
--- a/http-status-codes/extend.sh
+++ b/http-status-codes/extend.sh
@@ -12,11 +12,13 @@ cat "$@" > ${TARGET}
 TMPDIR=`pwd`
 export TMPDIR
 
-for n in `seq 100 599`
+n=100
+while [ "$n" -le 599 ]
 do
     VAL=`recsel -e "Value = $n" -P Description iana.tmp || true`
     CAPS=`echo ${VAL} | tr [a-z] [A-Z] | tr " -" "__"`
     recset -f Identifier -a "${CAPS}" -e "Value = $n" ${TARGET}
+    n=`expr $n + 1`
 done
 
 
diff --git a/http-status-codes/http-status-codes-1.csv b/http-status-codes/http-status-codes-1.csv
index 9abdcae..b21e36f 100644
--- a/http-status-codes/http-status-codes-1.csv
+++ b/http-status-codes/http-status-codes-1.csv
@@ -39,14 +39,14 @@ Value,Description,Reference
 410,Gone,"[RFC7231, Section 6.5.9]"

 411,Length Required,"[RFC7231, Section 6.5.10]"

 412,Precondition Failed,"[RFC7232, Section 4.2][RFC8144, Section 3.2]"

-413,Payload Too Large,"[RFC7231, Section 6.5.11]"

+413,Content Too Large,"[RFC9110, Section 15.5.14]"

 414,URI Too Long,"[RFC7231, Section 6.5.12]"

 415,Unsupported Media Type,"[RFC7231, Section 6.5.13][RFC7694, Section 3]"

 416,Range Not Satisfiable,"[RFC7233, Section 4.4]"

 417,Expectation Failed,"[RFC7231, Section 6.5.14]"

 418-420,Unassigned,

 421,Misdirected Request,"[RFC7540, Section 9.1.2]"

-422,Unprocessable Entity,[RFC4918]

+422,Unprocessable Content,"[RFC9110, Sectio 15.5.21]"

 423,Locked,[RFC4918]

 424,Failed Dependency,[RFC4918]

 425,Too Early,[RFC8470]

diff --git a/images/gnunet-blue.png b/images/gnunet-blue.png
new file mode 100644
index 0000000..1658455
--- /dev/null
+++ b/images/gnunet-blue.png
diff --git a/index.rst b/index.rst
new file mode 100644
index 0000000..c565eb7
--- /dev/null
+++ b/index.rst
@@ -0,0 +1,10 @@
+############################################
+The GNUnet Assigned Numbers Authority (GANA)
+############################################
+
+
+.. toctree::
+   :maxdepth: 2
+
+   about
+   registries
diff --git a/payto-payment-target-types/Makefile b/payto-payment-target-types/Makefile
index 8364f52..9fa175c 100644
--- a/payto-payment-target-types/Makefile
+++ b/payto-payment-target-types/Makefile
@@ -1,2 +1,20 @@
+FILES=payto_payment_target_types.rst
+all: check $(FILES)
+
+
 check:
         recfix --check registry.rec
+
+distclean:
+        rm -f *.tmp
+
+clean:
+        rm -f $(FILES) *.tmp
+
+payto_payment_target_types.rst.tmp: registry.rec rst.template
+        ../format.sh rst.template < registry.rec > $@
+
+payto_payment_target_types.rst: rst.header payto_payment_target_types.rst.tmp
+        cat rst.header payto_payment_target_types.rst.tmp > $@
+
+.PHONY: check
diff --git a/payto-payment-target-types/eth.txt b/payto-payment-target-types/eth.txt
new file mode 100644
index 0000000..356f17d
--- /dev/null
+++ b/payto-payment-target-types/eth.txt
@@ -0,0 +1,119 @@
+# Payto Payment Target Type for Ethereum-compatible Blockchain Addresses
+
+## Target Type "eth"
+
+Name: eth
+
+Description:  Ethereum-compatible Blockchain Address
+
+  The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL
+  NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "NOT RECOMMENDED",
+  "MAY", and "OPTIONAL" in this document are to be interpreted as
+  described in RFC 2119 and RFC 8174.
+
+  The path consists of two components: The chain ID and the
+  Ethereum-compatible Mixed-case checksum address.
+
+  This is used to uniquely identify both the chain and the account
+  on the chain. The chain ID is used to prevent replay attacks
+  between different chains. If the checksum is invalid, the address
+  and corresponding URI is invalid and the payment should not be sent.
+  Connecting to the chain is out of scope for this specification. If
+  the chain is not available, the payment should not be sent, but the
+  URI is still valid.
+
+  The currency type can be omitted from the amount option, leaving
+  a simple decimal number with a maximum of 8 decimal places.
+  If the currency type (as part of the amount) is not present,
+  the currency is assumed to be the native currency of the chain.
+  If the currency is present, it must be a valid ERC-55 address
+  pointing to a valid ERC-20 token contract on the chain. If the
+  currency is not a valid ERC-20 token, then the URI is invalid.
+  This includes three-letter currency codes, which are not valid
+  ERC-20 token addresses.
+
+
+Syntax:
+     payto-eth-URI = "payto://eth/" addr [ "@" chain_id ] [ "?" opts ]
+
+  'addr' is an Ethereum-compatible Mixed-case checksum address
+  as defined in [ERC-55](https://eips.ethereum.org/EIPS/eip-55).
+  It MUST not be the zero address, and the checksum MUST be valid.
+  If either of these conditions is not met, the URI is invalid.
+
+  'chain_id' is an Ethereum chain ID as defined in 
+  [EIP-155](https://eips.ethereum.org/EIPS/eip-155).
+  If not present, it MUST default to 1 (mainnet).
+
+  'opts' is defined in
+  [Section 2 of RFC 8905](https://tools.ietf.org/html/rfc8905#section-2).
+
+
+Examples:
+
+      payto://eth/0x84af3D5824F0390b9510440B6ABB5CC02BB68ea1
+      payto://eth/0x84af3D5824F0390b9510440B6ABB5CC02BB68ea1@11155111
+      payto://eth/0x84af3D5824F0390b9510440B6ABB5CC02BB68ea1?amount=1.23
+      payto://eth/0x84af3D5824F0390b9510440B6ABB5CC02BB68ea1?amount=0x6b175474e89094c44da98b954eedeac495271d0f:1.23
+    
+    The first address requests that payment be sent to the
+    mainnet address '0x84af3D5824F0390b9510440B6ABB5CC02BB68ea1'.
+
+    The second address requests that payment be sent to the
+    Sepolia testnet address
+    '0x84af3D5824F0390b9510440B6ABB5CC02BB68ea1'.
+
+    The third address requests that 1.23 ETH (1230000000000000000
+    wei) be sent to the mainnet address
+    '0x84af3D5824F0390b9510440B6ABB5CC02BB68ea1'.
+
+    The fourth address requests that 1.23 DAI (1230000000000000000
+    base units of DAI, since DAI has 18 ERC-20 decimals) be sent
+    to the mainnet address '0x84af3D5824F0390b9510440B6ABB5CC02BB68ea1'.
+
+
+Motivation - not normative
+
+This syntax is modeled after the ERC-681 URL format
+for transaction requests, commonly used in Ethereum
+wallets and DApps. The function and function parameters
+are not included in this URI type, since they are not
+needed for payment requests.
+
+The chain ID is included in the URI, to prevent replay
+attacks between different chains. The checksum address
+is included in the URI, to prevent typos and other
+errors in the address. The checksum address is also
+included in the URI, to prevent phishing attacks by
+displaying the address in a different case than the
+one used to create the address.
+
+The currency is included in the URI, to allow payments
+to be made in any ERC-20 token. Three-letter currency
+codes are not included, since they are not valid ERC-20
+token addresses. Should sending traditional currencies
+be desired, Stablecoins are often ERC-20 tokens, and are
+therefore valid currencies for this URI type.
+
+
+Contact:  <gavinnjohn@gmail.com>
+
+
+Normative References
+
+* [ERC-20] Token Standard
+  <https://eips.ethereum.org/EIPS/eip-20>
+
+* [ERC-55] Mixed-case checksum address encoding
+  <https://eips.ethereum.org/EIPS/eip-55>
+
+* [EIP-155] Simple replay attack protection
+  <https://eips.ethereum.org/EIPS/eip-155>
+
+* [RFC 8905] The 'payto' URI Scheme for Payments
+  <https://tools.ietf.org/html/rfc8905>
+
+Informative References
+
+* [EIP-681] URL Format for Transaction Requests
+  <https://eips.ethereum.org/EIPS/eip-681>
diff --git a/payto-payment-target-types/registry.rec b/payto-payment-target-types/registry.rec
index f91ab9c..1c8fb3c 100644
--- a/payto-payment-target-types/registry.rec
+++ b/payto-payment-target-types/registry.rec
@@ -37,3 +37,15 @@ Reference: RFC 8905
 Name: ldap
 Reference: ldap.txt
 Contact: ietf@pep.security
+
+Name: eth
+Reference: eth.txt
+Contact: gavinnjohn@gmail.com
+
+Name: interac-etransfer
+Reference: TBD
+Contact: singpolyma@singpolyma.net
+
+Name: wallee-transaction
+Reference: wallee-transaction.txt
+Contact: habej2@bfh.ch
diff --git a/payto-payment-target-types/rst.footer b/payto-payment-target-types/rst.footer
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/payto-payment-target-types/rst.footer
diff --git a/payto-payment-target-types/rst.header b/payto-payment-target-types/rst.header
new file mode 100644
index 0000000..5840ecc
--- /dev/null
+++ b/payto-payment-target-types/rst.header
@@ -0,0 +1,13 @@
+GNU Taler Payment Target Types
+------------------------------
+
+Entries
+^^^^^^^
+
+.. list-table:: GNU Taler Payment Target Types
+   :widths: auto
+   :header-rows: 1
+
+   * - Name
+     - Reference
+     - Contact
diff --git a/payto-payment-target-types/rst.template b/payto-payment-target-types/rst.template
new file mode 100644
index 0000000..be6e655
--- /dev/null
+++ b/payto-payment-target-types/rst.template
@@ -0,0 +1,3 @@
+   * - {{Name}}
+     - {{Reference}}
+     - {{Contact}}
diff --git a/payto-payment-target-types/wallee-transaction.txt b/payto-payment-target-types/wallee-transaction.txt
new file mode 100644
index 0000000..ee03e63
--- /dev/null
+++ b/payto-payment-target-types/wallee-transaction.txt
@@ -0,0 +1,49 @@
+# Payto Payment Target Type for Wallee Transactions
+
+## Target Type "wallee-transaction"
+
+Name: wallee-transaction
+
+Description:  Wallee Transaction
+
+   A Wallee transaction is targeted by this payto target-type.
+   It aims to allow refunding a transaction which was initiated
+   by Wallee.    
+
+   For refunding a transaction using Wallee, this payto specification
+   shall be used. To trigger a refund operation in Wallee, the identifier
+   of the transaction must be given as path parameter. The identifier is
+   a 64-bit integer.
+
+Syntax:
+
+   payto-wallee-transaction-URI = "payto://wallee-transaction/" [ id ]
+
+   'id' is a Long as defined in 
+   [Wallee Type System](https://app-wallee.com/en-us/doc/api/web-service#_type_system)
+
+
+Examples:
+
+   payto://wallee-transaction/18446744073709551616
+   payto://wallee-transaction/13434452243525552616
+
+
+Contact:  <mailto:habej2@bfh.ch>
+
+
+Normative References
+
+* [RFC 8905] The 'payto' URI Scheme for Payments
+  <https://tools.ietf.org/html/rfc8905>
+
+Informative References
+
+* [Wallee Transaction Model] The Transaction model of Wallee
+  <https://app-wallee.com/en-us/doc/api/model/transaction>
+
+* [Wallee Transaction API] The Transaction api of Wallee
+  <https://app-wallee.com/doc/api/web-service#_transaction>
+
+* [Wallee Type System] The type system used by Wallee
+  <https://app-wallee.com/en-us/doc/api/web-service#_type_system>
diff --git a/registries.rst b/registries.rst
new file mode 100644
index 0000000..35cfa91
--- /dev/null
+++ b/registries.rst
@@ -0,0 +1,19 @@
+Registries
+==========
+
+.. toctree::
+   :maxdepth: 1
+
+   dot-alt/dot_alt.rst
+   gnu-name-system-default-tlds/tlds.rst
+   gnu-name-system-record-flags/gnu_name_system_record_flags.rst
+   gnu-name-system-record-types/gnu_name_system_record_types.rst
+   gnunet-error-codes/gnunet_error_codes.rst
+   gnunet-protocols/gnunet_overlay_protocols.rst
+   gnunet-signatures/gnunet_signatures.rst
+   gnunet-dht-block-types/gnunet_dht_block_types.rst
+   gnu-taler-db-events/taler_dbevents.rst
+   gnu-taler-error-codes/taler_error_codes.rst
+   payto-payment-target-types/payto_payment_target_types.rst
+   gns-protocol-numbers/gnu_name_system_protocols.rst
+   gns-service-port-numbers/gnu_name_system_service_ports.rst
\ No newline at end of file