22 files changed, 1049 insertions, 305 deletions

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 03f180c29..c454765cf 100644
--- a/doc/man/gnunet-config.1
+++ b/doc/man/gnunet-config.1
@@ -26,33 +26,44 @@
 .Os
 .Sh NAME
 .Nm gnunet-config
-.Nd manipulate GNUnet configuration files
+.Nd manipulate GNUnet configuration files and provide information on how GNUnet was built
 .Sh SYNOPSIS
 .Nm
 .Op Fl b Ar BACKEND | Fl -supported-backend= Ns Ar BACKEND
+.Op Fl C | -cflags
 .Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
+.Op Fl F | -full
 .Op Fl f | -filename
 .Op Fl h | -help
+.Op Fl j | -libs
 .Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
 .Op Fl o Ar OPTION | Fl -option= Ns Ar OPTION
+.Op Fl p | -prefix
+.Op Fl r | -rewrite
 .Op Fl S |-list-sections
 .Op Fl s Ar SECTION | Fl -section= Ns Ar SECTION
 .Op Fl V Ar VALUE | Fl -value Ar VALUE
 .Op Fl v | -version
-.Op Fl r | -rewrite
-.Op Fl F | -full
 .Sh DESCRIPTION
 .Nm
 can be used to read or modify GNUnet configuration files.
+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
 Tests whether the specified BACKEND is supported by the current installation.  The backend must match the name of a plugin, e.g. "namestore_postgres" for the Postgres database backend of the "NAMESTORE" service. If the BACKEND is supported, gnunet-config will return a status code of 0 (success), otherwise 77 (unsupported).  When this option is specified, no other options may be specified. Specifying this option together with other options will cause gnunet-config to return a status code of 1 (error).
+.It Fl C | -cflags
+Print an appropriate value for CFLAGS to compile applications on top of GNUnet.
 .It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
 Use the configuration file FILENAME.
+.It Fl F | -full
+Write the full configuration, not just the deltas to the defaults.
 .It Fl f | -filename
 Try to perform expansions as if the option values represent filenames (will also be applied even if the option is not really a filename).
 .It Fl h | -help
 Print short help on options.
+.It Fl j | -libs
+Print an appropriate value for LIBS to compile applications on top of GNUnet.
 .It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
 Use LOGLEVEL for logging.
 Valid values are DEBUG, INFO, WARNING and ERROR.
@@ -60,6 +71,10 @@ Valid values are DEBUG, INFO, WARNING and ERROR.
 Which configuration option should be accessed or edited.
 Required to set a value.
 If not given, all values of a given section will be printed in the format "OPTION = VALUE".
+.It Fl p | -prefix
+Print GNUnet's installation prefix (for example /usr/local.)
+.It Fl r | -rewrite
+Write the configuration to file, even if it did not change.
 .It Fl S |-list-sections
 List available configuration sections for use with --section.
 .It Fl s Ar SECTION | Fl -section= Ns Ar SECTION
@@ -70,10 +85,6 @@ Configuration value to store in the given section under the given option.
 Must only be given together with -s and -o options.
 .It Fl v | -version
 Print GNUnet version number.
-.It Fl r | -rewrite
-Write the configuration to file, even if it did not change.
-.It Fl F | -full
-Write the full configuration, not just the deltas to the defaults.
 .El
 .Sh SEE ALSO
 The full documentation for gnunet is maintained as a Texinfo manual.
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-qr.1 b/doc/man/gnunet-qr.1
index eec19c14a..7a40cb0f3 100644
--- a/doc/man/gnunet-qr.1
+++ b/doc/man/gnunet-qr.1
@@ -31,6 +31,7 @@
 .Nm
 .Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
 .Op Fl d Ar DEVICE | Fl -device= Ns Ar DEVICE
+.Op Fl f Ar FILENAME | Fl -file= Ns Ar FILENAME
 .Op Fl h | -help
 .Op Fl s | -silent
 .Op Fl v | -verbose
@@ -44,6 +45,10 @@ Use the configuration file
 .It Fl d Ar DEVICE | Fl -device= Ns Ar DEVICE
 Use device
 .Ar DEVICE .
+.It Fl f Ar FILENAME | Fl -file= Ns Ar FILENAME
+Read a QR code from the PNG-encoded file
+.Ar FILENAME .
+Available only if GNUnet is built with libpng support.
 .It Fl h | -help
 Print short help on options.
 .It Fl s | -silent
diff --git a/doc/man/gnunet-reclaim.1 b/doc/man/gnunet-reclaim.1
index 049bff155..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
@@ -62,9 +65,9 @@ Configure logging to write logs to LOGFILE.
 .It Fl e Ar EGO | Fl -ego= Ns Ar EGO
 Specify identity to use. Always required.
 .It Fl a Ar NAME | Fl -add= Ns Ar NAME
-Add an attribute with NAME. Must be used in conjunction with -V
+Add or update an attribute with NAME. Must be used in conjunction with -V
 .It Fl V Ar VALUE | Fl -value= Ns Ar VALUE
-Specify value of attribute to add.
+Specify value of attribute to add or update.
 .It Fl t Ar TYPE | Fl -type= Ns Ar TYPE
 Specify type of attribute to add (Default: STRING)
 .It Fl d Ar ID | Fl -delete= Ns Ar ID
@@ -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