142 files changed, 3783 insertions, 385 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index a9ad69954..b45362d38 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,18 +1,37 @@
 # This Makefile.am is in the public domain
 
+SUBDIRS = .
 
-if DOCUMENTATION
-  SUBDIRS = doxygen handbook tutorial
+if HAVE_DOXY_BINARY
+  SUBDIRS += doxygen
 endif
 
-if !DOCUMENTATION
-  SUBDIRS = doxygen
+# OpenBSD is a bit iffy wrt sphinx make info
+if OPENBSD
+all-local:
+        cd handbook/texinfo && make || touch gnunet.info
+GNUNET_TEXI =
+else
+GNUNET_TEXI = handbook/texinfo/gnunet.texi
 endif
 
+install-data-hook:
+        mkdir -p $(DESTDIR)$(docdir)
+        cp -pr handbook/html $(DESTDIR)$(docdir)
+        mkdir -p $(DESTDIR)$(infodir)
+        cp -pr handbook/texinfo/gnunet.info $(DESTDIR)$(infodir)
+
 if INCLUDE_MANPAGES
-  SUBDIRS += man
+SUBDIRS += man
 endif
 
-EXTRA_DIST =                                                    \
+AM_MAKEINFOFLAGS = --no-headers --no-split
+
+info_TEXINFOS = \
+  $(GNUNET_TEXI)
+
+EXTRA_DIST = \
+        handbook/texinfo \
         system_specific/outdated-and-old-installation-instructions.txt \
-        system_specific/FROM_SOURCE
+        system_specific/FROM_SOURCE \
+        handbook/html
diff --git a/doc/doxygen/.gitignore b/doc/doxygen/.gitignore
new file mode 100644
index 000000000..8cfc0958d
--- /dev/null
+++ b/doc/doxygen/.gitignore
@@ -0,0 +1,5 @@
+version.doxy
+gnunet.tag
+doxygen_warnings.log
+html/
+xml/
diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
index 7819bb558..52f124e33 100644
--- a/doc/doxygen/Makefile.am
+++ b/doc/doxygen/Makefile.am
@@ -6,13 +6,16 @@ all:
 "\tmake fast - fast mode without dependency graphs"
 
 full: gnunet.doxy
+        python -c "f=open('../../.version'); print(f'PROJECT_NUMBER = {f.read().split(\"-\")[0]}'); f.close()" > version.doxy
         doxygen $<
 
 fast: gnunet.doxy
+        python -c "f=open('../../.version'); print(f'PROJECT_NUMBER = {f.read().split(\"-\")[0]}'); f.close()" > version.doxy
         sed 's/\(HAVE_DOT.*=\).*/\1 NO/' $< | doxygen -
 
 clean:
         rm -rf html
+        rm -rf xml
 
 EXTRA_DIST = \
    gnunet.doxy
diff --git a/doc/doxygen/gnunet-logo-no-text-small.png b/doc/doxygen/gnunet-logo-no-text-small.png
new file mode 100644
index 000000000..1f2c46940
--- /dev/null
+++ b/doc/doxygen/gnunet-logo-no-text-small.png
diff --git a/doc/doxygen/gnunet.doxy b/doc/doxygen/gnunet.doxy
index 7874576ff..3fe3b866a 100644
--- a/doc/doxygen/gnunet.doxy
+++ b/doc/doxygen/gnunet.doxy
@@ -1,17 +1,145 @@
-# Doxyfile 1.5.6
+# Doxyfile 1.9.5
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+#
+# Note:
+#
+# Use doxygen to compare the used configuration file with the template
+# configuration file:
+# doxygen -x [configFile]
+# Use doxygen to compare the used configuration file with the template
+# configuration file without replacing the environment variables or CMake type
+# replacement variables:
+# doxygen -x_noenv [configFile]
 
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the configuration
+# file that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# https://www.gnu.org/software/libiconv/ for the list of possible encodings.
+# The default value is: UTF-8.
+
 DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
 PROJECT_NAME           = GNUnet
-PROJECT_NUMBER         = 0.11.x
-PROJECT_LOGO           = logo.png
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+@INCLUDE = "version.doxy"
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          =
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+PROJECT_LOGO           = gnunet-logo-no-text-small.png
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
 OUTPUT_DIRECTORY       = .
+
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096
+# sub-directories (in 2 levels) under the output directory of each output format
+# and will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to
+# control the number of sub-directories.
+# The default value is: NO.
+
 CREATE_SUBDIRS         = YES
+
+# Controls the number of sub-directories that will be created when
+# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every
+# level increment doubles the number of directories, resulting in 4096
+# directories at level 8 which is the default and also the maximum value. The
+# sub-directories are organized in 2 levels, the first level always has a fixed
+# numer of 16 directories.
+# Minimum value: 0, maximum value: 8, default value: 8.
+# This tag requires that the tag CREATE_SUBDIRS is set to YES.
+
+CREATE_SUBDIRS_LEVEL   = 8
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian,
+# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English
+# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek,
+# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with
+# English messages), Korean, Korean-en (Korean with English messages), Latvian,
+# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese,
+# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish,
+# Swedish, Turkish, Ukrainian and Vietnamese.
+# The default value is: English.
+
 OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
 BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
 REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
 ABBREVIATE_BRIEF       = "The $name class" \
                          "The $name widget" \
                          "The $name file" \
@@ -23,79 +151,807 @@ ABBREVIATE_BRIEF       = "The $name class" \
                          a \
                          an \
                          the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
 ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
 INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
 FULL_PATH_NAMES        = YES
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
 STRIP_FROM_PATH        = ../..
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
 STRIP_FROM_INC_PATH    = ../../src/include \
                          src/include \
                          include
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
 SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
 JAVADOC_AUTOBRIEF      = YES
+
+# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line
+# such as
+# /***************
+# as being the beginning of a Javadoc-style comment "banner". If set to NO, the
+# Javadoc-style will behave just like regular comments and it will not be
+# interpreted by doxygen.
+# The default value is: NO.
+
+JAVADOC_BANNER         = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
 QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
 MULTILINE_CPP_IS_BRIEF = NO
+
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
 INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
+
 SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
 TAB_SIZE               = 8
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:^^"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
+
 ALIASES                =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
 OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
 OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
 OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
 OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice
+# sources only. Doxygen will then generate output that is more tailored for that
+# language. For instance, namespaces will be presented as modules, types will be
+# separated into more groups, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_SLICE  = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
+# tries to guess whether the code is fixed or free formatted code, this is the
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen. When specifying no_extension you should add
+# * to the FILE_PATTERNS.
+#
+# Note see also the list of default file extension mappings.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See https://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 5.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS   = 5
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
 BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
 CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
 SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
 IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
 DISTRIBUTE_GROUP_DOC   = NO
+
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
 SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
 TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# than 0 to get more control over the balance between CPU load and processing
+# speed. At this moment only the input processing can be done using multiple
+# threads. Since this is still an experimental feature the default is set to 1,
+# which effectively disables parallel processing. Please report any issues you
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
 EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
 EXTRACT_PRIVATE        = YES
+
+# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual
+# methods of a class will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIV_VIRTUAL   = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
 EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
 EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
+
 EXTRACT_LOCAL_METHODS  = YES
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
 EXTRACT_ANON_NSPACES   = YES
+
+# If this flag is set to YES, the name of an unnamed parameter in a declaration
+# will be determined by the corresponding definition. By default unnamed
+# parameters remain unnamed in the output.
+# The default value is: YES.
+
+RESOLVE_UNNAMED_PARAMS = YES
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
 HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
 HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
+# The default value is: NO.
+
 HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
 HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
 INTERNAL_DOCS          = YES
+
+# With the correct setting of option CASE_SENSE_NAMES doxygen will better be
+# able to match the capabilities of the underlying filesystem. In case the
+# filesystem is case sensitive (i.e. it supports files in the same directory
+# whose names only differ in casing), the option must be set to YES to properly
+# deal with such files in case they appear in the input. For filesystems that
+# are not case sensitive the option should be set to NO to properly deal with
+# output files written for symbols that only differ in casing, such as for two
+# classes, one named CLASS and the other named Class, and to also support
+# references to files without having to specify the exact matching casing. On
+# Windows (including Cygwin) and MacOS, users should typically set this option
+# to NO, whereas on Linux or other Unix flavors it should typically be set to
+# YES.
+# Possible values are: SYSTEM, NO and YES.
+# The default value is: SYSTEM.
+
 CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
+
 HIDE_SCOPE_NAMES       = NO
+
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
 SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
 INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
+
 SORT_MEMBER_DOCS       = NO
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
 SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
 SORT_GROUP_NAMES       = YES
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
 SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
+
 GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
+
 GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
 GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
 GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
 ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
 MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
+# list will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
 SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
 SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
 SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
 FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
+CITE_BIB_FILES         =
+
 #---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
+# Configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
 QUIET                  = YES
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
 WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
 WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
+# The default value is: YES.
+
 WARN_IF_DOC_ERROR      = YES
+
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
+# The default value is: NO.
+
 WARN_NO_PARAMDOC       = YES
+
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS
+# then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but
+# at the end of the doxygen process doxygen will return with a non-zero status.
+# Possible values are: NO, YES and FAIL_ON_WARNINGS.
+# The default value is: NO.
+
+WARN_AS_ERROR          = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# See also: WARN_LINE_FORMAT
+# The default value is: $file:$line: $text.
+
 WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           =
+
+# In the $text part of the WARN_FORMAT command it is possible that a reference
+# to a more specific place is given. To make it easier to jump to this place
+# (outside of doxygen) the user can define a custom "cut" / "paste" string.
+# Example:
+# WARN_LINE_FORMAT = "'vi $file +$line'"
+# See also: WARN_FORMAT
+# The default value is: at line $line of file $file.
+
+WARN_LINE_FORMAT       = "at line $line of file $file"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr). In case the file specified cannot be opened for writing the
+# warning and error messages are written to standard error. When as file - is
+# specified the warning and error messages are written to standard output
+# (stdout).
+
+WARN_LOGFILE           = doxygen_warnings.log
+
 #---------------------------------------------------------------------------
-# configuration options related to the input files
+# Configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = ../../src ../../contrib ../../doc
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = ../../src \
+                         ../../contrib \
+                         ../../doc
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see:
+# https://www.gnu.org/software/libiconv/) for the list of possible encodings.
+# See also: INPUT_FILE_ENCODING
+# The default value is: UTF-8.
+
 INPUT_ENCODING         = UTF-8
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify
+# character encoding on a per file pattern basis. Doxygen will compare the file
+# name with each pattern and apply the encoding instead of the default
+# INPUT_ENCODING) if there is a match. The character encodings are a list of the
+# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding
+# "INPUT_ENCODING" for further information on supported encodings.
+
+INPUT_FILE_ENCODING    =
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# Note the list of default checked file patterns might differ from the list of
+# default file extension mappings.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
+
 FILE_PATTERNS          = *.c \
                          *.cc \
                          *.cxx \
@@ -145,161 +1001,1777 @@ FILE_PATTERNS          = *.c \
                          *.F \
                          *.VHD \
                          *.VHDL
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
 RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
 EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
 EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = */test_* */.svn/* */.git/* */perf_* .*
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       = */test_* \
+                         */.svn/* \
+                         */.git/* \
+                         */perf_* \
+                         .*
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# ANamespace::AClass, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
 EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
 EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
 EXAMPLE_PATTERNS       = *
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
 EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
 IMAGE_PATH             =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+#
+# Note that doxygen will use the data processed and written to standard output
+# for further processing, therefore nothing else, like debug statements or used
+# commands (so in case of a Windows batch file always use @echo OFF), should be
+# written to standard output.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
 INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
 FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
 FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
+# The Fortran standard specifies that for fixed formatted Fortran code all
+# characters from position 72 are to be considered as comment. A common
+# extension is to allow longer lines before the automatic comment starts. The
+# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can
+# be processed before the automatic comment starts.
+# Minimum value: 7, maximum value: 10000, default value: 72.
+
+FORTRAN_COMMENT_AFTER  = 72
+
 #---------------------------------------------------------------------------
-# configuration options related to source browsing
+# Configuration options related to source browsing
 #---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
 SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
 INLINE_SOURCES         = YES
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
 STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# entity all documented functions referencing it will be listed.
+# The default value is: NO.
+
 REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
 REFERENCES_RELATION    = YES
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
 REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see https://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
 USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
 VERBATIM_HEADERS       = YES
+
+# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
+# clang parser (see:
+# http://clang.llvm.org/) for more accurate parsing at the cost of reduced
+# performance. This can be particularly helpful with template rich C++ code for
+# which doxygen's built-in parser lacks the necessary type information.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse_libclang=ON option for CMake.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = NO
+
+# If the CLANG_ASSISTED_PARSING tag is set to YES and the CLANG_ADD_INC_PATHS
+# tag is set to YES then doxygen will add the directory of each input to the
+# include path.
+# The default value is: YES.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_ADD_INC_PATHS    = YES
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS          =
+
+# If clang assisted parsing is enabled you can provide the clang parser with the
+# path to the directory containing a file called compile_commands.json. This
+# file is the compilation database (see:
+# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) containing the
+# options used when the source files were built. This is equivalent to
+# specifying the -p option to a clang tool, such as clang-check. These options
+# will then be passed to the parser. Any options specified with CLANG_OPTIONS
+# will be added as well.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse_libclang=ON option for CMake.
+
+CLANG_DATABASE_PATH    =
+
 #---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
+# Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
 ALPHABETICAL_INDEX     = YES
-COLS_IN_ALPHA_INDEX    = 3
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
 IGNORE_PREFIX          = GNUNET_
+
 #---------------------------------------------------------------------------
-# configuration options related to the HTML output
+# Configuration options related to the HTML output
 #---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
+
 GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 HTML_STYLESHEET        =
-GENERATE_HTMLHELP      = NO
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output
+# should be rendered with a dark or light theme. Default setting AUTO_LIGHT
+# enables light output unless the user preference is dark output. Other options
+# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to
+# default to dark mode unless the user prefers light mode, and TOGGLE to let the
+# user toggle between dark and light mode via a button.
+# Possible values are: LIGHT Always generate light output., DARK Always generate
+# dark output., AUTO_LIGHT Automatically set the mode according to the user
+# preference, use light mode if no preference is set (the default)., AUTO_DARK
+# Automatically set the mode according to the user preference, use dark mode if
+# no preference is set. and TOGGLE Allow to user to switch between light and
+# dark mode via a button..
+# The default value is: AUTO_LIGHT.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE        = AUTO_LIGHT
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a color-wheel, see
+# https://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = NO
+
+# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
+# documentation will contain a main index with vertical navigation menus that
+# are dynamically created via JavaScript. If disabled, the navigation index will
+# consists of multiple levels of tabs that are statically embedded in every HTML
+# page. Disable this option to support browsers that do not have JavaScript,
+# like the Qt help browser.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_MENUS     = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see:
+# https://developer.apple.com/xcode/), introduced with OSX 10.5 (Leopard). To
+# create a documentation set, doxygen will generate a Makefile in the HTML
+# output directory. Running make will produce the docset in that directory and
+# running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy
+# genXcode/_index.html for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
 DOCSET_FEEDNAME        = "GNUnet Source Documentation"
+
+# This tag determines the URL of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDURL         =
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
 DOCSET_BUNDLE_ID       = org.gnunet
-HTML_DYNAMIC_SECTIONS  = NO
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
 CHM_FILE               =
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
 HHC_LOCATION           =
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the main .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
 GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
 CHM_INDEX_ENCODING     =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
 BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
 TOC_EXPAND             = NO
-DISABLE_INDEX          = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# The QHG_LOCATION tag can be used to specify the location (absolute path
+# including file name) of Qt's qhelpgenerator. If non-empty doxygen will try to
+# run qhelpgenerator on the generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = YES
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = YES
+
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATE_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 ENUM_VALUES_PER_LINE   = 4
-GENERATE_TREEVIEW      = NONE
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 TREEVIEW_WIDTH         = 250
+
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email
+# addresses.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+OBFUSCATE_EMAILS       = YES
+
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
 FORMULA_FONTSIZE       = 10
+
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using JavaScript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see:
+# https://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see:
+# https://xapian.org/). See the section "External Indexing and Searching" for
+# details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
 #---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
+# Configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
+
 GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when not enabling USE_PDFLATEX the default is latex when enabling
+# USE_PDFLATEX the default is pdflatex and when in the later case latex is
+# chosen this is overwritten by pdflatex. For specific output languages the
+# default can have been set differently, this depends on the implementation of
+# the output language.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# Note: This tag is used in the Makefile / make.bat.
+# See also: LATEX_MAKEINDEX_CMD for the part in the generated output file
+# (.tex).
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 MAKEINDEX_CMD_NAME     = makeindex
+
+# The LATEX_MAKEINDEX_CMD tag can be used to specify the command name to
+# generate index for LaTeX. In case there is no backslash (\) as first character
+# it will be automatically added in the LaTeX code.
+# Note: This tag is used in the generated output file (.tex).
+# See also: MAKEINDEX_CMD_NAME for the part in the Makefile / make.bat.
+# The default value is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_MAKEINDEX_CMD    = makeindex
+
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 COMPACT_LATEX          = YES
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 PAPER_TYPE             = a4
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
+#
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           =
+
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
 LATEX_HIDE_INDICES     = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP        = NO
+
+# The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
+# path from which the emoji images will be read. If a relative path is entered,
+# it will be relative to the LATEX_OUTPUT directory. If left blank the
+# LATEX_OUTPUT directory will be used.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EMOJI_DIRECTORY  =
+
 #---------------------------------------------------------------------------
-# configuration options related to the RTF output
+# Configuration options related to the RTF output
 #---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
 GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
 RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
 COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
 RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# configuration file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
 RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's configuration file. A template extensions file can be
+# generated using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
 RTF_EXTENSIONS_FILE    =
+
 #---------------------------------------------------------------------------
-# configuration options related to the man page output
+# Configuration options related to the man page output
 #---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
 GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
 MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
 MAN_EXTENSION          = .3
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
 MAN_LINKS              = NO
+
 #---------------------------------------------------------------------------
-# configuration options related to the XML output
+# Configuration options related to the XML output
 #---------------------------------------------------------------------------
-GENERATE_XML           = NO
+
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = YES
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
 XML_OUTPUT             = xml
-XML_SCHEMA             =
-XML_DTD                =
+
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
 XML_PROGRAMLISTING     = YES
+
+# If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, doxygen will include
+# namespace members in file scope as well, matching the HTML output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_NS_MEMB_FILE_SCOPE = NO
+
 #---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
+# Configuration options related to the DOCBOOK output
 #---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures
+# the structure of the code including all documentation. Note that this feature
+# is still experimental and incomplete at the moment.
+# The default value is: NO.
+
 GENERATE_AUTOGEN_DEF   = NO
+
 #---------------------------------------------------------------------------
-# configuration options related to the Perl module output
+# Configuration options related to the Perl module output
 #---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
 GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
 PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
 PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
 PERLMOD_MAKEVAR_PREFIX =
+
 #---------------------------------------------------------------------------
 # Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
 ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
 MACRO_EXPANSION        = YES
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
 EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
 SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of
+# RECURSIVE has no effect here.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
 INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
 INCLUDE_FILE_PATTERNS  =
-PREDEFINED             = GNUNET_UNUSED="" GNUNET_PACKED=""
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             = "GNUNET_UNUSED=" \
+                         "GNUNET_PACKED="
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
 EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
 SKIP_FUNCTION_MACROS   = YES
+
 #---------------------------------------------------------------------------
-# Configuration::additions related to external references
+# Configuration options related to external references
 #---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
 TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
 GENERATE_TAGFILE       = gnunet.tag
+
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
+
 ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
 EXTERNAL_GROUPS        = YES
-PERL_PATH              = /usr/bin/perl
+
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
-CLASS_DIAGRAMS         = YES
-MSCGEN_PATH            =
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
 HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
+
 HAVE_DOT               = YES
-DOT_FONTNAME           = FreeSans
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of
+# subgraphs. When you want a differently looking font in the dot files that
+# doxygen generates you can specify fontname, fontcolor and fontsize attributes.
+# For details please see <a href=https://graphviz.org/doc/info/attrs.html>Node,
+# Edge and Graph Attributes specification</a> You need to make sure dot is able
+# to find the font, which can be done by putting it in a standard location or by
+# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
+# directory containing the font. Default graphviz fontsize is 14.
+# The default value is: fontname=Helvetica,fontsize=10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_COMMON_ATTR        = "fontname=FreeSans,fontsize=10"
+
+# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can
+# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. <a
+# href=https://graphviz.org/doc/info/arrows.html>Complete documentation about
+# arrows shapes.</a>
+# The default value is: labelfontname=Helvetica,labelfontsize=10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_EDGE_ATTR          = "labelfontname=FreeSans,labelfontsize=10"
+
+# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes
+# around nodes set 'shape=plain' or 'shape=plaintext' <a
+# href=https://www.graphviz.org/doc/info/shapes.html>Shapes specification</a>
+# The default value is: shape=box,height=0.2,width=0.4.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NODE_ATTR          = "shape=box,height=0.2,width=0.4"
+
+# You can set the path where dot can find font specified with fontname in
+# DOT_COMMON_ATTR and others dot attributes.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 DOT_FONTPATH           =
+
+# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a
+# graph for each documented class showing the direct and indirect inheritance
+# relations. In case HAVE_DOT is set as well dot will be used to draw the graph,
+# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set
+# to TEXT the direct and indirect inheritance relations will be shown as texts /
+# links.
+# Possible values are: NO, YES, TEXT and GRAPH.
+# The default value is: YES.
+
 CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies. See also the chapter Grouping
+# in the manual.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag UML_LOOK is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the DOT_UML_DETAILS tag is set to NO, doxygen will show attributes and
+# methods without types and arguments in the UML graphs. If the DOT_UML_DETAILS
+# tag is set to YES, doxygen will add type and arguments for attributes and
+# methods in the UML graphs. If the DOT_UML_DETAILS tag is set to NONE, doxygen
+# will not generate fields with class member information in the UML graphs. The
+# class diagrams will look similar to the default class diagrams but using UML
+# notation for the relationships.
+# Possible values are: NO, YES and NONE.
+# The default value is: NO.
+# This tag requires that the tag UML_LOOK is set to YES.
+
+DOT_UML_DETAILS        = NO
+
+# The DOT_WRAP_THRESHOLD tag can be used to set the maximum number of characters
+# to display on a single line. If the actual line length exceeds this threshold
+# significantly it will wrapped across multiple lines. Some heuristics are apply
+# to avoid ugly line breaks.
+# Minimum value: 0, maximum value: 1000, default value: 17.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_WRAP_THRESHOLD     = 17
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 TEMPLATE_RELATIONS     = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 CALL_GRAPH             = YES
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 CALLER_GRAPH           = YES
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 DIRECTORY_GRAPH        = YES
+
+# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels
+# of child directories generated in directory dependency graphs by dot.
+# Minimum value: 1, maximum value: 25, default value: 1.
+# This tag requires that the tag DIRECTORY_GRAPH is set to YES.
+
+DIR_GRAPH_MAX_DEPTH    = 1
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 DOT_IMAGE_FORMAT       = svg
-INTERACTIVE_SVG        = NO
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = YES
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file or to the filename of jar file
+# to be used. If left blank, it is assumed PlantUML is not used or called during
+# a preprocessing step. Doxygen will generate a warning when it encounters a
+# \startuml command in this case and will not generate output for the diagram.
+
+PLANTUML_JAR_PATH      =
+
+# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for plantuml.
+
+PLANTUML_CFG_FILE      =
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 MAX_DOT_GRAPH_DEPTH    = 10
-DOT_TRANSPARENT        = YES
+
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 DOT_MULTI_TARGETS      = YES
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal
+# graphical representation for inheritance and collaboration diagrams is used.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
 GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
+# files that are used to generate the various graphs.
+#
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
+# The default value is: YES.
+
 DOT_CLEANUP            = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-SEARCHENGINE           = YES
diff --git a/doc/handbook/.gitignore b/doc/handbook/.gitignore
index 80ac74ea0..26718c2e9 100644
--- a/doc/handbook/.gitignore
+++ b/doc/handbook/.gitignore
@@ -1,11 +1,2 @@
-stamp-1
-version2.texi
-manual
-*.fn
-*.fns
-*.ky
-*.pg
-*.tp
-*.vr
-gnunet 
-gnunet.html
+html/
+texinfo/
diff --git a/doc/handbook/README b/doc/handbook/README
new file mode 100644
index 000000000..43761d3b4
--- /dev/null
+++ b/doc/handbook/README
@@ -0,0 +1,5 @@
+DO NOT EDIT THE HANDBOOK HERE
+
+The GNUnet handbook can be found (and edited) in gnunet-handbook.git.
+It is included in the submodule contrib/sphinx.
+The html, texinfo and manpages are autogenerated from there on ./bootstrap.
diff --git a/doc/handbook/meson.build b/doc/handbook/meson.build
new file mode 100644
index 000000000..ee6156192
--- /dev/null
+++ b/doc/handbook/meson.build
@@ -0,0 +1,42 @@
+fs = import('fs')
+makeinfo = find_program('makeinfo', native: true, required: false)
+sphinx = find_program('sphinx-build', native: true, required: false)
+
+if fs.exists('html')
+  install_subdir('html',
+                 install_dir: docdir,
+                 strip_directory: false)
+else
+  if sphinx.found()
+    sphinxhandbook = custom_target('handbook-html',
+      output: 'html',
+      command: [sphinx,
+              '-M', 'html',
+              meson.project_source_root()/'contrib'/'handbook', meson.current_build_dir()],
+      install: true,
+      install_dir: docdir)
+  endif
+endif
+
+if fs.exists('texinfo')
+  install_data('texinfo'/'gnunet.info',
+               install_dir: get_option('infodir'))
+else
+  if sphinx.found()
+    sphinxhandbooktexi = custom_target('handbook-texinfo',
+      output: ['texinfo'],
+      command: [sphinx,
+              '-M', 'texinfo',
+              meson.project_source_root()/'contrib'/'handbook', meson.current_build_dir()],
+      install: false,
+      install_dir: get_option('infodir'))
+    custom_target('gnunet.info',
+    output: 'gnunet.info',
+    depends: sphinxhandbooktexi,
+    command: [makeinfo, '--no-split', '--no-headers',
+              meson.current_build_dir()/'texinfo'/'gnunet.texi', '-o', '@OUTPUT0@'],
+      install: true,
+      install_dir: get_option('infodir'))
+  endif
+endif
+
diff --git a/doc/man/.gitignore b/doc/man/.gitignore
index 38ed67872..decad311d 100644
--- a/doc/man/.gitignore
+++ b/doc/man/.gitignore
@@ -3,3 +3,7 @@ groff_lint.log
 *.html
 gnunet-c-tutorial.7
 gnunet-documentation.7
+gana.*
+gnunet.*
+gnunet-dev.*
+lsd.*
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index e7045e8bf..6ab720826 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,20 +1,10 @@
 # This Makefile.am is in the public domain
 
 gnunet.conf.5: gnunet.conf.5.in Makefile
-        $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/gnunet.conf.5.in > $(srcdir)/gnunet.conf.5
+        $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/scripts/dosubst.awk < $(srcdir)/gnunet.conf.5.in > $(srcdir)/gnunet.conf.5
 
 CLEANFILES = gnunet.conf.5
 
-if TEXI2MDOC_GENERATION
-gnunet-tutorial.7: Makefile
-        @texi2mdoc -I../tutorial:../tutorial/chapters ../tutorial/tutorial.texi > gnunet-tutorial.7
-
-gnunet-documentation.7: Makefile
-        @texi2mdoc -I../handbook:../handbook/chapters ../handbook/gnunet.texi > gnunet-documentation.7
-
-CLEANFILES += gnunet-documentation.7 gnunet-tutorial.7
-endif
-
 if HAVE_EXPERIMENTAL
 if HAVE_MANDOC
 # After I went through the alternatives with the focus
@@ -24,7 +14,7 @@ if HAVE_MANDOC
 # I want and that the alternatives are depressing and
 # nonfunctional.
 produce_html.sh: produce_html.sh.in Makefile
-        $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/produce_html.sh.in > produce_html.sh
+        $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/scripts/dosubst.awk < $(srcdir)/produce_html.sh.in > produce_html.sh
         @chmod +x produce_html.sh
 
 CLEANFILES += produce_html.sh
@@ -48,7 +38,6 @@ endif
 man_MANS = \
   gnunet.conf.5 \
   gnunet-arm.1 \
-  gnunet-ats.1 \
   gnunet-auto-share.1 \
   gnunet-base32.1 \
   gnunet-bcd.1 \
@@ -57,10 +46,15 @@ man_MANS = \
   gnunet-core.1 \
   gnunet-conversation.1 \
   gnunet-conversation-test.1 \
+  gnunet-dht-get.1 \
+  gnunet-dht-put.1 \
+  gnunet-dht-monitor.1 \
+  gnunet-dht-hello.1 \
   gnunet-directory.1 \
   gnunet-dns2gns.1 \
   gnunet-datastore.1 \
   gnunet-download.1 \
+  gnunet-did.1 \
   gnunet-ecc.1 \
   gnunet-fs.1 \
   gnunet-gns.1 \
@@ -68,14 +62,15 @@ man_MANS = \
   gnunet-gns-proxy-setup-ca.1 \
   gnunet-identity.1 \
   gnunet-cadet.1 \
+  gnunet-messenger.1 \
   gnunet-namecache.1 \
   gnunet-namestore.1 \
-  gnunet-namestore-fcfsd.1 \
+  gnunet-namestore-dbtool.1 \
+  gnunet-namestore-zonefile.1 \
   gnunet-nat.1 \
   gnunet-nat-auto.1 \
   gnunet-nat-server.1 \
   gnunet-nse.1 \
-  gnunet-peerinfo.1 \
   gnunet-publish.1 \
   gnunet-qr.1 \
   gnunet-reclaim.1 \
@@ -85,7 +80,7 @@ man_MANS = \
   gnunet-scrypt.1 \
   gnunet-search.1 \
   gnunet-statistics.1 \
-  gnunet-testbed-profiler.1 \
+  gnunet-testing.1 \
   gnunet-testing-run-service.1 \
   gnunet-timeout.1 \
   gnunet-transport.1 \
@@ -95,10 +90,6 @@ man_MANS = \
   gnunet-vpn.1 \
   gnunet-zoneimport.1
 
-if TEXI2MDOC_GENERATION
-man_MANS += gnunet-tutorial.7 gnunet-documentation.7
-endif
-
 EXTRA_DIST = ${man_MANS} \
  gnunet.conf.5.in \
  produce_html.sh.in \
diff --git a/doc/man/gnunet-ats.1 b/doc/man/gnunet-ats.1
deleted file mode 100644
index 311501002..000000000
--- a/doc/man/gnunet-ats.1
+++ /dev/null
@@ -1,114 +0,0 @@
-.\" This file is part of GNUnet.
-.\" Copyright (C) 2001-2019 GNUnet e.V.
-.\"
-.\" Permission is granted to copy, distribute and/or modify this document
-.\" under the terms of the GNU Free Documentation License, Version 1.3 or
-.\" any later version published by the Free Software Foundation; with no
-.\" Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A
-.\" copy of the license is included in the file
-.\" FDL-1.3.
-.\"
-.\" A copy of the license is also available from the Free Software
-.\" Foundation Web site at http://www.gnu.org/licenses/fdl.html}.
-.\"
-.\" Alternately, this document is also available under the General
-.\" Public License, version 3 or later, as published by the Free Software
-.\" Foundation.  A copy of the license is included in the file
-.\" GPL3.
-.\"
-.\" A copy of the license is also available from the Free Software
-.\" Foundation Web site at http://www.gnu.org/licenses/gpl.html
-.\"
-.\" SPDX-License-Identifier: GPL3.0-or-later OR FDL1.3-or-later
-.\"
-.Dd October 16, 2015
-.Dt GNUNET-ATS 1
-.Os
-.Sh NAME
-.Nm gnunet-ats
-.Nd display information about transport resource allocation
-.Sh SYNOPSIS
-.Nm
-.Op Fl a | -all
-.Op Fl C Ar PEERID | Fl -connect= Ns Ar PEERID
-.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
-.Op Fl h | -help
-.Op Fl i Ar PEERID | Fl -id= Ns Ar PEERID
-.Op Fl k Ar VALUE | Fl -value= Ns Ar VALUE
-.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
-.Op Fl m | -monitor
-.Op Fl n | -numeric
-.Op Fl p Ar PREFERENCE | Fl -preference= Ns Ar PREFERENCE
-.Op Fl q | -quotas
-.Op Fl t Ar TYPE | Fl -type= Ns Ar TYPE
-.Op Fl u | -used
-.Op Fl V | -verbose
-.Op Fl v | -version
-.Sh DESCRIPTION
-.Nm
-can be used to display information about the
-GNUnet's transport selection mechanism.
-It shows information about the addresses and
-the assigned input and output bandwidth.
-.Sh OPTIONS
-.Bl -tag -width indent
-.It Fl a | -all
-List all addresses currently known to ats.
-.It Fl C Ar PEERID | Fl -connect= Ns Ar PEERID
-Ask ATS to suggest an address for PEERID to transport
-to establish a connection.
-Note that you can use the
-.Xr gnunet-transport 1
-commandline tool to force disconnects.
-.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
-Use the configuration file FILENAME.
-.It Fl h | -help
-Print short help on options.
-.It Fl i Ar PEERID | Fl -id= Ns Ar PEERID
-Print information for a specific peer identity only.
-.It Fl k Ar VALUE | Fl -value= Ns Ar VALUE
-Value to set for when changing preference values.
-.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
-Use LOGLEVEL for logging.
-Valid values are DEBUG, INFO, WARNING and ERROR.
-.It Fl m | -monitor
-Monitor changes to the bandwidth assignments continuously.
-.It Fl n | -numeric
-Do not resolve IP addresses to hostnames.
-.It Fl p Ar PREFERENCE | Fl -preference= Ns Ar PREFERENCE
-Set preference values, -i, -k and -t required.
-.It Fl q | -quotas
-Print quotas for all network types
-.It Fl t Ar TYPE | Fl -type= Ns Ar TYPE
-Preference type to change: latency | bandwidth
-.It Fl u | -used
-Print addresses actively used only
-.It Fl V | -verbose
-Print verbose output (include ATS address properties)
-.It v | -version
-Print GNUnet version number.
-.El
-.Sh SEE ALSO
-.Xr gnunet-transport 1
-.sp
-The full documentation for gnunet is maintained as a Texinfo manual.
-If the
-.Xr info 1
-and gnunet programs are properly installed at your site, the command
-.Pp
-.Dl info gnunet
-.Pp
-should give you access to the complete handbook,
-.Pp
-.Dl info gnunet-c-tutorial
-.Pp
-will give you access to a tutorial for developers.
-.Pp
-Depending on your installation, this information is also available in
-.Xr gnunet 7 and
-.Xr gnunet-c-tutorial 7 .
-.Sh BUGS
-Report bugs by using
-.Lk https://bugs.gnunet.org
-or by sending electronic mail to
-.Aq Mt bug-gnunet@gnu.org .
diff --git a/doc/man/gnunet-config.1 b/doc/man/gnunet-config.1
index 93d943758..c454765cf 100644
--- a/doc/man/gnunet-config.1
+++ b/doc/man/gnunet-config.1
@@ -47,7 +47,7 @@
 .Sh DESCRIPTION
 .Nm
 can be used to read or modify GNUnet configuration files.
-It can also provide informations to properly build applications on top of
+It can also provide information to properly build applications on top of
 GNUnet, like appropriate values for CFLAGS or the installation prefix.
 .Bl -tag -width indent
 .It Fl b Ar BACKEND | Fl -supported-backend= Ns Ar BACKEND
diff --git a/doc/man/gnunet-core.1 b/doc/man/gnunet-core.1
index 745a666b8..921f2ead6 100644
--- a/doc/man/gnunet-core.1
+++ b/doc/man/gnunet-core.1
@@ -39,8 +39,6 @@
 .Nm
 is a tool to access various functions of GNUnet's core subsystem
 from the command-line.
-The only function right now is to monitor the status of peers
-known to the CORE service.
 .Bl -tag -width indent
 .It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
 Configuration file to use.
@@ -52,6 +50,10 @@ Possible values for LOGLEVEL are ERROR, WARNING, INFO and DEBUG.
 .It Fl m | -monitor
 In monitor mode, gnunet-core will continuously print the connection status,
 instead of giving just a snapshot.
+.It Fl i | -show-identity
+Output current local peer identity.
+.It Fl s | -connection-status
+Show current peer connection status.
 .It Fl v | -version
 Print the version number.
 .It Fl V | -verbose
diff --git a/doc/man/gnunet-dht-get.1 b/doc/man/gnunet-dht-get.1
new file mode 100644
index 000000000..bd411f2f0
--- /dev/null
+++ b/doc/man/gnunet-dht-get.1
@@ -0,0 +1,90 @@
+.\" This file is part of GNUnet.
+.\" Copyright (C) 2023 GNUnet e.V.
+.\"
+.\" Permission is granted to copy, distribute and/or modify this document
+.\" under the terms of the GNU Free Documentation License, Version 1.3 or
+.\" any later version published by the Free Software Foundation; with no
+.\" Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A
+.\" copy of the license is included in the file
+.\" FDL-1.3.
+.\"
+.\" A copy of the license is also available from the Free Software
+.\" Foundation Web site at http://www.gnu.org/licenses/fdl.html}.
+.\"
+.\" Alternately, this document is also available under the General
+.\" Public License, version 3 or later, as published by the Free Software
+.\" Foundation.  A copy of the license is included in the file
+.\" GPL3.
+.\"
+.\" A copy of the license is also available from the Free Software
+.\" Foundation Web site at http://www.gnu.org/licenses/gpl.html
+.\"
+.\" SPDX-License-Identifier: GPL3.0-or-later OR FDL1.3-or-later
+.\"
+.Dd January 5, 2023
+.Dt GNUNET-DHT-GET 1
+.Os
+.Sh NAME
+.Nm gnunet-dht-get
+.Nd Issue a GET request to the DHT. Prints results.
+.Sh SYNOPSIS
+.Nm
+.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
+.Op Fl h | -help
+.Op Fl k Ar KEY | Fl -key= Ns Ar KEY
+.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
+.Op Fl l Ar LOGFILE | Fl -logfile= Ns Ar LOGFILE
+.Op Fl R | -record
+.Op Fl r Ar LEVEL | Fl -replication= Ns Ar LEVEL
+.Op Fl T Ar TYPE | Fl -type= Ns Ar TYPE
+.Op Fl V | -verbose
+.Op Fl v | -version
+.Op Fl x | -demultiplex
+.Sh DESCRIPTION
+.Nm
+is a command line tool to issue GET requests to the DHT.
+.Sh OPTIONS
+.Bl -tag -width indent
+.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
+Use the configuration file
+.Ar FILENAME .
+.It Fl h | -help
+Print short help on options.
+.It Fl k Ar KEY | Fl -key= Ns Ar KEY
+use the query key
+.Ar KEY .
+.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
+Use LOGLEVEL for logging.
+Valid values are DEBUG, INFO, WARNING and ERROR.
+.It Fl l Ar LOGFILE | Fl -logfile= Ns Ar LOGFILE
+Configure logging to write logs to
+.Ar LOGFILE .
+.It Fl R | -record
+Set DHT's record route option for the request.
+.It Fl r Ar LEVEL | -replication-level= Ns Ar LEVEL
+Use the DHT replication level
+.Ar LEVEL .
+.It Fl t Ar TYPE | -type= Ns Ar TYPE
+the block type to look for under
+.Ar KEY .
+.It Fl V | -verbose
+be verbose.
+.It Fl v | -version
+Print GNUnet version number.
+.It Fl x | -demultiplex
+Set DHT's demultiplex everywhere option.
+.El
+.Sh SEE ALSO
+The full documentation for gnunet is maintained as a Texinfo manual.
+If the
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-dht-hello.1 b/doc/man/gnunet-dht-hello.1
new file mode 100644
index 000000000..b50736f65
--- /dev/null
+++ b/doc/man/gnunet-dht-hello.1
@@ -0,0 +1,75 @@
+.\" This file is part of GNUnet.
+.\" Copyright (C) 2023 GNUnet e.V.
+.\"
+.\" Permission is granted to copy, distribute and/or modify this document
+.\" under the terms of the GNU Free Documentation License, Version 1.3 or
+.\" any later version published by the Free Software Foundation; with no
+.\" Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A
+.\" copy of the license is included in the file
+.\" FDL-1.3.
+.\"
+.\" A copy of the license is also available from the Free Software
+.\" Foundation Web site at http://www.gnu.org/licenses/fdl.html}.
+.\"
+.\" Alternately, this document is also available under the General
+.\" Public License, version 3 or later, as published by the Free Software
+.\" Foundation.  A copy of the license is included in the file
+.\" GPL3.
+.\"
+.\" A copy of the license is also available from the Free Software
+.\" Foundation Web site at http://www.gnu.org/licenses/gpl.html
+.\"
+.\" SPDX-License-Identifier: GPL3.0-or-later OR FDL1.3-or-later
+.\"
+.Dd January 5, 2023
+.Dt GNUNET-DHT-HELLO 1
+.Os
+.Sh NAME
+.Nm gnunet-dht-hello
+.Nd Obtain HELLO from DHT or provide HELLO to DHT for bootstrapping.
+.Sh SYNOPSIS
+.Nm
+.Op Ar URL
+.El
+.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
+.Op Fl h | -help
+.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
+.Op Fl l Ar LOGFILE | Fl -logfile= Ns Ar LOGFILE
+.Op Fl V | -verbose
+.Op Fl v | -version
+.Sh DESCRIPTION
+.Nm
+is a command line tool to either get a HELLO for your own peer (no arguments) or to
+parse a HELLO URL by providing it as the sole argument.
+.Sh OPTIONS
+.Bl -tag -width indent
+.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
+Use the configuration file
+.Ar FILENAME .
+.It Fl h | -help
+Print short help on options.
+.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
+Use LOGLEVEL for logging.
+Valid values are DEBUG, INFO, WARNING and ERROR.
+.It Fl l Ar LOGFILE | Fl -logfile= Ns Ar LOGFILE
+Configure logging to write logs to
+.Ar LOGFILE .
+.It Fl V | -verbose
+be verbose.
+.It Fl v | -version
+Print GNUnet version number.
+.El
+.Sh SEE ALSO
+The full documentation for gnunet is maintained as a Texinfo manual.
+If the
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-dht-monitor.1 b/doc/man/gnunet-dht-monitor.1
new file mode 100644
index 000000000..08707f6bb
--- /dev/null
+++ b/doc/man/gnunet-dht-monitor.1
@@ -0,0 +1,82 @@
+.\" This file is part of GNUnet.
+.\" Copyright (C) 2023 GNUnet e.V.
+.\"
+.\" Permission is granted to copy, distribute and/or modify this document
+.\" under the terms of the GNU Free Documentation License, Version 1.3 or
+.\" any later version published by the Free Software Foundation; with no
+.\" Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A
+.\" copy of the license is included in the file
+.\" FDL-1.3.
+.\"
+.\" A copy of the license is also available from the Free Software
+.\" Foundation Web site at http://www.gnu.org/licenses/fdl.html}.
+.\"
+.\" Alternately, this document is also available under the General
+.\" Public License, version 3 or later, as published by the Free Software
+.\" Foundation.  A copy of the license is included in the file
+.\" GPL3.
+.\"
+.\" A copy of the license is also available from the Free Software
+.\" Foundation Web site at http://www.gnu.org/licenses/gpl.html
+.\"
+.\" SPDX-License-Identifier: GPL3.0-or-later OR FDL1.3-or-later
+.\"
+.Dd January 5, 2023
+.Dt GNUNET-DHT-MONITOR 1
+.Os
+.Sh NAME
+.Nm gnunet-dht-monitor
+.Nd Print packets that go through the DHT on this peer.
+.Sh SYNOPSIS
+.Nm
+.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
+.Op Fl h | -help
+.Op Fl k Ar KEY | Fl -key= Ns Ar KEY
+.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
+.Op Fl l Ar LOGFILE | Fl -logfile= Ns Ar LOGFILE
+.Op Fl T Ar TIMEOUT | Fl -timeout= Ns Ar TIMEOUT
+.Op Fl t Ar TYPE | Fl -type= Ns Ar TYPE
+.Op Fl V | -verbose
+.Op Fl v | -version
+.Sh DESCRIPTION
+.Nm
+is a command line tool to monitor DHT packets that go through this peer.
+.Sh OPTIONS
+.Bl -tag -width indent
+.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
+Use the configuration file
+.Ar FILENAME .
+.It Fl h | -help
+Print short help on options.
+.It Fl k Ar KEY | Fl -key= Ns Ar KEY
+use the query key
+.Ar KEY .
+.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
+Use LOGLEVEL for logging.
+Valid values are DEBUG, INFO, WARNING and ERROR.
+.It Fl l Ar LOGFILE | Fl -logfile= Ns Ar LOGFILE
+Configure logging to write logs to
+.Ar LOGFILE .
+.It Fl T Ar TIMEOUT | -timeout= Ns Ar TIMEOUT
+how long should the monitor command run.
+.It Fl t Ar TYPE | Fl -type= Ns Ar TYPE
+the block type to filter for.
+.It Fl V | -verbose
+be verbose.
+.It Fl v | -version
+Print GNUnet version number.
+.El
+.Sh SEE ALSO
+The full documentation for gnunet is maintained as a Texinfo manual.
+If the
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-dht-put.1 b/doc/man/gnunet-dht-put.1
new file mode 100644
index 000000000..ec6b38c44
--- /dev/null
+++ b/doc/man/gnunet-dht-put.1
@@ -0,0 +1,100 @@
+.\" This file is part of GNUnet.
+.\" Copyright (C) 2023 GNUnet e.V.
+.\"
+.\" Permission is granted to copy, distribute and/or modify this document
+.\" under the terms of the GNU Free Documentation License, Version 1.3 or
+.\" any later version published by the Free Software Foundation; with no
+.\" Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A
+.\" copy of the license is included in the file
+.\" FDL-1.3.
+.\"
+.\" A copy of the license is also available from the Free Software
+.\" Foundation Web site at http://www.gnu.org/licenses/fdl.html}.
+.\"
+.\" Alternately, this document is also available under the General
+.\" Public License, version 3 or later, as published by the Free Software
+.\" Foundation.  A copy of the license is included in the file
+.\" GPL3.
+.\"
+.\" A copy of the license is also available from the Free Software
+.\" Foundation Web site at http://www.gnu.org/licenses/gpl.html
+.\"
+.\" SPDX-License-Identifier: GPL3.0-or-later OR FDL1.3-or-later
+.\"
+.Dd January 5, 2023
+.Dt GNUNET-DHT-PUT 1
+.Os
+.Sh NAME
+.Nm gnunet-dht-put
+.Nd Issue a PUT request to the DHT to insert
+.Ar DATA
+under
+.Ar KEY .
+.Sh SYNOPSIS
+.Nm
+.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
+.Op Fl d Ar DATA | Fl -data= Ns Ar DATA
+.Op Fl e Ar EXPIRATION | Fl -expiration= Ns Ar EXPIRATION
+.Op Fl h | -help
+.Op Fl k Ar KEY | Fl -key= Ns Ar KEY
+.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
+.Op Fl l Ar LOGFILE | Fl -logfile= Ns Ar LOGFILE
+.Op Fl R | -record
+.Op Fl r Ar LEVEL | Fl -replication= Ns Ar LEVEL
+.Op Fl t Ar TYPE | Fl -type= Ns Ar TYPE
+.Op Fl V | -verbose
+.Op Fl v | -version
+.Op Fl x | -demultiplex
+.Sh DESCRIPTION
+.Nm
+is a command line tool to issue PUT requests to the DHT.
+.Sh OPTIONS
+.Bl -tag -width indent
+.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
+Use the configuration file
+.Ar FILENAME .
+.It Fl d Ar DATA | Fl -data= Ns Ar DATA
+the data to insert under
+.Ar KEY .
+.It Fl e Ar EXPIRATION | Fl -expiration= Ns Ar EXPIRATION
+how long to store this entry in the DHT (in seconds)
+.It Fl h | -help
+Print short help on options.
+.It Fl k Ar KEY | Fl -key= Ns Ar KEY
+use the query key
+.Ar KEY .
+.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
+Use LOGLEVEL for logging.
+Valid values are DEBUG, INFO, WARNING and ERROR.
+.It Fl l Ar LOGFILE | Fl -logfile= Ns Ar LOGFILE
+Configure logging to write logs to
+.Ar LOGFILE .
+.It Fl R | -record
+Set DHT's record route option for the request.
+.It Fl r Ar LEVEL | -replication-level= Ns Ar LEVEL
+Use the DHT replication level
+.Ar LEVEL .
+.It Fl t Ar TYPE | -type= Ns Ar TYPE
+the block type of
+.Ar DATA .
+.It Fl V | -verbose
+be verbose.
+.It Fl v | -version
+Print GNUnet version number.
+.It Fl x | -demultiplex
+Set DHT's demultiplex everywhere option.
+.El
+.Sh SEE ALSO
+The full documentation for gnunet is maintained as a Texinfo manual.
+If the
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-did.1 b/doc/man/gnunet-did.1
new file mode 100644
index 000000000..283561920
--- /dev/null
+++ b/doc/man/gnunet-did.1
@@ -0,0 +1,108 @@
+.\" This file is part of GNUnet.
+.\" Copyright (C) 2023 GNUnet e.V.
+.\"
+.\" Permission is granted to copy, distribute and/or modify this document
+.\" under the terms of the GNU Free Documentation License, Version 1.3 or
+.\" any later version published by the Free Software Foundation; with no
+.\" Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A
+.\" copy of the license is included in the file
+.\" FDL-1.3.
+.\"
+.\" A copy of the license is also available from the Free Software
+.\" Foundation Web site at http://www.gnu.org/licenses/fdl.html}.
+.\"
+.\" Alternately, this document is also available under the General
+.\" Public License, version 3 or later, as published by the Free Software
+.\" Foundation.  A copy of the license is included in the file
+.\" GPL3.
+.\"
+.\" A copy of the license is also available from the Free Software
+.\" Foundation Web site at http://www.gnu.org/licenses/gpl.html
+.\"
+.\" SPDX-License-Identifier: GPL3.0-or-later OR FDL1.3-or-later
+.\"
+.Dd January 5, 2023
+.Dt GNUNET-DID 1
+.Os
+.Sh NAME
+.Nm gnunet-did
+.Nd command line tool to create and manage gnunet identity DIDs.
+.Sh SYNOPSIS
+.Nm
+.Op Fl A | -show-all
+.Op Fl C | -create
+.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
+.Op Fl d Ar DID | Fl -did= Ns Ar DID
+.Op Fl D Ar DID_DOCUMENT | Fl -did-document= Ns Ar DID_DOCUMENT
+.Op Fl e Ar EGO | Fl -ego= Ns Ar EGO
+.Op Fl g | -get
+.Op Fl h | -help
+.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
+.Op Fl l Ar LOGFILE | Fl -logfile= Ns Ar LOGFILE
+.Op Fl r | -remove
+.Op Fl R | -replace
+.Op Fl s | -show
+.Op Fl t Ar TIME | Fl -expiration-time= Ns Ar TIME
+.Op Fl v | -version
+.Sh DESCRIPTION
+.Nm
+is a command line tool to create and manage gnunet identity DIDs.
+.Sh OPTIONS
+.Bl -tag -width indent
+.It Fl A | -show-all
+List all DIDs for all egos.
+.It Fl C | -create
+Create a DID Document and display the DID.
+.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
+Use the specified configuration file
+.Ar FILENAME .
+.It Fl d Ar DID | Fl -did= Ns Ar DID
+The to use for the operation is 
+.Ar DID .
+.It Fl D Ar DID_DOCUMENT | Fl -did-document= Ns Ar DID_DOCUMENT
+The DID Document to use is
+.Ar DID_DOCUMENT .
+.It Fl e Ar EGO | Fl -ego= Ns Ar EGO
+The ego to use is
+.Ar EGO .
+.It Fl g | -get
+Get the DID Document associated with the DID given in
+.Ar DID .
+.It Fl h | -help
+Print short help on options.
+.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
+Use LOGLEVEL for logging.
+Valid values are DEBUG, INFO, WARNING and ERROR.
+.It Fl l Ar LOGFILE | Fl -logfile= Ns Ar LOGFILE
+Configure logging to write logs to
+.Ar LOGFILE .
+.It Fl r | -remove
+Remove the DID given in --did.
+.It Fl R | -replace
+Replace the DID Docuemnt given in --did-document for the DID given in
+.Ar DID .
+.It Fl s | -show
+Show the DID for the ego given in --ego.
+.It Fl t | -expiration-time
+The expiration time to use in the GNS record for the DID Document given in
+Ar. DID_DOCUMENT .
+.It Fl v | -version
+Print GNUnet version number.
+.El
+.Sh SEE ALSO
+The full documentation for gnunet is maintained as a Texinfo manual.
+If the
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.Pp
+should give you access to the complete handbook.
+.sp
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-dns2gns.1 b/doc/man/gnunet-dns2gns.1
index 0993fb419..72a7785d7 100644
--- a/doc/man/gnunet-dns2gns.1
+++ b/doc/man/gnunet-dns2gns.1
@@ -57,7 +57,6 @@ Valid values are DEBUG, INFO, WARNING and ERROR.
 Print GNUnet version number.
 .El
 .Sh SEE ALSO
-.Xr gnunet-gns-fcfs 1 ,
 .Xr gnunet-gns 1 ,
 .Xr gnunet-identity 1
 .Pp
diff --git a/doc/man/gnunet-identity.1 b/doc/man/gnunet-identity.1
index 599d3b269..d693d3688 100644
--- a/doc/man/gnunet-identity.1
+++ b/doc/man/gnunet-identity.1
@@ -26,7 +26,7 @@
 .Os
 .Sh NAME
 .Nm gnunet-identity
-.Nd create, delete or list egos
+.Nd maintain (create, delete or list) or perform actions with egos
 .Sh SYNOPSIS
 .Nm
 .Op Fl C Ar NAME | Fl -create= Ns Ar NAME
@@ -34,11 +34,13 @@
 .Op Fl d | -display
 .Op Fl e Ar NAME | Fl -ego= Ns Ar NAME
 .Op Fl h | -help
+.Op Fl k Ar PUBLIC_KEY | Fl -key= Ns Ar PUBLIC_KEY
 .Op Fl m | -monitor
 .Op Fl p | -private-keys
 .Op Fl q | -quiet
-.Op Fl s Ar SUBSYSTEM | Fl -set= Ns Ar SUBSYSTEM
+.Op Fl R Ar MESSAGE | Fl -read= Ns Ar MESSAGE
 .Op Fl V | -verbose
+.Op Fl W Ar MESSAGE | Fl -write= Ns Ar MESSAGE
 .Op Fl X | -eddsa
 .Sh DESCRIPTION
 .Nm
@@ -51,6 +53,9 @@ created locally, to create new egos, and to delete
 existing egos (the namespace will continue to exist, but it will
 be impossible to add additional data to it).
 .Pp
+In addition, it is possible to encrypt and decrypt messages (arbitrary strings)
+using a given public key (for encryption) or ego (for decryption).
+.Pp
 Creating a new ego requires using the
 .Fl C
 option together with an identifier (name) that is to be used for
@@ -72,6 +77,11 @@ Perform "set" operation with the respective ego or restrict "display"
 operation to the respective ego.
 .It Fl h | -help
 Print the help page.
+.It Fl k Ar PUBLIC_KEY | Fl -key= Ns Ar PUBLIC_KEY
+The public key to use for a message recipient. Use together with
+.Fl W .
+The recipient can obtain the desired ego's public key using the "display"
+operation.
 .It Fl m | -monitor
 Run in monitor mode, listing all ouf our egos until CTRL-C is pressed.
 Each ego is listed together with a unique pointer value; if
@@ -83,18 +93,21 @@ keys. The second column shows the public key, the third column shows the
 private key.
 .It Fl q | -quiet
 Be quiet, in particular outputs only the public key when listing egos.
-.It Fl s Ar SUBSYSTEM | Fl -set= Ns Ar SUBSYSTEM
-Perform "set" operation for the specified
-.Ar SUBSYSTEM
-with the respective ego.
-Needs to be used together with option
+.It Fl R Ar MESSAGE | Fl -read= Ns Ar MESSAGE
+Decrypt (read) a message using the respective ego private key. Use together with
 .Fl e .
-After this, the given SUBSYSTEM will use the ego with the specified NAME.
-This will fail if
-.Ar NAME
-does not yet exist.
+The message consists of an ephemeral key and the ciphertext, separated by a dot.
+Such messages can be created with
+.Fl W .
 .It Fl V | -verbose
 Be verbose, in particular outputs the public key of freshly created egos.
+.It Fl W Ar MESSAGE | Fl -write= Ns Ar MESSAGE
+Encrypt (write) the given message for the identity given with
+.Fl k .
+The output contains an ephemeral message public key and the message separated
+by a dot. The entire line needs to be transferred to the recipient, who can use
+.Fl R
+to decrypt the message.
 .It Fl X | -eddsa
 Use EdDSA instead of ECDSA.
 .El
diff --git a/doc/man/gnunet-peerinfo.1 b/doc/man/gnunet-messenger.1
index 94951af86..9dfe86227 100644
--- a/doc/man/gnunet-peerinfo.1
+++ b/doc/man/gnunet-messenger.1
@@ -1,5 +1,5 @@
 .\" This file is part of GNUnet.
-.\" Copyright (C) 2001-2019 GNUnet e.V.
+.\" Copyright (C) 2023 GNUnet e.V.
 .\"
 .\" Permission is granted to copy, distribute and/or modify this document
 .\" under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -21,59 +21,51 @@
 .\"
 .\" SPDX-License-Identifier: GPL3.0-or-later OR FDL1.3-or-later
 .\"
-.Dd March 4, 2013
-.Dt GNUNET-PEERINFO 1
+.Dd January 5, 2023
+.Dt GNUNET-MESSENGER 1
 .Os
 .Sh NAME
-.Nm gnunet-peerinfo
-.Nd display information about other peers
+.Nm gnunet-messenger
+.Nd Open and connect to rooms using the MESSENGER service to chat.
 .Sh SYNOPSIS
 .Nm
 .Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
-.Op Fl g | -get-hello
+.Op Fl d Ar PEERIDENTITY | Fl -door= Ns Ar PEERIDENTITY
+.Op Fl e Ar IDENTITY | Fl -ego= Ns Ar IDENTITY
 .Op Fl h | -help
-.Op Fl i | -info
 .Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
-.Op Fl l Ar LOGFILE | Fl -logfile= ns Ar LOGFILE
-.Op Fl n | -numeric
-.Op Fl p Ar HELLO | Fl -put-hello= Ns Ar HELLO
-.Op Fl q | -quiet
-.Op Fl s | -self
+.Op Fl l Ar LOGFILE | Fl -logfile= Ns Ar LOGFILE
+.Op Fl p | -private
+.Op Fl r Ar ROOMKEY | Fl -room= Ns Ar ROOMKEY
 .Op Fl v | -version
 .Sh DESCRIPTION
 .Nm
-displays the known addresses and trust of known peers.
+is a command line tool to connect to rooms using the MESSENGER service to chat.
+.Sh OPTIONS
 .Bl -tag -width indent
 .It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
-Load config file, default FILENAME of the config is 
-.Pa ~/.config/gnunet.conf .
-.It Fl g | -get-hello
-Output HELLO uri(s)
+Use the specified configuration file
+.Ar FILENAME .
+.It Fl d Ar PEERIDENTITY | Fl -did= Ns Ar PEERIDENTITY
+peer identity to entry into the room.
+.It Fl e Ar IDENTITY | Fl -ego= Ns Ar IDENTITY
+identity to use for messaging
 .It Fl h | -help
-Print the help page.
-.It Fl i | -info
-List all known peers (and their addresses).
+Print short help on options.
 .It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
-Set the loglevel
-.It Fl l Ar LOGFILE | Fl -logfile= ns Ar LOGFILE
-Log messages to LOGFILE
-.It Fl n | -numeric
-Disable resolution of IPs to hostnames
-.It Fl p Ar HELLO | Fl -put-hello= Ns Ar HELLO
-Add given HELLO uri to the database
-.It Fl q | -quiet
-Do not print anything but the peer identities
-.It Fl s | -self
-Print only our own identity.
-Together with
-.Fl q ,
-this is the exact line that other peers would have to put in to their friends file in order to consider this peer one of their friends in F2F mode.
+Use LOGLEVEL for logging.
+Valid values are DEBUG, INFO, WARNING and ERROR.
+.It Fl l Ar LOGFILE | Fl -logfile= Ns Ar LOGFILE
+Configure logging to write logs to
+.Ar LOGFILE .
+.It Fl p | -private
+flag to enable private mode.
+.It Fl r Ar ROOMKEY | Fl -room= Ns Ar ROOMKEY
+key of the room to connect to.
 .It Fl v | -version
-Print the version number
+Print GNUnet version number.
 .El
 .Sh SEE ALSO
-.Xr gnunet.conf 5
-.sp
 The full documentation for gnunet is maintained as a Texinfo manual.
 If the
 .Xr info 1
@@ -81,15 +73,8 @@ and gnunet programs are properly installed at your site, the command
 .Pp
 .Dl info gnunet
 .Pp
-should give you access to the complete handbook,
-.Pp
-.Dl info gnunet-c-tutorial
-.Pp
-will give you access to a tutorial for developers.
+should give you access to the complete handbook.
 .sp
-Depending on your installation, this information is also available in
-.Xr gnunet 7 and
-.Xr gnunet-c-tutorial 7 .
 .\".Sh HISTORY
 .\".Sh AUTHORS
 .Sh BUGS
diff --git a/doc/man/gnunet-testbed-profiler.1 b/doc/man/gnunet-namestore-dbtool.1
index d079609ad..af882209b 100644
--- a/doc/man/gnunet-testbed-profiler.1
+++ b/doc/man/gnunet-namestore-dbtool.1
@@ -1,5 +1,5 @@
 .\" This file is part of GNUnet.
-.\" Copyright (C) 2001-2019 GNUnet e.V.
+.\" Copyright (C) 2001-2022 GNUnet e.V.
 .\"
 .\" Permission is granted to copy, distribute and/or modify this document
 .\" under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -21,50 +21,48 @@
 .\"
 .\" SPDX-License-Identifier: GPL3.0-or-later OR FDL1.3-or-later
 .\"
-.Dd September 13, 2014
-.Dt GNUNET-TESTBED-PROFILER 1
+.Dd September 30, 2022
+.Dt GNUNET-NAMESTORE-DBTOOL 1
 .Os
 .Sh NAME
-.Nm gnunet-testbed-profiler
-.Nd profiling driver for the testbed
+.Nm gnunet-namestore-dbtool
+.Nd manipulate GNU Name System (GNS) namestore database
 .Sh SYNOPSIS
 .Nm
+.Op Fl i | -initialize
 .Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
-.Op Fl e Ar COUNT | Fl -num-errors= Ns Ar COUNT
-.Op Fl H Ar FILENAME |  Fl -hosts= Ns Ar FILENAME
+.Op Fl r | -reset
 .Op Fl h | -help
 .Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
-.Op Fl l Ar LOGFILE |  Fl -logfile= Ns Ar LOGFILE
-.Op Fl n | -non-interactive
-.Op Fl p Ar COUNT | Fl -num-peers= Ns Ar COUNT
+.Op Fl p Ar PLUGIN | Fl -plugin= Ns Ar PLUGIN
 .Op Fl v | -version
 .Sh DESCRIPTION
 .Nm
-is a command line profiling driver for the testbed.
-.Sh OPTIONS
+can be used to initialize or reset the namestore database.
+.Pp
+The options are as follows:
 .Bl -tag -width indent
-.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
-Use the configuration file FILENAME.
-.It Fl e Ar COUNT | Fl -num-errors= Ns Ar COUNT
-Tolerate COUNT number of continuous timeout failures.
-.It Fl H Ar FILENAME |  Fl -hosts= Ns Ar FILENAME
-Name of the file with the login information for the testbed.
+.It Fl i | -initialize
+Desired operation is initialization of a database.
+.It Fl p Ar PLUGINNAME | Fl -plugin= Ns Ar PLUGINNAME
+Use the plugin PLUGINNAME.
+.It Fl r | -reset
+Desired operation is reset and reinitialization of a database
 .It Fl h | -help
 Print short help on options.
 .It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
 Use LOGLEVEL for logging.
 Valid values are DEBUG, INFO, WARNING and ERROR.
-.It Fl l Ar LOGFILE |  Fl -logfile= Ns Ar LOGFILE
-Configure logging to write logs to LOGFILE.
-.It Fl n | -non-interactive
-Run profiler in non-interactive mode where upon testbed setup the profiler does not wait for a keystroke but continues to run until a termination signal is received.
-.It Fl p Ar COUNT | Fl -num-peers= Ns Ar COUNT
-Create COUNT number of peers.
 .It Fl v | -version
 Print GNUnet version number.
 .El
+.\".Sh EXAMPLES
+.\".Sh FILES
 .Sh SEE ALSO
-The full documentation for gnunet is maintained as a Texinfo manual.
+.Xr gnunet-gns 1 ,
+.Xr gnunet-namestore 1
+.sp
+The full documentation for GNUnet is maintained as a Texinfo manual.
 If the
 .Xr info 1
 and gnunet programs are properly installed at your site, the command
diff --git a/doc/man/gnunet-namestore-fcfsd.1 b/doc/man/gnunet-namestore-zonefile.1
index 39bb9fcbc..2b602b8df 100644
--- a/doc/man/gnunet-namestore-fcfsd.1
+++ b/doc/man/gnunet-namestore-zonefile.1
@@ -1,5 +1,5 @@
 .\" This file is part of GNUnet.
-.\" Copyright (C) 2001-2019 GNUnet e.V.
+.\" Copyright (C) 2022 GNUnet e.V.
 .\"
 .\" Permission is granted to copy, distribute and/or modify this document
 .\" under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -21,39 +21,30 @@
 .\"
 .\" SPDX-License-Identifier: GPL3.0-or-later OR FDL1.3-or-later
 .\"
-.Dd September 5, 2013
-.Dt GNUNET-NAMESTORE-FCFSD 1
+.Dd Friday 21, 2022
+.Dt GNUNET-NAMESTORE-ZONEFILE 1
 .Os
 .Sh NAME
-.Nm gnunet-namestore-fcfsd
-.Nd HTTP server for GNU Name System First-Come-First-Served name registration
+.Nm gnunet-namestore-zonefile
+.Nd Import GNU Name System (GNS) zone data using zonefiles.
 .Sh SYNOPSIS
 .Nm
 .Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
 .Op Fl h | -help
 .Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
 .Op Fl v | -version
-.Op Fl z Ar EGO | -zone= Ns Ar EGO
+.Op Fl z Ar EGO | Fl -zone= Ns Ar EGO
 .Sh DESCRIPTION
-Most users will not want to run an FCFS-zone and thus will not need this program.
-.Pp
 .Nm
-runs a web server where users can register names to be mapped to their GNS zone.
-Names are made available on a First Come First Served basis (hence fcfs).
-Registered names do not expire.
-The HTTP server is run on the port that is specified in the configuration file in section "[fcfsd]" under the name "HTTPPORT".
+can be used to manipulate records in a GNS zone.
+.Pp
+The zonefile is read from standard input.
 .Pp
-It is possible to manage gnunet-gns-fcfsd using gnunet-(service-arm) by starting the daemon using "gnunet-arm -i fcfsd" or by setting "IMMEDIATE_START=YES" in the "fcfds" section of your configuration and the "-z ZONE" in as the "OPTION".
+$ORIGIN entries in the zonefile will be treated as ego names (without the trailing ".") and created if missing.
 .Pp
-An FCFS-zone is run at
-.Lk http://gnunet.org/fcfs/ .
-GNS users are encouraged to register their zone with the gnunet.org FCFS authority.
+To implicity give an initial $ORIGIN, use the --ego flag.
 .Pp
-If you want to run your own FCFS registrar, you need to first create a pseudonym (using "gnunet-identity -C NAME"), and use it with the
-.Fl z
-option.
-After that, you can start the FCFSD service (possibly using
-.Xr gnunet-arm 1 Ns ).
+All records will be created public and with relative expiration times set to the value provided in $TTL entries.
 .Pp
 The options are as follows:
 .Bl -tag -width indent
@@ -66,19 +57,22 @@ Use LOGLEVEL for logging.
 Valid values are DEBUG, INFO, WARNING and ERROR.
 .It Fl v | -version
 Print GNUnet version number.
-.It Fl z Ar EGO | -zone= Ns Ar EGO
-Specifies for which
-.Ar EGO
-FCFSD should manage the zone.
+.It Fl z Ar EGO | Fl -zone= Ns Ar EGO
+Specifies the name of the ego controlling the private key for the
+zone. If not provided, we will attempt to use the default identity set
+for the "namestore". Alternatively, a private key may be passed in
+Base32-encoding using the GNUNET_NAMESTORE_EGO_PRIVATE_KEY environment
+variable. The latter is useful to improve performance of tools like
+Ascension as it allows the command to skip IPC with the identity
+management subsystem.
 .El
 .\".Sh EXAMPLES
 .\".Sh FILES
 .Sh SEE ALSO
-.Xr gnunet-identity 1 ,
 .Xr gnunet-gns 1 ,
-.Xr gnunet-gns-proxy 1
+.Xr gnunet-namestore 1
 .sp
-The full documentation for gnunet is maintained as a Texinfo manual.
+The full documentation for GNUnet is maintained as a Texinfo manual.
 If the
 .Xr info 1
 and gnunet programs are properly installed at your site, the command
diff --git a/doc/man/gnunet-namestore.1 b/doc/man/gnunet-namestore.1
index 73bbe5a5c..6915aed6e 100644
--- a/doc/man/gnunet-namestore.1
+++ b/doc/man/gnunet-namestore.1
@@ -1,5 +1,5 @@
 .\" This file is part of GNUnet.
-.\" Copyright (C) 2001-2019 GNUnet e.V.
+.\" Copyright (C) 2001-2022 GNUnet e.V.
 .\"
 .\" Permission is granted to copy, distribute and/or modify this document
 .\" under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -39,15 +39,20 @@
 .Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
 .Op Fl m | -monitor
 .Op Fl n Ar NAME | Fl -name= Ns Ar NAME
+.Op Fl O | -list-orphans
+.Op Fl o | -omit-private
+.Op Fl P | -purge-orphans
 .Op Fl p | -public
-.Op Fl r Ar PKEY | Fl -reverse= Ns Ar PKEY
-.Op Fl R Ar RECORDLINE | Fl -replace= Ns Ar RECORDLINE
 .Op Fl s | -shadow
+.Op Fl S | -from-stdin
+.Op Fl T | -include-maintenance
 .Op Fl t Ar TYPE | Fl -type= Ns Ar TYPE
 .Op Fl u Ar URI | Fl -uri= Ns Ar URI
 .Op Fl v | -version
 .Op Fl V Ar VALUE | Fl -value= Ns Ar VALUE
+.Op Fl X | -purge-zone-records
 .Op Fl z Ar EGO | Fl -zone= Ns Ar EGO
+.Op Fl Z Ar KEY | Fl -zone-to-name= Ns Ar KEY
 .Sh DESCRIPTION
 .Nm
 can be used to manipulate records in a GNS zone.
@@ -88,26 +93,53 @@ Monitor changes to the zone on an ongoing basis (in contrast to -D,
 which merely displays the current records).
 .It Fl n Ar NAME | Fl -name= Ns Ar NAME
 Label or name of the record to add/delete/display.
+.It Fl O | -list-orphans
+List orphaned records.
+.It Fl o | -omit-private
+Filter private records. Use in combination with --display.
+.It Fl P | -purge-orphans
+Delete orphaned records from namestore.
 .It Fl p | -public
 Create a record that is public (shared with other users that know the
 label).
-.It Fl r Ar PKEY | Fl -reverse= Ns Ar PKEY
-Determine our GNS name for the given public key (reverse lookup of the
-PKEY) in the given zone.
-.It Fl R Ar RECORDLINE | Fl -replace= Ns Ar RECORDLINE
-Sets record set to values given in RECORDLINE.
-This option can be specified multiple times to provide multiple
-records for the record set.
-Existing records under the same label will be deleted.
-The format for the RECORDLINE is "TTL TYPE FLAGS VALUE" where TTL is
-the time to live in seconds (unit must not be given explicitly,
-seconds is always implied), TYPE is the DNS/GNS record type,
-FLAGS is "(N)ORMAL", "(S)HADOW" or "(P)UBLIC".
-The VALUE follows the usual human-readable value format(s) of DNS/GNS.
+.It Fl r | -recordline
+Changes the output format of zones and records to recordline.
 .It Fl s | -shadow
 Create a record that is a shadow record.
 Shadow records are only used once all other records of the same type
 under the same label have expired.
+.It Fl S | -from-stdin
+Read recordlines from stdin until EOF is encountered.
+The format uses
+.B recordlines
+:
+A record in a recordline follows the format
+
+NAME.EGO:
+ TYPE EXPIRATION [FLAGS] VALUE
+ ...
+Multiple records may be provided for a name.
+
+EXPIRATION is given in microseconds without a unit (e.g. 3600000000 for 3600 seconds).
+
+FLAGS is a concatenation of record flags.
+Possible values for flags and their meaning are:
+.Pp
+  p: Public
+  s: Shadow
+  S: Supplemental
+  C: Critical
+  r: Relative expiration
+
+TYPE and VALUE are used in the same way as for the "-t" and "-V" options.
+Example formats for recordlines can be output using the "-D" flag combined
+with "--recordline".
+An example record set in recordline format can be found in the examples.
+It is possible to specify multiple record sets.
+Can only be used in combination with "-a" to add the parsed record sets.
+Existing record sets under names will be replaced.
+.It Fl T | -include-maintenance
+Show maintenance records such as TOMBSTONEs. Use in combination with --display.
 .It Fl t Ar TYPE | Fl -type= Ns Ar TYPE
 Type of the record to add/delete/display ("A"; "AAAA"; "NS"; "PKEY"; "MX"; etc.).
 .It Fl u Ar URI | Fl -uri= Ns Ar URI
@@ -121,6 +153,8 @@ Specific format depends on the record type.
 A records expect a dotted decimal IPv4 address, AAAA records an IPv6
 address, PKEY a public key in GNUnet's printable format, and CNAME and
 NS records should be a domain name.
+.It Fl X | -purge-zone-records
+Delete all records in a zone.
 .It Fl z Ar EGO | Fl -zone= Ns Ar EGO
 Specifies the name of the ego controlling the private key for the
 zone. If not provided, we will attempt to use the default identity set
@@ -129,8 +163,45 @@ Base32-encoding using the GNUNET_NAMESTORE_EGO_PRIVATE_KEY environment
 variable. The latter is useful to improve performance of tools like
 Ascension as it allows the command to skip IPC with the identity
 management subsystem.
+.It Fl Z Ar KEY | Fl -zone-to-name= Ns Ar KEY
+Determine our GNS name for the given public key (reverse lookup of the
+KEY) in the given zone.
 .El
-.\".Sh EXAMPLES
+.Sh EXAMPLES
+.Tp
+.Nm
+-z example -a -n www -t A -V "1.2.3.4" -e 1d -p
+.Tp
+.Pp
+.Dl Add a public record for ego "example" with name "www" containing an IP address.
+.sp
+.Tp
+.Nm
+-z example -D
+.Tp
+.Pp
+.Dl Show all records for ego "example".
+.sp
+.Tp
+.Nm
+-z example -D -r
+.Tp
+.Pp
+.Dl Show all records for ego "example" in recordline format.
+.sp
+.Tp
+.Nm
+--add --from-stdin <<EOF
+ www.alice:
+  A 3600000000 [pr] 1.2.3.4
+  TXT 3600000001 [pr] Hello World
+
+ www.bob:
+  A 12345679000000 [pr] 4.3.2.1
+ EOF
+.Tp
+.Pp
+.Dl Read record sets in recordline format from stdin.
 .\".Sh FILES
 .Sh SEE ALSO
 .Xr gnunet-gns 1 ,
diff --git a/doc/man/gnunet-nse.1 b/doc/man/gnunet-nse.1
index 5f2d02bfa..193173381 100644
--- a/doc/man/gnunet-nse.1
+++ b/doc/man/gnunet-nse.1
@@ -48,6 +48,9 @@ Use LOGLEVEL for logging.
 Valid values are DEBUG, INFO, WARNING and ERROR.
 .It Fl l Ar LOGFILE | Fl -logfile= Ns Ar LOGFILE
 Configure logging to write logs to LOGFILE.
+.It Fl m | -monitor
+In monitor mode, gnunet-nse will continuously print the NSE estimates,
+instead of giving just a snapshot.
 .It Fl v | -version
 Print GNUnet version number.
 .El
diff --git a/doc/man/gnunet-reclaim.1 b/doc/man/gnunet-reclaim.1
index 70c63666c..a38d9c9e0 100644
--- a/doc/man/gnunet-reclaim.1
+++ b/doc/man/gnunet-reclaim.1
@@ -39,6 +39,9 @@
 .Op Fl d Ar ID | Fl -delete= Ns Ar ID
 .Op Fl r Ar RP | Fl -rp= Ns Ar RP
 .Op Fl D | -dump
+.Op Fl A | -credentials
+.Op Fl I | -credential-id Ns Ar CREDENTIAL_ID
+.Op Fl N | -credential-name Ns AR NAME
 .Op Fl i Ar A1,A2,... | Fl -issue= Ns Ar A1,A2,...
 .Op Fl C Ar TICKET | Fl -consume= Ns Ar TICKET
 .Op Fl R Ar TICKET | Fl -revoke= Ns Ar TICKET
@@ -73,6 +76,12 @@ Delete an attribute with ID.
 Specify relative expiration interval (freshness) of attribute.
 .It Fl D | -dump
 List all attributes for given identity.
+.It Fl A | -credentials
+List credentials for a given identity.
+.It Fl I | -credential-id= Ns Ar CREDENTIAL_ID
+Credential ID to use when creating an attribute backed by a credential
+.It Fl N | -credential-name= Ns Ar NAME
+The name of the credential to add.
 .It Fl i Ar A1,A2,... | Fl -issue= Ns Ar A1,A2,...
 Authorize a relying party to access a set of attributes. Must be
 used in conjunction with -r. Returns a TICKET.
diff --git a/doc/man/gnunet-search.1 b/doc/man/gnunet-search.1
index 4ec5189de..3145842a4 100644
--- a/doc/man/gnunet-search.1
+++ b/doc/man/gnunet-search.1
@@ -21,7 +21,7 @@
 .\"
 .\" SPDX-License-Identifier: GPL3.0-or-later OR FDL1.3-or-later
 .\"
-.Dd February 25, 2012
+.Dd February 12, 2022
 .Dt GNUNET-SEARCH 1
 .Os
 .Sh NAME
@@ -30,13 +30,18 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl a Ar LEVEL | Fl -anonymity= Ns Ar LEVEL
+.Op Fl b | -bookmark-only
 .Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
+.Op Fl F Ar FORMAT | Fl -dir-printf= Ns Ar FORMAT
+.Op Fl f Ar FORMAT | Fl -printf= Ns Ar FORMAT
 .Op Fl h | -help
+.Op Fl i Ar FORMAT | Fl -iter-printf= Ns Ar FORMAT
 .Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
 .Op Fl l Ar FILENAME | Fl -logfile= Ns Ar FILENAME
 .Op Fl o Ar FILENAME | Fl -output= Ns Ar FILENAME
 .Op Fl n | -no-network
 .Op Fl N Ar VALUE | Fl -results= Ns Ar VALUE
+.Op Fl s | -silent
 .Op Fl t Ar DELAY | Fl -timeout= Ns Ar DELAY
 .Op Fl v | -version
 .Op Fl V | -verbose
@@ -63,40 +68,207 @@ The specific numeric value (for anonymity levels above 1) is simple:
 Given an anonymity level L (above 1), each request FS makes on your behalf must be hidden in L-1 equivalent requests of cover traffic (traffic your peer routes for others) in the same time-period.
 The time-period is twice the average delay by which GNUnet artificially delays traffic.
 Note that regardless of the anonymity level you choose, peers that cache content in the network always use anonymity level 1.
+.It Fl b | -bookmark-only
+Do not search, print only the URI that points to the search with the given keywords.
 .It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
 Use the configuration file
 .Ar FILENAME
 (default:
-.Pa ~/.config/gnunet.conf )
+.Pa ~/.config/gnunet.conf Ns
+).
+.It Fl F Ar FORMAT | Fl -dir-printf= Ns Ar FORMAT
+Write the search results for directories according to
+.Ar FORMAT Ns
+\&. The directives supported here are identical to those supported in the
+.Fl -printf
+argument (please refer to it for more information). If missing,
+.Fl -dir-printf
+defaults to
+.Fl -printf Ns
+\&. If
+.Fl -printf
+is missing too
+.Fl -dir-printf
+defaults to
+.Ql #%n:\engnunet-download -o Qo %f Qc -R %u\en\en Ns
+\&.
+.It Fl f Ar FORMAT | Fl -printf= Ns Ar FORMAT
+Write the search results according to
+.Ar FORMAT Ns
+, in which
+.Ql \e
+and
+.Ql %
+directives are interpreted as follows:
+.Bl -tag -width indent
+.It Li \e\e
+a literal backslash
+.No ( Ql \e Ns )
+.It Li \ea
+an alarm bell
+.It Li \eb
+a backspace
+.It Li \ee
+an escape
+.It Li \ef
+a form feed
+.It Li \en
+a newline
+.It Li \er
+a carriage return
+.It Li \et
+a horizontal tab
+.It Li \ev
+a vertical tab
+.It Li \e0
+an ASCII NUL.
+.It Li \eN...
+the character whose ASCII code is N..., expressed in octal digits
+.It Li \exX...
+the character whose ASCII code is X..., expressed in hexadecimal digits
+.Pp
+.El
+.Sy Note:
+The
+.Ql \e
+character followed by any other character not listed above is treated as an ordinary character, so both characters are printed.
+.Bl -tag -width indent
+.It Li %%
+a percent sign
+.It Li %a
+the complete list of all the printable metadata properties available, displayed according to the
+.Fl -iter-printf
+argument; this specifier optionally supports metatype filtering via hash sign
+.No (e.g.
+.Ql %2#a
+prints all embedded file names, if present - see libextractor's metatypes for the complete list of numerical identifiers)
+.It Li %f
+the file's name
+.It Li %j
+the first printable metadata property available, displayed according to the
+.Fl -iter-printf
+argument; this specifier optionally supports metatype filtering via hash sign
+.No (e.g.
+.Ql %5#j
+prints a book title, if present); see libextractor's metatypes for the complete list of numerical identifiers)
+.It Li %l
+the file name's length
+.It Li %m
+the file's mime type
+.It Li %n
+the search result number
+.It Li %s
+the file's size in bytes
+.It Li %u
+the file's URI
+.El
+.Pp
+.Sy Note:
+The
+.Ql %
+character followed by any other character not listed above is treated as an ordinary character, so both characters are printed.
+.Pp
+If missing,
+.Fl -printf
+defaults to
+.Ql #%n:\engnunet-download -o Qo %f Qc %u\en\en Ns
+\&.
 .It Fl h | -help
 Print the help page.
+.It Fl i Ar FORMAT | Fl -iter-printf= Ns Ar FORMAT
+When the
+.Ql %a
+or
+.Ql %j
+format specifiers appear in
+.Fl -printf
+or
+.Fl -dir-printf Ns
+, list each metadata property according to
+.Ar FORMAT Ns
+, in which the
+.Ql \e
+directives are interpreted as in
+.Fl -printf
+and
+.Fl -dir-printf Ns
+, while the
+.Ql %
+directives are interpreted as follows:
+.Bl -tag -width indent
+.It Li %%
+a percent sign
+.It Li %p
+the property's content
+.It Li %l
+the property content's length in bytes
+.It Li %i
+the property type's unique identifier
+.It Li %n
+the property number
+.It Li %t
+the property type (available only if compiled with libextractor)
+.It Li %w
+the name of the plugin that provided the information
+.El
+.Pp
+.Sy Note:
+The
+.Ql %
+character followed by any other character not listed above is treated as an ordinary character, so both characters are printed.
+.Pp
+If missing,
+.Fl -iter-printf
+defaults to
+.Ql \& \& %t: %p\en
+or
+.Ql \& \& MetaType #%i: %p\en Ns
+, depending on whether the program was compiled with libextractor or not.
 .It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
 Change the loglevel.
-Possible values for LOGLEVEL are ERROR, WARNING, INFO and DEBUG.
+Possible values for
+.Ar LOGLEVEL
+are ERROR, WARNING, INFO and DEBUG.
 .It Fl l Ar FILENAME | Fl -logfile= Ns Ar FILENAME
 Write logs to
 .Ar FILENAME .
 .It Fl o Ar FILENAME | Fl -output= Ns Ar FILENAME
 Writes a GNUnet directory containing all of the search results to
-.Ar FILENAME .
+.Ar FILENAME
+.No (e.g.
+.Ql gnunet-search --output=commons.gnd commons Ns
+).
 .It Fl n | -no-network
 Only search locally, do not forward requests to other peers.
 .It Fl N Ar VALUE | Fl -results= Ns Ar VALUE
 Automatically terminate the search after receiving
 .Ar VALUE
 results.
+.It Fl s | -silent
+Enable silent mode and do not print any result (the
+.Fl -output
+argument is required).
 .It Fl t Ar DELAY | Fl -timeout= Ns Ar DELAY
 Automatically timeout search after
 .Ar DELAY .
-The value given must be a number followed by a space and a time unit, for example "500 ms".
-Note that the quotes are required on the shell.
-Otherwise the search runs until gnunet-search is aborted with CTRL-C.
+The value given must be a number followed by a space and a time unit, for example
+.Qo 500 ms Qc . Note that the quotes are required on the shell. Without a unit it defaults to microseconds (1000000 = 1 second).
+If 0 or omitted the search runs until gnunet-search is aborted with CTRL-C.
 .It Fl v | -version
 print the version number
 .It Fl V | -verbose
-print meta data from search results as well
+append
+.Ql %a\en
+to the default
+.Fl -printf
+and
+.Fl -dir-printf
+arguments \[u2013] ignored when these are provided by the user
 .El
-You can run gnunet-search with an URI instead of a keyword.
+.Pp
+It is possible to run
+.Nm gnunet-search
+with an URI instead of a keyword.
 The URI can have the format for a namespace search or for a keyword search.
 For a namespace search, the format is
 .Pp
@@ -108,46 +280,137 @@ For a keyword search, use
 .Pp
 If the format does not correspond to a GNUnet URI, GNUnet will automatically assume that keywords are supplied directly.
 .sp
-If multiple keywords are passed, gnunet-search will look for content matching any of the keywords.
-The prefix "+" makes a keyword mandatory.
+If multiple keywords are passed,
+.Nm gnunet-search
+will look for content matching any of the keywords.
+The
+.Ql +
+prefix makes a keyword mandatory.
 .Sh FILES
 .Pa ~/.config/gnunet.conf
 GNUnet configuration file; specifies the default value for the timeout
 .Sh EXAMPLES
-.Dl $ gnunet-search "Das Kapital"
+Example 1:
+.Pp
+.Dl $ gnunet-search 'Das Kapital'
 .Pp
-Searches for content matching the keyword "Das Kapital".
+searches for content matching the keyword
+.Dq Das Kapital Ns
+.
+.Pp
+Example 2:
+.Pp
+.Dl $ gnunet-search Das Kapital
+.Pp
+searches for content matching either keyword
+.Dq Das
+or keyword
+.Dq Kapital Ns
+.
+.Pp
+Example 3:
 .Pp
 .Dl $ gnunet-search +Das +Kapital
 .Pp
-Searches for content matching both mandatory keywords "Das" and "Kapital".
+searches for content matching both mandatory keywords
+.Dq Das
+and
+.Dq Kapital Ns
+.
 .sp
-Search results are printed by gnunet-search like this:
+Search results are printed by
+.Nm gnunet-search
+like this:
 .Pp
 .ad l
         gnunet-download -o "COPYING" gnunet://fs/chk/HASH1.HASH2.SIZE
-                Description: The GNU General Public License
-                Mime-type: text/plain
+.Pp
+          Description: The GNU General Public License
+          Mime-type: text/plain
+          ...
 .ad b
-
+.Pp
 The first line contains the command to run to download the file.
-The suggested filename in the example is COPYING.
-The GNUnet URI consists of the key and query hash of the file and finally the size of the file.
-After the command to download the file, GNUnet will print meta-data about the file as advertised in the search result.
-The meta-data here is the description ("The GNU General Public License") and the mime-type ("text-plain").
+The suggested filename in the example is
+.Ql COPYING Ns
+\&. The GNUnet URI consists of the key and query hash of the file and finally the size of the file.
+If the
+.Fl -verbose
+option was provided, after the command to download the file, GNUnet will print metadata about the file as advertised in the search result.
+The metadata here is the description
+.No ( Ns
+.Dq The GNU General Public License Ns
+) and the mime-type
+.No ( Ns
+.Dq text-plain Ns
+).
 See the options for
 .Xr gnunet-publish 1
-on how to supply meta-data by hand.
+on how to supply metadata by hand.
+.Pp
+The
+.Fl -printf
+.No ( Ns
+.Fl f Ns
+),
+.Fl -dir-printf
+.No ( Ns
+.Fl F Ns
+) and
+.Fl -iter-printf
+.No ( Ns
+.Fl i Ns
+) arguments offer powerful tools for manipulating the output printed. For instance,
+.Pp
+Example 4:
+.Pp
+.ad l
+        $ gnunet-search -f '%f (%s bytes)\en' commons
+.Pp
+will print a simple list of the results that match the
+.Dq commons
+keyword, with only the file name and the size printed, without any URI. Or, for instance,
+.Pp
+Example 5:
+.Pp
+.ad l
+        #!/bin/sh
+        {
+          printf '<list>'
+          gnunet-search -f '
+          <file uri="%u">
+            <filename len="%l">%f</filename>
+            <size>%s</size>
+            <mimetype>%m</mimetype>
+            <result_id>%n</result_id>
+            <metadata>%a
+            </metadata>
+          </file>' \e
+            -i '
+              <property tid="%i" type="%t">
+                <content len="%l">%p</content>
+                <property_id>%n</property_id>
+                <provided_by>%w</provided_by>
+              </property>' \e
+            -t '2 s' commons
+          printf '\en</list>\en'
+        } > commons.xml
+.Pp
+will run for two seconds and then create a file named
+.Pa commons.xml Ns
+, containing the search results that match the
+.Dq commons
+keyword in XML format.
 .Sh SEE ALSO
 .Xr gnunet-download 1 ,
 .Xr gnunet-fs-gtk 1 ,
 .Xr gnunet-publish 1 ,
 .Xr gnunet.conf 5
 .sp
-The full documentation for gnunet is maintained as a Texinfo manual.
+The full documentation for GNUnet is maintained as a Texinfo manual.
 If the
 .Xr info 1
-and gnunet programs are properly installed at your site, the command
+and gnunet packages are properly installed at your site, the command
 .Pp
 .Dl info gnunet
 .Pp
diff --git a/doc/man/meson.build b/doc/man/meson.build
new file mode 100644
index 000000000..fbd8179ba
--- /dev/null
+++ b/doc/man/meson.build
@@ -0,0 +1,62 @@
+five = configure_file(input : 'gnunet.conf.5.in',
+               output : 'gnunet.conf.5',
+               configuration : cdata,
+               install: false,
+               install_dir: get_option('mandir'))
+
+install_man(
+  [
+  five,
+  'gnunet-arm.1',
+  'gnunet-auto-share.1',
+  'gnunet-base32.1',
+  'gnunet-bcd.1',
+  'gnunet-bugreport.1',
+  'gnunet-config.1',
+  'gnunet-core.1',
+  'gnunet-conversation.1',
+  'gnunet-conversation-test.1',
+  'gnunet-dht-get.1',
+  'gnunet-dht-put.1',
+  'gnunet-dht-monitor.1',
+  'gnunet-dht-hello.1',
+  'gnunet-directory.1',
+  'gnunet-dns2gns.1',
+  'gnunet-datastore.1',
+  'gnunet-download.1',
+  'gnunet-did.1',
+  'gnunet-ecc.1',
+  'gnunet-fs.1',
+  'gnunet-gns.1',
+  'gnunet-gns-proxy.1',
+  'gnunet-gns-proxy-setup-ca.1',
+  'gnunet-identity.1',
+  'gnunet-cadet.1',
+  'gnunet-messenger.1',
+  'gnunet-namecache.1',
+  'gnunet-namestore.1',
+  'gnunet-namestore-dbtool.1',
+  'gnunet-namestore-zonefile.1',
+  'gnunet-nat.1',
+  'gnunet-nat-auto.1',
+  'gnunet-nat-server.1',
+  'gnunet-nse.1',
+  'gnunet-publish.1',
+  'gnunet-qr.1',
+  'gnunet-reclaim.1',
+  'gnunet-resolver.1',
+  'gnunet-revocation.1',
+  'gnunet-scalarproduct.1',
+  'gnunet-scrypt.1',
+  'gnunet-search.1',
+  'gnunet-statistics.1',
+  'gnunet-testing.1',
+  'gnunet-testing-run-service.1',
+  'gnunet-timeout.1',
+  'gnunet-transport.1',
+  'gnunet-transport-certificate-creation.1',
+  'gnunet-unindex.1',
+  'gnunet-uri.1',
+  'gnunet-vpn.1',
+  'gnunet-zoneimport.1'])
+
diff --git a/doc/man/produce_html.sh.in b/doc/man/produce_html.sh.in
index 8680c0106..e9581622f 100755
--- a/doc/man/produce_html.sh.in
+++ b/doc/man/produce_html.sh.in
@@ -1,13 +1,6 @@
 #!/bin/bash
 
-if test -e @PKGDATADIRECTORY@/existence.sh
-then
-    . @PKGDATADIRECTORY@/existence.sh
-else
-    . $dir/../../contrib/build-common/sh/lib.sh/existence.sh
-fi
-
-if existence mandoc;
+if command -v mandoc >/dev/null 2>&1;
 then
     for f in `find . -name \*\.[1-9]`;
     do
diff --git a/doc/meson.build b/doc/meson.build
new file mode 100644
index 000000000..84b3cfde2
--- /dev/null
+++ b/doc/meson.build
@@ -0,0 +1,2 @@
+subdir('handbook')
+subdir('man')
diff --git a/doc/doc.h b/doc/old/doc.h
index db079e94a..db079e94a 100644
--- a/doc/doc.h
+++ b/doc/old/doc.h
diff --git a/doc/docstyle.css b/doc/old/docstyle.css
index 8719248d0..8719248d0 100644
--- a/doc/docstyle.css
+++ b/doc/old/docstyle.css
diff --git a/doc/old/handbook/.gitignore b/doc/old/handbook/.gitignore
new file mode 100644
index 000000000..80ac74ea0
--- /dev/null
+++ b/doc/old/handbook/.gitignore
@@ -0,0 +1,11 @@
+stamp-1
+version2.texi
+manual
+*.fn
+*.fns
+*.ky
+*.pg
+*.tp
+*.vr
+gnunet 
+gnunet.html
diff --git a/doc/handbook/Makefile.am b/doc/old/handbook/Makefile.am
index 7c10b417a..7c10b417a 100644
--- a/doc/handbook/Makefile.am
+++ b/doc/old/handbook/Makefile.am
diff --git a/doc/handbook/TODO b/doc/old/handbook/TODO
index fa1ce7a23..fa1ce7a23 100644
--- a/doc/handbook/TODO
+++ b/doc/old/handbook/TODO
diff --git a/doc/handbook/agpl-3.0.texi b/doc/old/handbook/agpl-3.0.texi
index eabb0c6df..eabb0c6df 100644
--- a/doc/handbook/agpl-3.0.texi
+++ b/doc/old/handbook/agpl-3.0.texi
diff --git a/doc/handbook/chapters/configuration.texi b/doc/old/handbook/chapters/configuration.texi
index 27efc82e2..27efc82e2 100644
--- a/doc/handbook/chapters/configuration.texi
+++ b/doc/old/handbook/chapters/configuration.texi
diff --git a/doc/handbook/chapters/contributing.texi b/doc/old/handbook/chapters/contributing.texi
index f3beeef76..f3beeef76 100644
--- a/doc/handbook/chapters/contributing.texi
+++ b/doc/old/handbook/chapters/contributing.texi
diff --git a/doc/handbook/chapters/developer.texi b/doc/old/handbook/chapters/developer.texi
index a8f9d1ec3..c8905f2c1 100644
--- a/doc/handbook/chapters/developer.texi
+++ b/doc/old/handbook/chapters/developer.texi
@@ -96,7 +96,7 @@ introduction, each of the GNUnet subsystems (directories in the
 addition to this documentation, GNUnet developers should be aware of the
 services available on the GNUnet server to them.
 
-New developers can have a look a the @uref{https://docs.gnunet.org/tutorial/gnunet-tutorial.html, GNUnet C tutorial}.
+New developers can have a look a the @uref{https://docs.gnunet.org/tutorial/tutorial.html, GNUnet C tutorial}.
 
 @c ** FIXME: Link to files in source, not online.
 @c ** FIXME: Where is the Java tutorial?
@@ -6250,7 +6250,7 @@ by NAMESTORE.
 Here a client uses the @code{GNUNET_NAMESTORE_zone_iteration_start}
 function and passes the namestore handle, the zone to iterate over and a
 callback function to call with the result.
-If the client wants to iterate over all the WHAT!? FIXME, it passes NULL for the zone.
+To iterate over all the zones, it is possible to pass NULL for the zone.
 A @code{GNUNET_NAMESTORE_ZoneIterator} handle is returned to be used to
 continue iteration.
 
@@ -9990,7 +9990,7 @@ Also MESSENGER provides multiple features with privacy in mind:
       original sender (uses the MESSENGER provided verification)
 @item MESSENGER allows using the publicly known anonymous ego instead of any
       unique identifying ego
-@item MESSENGER allows your node to decide between acting as host of the used
+@item MESSENGER allows your node to decide between acting as relay of the used
       messaging room (sharing your peer's identity with all nodes in the group)
       or acting as guest (sharing your peer's identity only with the nodes you
       explicitly open a connection to)
diff --git a/doc/handbook/chapters/installation.texi b/doc/old/handbook/chapters/installation.texi
index 54fb3f486..f93645114 100644
--- a/doc/handbook/chapters/installation.texi
+++ b/doc/old/handbook/chapters/installation.texi
@@ -41,8 +41,9 @@ should be installed with a package manager.
 
 The mandatory libraries and applications are
 @itemize @bullet
-@item autoconf 2.59 or above
-@item automake 1.11.1 or above
+@item autoconf 2.59 or above (when building from git)
+@item automake 1.11.1 or above (when building from git)
+@item recutils 1.0 or above (when building from git)
 @item gettext
 @item glibc (read below, other libcs work)
 @item GnuTLS 3.2.12 or above, recommended to be linked against libunbound
@@ -54,6 +55,7 @@ The mandatory libraries and applications are
 @item libidn2 or libidn
 @item libmicrohttpd 0.9.63 or above
 @item libunistring
+@item libjansson
 @item libgmp
 @item libgnurl or libcurl (libcurl has to be linked to GnuTLS) 7.35.0 or above
 @item Texinfo 5.2 or above (for building the documentation)
@@ -100,7 +102,6 @@ These are the dependencies only required for certain features
 (for attribute-based encryption and the identity provider subsystem)
 @item texi2mdoc (for automatic mdoc generation)
 @item perl5 for some utilities (which are not installed)
-@item libjanson
 @end itemize
 
 About libextractor being optional:
diff --git a/doc/handbook/chapters/keyconcepts.texi b/doc/old/handbook/chapters/keyconcepts.texi
index c8dd1599b..c8dd1599b 100644
--- a/doc/handbook/chapters/keyconcepts.texi
+++ b/doc/old/handbook/chapters/keyconcepts.texi
diff --git a/doc/handbook/chapters/philosophy.texi b/doc/old/handbook/chapters/philosophy.texi
index 785a65e42..180589829 100644
--- a/doc/handbook/chapters/philosophy.texi
+++ b/doc/old/handbook/chapters/philosophy.texi
@@ -7,11 +7,12 @@
 @c of GNUnet.
 The primary goal of the GNUnet project is to provide a reliable, open,
 non-discriminating and censorship-resistant system for information
-exchange. We value free speech above state interests and intellectual
+exchange.
+We value free speech above state interests and intellectual
 monopoly. GNUnet's long-term goal is to serve as a development
 platform for the next generation of Internet protocols.
 
-GNUnet is an anarchistic network. Participants are encouraged to
+Participants are encouraged to
 contribute at least as much resources (storage, bandwidth) to the network
 as they consume, so that their participation does not have a negative
 impact on other users.
diff --git a/doc/handbook/chapters/preface.texi b/doc/old/handbook/chapters/preface.texi
index 961ec0737..961ec0737 100644
--- a/doc/handbook/chapters/preface.texi
+++ b/doc/old/handbook/chapters/preface.texi
diff --git a/doc/handbook/chapters/user.texi b/doc/old/handbook/chapters/user.texi
index aa912f96f..714336228 100644
--- a/doc/handbook/chapters/user.texi
+++ b/doc/old/handbook/chapters/user.texi
@@ -56,7 +56,8 @@ $ gnunet-arm -e
 * The GNS Tab::
 * Creating a Record::
 * Resolving GNS records::
-* Integration with Browsers::
+* Integration with Browsers (DNS2GNS service)::
+* Integration with Browsers (SOCKS proxy)::
 * Creating a Business Card::
 * Be Social::
 * Backup of Identities and Egos::
@@ -67,8 +68,16 @@ $ gnunet-arm -e
 @node Preliminaries
 @subsection Preliminaries
 
+In the default configuration, there are two zones defined and shipped with
+GNUnet:
+
+The first is ``gnunet.org'', which points to the authoritate zone of the
+GNUnet project. It can be used to resolve, for example, ``www.gnunet.org''.
+
+``.pin'' is another default zone which points to a special zone also  managed
+by gnunet.org. Users may register submodomains on a first-come first-served-basis
+at @url{https://fcfs.gnunet.org}.
 
-``.pin'' is a default zone which points to a zone managed by gnunet.org.
 Use @code{gnunet-config -s gns} to view the GNS configuration, including
 all configured zones that are operated by other users.  The respective
 configuration entry names start with a ``.'', e.g. ``.pin''.
@@ -190,13 +199,99 @@ Got `A' record: 217.92.15.146
 That shows that resolution works, once GNS is integrated with
 the application.
 
-@node Integration with Browsers
-@subsection Integration with Browsers
+@node Integration with Browsers (DNS2GNS service)
+@subsection Integration with Browsers (DNS2GNS service)
+
+Most OSes allow you to either modify your @code{/etc/resolv.conf} directly or
+through @code{resolvectl}.
+We are going to configure the @code{dns2gns} service in order to translate DNS name
+queries by applications to GNS name queries where applicable and else fall back
+to DNS.
+
+Optionally, you may want to configure your @code{dns2gns} service to run on a
+non-priviledged port like 5353.
+But, in case you are going to edit @code{/etc/resolv.conf} directly, the
+@code{dns2gns} service MUST run on port 53 as you cannot specify the port number.
+A $FALLBACK_DNS variable should be a DNS server you trust such as your local router:
+
+@example
+$ gnunet-config -s dns2gns -o OPTIONS -V "-d $FALLBACK_DNS -p 5252"
+$ gnunet-arm -i dns2gns # Make sure the service is started
+@end example
+
+If you edit your resolv.conf directly, it should contain and entry like this:
+
+@example
+nameserver 127.0.0.1
+@end example
+
+In any case, it is very likely that the method of modification of your
+resolver is OS specific.
+Recently, the combination of NetworkManager and systemd-resolved is becoming
+increasingly popular.
+
+If you use resolvectl and systemd-resolved you can temporarily
+set the nameserver like this:
+
+@example
+$ resolvectl $INTERFACE 127.0.0.1:5353
+@end example
+
+Where @code{$INTERFACE} is your network interface such as ``eth0''.
+
+In order to automatically set the DNS2GNS server if it is running already you
+can use NetworkManager-dispatcher. First, enable it:
 
+@example
+$ sudo systemctl enable NetworkManager-dispatcher.service
+$ sudo systemctl start NetworkManager-dispatcher.service
+@end example
 
-While we recommend integrating GNS using the NSS module in the
-GNU libc Name Service Switch, you can also integrate GNS
-directly with your browser via the @code{gnunet-gns-proxy}.
+Then, create a script /etc/NetworkManager/dispatch.h/10-dns2-gns.sh:
+
+@example
+#!/bin/sh
+interface=$1
+status=$2
+
+if [ "$interface" = "eth0" ]; then
+  case $status in
+    up)
+      if nc -u -z 127.0.0.1 5353; then
+      resolvectl dns $interface 127.0.0.1:5353
+    fi
+    ;;
+    down)
+    ;;
+  esac
+fi
+@end example
+
+Make sure the script is owned by root and executable:
+
+@example
+$ sudo root:root /etc/NetworkManager/dispatch.d/10-dns2gns.sh
+$ sudo +x /etc/NetworkManager/dispatch.d/10-dns2gns.sh
+@end example
+
+You can test accessing this website using your browser or curl:
+
+@example
+$ curl www.gnunet.org
+@end example
+
+Note that ``gnunet.org'' is a domain that also exists in DNS and for which the
+GNUnet project webservers can provide trusted TLS certificates.
+When using non-DNS names with GNS or aliases, this may result in issues
+when accessing HTTPS websites with browsers.
+In order learn how to provide relief for this issue, read on.
+
+@node Integration with Browsers (SOCKS proxy)
+@subsection Integration with Browsers (SOCKS proxy)
+
+While we recommend integrating GNS using the DNS2GNS service or the
+NSSwitch plugin, you can also
+integrate GNS directly with your browser via the @code{gnunet-gns-proxy}.
 This method can have the advantage that the proxy can validate
 TLS/X.509 records and thus strengthen web security; however, the proxy
 is still a bit brittle, so expect subtle failures. We have had reasonable
@@ -1561,6 +1656,9 @@ The GNS currently supports the record types as defined in
 @uref{https://git.gnunet.org/gana.git/tree/gnu-name-system-record-types/registry.rec, GANA}.
 In addition, GNS supports DNS record types, such as A, AAAA or TXT.
 
+For a complete description of the records, please refer to the specification
+at @uref{https://lsd.gnunet.org/lsd0001, LSD0001}.
+
 In the following, we discuss GNS records with specific behaviour or special
 handling of DNS records.
 
@@ -1570,8 +1668,9 @@ handling of DNS records.
 * BOX::
 * LEHO::
 * VPN::
-* CNAME::
+* REDIRECT::
 * GNS2DNS::
+* TOMBSTONE::
 * SOA SRV PTR and MX::
 @end menu
 
@@ -1668,11 +1767,11 @@ having the following lines in the @file{gnunet.conf} configuration file:
 TCP_REDIRECTS = 80:localhost4:8080
 @end example
 
-@node CNAME
-@subsubsection CNAME
+@node REDIRECT
+@subsubsection REDIRECT
 
-As specified in RFC 1035 whenever a CNAME is encountered the query
-needs to be restarted with the specified name. In GNS a CNAME
+As specified in LSD0001 whenever a REDIRECT is encountered the query
+needs to be restarted with the specified name. A REDIRECT
 can either be:
 
 @itemize @bullet
@@ -1721,6 +1820,21 @@ However, imagine the nameserver was "ns.gnunet.org". In this case,
 delegating to "ns.gnunet.org" would mean that despite using GNS,
 censorship in the DNS ".org" zone would still be effective.
 
+@node TOMBSTONE
+@subsubsection TOMBSTONE
+
+The GNUnet GNS implementation uses the TOMBSTONE record to ensure
+ciphertext indistinguishability for published records.
+It must be ensured that when relative expiration times are decreased, the
+expiration time of the next record block MUST be after the last published block.
+A similar issue arises if the record set under a label is deleted and reused
+later.
+
+The creation and maintenance of the TOMBSTONE record is done automatically.
+You do not need to mind it yourself and can safely ignore any TOMBSTONE
+blocks you may see when investigating your zone(s).
+TOMBSTONE records are always private and will never be published.
+
 @node SOA SRV PTR and MX
 @subsubsection SOA SRV PTR and MX
 
@@ -2346,16 +2460,16 @@ that will terminate at the respective peer's service.
 @section Using the GNUnet Messenger
 
 The GNUnet Messenger subsystem allows decentralized message-based 
-communication inside of so called rooms. Each room can be hosted by
+communication inside of so called rooms. Each room can be relayed by
 a variable amount of peers. Every member of a room has the possibility
-to host the room on its own peer. A peer allows any amount of members 
+to relay the room on its own peer. A peer allows any amount of members 
 to join a room. The amount of members in a room is not restricted.
 
-Messages in a room will be distributed between all peers hosting the 
+Messages in a room will be distributed between all peers relaying the 
 room or being internally (in context of the messenger service) connected 
-to a hosting peer. All received or sent messages will be stored on any 
-peer locally which is hosting the respective room or is internally
-connected to such a hosting peer.
+to a relaying peer. All received or sent messages will be stored on any 
+peer locally which is relaying the respective room or is internally
+connected to such a relaying peer.
 
 The Messenger service is built on the CADET subsystem to make internal 
 connections between peers using a reliable and encrypted transmission. 
@@ -2392,9 +2506,9 @@ library designed for messenger applications.
 @node Entering a room
 @subsection Entering a room
 
-You can enter any room by its ROOMKEY and any PEERIDENTITY of a hosting peer.
-Optionally you can provide any IDENTITY which can represent a local ego by
-its name.
+You can enter any room by its ROOMKEY and any PEERIDENTITY of a relaying 
+peer. Optionally you can provide any IDENTITY which can represent a local 
+ego by its name.
 
 @example
 $ gnunet-messenger [-e IDENTITY] -d PEERIDENTITY -r ROOMKEY
@@ -2422,14 +2536,14 @@ be distributed as your name for the service in any case.
 @subsection Opening a room
 
 You can open any room in a similar way to entering it. You just have to leave
-out the '-d' parameter and the PEERIDENTITY of the hosting peer.
+out the '-d' parameter and the PEERIDENTITY of the relaying peer.
 
 @example
 $ gnunet-messenger [-e IDENTITY] -r ROOMKEY
 @end example
 
 Providing ROOMKEY and IDENTITY is identical to entering a room. Opening a room
-will also make your peer to a host of this room. So others can enter the room
+will also make your peer to a relay of this room. So others can enter the room
 through your peer if they have the required ROOMKEY and your peer ID.
 
 If you want to use the zeroed hash as shared secret key for the room you can
diff --git a/doc/handbook/chapters/vocabulary.texi b/doc/old/handbook/chapters/vocabulary.texi
index 0ee472b95..0ee472b95 100644
--- a/doc/handbook/chapters/vocabulary.texi
+++ b/doc/old/handbook/chapters/vocabulary.texi
diff --git a/doc/handbook/docstyle.css b/doc/old/handbook/docstyle.css
index 8719248d0..8719248d0 100644
--- a/doc/handbook/docstyle.css
+++ b/doc/old/handbook/docstyle.css
diff --git a/doc/handbook/fdl-1.3.texi b/doc/old/handbook/fdl-1.3.texi
index cb71f05a1..cb71f05a1 100644
--- a/doc/handbook/fdl-1.3.texi
+++ b/doc/old/handbook/fdl-1.3.texi
diff --git a/doc/handbook/gendocs.sh b/doc/old/handbook/gendocs.sh
index 79c92c9ad..79c92c9ad 100755
--- a/doc/handbook/gendocs.sh
+++ b/doc/old/handbook/gendocs.sh
diff --git a/doc/handbook/gendocs_template b/doc/old/handbook/gendocs_template
index cb0450bee..cb0450bee 100644
--- a/doc/handbook/gendocs_template
+++ b/doc/old/handbook/gendocs_template
diff --git a/doc/handbook/gendocs_template_min b/doc/old/handbook/gendocs_template_min
index 6a4711870..6a4711870 100644
--- a/doc/handbook/gendocs_template_min
+++ b/doc/old/handbook/gendocs_template_min
diff --git a/doc/handbook/gnunet.texi b/doc/old/handbook/gnunet.texi
index ca74c347d..ca74c347d 100644
--- a/doc/handbook/gnunet.texi
+++ b/doc/old/handbook/gnunet.texi
diff --git a/doc/handbook/gpl-3.0.texi b/doc/old/handbook/gpl-3.0.texi
index 0e2e212ac..0e2e212ac 100644
--- a/doc/handbook/gpl-3.0.texi
+++ b/doc/old/handbook/gpl-3.0.texi
diff --git a/doc/handbook/htmlxref.cnf b/doc/old/handbook/htmlxref.cnf
index a4928f6fe..a4928f6fe 100644
--- a/doc/handbook/htmlxref.cnf
+++ b/doc/old/handbook/htmlxref.cnf
diff --git a/doc/handbook/images/ascension_interaction.png b/doc/old/handbook/images/ascension_interaction.png
index 84e2e9c0f..84e2e9c0f 100644
--- a/doc/handbook/images/ascension_interaction.png
+++ b/doc/old/handbook/images/ascension_interaction.png
diff --git a/doc/handbook/images/ascension_ssd.png b/doc/old/handbook/images/ascension_ssd.png
index 3b142ab31..3b142ab31 100644
--- a/doc/handbook/images/ascension_ssd.png
+++ b/doc/old/handbook/images/ascension_ssd.png
diff --git a/doc/handbook/images/daemon_lego_block.png b/doc/old/handbook/images/daemon_lego_block.png
index 5a088b532..5a088b532 100644
--- a/doc/handbook/images/daemon_lego_block.png
+++ b/doc/old/handbook/images/daemon_lego_block.png
diff --git a/doc/handbook/images/daemon_lego_block.svg b/doc/old/handbook/images/daemon_lego_block.svg
index 38ad90d13..38ad90d13 100644
--- a/doc/handbook/images/daemon_lego_block.svg
+++ b/doc/old/handbook/images/daemon_lego_block.svg
diff --git a/doc/handbook/images/gns.dot b/doc/old/handbook/images/gns.dot
index 55b05d482..55b05d482 100644
--- a/doc/handbook/images/gns.dot
+++ b/doc/old/handbook/images/gns.dot
diff --git a/doc/handbook/images/gns.eps b/doc/old/handbook/images/gns.eps
index 3f3c28d98..3f3c28d98 100644
--- a/doc/handbook/images/gns.eps
+++ b/doc/old/handbook/images/gns.eps
diff --git a/doc/handbook/images/gns.jpg b/doc/old/handbook/images/gns.jpg
index d71109b95..d71109b95 100644
--- a/doc/handbook/images/gns.jpg
+++ b/doc/old/handbook/images/gns.jpg
diff --git a/doc/handbook/images/gnunet-0-10-peerinfo.png b/doc/old/handbook/images/gnunet-0-10-peerinfo.png
index c5e711aff..c5e711aff 100644
--- a/doc/handbook/images/gnunet-0-10-peerinfo.png
+++ b/doc/old/handbook/images/gnunet-0-10-peerinfo.png
diff --git a/doc/handbook/images/gnunet-fs-gtk-0-10-star-tab.png b/doc/old/handbook/images/gnunet-fs-gtk-0-10-star-tab.png
index d7993cc46..d7993cc46 100644
--- a/doc/handbook/images/gnunet-fs-gtk-0-10-star-tab.png
+++ b/doc/old/handbook/images/gnunet-fs-gtk-0-10-star-tab.png
diff --git a/doc/handbook/images/gnunet-gtk-0-10-download-area.png b/doc/old/handbook/images/gnunet-gtk-0-10-download-area.png
index 8500d46c9..8500d46c9 100644
--- a/doc/handbook/images/gnunet-gtk-0-10-download-area.png
+++ b/doc/old/handbook/images/gnunet-gtk-0-10-download-area.png
diff --git a/doc/handbook/images/gnunet-gtk-0-10-fs-menu.png b/doc/old/handbook/images/gnunet-gtk-0-10-fs-menu.png
index dc20c45a9..dc20c45a9 100644
--- a/doc/handbook/images/gnunet-gtk-0-10-fs-menu.png
+++ b/doc/old/handbook/images/gnunet-gtk-0-10-fs-menu.png
diff --git a/doc/handbook/images/gnunet-gtk-0-10-fs-publish-editing.png b/doc/old/handbook/images/gnunet-gtk-0-10-fs-publish-editing.png
index 6f9f75ea6..6f9f75ea6 100644
--- a/doc/handbook/images/gnunet-gtk-0-10-fs-publish-editing.png
+++ b/doc/old/handbook/images/gnunet-gtk-0-10-fs-publish-editing.png
diff --git a/doc/handbook/images/gnunet-gtk-0-10-fs-publish-select.png b/doc/old/handbook/images/gnunet-gtk-0-10-fs-publish-select.png
index 50672e379..50672e379 100644
--- a/doc/handbook/images/gnunet-gtk-0-10-fs-publish-select.png
+++ b/doc/old/handbook/images/gnunet-gtk-0-10-fs-publish-select.png
diff --git a/doc/handbook/images/gnunet-gtk-0-10-fs-publish-with-file.png b/doc/old/handbook/images/gnunet-gtk-0-10-fs-publish-with-file.png
index b46542563..b46542563 100644
--- a/doc/handbook/images/gnunet-gtk-0-10-fs-publish-with-file.png
+++ b/doc/old/handbook/images/gnunet-gtk-0-10-fs-publish-with-file.png
diff --git a/doc/handbook/images/gnunet-gtk-0-10-fs-publish-with-file_0.png b/doc/old/handbook/images/gnunet-gtk-0-10-fs-publish-with-file_0.png
index b46542563..b46542563 100644
--- a/doc/handbook/images/gnunet-gtk-0-10-fs-publish-with-file_0.png
+++ b/doc/old/handbook/images/gnunet-gtk-0-10-fs-publish-with-file_0.png
diff --git a/doc/handbook/images/gnunet-gtk-0-10-fs-publish.png b/doc/old/handbook/images/gnunet-gtk-0-10-fs-publish.png
index 033b38fa5..033b38fa5 100644
--- a/doc/handbook/images/gnunet-gtk-0-10-fs-publish.png
+++ b/doc/old/handbook/images/gnunet-gtk-0-10-fs-publish.png
diff --git a/doc/handbook/images/gnunet-gtk-0-10-fs-published.png b/doc/old/handbook/images/gnunet-gtk-0-10-fs-published.png
index fbd3dd6a3..fbd3dd6a3 100644
--- a/doc/handbook/images/gnunet-gtk-0-10-fs-published.png
+++ b/doc/old/handbook/images/gnunet-gtk-0-10-fs-published.png
diff --git a/doc/handbook/images/gnunet-gtk-0-10-fs-search.png b/doc/old/handbook/images/gnunet-gtk-0-10-fs-search.png
index bb64ab92e..bb64ab92e 100644
--- a/doc/handbook/images/gnunet-gtk-0-10-fs-search.png
+++ b/doc/old/handbook/images/gnunet-gtk-0-10-fs-search.png
diff --git a/doc/handbook/images/gnunet-gtk-0-10-fs.png b/doc/old/handbook/images/gnunet-gtk-0-10-fs.png
index c7a294878..c7a294878 100644
--- a/doc/handbook/images/gnunet-gtk-0-10-fs.png
+++ b/doc/old/handbook/images/gnunet-gtk-0-10-fs.png
diff --git a/doc/handbook/images/gnunet-gtk-0-10-gns-a-done.png b/doc/old/handbook/images/gnunet-gtk-0-10-gns-a-done.png
index f8231b3a6..f8231b3a6 100644
--- a/doc/handbook/images/gnunet-gtk-0-10-gns-a-done.png
+++ b/doc/old/handbook/images/gnunet-gtk-0-10-gns-a-done.png
diff --git a/doc/handbook/images/gnunet-gtk-0-10-gns-a.png b/doc/old/handbook/images/gnunet-gtk-0-10-gns-a.png
index 39858d72c..39858d72c 100644
--- a/doc/handbook/images/gnunet-gtk-0-10-gns-a.png
+++ b/doc/old/handbook/images/gnunet-gtk-0-10-gns-a.png
diff --git a/doc/handbook/images/gnunet-gtk-0-10-gns.png b/doc/old/handbook/images/gnunet-gtk-0-10-gns.png
index c71a2bd7b..c71a2bd7b 100644
--- a/doc/handbook/images/gnunet-gtk-0-10-gns.png
+++ b/doc/old/handbook/images/gnunet-gtk-0-10-gns.png
diff --git a/doc/handbook/images/gnunet-gtk-0-10-identity.png b/doc/old/handbook/images/gnunet-gtk-0-10-identity.png
index d0b426098..d0b426098 100644
--- a/doc/handbook/images/gnunet-gtk-0-10-identity.png
+++ b/doc/old/handbook/images/gnunet-gtk-0-10-identity.png
diff --git a/doc/handbook/images/gnunet-gtk-0-10-search-selected.png b/doc/old/handbook/images/gnunet-gtk-0-10-search-selected.png
index da1ad4d31..da1ad4d31 100644
--- a/doc/handbook/images/gnunet-gtk-0-10-search-selected.png
+++ b/doc/old/handbook/images/gnunet-gtk-0-10-search-selected.png
diff --git a/doc/handbook/images/gnunet-gtk-0-10-traffic.png b/doc/old/handbook/images/gnunet-gtk-0-10-traffic.png
index 76458f717..76458f717 100644
--- a/doc/handbook/images/gnunet-gtk-0-10-traffic.png
+++ b/doc/old/handbook/images/gnunet-gtk-0-10-traffic.png
diff --git a/doc/handbook/images/gnunet-namestore-gtk-phone.png b/doc/old/handbook/images/gnunet-namestore-gtk-phone.png
index 3bb859629..3bb859629 100644
--- a/doc/handbook/images/gnunet-namestore-gtk-phone.png
+++ b/doc/old/handbook/images/gnunet-namestore-gtk-phone.png
diff --git a/doc/handbook/images/gnunet-namestore-gtk-vpn.png b/doc/old/handbook/images/gnunet-namestore-gtk-vpn.png
index c716729ba..c716729ba 100644
--- a/doc/handbook/images/gnunet-namestore-gtk-vpn.png
+++ b/doc/old/handbook/images/gnunet-namestore-gtk-vpn.png
diff --git a/doc/handbook/images/gnunet-setup-exit.png b/doc/old/handbook/images/gnunet-setup-exit.png
index 66bd972bc..66bd972bc 100644
--- a/doc/handbook/images/gnunet-setup-exit.png
+++ b/doc/old/handbook/images/gnunet-setup-exit.png
diff --git a/doc/handbook/images/gnunet-tutorial-service.png b/doc/old/handbook/images/gnunet-tutorial-service.png
index 6daed2f35..6daed2f35 100644
--- a/doc/handbook/images/gnunet-tutorial-service.png
+++ b/doc/old/handbook/images/gnunet-tutorial-service.png
diff --git a/doc/handbook/images/gnunet-tutorial-system.png b/doc/old/handbook/images/gnunet-tutorial-system.png
index 8b54e16cf..8b54e16cf 100644
--- a/doc/handbook/images/gnunet-tutorial-system.png
+++ b/doc/old/handbook/images/gnunet-tutorial-system.png
diff --git a/doc/handbook/images/iceweasel-preferences.png b/doc/old/handbook/images/iceweasel-preferences.png
index e62c2c4d9..e62c2c4d9 100644
--- a/doc/handbook/images/iceweasel-preferences.png
+++ b/doc/old/handbook/images/iceweasel-preferences.png
diff --git a/doc/handbook/images/iceweasel-proxy.png b/doc/old/handbook/images/iceweasel-proxy.png
index 9caad4508..9caad4508 100644
--- a/doc/handbook/images/iceweasel-proxy.png
+++ b/doc/old/handbook/images/iceweasel-proxy.png
diff --git a/doc/handbook/images/lego_stack.svg b/doc/old/handbook/images/lego_stack.svg
index a0e8017c3..a0e8017c3 100644
--- a/doc/handbook/images/lego_stack.svg
+++ b/doc/old/handbook/images/lego_stack.svg
diff --git a/doc/handbook/images/messenger_room.png b/doc/old/handbook/images/messenger_room.png
index 8b3590cf8..8b3590cf8 100644
--- a/doc/handbook/images/messenger_room.png
+++ b/doc/old/handbook/images/messenger_room.png
diff --git a/doc/handbook/images/messenger_room.svg b/doc/old/handbook/images/messenger_room.svg
index 6bd8d425c..6bd8d425c 100644
--- a/doc/handbook/images/messenger_room.svg
+++ b/doc/old/handbook/images/messenger_room.svg
diff --git a/doc/handbook/images/service_lego_block.png b/doc/old/handbook/images/service_lego_block.png
index 56caf6b9c..56caf6b9c 100644
--- a/doc/handbook/images/service_lego_block.png
+++ b/doc/old/handbook/images/service_lego_block.png
diff --git a/doc/handbook/images/service_lego_block.svg b/doc/old/handbook/images/service_lego_block.svg
index ef0d0234f..ef0d0234f 100644
--- a/doc/handbook/images/service_lego_block.svg
+++ b/doc/old/handbook/images/service_lego_block.svg
diff --git a/doc/handbook/images/service_stack.png b/doc/old/handbook/images/service_stack.png
index 747d087b2..747d087b2 100644
--- a/doc/handbook/images/service_stack.png
+++ b/doc/old/handbook/images/service_stack.png
diff --git a/doc/handbook/images/structure.dot b/doc/old/handbook/images/structure.dot
index f3cf193d8..f3cf193d8 100644
--- a/doc/handbook/images/structure.dot
+++ b/doc/old/handbook/images/structure.dot
diff --git a/doc/handbook/images/tng.dot b/doc/old/handbook/images/tng.dot
index 14e72ee04..14e72ee04 100644
--- a/doc/handbook/images/tng.dot
+++ b/doc/old/handbook/images/tng.dot
diff --git a/doc/handbook/images/tng.png b/doc/old/handbook/images/tng.png
index 3b93b77cc..3b93b77cc 100644
--- a/doc/handbook/images/tng.png
+++ b/doc/old/handbook/images/tng.png
diff --git a/doc/handbook/manual.css b/doc/old/handbook/manual.css
index 0fe08b83c..0fe08b83c 100644
--- a/doc/handbook/manual.css
+++ b/doc/old/handbook/manual.css
diff --git a/doc/handbook/reset.css b/doc/old/handbook/reset.css
index 9a6c3065f..9a6c3065f 100644
--- a/doc/handbook/reset.css
+++ b/doc/old/handbook/reset.css
diff --git a/doc/handbook/run-gendocs.sh b/doc/old/handbook/run-gendocs.sh
index e52ae0d23..e52ae0d23 100755
--- a/doc/handbook/run-gendocs.sh
+++ b/doc/old/handbook/run-gendocs.sh
diff --git a/doc/handbook/style.css b/doc/old/handbook/style.css
index e5271197b..e5271197b 100644
--- a/doc/handbook/style.css
+++ b/doc/old/handbook/style.css
diff --git a/doc/index.html b/doc/old/index.html
index 3c25e61bd..3c25e61bd 100644
--- a/doc/index.html
+++ b/doc/old/index.html
diff --git a/doc/manual.css b/doc/old/manual.css
index 0fe08b83c..0fe08b83c 100644
--- a/doc/manual.css
+++ b/doc/old/manual.css
diff --git a/doc/reset.css b/doc/old/reset.css
index 9a6c3065f..9a6c3065f 100644
--- a/doc/reset.css
+++ b/doc/old/reset.css
diff --git a/doc/style.css b/doc/old/style.css
index e5271197b..e5271197b 100644
--- a/doc/style.css
+++ b/doc/old/style.css
diff --git a/doc/tutorial/.gitignore b/doc/old/tutorial/.gitignore
index 11bb2078e..11bb2078e 100644
--- a/doc/tutorial/.gitignore
+++ b/doc/old/tutorial/.gitignore
diff --git a/doc/tutorial/Makefile.am b/doc/old/tutorial/Makefile.am
index afe4aa6c0..afe4aa6c0 100644
--- a/doc/tutorial/Makefile.am
+++ b/doc/old/tutorial/Makefile.am
diff --git a/doc/tutorial/agpl-3.0.texi b/doc/old/tutorial/agpl-3.0.texi
index eabb0c6df..eabb0c6df 100644
--- a/doc/tutorial/agpl-3.0.texi
+++ b/doc/old/tutorial/agpl-3.0.texi
diff --git a/doc/tutorial/docstyle.css b/doc/old/tutorial/docstyle.css
index 8719248d0..8719248d0 100644
--- a/doc/tutorial/docstyle.css
+++ b/doc/old/tutorial/docstyle.css
diff --git a/doc/tutorial/examples/001.c b/doc/old/tutorial/examples/001.c
index 7f6699dd2..7042118ba 100644
--- a/doc/tutorial/examples/001.c
+++ b/doc/old/tutorial/examples/001.c
@@ -1,3 +1,4 @@
+#include "platform.h"
 #include <gnunet/platform.h>
 #include <gnunet/gnunet_util_lib.h>
 
diff --git a/doc/tutorial/examples/002.c b/doc/old/tutorial/examples/002.c
index 02233fd61..02233fd61 100644
--- a/doc/tutorial/examples/002.c
+++ b/doc/old/tutorial/examples/002.c
diff --git a/doc/tutorial/examples/003.c b/doc/old/tutorial/examples/003.c
index d158d7e75..d158d7e75 100644
--- a/doc/tutorial/examples/003.c
+++ b/doc/old/tutorial/examples/003.c
diff --git a/doc/tutorial/examples/004.c b/doc/old/tutorial/examples/004.c
index 0ef007907..0ef007907 100644
--- a/doc/tutorial/examples/004.c
+++ b/doc/old/tutorial/examples/004.c
diff --git a/doc/tutorial/examples/005.c b/doc/old/tutorial/examples/005.c
index 1b59f85a6..1b59f85a6 100644
--- a/doc/tutorial/examples/005.c
+++ b/doc/old/tutorial/examples/005.c
diff --git a/doc/tutorial/examples/006.c b/doc/old/tutorial/examples/006.c
index 944d2b18c..944d2b18c 100644
--- a/doc/tutorial/examples/006.c
+++ b/doc/old/tutorial/examples/006.c
diff --git a/doc/tutorial/examples/007.c b/doc/old/tutorial/examples/007.c
index 096539e43..096539e43 100644
--- a/doc/tutorial/examples/007.c
+++ b/doc/old/tutorial/examples/007.c
diff --git a/doc/tutorial/examples/008.c b/doc/old/tutorial/examples/008.c
index 2dffe2cf9..2dffe2cf9 100644
--- a/doc/tutorial/examples/008.c
+++ b/doc/old/tutorial/examples/008.c
diff --git a/doc/tutorial/examples/009.c b/doc/old/tutorial/examples/009.c
index 26d918fb0..9d6fdd7e7 100644
--- a/doc/tutorial/examples/009.c
+++ b/doc/old/tutorial/examples/009.c
@@ -1,3 +1,4 @@
+#include "platform.h"
 #include <gnunet/gnunet_core_service.h>
 
 struct GNUNET_CORE_Handle *
diff --git a/doc/tutorial/examples/010.c b/doc/old/tutorial/examples/010.c
index 33494490d..33494490d 100644
--- a/doc/tutorial/examples/010.c
+++ b/doc/old/tutorial/examples/010.c
diff --git a/doc/tutorial/examples/011.c b/doc/old/tutorial/examples/011.c
index 23bc051de..23bc051de 100644
--- a/doc/tutorial/examples/011.c
+++ b/doc/old/tutorial/examples/011.c
diff --git a/doc/tutorial/examples/012.c b/doc/old/tutorial/examples/012.c
index cb21d78ab..dc59eb506 100644
--- a/doc/tutorial/examples/012.c
+++ b/doc/old/tutorial/examples/012.c
@@ -1,3 +1,4 @@
+#include "platform.h"
 #include "gnunet_peerstore_service.h"
 
 peerstore_handle = GNUNET_PEERSTORE_connect (cfg);
diff --git a/doc/tutorial/examples/013.1.c b/doc/old/tutorial/examples/013.1.c
index fa5212868..fa5212868 100644
--- a/doc/tutorial/examples/013.1.c
+++ b/doc/old/tutorial/examples/013.1.c
diff --git a/doc/tutorial/examples/013.c b/doc/old/tutorial/examples/013.c
index 6792417e1..6792417e1 100644
--- a/doc/tutorial/examples/013.c
+++ b/doc/old/tutorial/examples/013.c
diff --git a/doc/tutorial/examples/014.c b/doc/old/tutorial/examples/014.c
index db2ed1165..db2ed1165 100644
--- a/doc/tutorial/examples/014.c
+++ b/doc/old/tutorial/examples/014.c
diff --git a/doc/tutorial/examples/015.c b/doc/old/tutorial/examples/015.c
index 0dd267e8e..0dd267e8e 100644
--- a/doc/tutorial/examples/015.c
+++ b/doc/old/tutorial/examples/015.c
diff --git a/doc/tutorial/examples/016.c b/doc/old/tutorial/examples/016.c
index d169da16d..d169da16d 100644
--- a/doc/tutorial/examples/016.c
+++ b/doc/old/tutorial/examples/016.c
diff --git a/doc/tutorial/examples/017.c b/doc/old/tutorial/examples/017.c
index c86fbcd1f..c86fbcd1f 100644
--- a/doc/tutorial/examples/017.c
+++ b/doc/old/tutorial/examples/017.c
diff --git a/doc/tutorial/examples/018.c b/doc/old/tutorial/examples/018.c
index 3fc22584c..3fc22584c 100644
--- a/doc/tutorial/examples/018.c
+++ b/doc/old/tutorial/examples/018.c
diff --git a/doc/tutorial/examples/019.c b/doc/old/tutorial/examples/019.c
index aaf001516..aaf001516 100644
--- a/doc/tutorial/examples/019.c
+++ b/doc/old/tutorial/examples/019.c
diff --git a/doc/tutorial/examples/020.c b/doc/old/tutorial/examples/020.c
index 596db3069..596db3069 100644
--- a/doc/tutorial/examples/020.c
+++ b/doc/old/tutorial/examples/020.c
diff --git a/doc/tutorial/examples/021.c b/doc/old/tutorial/examples/021.c
index 688a31fe0..688a31fe0 100644
--- a/doc/tutorial/examples/021.c
+++ b/doc/old/tutorial/examples/021.c
diff --git a/doc/tutorial/examples/022.c b/doc/old/tutorial/examples/022.c
index a373619bd..a373619bd 100644
--- a/doc/tutorial/examples/022.c
+++ b/doc/old/tutorial/examples/022.c
diff --git a/doc/tutorial/examples/023.c b/doc/old/tutorial/examples/023.c
index 820c38b10..820c38b10 100644
--- a/doc/tutorial/examples/023.c
+++ b/doc/old/tutorial/examples/023.c
diff --git a/doc/tutorial/examples/024.c b/doc/old/tutorial/examples/024.c
index 2e84b5905..2e84b5905 100644
--- a/doc/tutorial/examples/024.c
+++ b/doc/old/tutorial/examples/024.c
diff --git a/doc/tutorial/examples/025.Makefile.am b/doc/old/tutorial/examples/025.Makefile.am
index 66d4f80ec..66d4f80ec 100644
--- a/doc/tutorial/examples/025.Makefile.am
+++ b/doc/old/tutorial/examples/025.Makefile.am
diff --git a/doc/tutorial/examples/026.c b/doc/old/tutorial/examples/026.c
index 264e0b6b9..264e0b6b9 100644
--- a/doc/tutorial/examples/026.c
+++ b/doc/old/tutorial/examples/026.c
diff --git a/doc/tutorial/examples/testbed_test.c b/doc/old/tutorial/examples/testbed_test.c
index 1696234b0..1a8c25655 100644
--- a/doc/tutorial/examples/testbed_test.c
+++ b/doc/old/tutorial/examples/testbed_test.c
@@ -1,3 +1,4 @@
+#include "platform.h"
 #include <unistd.h>
 #include <gnunet/platform.h>
 #include <gnunet/gnunet_util_lib.h>
diff --git a/doc/tutorial/fdl-1.3.texi b/doc/old/tutorial/fdl-1.3.texi
index cb71f05a1..cb71f05a1 100644
--- a/doc/tutorial/fdl-1.3.texi
+++ b/doc/old/tutorial/fdl-1.3.texi
diff --git a/doc/tutorial/gpl-3.0.texi b/doc/old/tutorial/gpl-3.0.texi
index 0e2e212ac..0e2e212ac 100644
--- a/doc/tutorial/gpl-3.0.texi
+++ b/doc/old/tutorial/gpl-3.0.texi
diff --git a/doc/tutorial/htmlxref.cnf b/doc/old/tutorial/htmlxref.cnf
index a4928f6fe..a4928f6fe 100644
--- a/doc/tutorial/htmlxref.cnf
+++ b/doc/old/tutorial/htmlxref.cnf
diff --git a/doc/tutorial/manual.css b/doc/old/tutorial/manual.css
index 0fe08b83c..0fe08b83c 100644
--- a/doc/tutorial/manual.css
+++ b/doc/old/tutorial/manual.css
diff --git a/doc/tutorial/reset.css b/doc/old/tutorial/reset.css
index 9a6c3065f..9a6c3065f 100644
--- a/doc/tutorial/reset.css
+++ b/doc/old/tutorial/reset.css
diff --git a/doc/tutorial/run-gendocs.sh b/doc/old/tutorial/run-gendocs.sh
index b4899722c..b4899722c 100755
--- a/doc/tutorial/run-gendocs.sh
+++ b/doc/old/tutorial/run-gendocs.sh
diff --git a/doc/tutorial/style.css b/doc/old/tutorial/style.css
index e5271197b..e5271197b 100644
--- a/doc/tutorial/style.css
+++ b/doc/old/tutorial/style.css
diff --git a/doc/tutorial/tutorial.texi b/doc/old/tutorial/tutorial.texi
index 0a011c0c8..f849e116a 100644
--- a/doc/tutorial/tutorial.texi
+++ b/doc/old/tutorial/tutorial.texi
@@ -225,7 +225,7 @@ This is required for obtaining the repository, which is achieved with
 the following command:
 
 @example
-$ git clone https://git.gnunet.org/gnunet
+$ git clone https://git.gnunet.org/gnunet.git
 @end example
 
 @noindent
@@ -795,7 +795,7 @@ a template build system for writing GNUnet extensions in C. It can be
 obtained as follows:
 
 @example
-$ git clone https://git.gnunet.org/gnunet-ext
+$ git clone https://git.gnunet.org/gnunet-ext.git
 $ cd gnunet-ext/
 $ ./bootstrap
 $ ./configure --prefix=$PREFIX --with-gnunet=$PREFIX