60 files changed, 1721 insertions, 1392 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4443b42f8..eb23b534b 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,9 +1,14 @@
 # This Makefile.am is in the public domain
 if DOCUMENTATION
-  SUBDIRS = man doxygen handbook tutorial
+  SUBDIRS = doxygen handbook tutorial
 endif
 if !DOCUMENTATION
-  SUBDIRS = man doxygen
+  SUBDIRS = doxygen
+endif
+if INCLUDE_MANPAGES
+  SUBDIRS += man
 endif
 EXTRA_DIST =                                                    \
diff --git a/doc/doc.h b/doc/doc.h
index 7dfeb1c42..db079e94a 100644
--- a/doc/doc.h
+++ b/doc/doc.h
@@ -7,5 +7,5 @@
 *
 * Some additional documentation can be found under [Files](files.html), in the src/include/ directory.
 *
- * See also the [handbooks](https://gnunet.org/handbooks) on installation, and for user and developer documentation.
+ * See also the [handbooks](https://docs.gnunet.org/) on installation, and for user and developer documentation.
 */
diff --git a/doc/handbook/Makefile.am b/doc/handbook/Makefile.am
index 57a85bd56..a50a58937 100644
--- a/doc/handbook/Makefile.am
+++ b/doc/handbook/Makefile.am
@@ -18,7 +18,7 @@ infoimagedir = $(infodir)/images
 # we use the include version which is backwards compatible
 # and upwards compatible, while the ref variant is neither.
-AM_MAKEINFOHTMLFLAGS = --no-split --css-include=manual.css
+AM_MAKEINFOHTMLFLAGS = --no-split --css-include=style.css --css-include=manual.css
 dist_infoimage_DATA =                                           \
        images/gnunet-gtk-0-10-gns-a-done.png                   \
@@ -154,13 +154,6 @@ version.texi/replacement/revert:
        @echo "@set VERSION GPACKAGE_VERSION" > gversion.texi
        @echo "@set EDITION GPACKAGE_VERSION" >> gversion.texi
-if TEXI2MDOC_GENERATION
-gnunet-documentation.7: version.texi/replacement
-        @echo Attempting to output an mdoc formatted section 7 document
-        @texi2mdoc -I$(pwd):$(pwd)/chapters gnunet.texi > ../man/gnunet-documentation.7
-# TODO: (Maybe) other outputs resulting from this.
-endif
 # FIXME: rm *.html and *.pdf
 #doc-clean:
diff --git a/doc/handbook/chapters/developer.texi b/doc/handbook/chapters/developer.texi
index cd81fcfb7..6c426ebad 100644
--- a/doc/handbook/chapters/developer.texi
+++ b/doc/handbook/chapters/developer.texi
@@ -202,7 +202,8 @@ Gtk+-based user interfaces, including:
 @item @command{gnunet-statistics-gtk} (statistics over time),
 @item @command{gnunet-peerinfo-gtk}
 (information about current connections and known peers),
-@item @command{gnunet-chat-gtk} (chat GUI) and
+@item @command{gnunet-namestore-gtk} (GNS record editor),
+@item @command{gnunet-conversation-gtk} (voice chat GUI) and
 @item @command{gnunet-setup} (setup tool for "everything")
 @end itemize
@@ -2176,7 +2177,7 @@ work):
 @example
 export PYPI=@value{PYPI-URL}
 wget $PYPI/z/zope.interface/zope.interface-3.8.0.tar.gz
-tar zvfz zope.interface-3.8.0.tar.gz
+tar xzvf zope.interface-3.8.0.tar.gz
 cd zope.interface-3.8.0
 sudo python setup.py install
 @end example
@@ -2401,10 +2402,11 @@ the program at various levels.
 @file{gnunet_common.h} defines several @strong{log levels}:
 @table @asis
-@item ERROR for errors (really problematic situations, often leading to
+@item ERROR for errors
-crashes)
+(really problematic situations, often leading to crashes)
-@item WARNING for warnings (troubling situations that might have
+@item WARNING for warnings
-negative consequences, although not fatal)
+(troubling situations that might have negative consequences, although
+not fatal)
 @item INFO for various information.
 Used somewhat rarely, as GNUnet statistics is used to hold and display
 most of the information that users might find interesting.
@@ -2830,7 +2832,7 @@ which both ensure correct alignment when sending structs over the network.
 @c ***********************************************************************
 @node Client - Establish connection
 @subsubsection Client - Establish connection
-@c %**end of header
 At first, on the client side, the underlying API is employed to create a
@@ -2845,7 +2847,7 @@ client = GNUNET_CLIENT_connect ("transport", cfg);
 @c ***********************************************************************
 @node Client - Initialize request message
 @subsubsection Client - Initialize request message
-@c %**end of header
 When the connection is ready, we initialize the message. In this step,
 all the fields of the message should be properly initialized, namely the
@@ -2878,7 +2880,7 @@ Big Endian and Little Endian.
 @c ***********************************************************************
 @node Client - Send request and receive response
 @subsubsection Client - Send request and receive response
-@c %**end of header
 @b{FIXME: This is very outdated, see the tutorial for the current API!}
@@ -2913,7 +2915,7 @@ int main(int argc, char**argv) @{
 @c ***********************************************************************
 @node Server - Add new handles for specified messages
 @subsubsection Server - Add new handles for specified messages
-@c %**end of header
 in the function above the argument @code{run} is used to initiate
 transport service,and defined like this:
@@ -2971,7 +2973,7 @@ depicted as @code{@{NULL, NULL, 0, 0@}} is set in the last area.
 @c ***********************************************************************
 @node Server - Process request message
 @subsubsection Server - Process request message
-@c %**end of header
 After the initialization of transport service, the request message would
 be processed. Before handling the main message data, the validity of this
@@ -3022,7 +3024,7 @@ message.
 @c ***********************************************************************
 @node Server - Response to client
 @subsubsection Server - Response to client
-@c %**end of header
 Once the processing of current request is done, the server should give the
 response to the client. A new @code{struct AddressLookupMessage} would be
@@ -3058,7 +3060,7 @@ to send the message.
 @c ***********************************************************************
 @node Server - Notification of clients
 @subsubsection Server - Notification of clients
-@c %**end of header
 Often a service needs to (repeatedly) transmit notifications to a client
 or a group of clients. In these cases, the client typically has once
@@ -3087,7 +3089,7 @@ messages to the server.
 @node Conversion between Network Byte Order (Big Endian) and Host Byte Order
 @subsubsection Conversion between Network Byte Order (Big Endian) and Host Byte Order
 @c %** subsub? it's a referenced page on the ipc document.
-@c %**end of header
 Here we can simply comprehend big endian and little endian as Network Byte
 Order and Host Byte Order respectively. What is the difference between
@@ -3143,7 +3145,7 @@ byte order.
 @cindex Cryptography API
 @node Cryptography API
 @subsection Cryptography API
-@c %**end of header
 The gnunetutil APIs provides the cryptographic primitives used in GNUnet.
 GNUnet uses 2048 bit RSA keys for the session key exchange and for signing
@@ -3180,7 +3182,7 @@ should be considered secure for traditional applications of RSA.
 @cindex Message Queue API
 @node Message Queue API
 @subsection Message Queue API
-@c %**end of header
 @strong{ Introduction }@
 Often, applications need to queue messages that
@@ -3324,7 +3326,7 @@ callback. When canceling an envelope, it is not necessary@ to call
 @cindex Service API
 @node Service API
 @subsection Service API
-@c %**end of header
 Most GNUnet code lives in the form of services. Services are processes
 that offer an API for other components of the system to build on. Those
@@ -3400,7 +3402,7 @@ clients to set (possibly persistent) statistic values before terminating.
 @c ***********************************************************************
 @node Optimizing Memory Consumption of GNUnet's (Multi-) Hash Maps
 @subsection Optimizing Memory Consumption of GNUnet's (Multi-) Hash Maps
-@c %**end of header
 A commonly used data structure in GNUnet is a (multi-)hash map. It is most
 often used to map a peer identity to some data structure, but also to map
@@ -3424,7 +3426,7 @@ the hash map.
 @node Analysis
 @subsubsection Analysis
-@c %**end of header
 The main reason for the "excessive" memory consumption by the hash map is
 that GNUnet uses 512-bit cryptographic hash codes --- and the
@@ -3475,7 +3477,7 @@ we tend to really try to keep the entries small.
 @c ***********************************************************************
 @node Solution
 @subsubsection Solution
-@c %**end of header
 The solution that has now been implemented is to @strong{optionally}
 allow the hash map to not make a (deep) copy of the hash but instead have
@@ -3493,7 +3495,7 @@ pointer and undefined behavior of the (multi-)hash map API.
 @c ***********************************************************************
 @node Migration
 @subsubsection Migration
-@c %**end of header
 To use the new feature, first check that the values contain the respective
 key (and never modify it). Then, all calls to
@@ -3542,7 +3544,7 @@ removed from the map, undefined behavior is likely to be observed.
 @c ***********************************************************************
 @node Conclusion
 @subsubsection Conclusion
-@c %**end of header
 The new optimization can is often applicable and can result in a
 reduction in memory consumption of up to 30% in practice. However, it
@@ -3555,10 +3557,11 @@ at least until benchmarks exist).
 @c ***********************************************************************
 @node Availability
 @subsubsection Availability
-@c %**end of header
-The new multi hash map code was committed in SVN 24319 (will be in GNUnet
-0.9.4). Various subsystems (transport, core, dht, file-sharing) were
+The new multi hash map code was committed in SVN 24319 (which made its
+way into GNUnet version 0.9.4).
+Various subsystems (transport, core, dht, file-sharing) were
 previously audited and modified to take advantage of the new capability.
 In particular, memory consumption of the file-sharing service is expected
 to drop by 20-30% due to this change.
@@ -3567,7 +3570,7 @@ to drop by 20-30% due to this change.
 @cindex CONTAINER_MDLL API
 @node CONTAINER_MDLL API
 @subsection CONTAINER_MDLL API
-@c %**end of header
 This text documents the GNUNET_CONTAINER_MDLL API. The
 GNUNET_CONTAINER_MDLL API is similar to the GNUNET_CONTAINER_DLL API in
@@ -3633,7 +3636,7 @@ Iterating over the list should be done by directly accessing the
 @cindex ARM
 @node Automatic Restart Manager (ARM)
 @section Automatic Restart Manager (ARM)
-@c %**end of header
 GNUnet's Automated Restart Manager (ARM) is the GNUnet service responsible
 for system initialization and service babysitting. ARM starts and halts
@@ -3654,7 +3657,7 @@ about how ARM works and how to interact with it.
 @c ***********************************************************************
 @node Basic functionality
 @subsection Basic functionality
-@c %**end of header
 @itemize @bullet
 @item ARM source code can be found under "src/arm".@ Service processes are
@@ -3678,7 +3681,7 @@ it to start a service "resolver", stops the "resolver" then stops "ARM".
 @c ***********************************************************************
 @node Key configuration options
 @subsection Key configuration options
-@c %**end of header
 Configurations for ARM and services should be available in a .conf file
 (As an example, see test_arm_api_data.conf). When running ARM, the
@@ -3747,7 +3750,7 @@ services that are going to run.
 @c ***********************************************************************
 @node ARM - Availability
 @subsection ARM - Availability
-@c %**end of header
 As mentioned before, one of the features provided by ARM is starting
 services on demand. Consider the example of one service "client" that
@@ -3835,7 +3838,7 @@ problematic service.
 @cindex TRANSPORT Subsystem
 @node TRANSPORT Subsystem
 @section TRANSPORT Subsystem
-@c %**end of header
 This chapter documents how the GNUnet transport subsystem works. The
 GNUnet transport subsystem consists of three main components: the
@@ -3893,7 +3896,7 @@ transport service.
 @node Address validation protocol
 @subsection Address validation protocol
-@c %**end of header
 This section documents how the GNUnet transport service validates
 connections with other peers. It is a high-level description of the
@@ -3956,7 +3959,7 @@ implementation details).
 @cindex NAT library
 @node NAT library
 @section NAT library
-@c %**end of header
 The goal of the GNUnet NAT library is to provide a general-purpose API for
 NAT traversal @strong{without} third-party support. So protocols that
@@ -4003,7 +4006,7 @@ This way, it is easy to test if the current NAT configuration is valid.
 @node Distance-Vector plugin
 @section Distance-Vector plugin
-@c %**end of header
 The Distance Vector (DV) transport is a transport mechanism that allows
 peers to act as relays for each other, thereby connecting peers that would
@@ -4072,7 +4075,8 @@ message, and delivers it to Carol as though it came directly from Alice.
 @cindex SMTP plugin
 @node SMTP plugin
 @section SMTP plugin
-@c %**end of header
+@c TODO: Update!
 This section describes the new SMTP transport plugin for GNUnet as it
 exists in the 0.7.x and 0.8.x branch. SMTP support is currently not
@@ -4080,6 +4084,9 @@ available in GNUnet 0.9.x. This page also describes the transport layer
 abstraction (as it existed in 0.7.x and 0.8.x) in more detail and gives
 some benchmarking results. The performance results presented are quite
 old and maybe outdated at this point.
+For the readers in the year 2019, you will notice by the mention of
+version 0.7, 0.8, and 0.9 that this section has to be taken with your
+usual grain of salt and be updated eventually.
 @itemize @bullet
 @item Why use SMTP for a peer-to-peer transport?
@@ -4101,7 +4108,7 @@ old and maybe outdated at this point.
 @node Why use SMTP for a peer-to-peer transport?
 @subsection Why use SMTP for a peer-to-peer transport?
-@c %**end of header
 There are many reasons why one would not want to use SMTP:
@@ -4136,7 +4143,7 @@ type of situation.
 @node How does it work?
 @subsection How does it work?
-@c %**end of header
 When a GNUnet peer needs to send a message to another GNUnet peer that has
 advertised (only) an SMTP transport address, GNUnet base64-encodes the
@@ -4149,7 +4156,7 @@ GNUnet E-mail messages by searching for a generic filter.
 @node How do I configure my peer?
 @subsection How do I configure my peer?
-@c %**end of header
 First, you need to configure @code{procmail} to filter your inbound E-mail
 for GNUnet traffic. The GNUnet messages must be delivered into a pipe, for
@@ -4194,7 +4201,7 @@ This should be it, but you may probably want to test it first.
 @node How do I test if it works?
 @subsection How do I test if it works?
-@c %**end of header
 Any transport can be subjected to some rudimentary tests using the
 @code{gnunet-transport-check} tool. The tool sends a message to the local
@@ -4217,7 +4224,7 @@ to send and receive messages.
 @node How fast is it?
 @subsection How fast is it?
-@c %**end of header
 We have measured the performance of the UDP, TCP and SMTP transport layer
 directly and when used from an application using the GNUnet core.
@@ -4284,7 +4291,7 @@ benchmarking results.
 @cindex Bluetooth plugin
 @node Bluetooth plugin
 @section Bluetooth plugin
-@c %**end of header
 This page describes the new Bluetooth transport plugin for GNUnet. The
 plugin is still in the testing stage so don't expect it to work
@@ -4310,7 +4317,7 @@ ask on the IRC channel.
 @node What do I need to use the Bluetooth plugin transport?
 @subsection What do I need to use the Bluetooth plugin transport?
-@c %**end of header
 If you are a GNU/Linux user and you want to use the Bluetooth
 transport plugin you should install the
@@ -4337,7 +4344,7 @@ protocol so we cannot turn on your device programatically!
 @c FIXME: Change to unique title
 @node How does it work2?
 @subsection How does it work2?
-@c %**end of header
 The Bluetooth transport plugin uses virtually the same code as the WLAN
 plugin and only the helper binary is different. The helper takes a single
@@ -4367,7 +4374,7 @@ discovery.
 @node What possible errors should I be aware of?
 @subsection What possible errors should I be aware of?
-@c %**end of header
 @emph{This section is dedicated for GNU/Linux users}
@@ -4406,7 +4413,7 @@ the device and to send some particular commands to it.
 @c FIXME: A more unique name
 @node How do I configure my peer2?
 @subsection How do I configure my peer2?
-@c %**end of header
 On GNU/Linux, you just have to be sure that the interface name
 corresponds to the one that you want to use.
@@ -4440,7 +4447,7 @@ transport service.
 @node How can I test it?
 @subsection How can I test it?
-@c %**end of header
 If you have two Bluetooth devices on the same machine and you are using
 GNU/Linux you must:
@@ -4487,7 +4494,7 @@ transport service.
 @node The implementation of the Bluetooth transport plugin
 @subsection The implementation of the Bluetooth transport plugin
-@c %**end of header
 This page describes the implementation of the Bluetooth transport plugin.
@@ -4521,7 +4528,7 @@ platforms.
 @node Linux functionality
 @subsubsection Linux functionality
-@c %**end of header
 In order to implement the plugin functionality on GNU/Linux I
 used the BlueZ stack.
@@ -4617,7 +4624,7 @@ support for @strong{broadcast messages}.}
 @node Details about the broadcast implementation
 @subsubsection Details about the broadcast implementation
-@c %**end of header
 First I want to point out that the broadcast functionality for the CONTROL
 messages is not implemented in a conventional way. Since the inquiry scan
@@ -4664,7 +4671,7 @@ simply use the socket.
 @node Windows functionality
 @subsubsection Windows functionality
-@c %**end of header
 For Windows I decided to use the Microsoft Bluetooth stack which has the
 advantage of coming standard from Windows XP SP2. The main disadvantage is
@@ -4719,7 +4726,7 @@ broadcast messages. When it receives a broadcast message it will skip it.
 @node Pending features
 @subsubsection Pending features
-@c %**end of header
 @itemize @bullet
 @item Implement the broadcast functionality on Windows @emph{(currently
@@ -4735,7 +4742,7 @@ contact me.
 @node WLAN plugin
 @section WLAN plugin
-@c %**end of header
 This section documents how the wlan transport plugin works. Parts which
 are not implemented yet or could be better implemented are described at
@@ -4744,7 +4751,7 @@ the end.
 @cindex ATS Subsystem
 @node ATS Subsystem
 @section ATS Subsystem
-@c %**end of header
 ATS stands for "automatic transport selection", and the function of ATS in
 GNUnet is to decide on which address (and thus transport plugin) should
@@ -4767,7 +4774,7 @@ superior.
 @cindex CORE Subsystem
 @node CORE Subsystem
 @section CORE Subsystem
-@c %**end of header
 The CORE subsystem in GNUnet is responsible for securing link-layer
 communications between nodes in the GNUnet overlay network. CORE builds
@@ -4811,7 +4818,7 @@ message counters and ephemeral keys)
 @cindex core subsystem limitations
 @node Limitations
 @subsection Limitations
-@c %**end of header
 CORE does not perform
 @uref{http://en.wikipedia.org/wiki/Routing, routing}; using CORE it is
@@ -4845,7 +4852,7 @@ control is needed, applications should use the CADET service.
 @cindex when is a peer connected
 @node When is a peer "connected"?
 @subsection When is a peer "connected"?
-@c %**end of header
 In addition to the security features mentioned above, CORE also provides
 one additional key feature to applications using it, and that is a
@@ -4878,7 +4885,7 @@ connection.
 @cindex libgnunetcore
 @node libgnunetcore
 @subsection libgnunetcore
-@c %**end of header
 The CORE API (defined in @file{gnunet_core_service.h}) is the basic
 messaging API used by P2P applications built using GNUnet. It provides
@@ -4943,7 +4950,7 @@ re-established, the applications will be receive matching connect events.
 @cindex core clinet-service protocol
 @node The CORE Client-Service Protocol
 @subsection The CORE Client-Service Protocol
-@c %**end of header
 This section describes the protocol between an application using the CORE
 service (the client) and the CORE service process itself.
@@ -4957,7 +4964,7 @@ service (the client) and the CORE service process itself.
 @node Setup2
 @subsubsection Setup2
-@c %**end of header
 When a client connects to the CORE service, it first sends a
 @code{InitMessage} which specifies options for the connection and a set of
@@ -4986,7 +4993,7 @@ both CORE and the client can send messages.
 @node Notifications
 @subsubsection Notifications
-@c %**end of header
 The CORE will send @code{ConnectNotifyMessage}s and
 @code{DisconnectNotifyMessage}s whenever peers connect or disconnect from
@@ -5002,7 +5009,7 @@ identity given is that of the receiver.
 @node Sending
 @subsubsection Sending
-@c %**end of header
 When a client wants to transmit a message, it first requests a
 transmission slot by sending a @code{SendMessageRequest} which specifies
@@ -5022,7 +5029,7 @@ for each request).
 @cindex CORE Peer-to-Peer Protocol
 @node The CORE Peer-to-Peer Protocol
 @subsection The CORE Peer-to-Peer Protocol
-@c %**end of header
 @menu
@@ -5035,7 +5042,7 @@ for each request).
 @cindex EphemeralKeyMessage creation
 @node Creating the EphemeralKeyMessage
 @subsubsection Creating the EphemeralKeyMessage
-@c %**end of header
 When the CORE service starts, each peer creates a fresh ephemeral (ECC)
 public-private key pair and signs the corresponding
@@ -5076,7 +5083,7 @@ connection using the new ephemeral key
 @node Establishing a connection
 @subsubsection Establishing a connection
-@c %**end of header
 Peers begin their interaction by sending a @code{EphemeralKeyMessage} to
 the other peer once the TRANSPORT service notifies the CORE service about
@@ -5094,7 +5101,7 @@ connection to @code{KX_STATE_UP}.
 @node Encryption and Decryption
 @subsubsection Encryption and Decryption
-@c %**end of header
 All functions related to the key exchange and encryption/decryption of
 messages can be found in @file{gnunet-service-core_kx.c} (except for the
@@ -5122,7 +5129,7 @@ older than 12 hours.
 @node Type maps
 @subsubsection Type maps
-@c %**end of header
 Once an encrypted connection has been established, peers begin to exchange
 type maps. Type maps are used to allow the CORE service to determine which
@@ -5155,6 +5162,8 @@ receiving a type map by sending back a
 retransmit the type map (with exponential back-off).
 @cindex CADET Subsystem
+@cindex CADET
+@cindex cadet
 @node CADET Subsystem
 @section CADET Subsystem
@@ -5221,6 +5230,7 @@ Should a message get lost on TRANSPORT/CORE level, if a channel is
 created with as reliable, CADET will retransmit the lost message and
 deliver it in order to the destination application.
+@pindex GNUNET_CADET_connect
 To communicate with other peers using CADET, it is necessary to first
 connect to the service using @code{GNUNET_CADET_connect}.
 This function takes several parameters in form of callbacks, to allow the
@@ -5232,7 +5242,8 @@ CADET, even do one connection per listening port).
 The function returns a handle which has to be used for any further
 interaction with the service.
-To connect to a remote peer a client has to call the
+@pindex GNUNET_CADET_channel_create
+To connect to a remote peer, a client has to call the
 @code{GNUNET_CADET_channel_create} function. The most important parameters
 given are the remote peer's identity (it public key) and a port, which
 specifies which application on the remote peer to connect to, similar to
@@ -5242,6 +5253,7 @@ exchanges to assure and authenticated, secure and verified communication.
 Similar to @code{GNUNET_CADET_connect},@code{GNUNET_CADET_create_channel}
 returns a handle to interact with the created channel.
+@pindex GNUNET_CADET_notify_transmit_ready
 For every message the client wants to send to the remote application,
 @code{GNUNET_CADET_notify_transmit_ready} must be called, indicating the
 channel on which the message should be sent and the size of the message
@@ -5258,6 +5270,7 @@ case. To be alerted when a channel is online, a client can call
 means that the channel is online. The callback can give 0 bytes to CADET
 if no message is to be sent, this is OK.
+@pindex GNUNET_CADET_notify_transmit_cancel
 If a transmission was requested but before the callback fires it is no
 longer needed, it can be canceled with
 @code{GNUNET_CADET_notify_transmit_ready_cancel}, which uses the handle
@@ -5266,6 +5279,7 @@ As in the case of CORE, only one message can be requested at a time: a
 client must not call @code{GNUNET_CADET_notify_transmit_ready} again until
 the callback is called or the request is canceled.
+@pindex GNUNET_CADET_channel_destroy
 When a channel is no longer needed, a client can call
 @code{GNUNET_CADET_channel_destroy} to get rid of it.
 Note that CADET will try to transmit all pending traffic before notifying
@@ -5277,6 +5291,7 @@ on any incoming or outgoing channels are given to the client when CADET
 executes the callbacks given to it at the time of
 @code{GNUNET_CADET_connect}.
+@pindex GNUNET_CADET_disconnect
 Finally, when an application no longer wants to use CADET, it should call
 @code{GNUNET_CADET_disconnect}, but first all channels and pending
 transmissions must be closed (otherwise CADET will complain).
@@ -5394,7 +5409,7 @@ to all the other peers, who will calculate the estimate from it.
 @node Target value
 @subsubsection Target value
-@c %**end of header
 The target value itself is generated by hashing the current time, rounded
 down to an agreed value. If the rounding amount is 1h (default) and the
@@ -5404,7 +5419,7 @@ Every repetition is called a round.
 @node Timing
 @subsubsection Timing
-@c %**end of header
 The NSE subsystem has some timing control to avoid everybody broadcasting
 its ID all at one. Once each peer has the target random value, it
@@ -5421,7 +5436,7 @@ peers closest to the target value start broadcasting their ID the first.
 @node Controlled Flooding
 @subsubsection Controlled Flooding
-@c %**end of header
 When a peer receives a value, first it verifies that it is closer than the
 closest value it had so far, otherwise it answers the incoming message
@@ -5440,7 +5455,7 @@ to the neighbors.
 @node Calculating the estimate
 @subsubsection Calculating the estimate
-@c %**end of header
 Once the closest ID has been spread across the network each peer gets the
 exact distance between this ID and the target value of the round and
@@ -5459,7 +5474,7 @@ means a factor of two in the size estimate.
 @node libgnunetnse
 @subsection libgnunetnse
-@c %**end of header
 The NSE subsystem has the simplest API of all services, with only two
 calls: @code{GNUNET_NSE_connect} and @code{GNUNET_NSE_disconnect}.
@@ -5485,7 +5500,7 @@ is no longer called with new estimates.
 @node Results
 @subsubsection Results
-@c %**end of header
 The callback provides two values: the average and the
 @uref{http://en.wikipedia.org/wiki/Standard_deviation, standard deviation}
@@ -5523,7 +5538,7 @@ changing rapidly).
 @node libgnunetnse - Examples
 @subsubsection libgnunetnse -Examples
-@c %**end of header
 Let's close with a couple examples.
@@ -5550,7 +5565,7 @@ case a 5 sigma minimum would be 2 million and a 6 sigma minimum,
 @node The NSE Client-Service Protocol
 @subsection The NSE Client-Service Protocol
-@c %**end of header
 As with the API, the client-service protocol is very simple, only has 2
 different messages, defined in @code{src/nse/nse.h}:
@@ -5571,8 +5586,8 @@ simply disconnects from the service, with no message involved.
 @node The NSE Peer-to-Peer Protocol
 @subsection The NSE Peer-to-Peer Protocol
-@c %**end of header
+@pindex GNUNET_MESSAGE_TYPE_NSE_P2P_FLOOD
 The NSE subsystem only has one message in the P2P protocol, the
 @code{GNUNET_MESSAGE_TYPE_NSE_P2P_FLOOD} message.
@@ -5626,7 +5641,7 @@ traffic spikes and minimize cross-messages.
 @node HOSTLIST Subsystem
 @section HOSTLIST Subsystem
-@c %**end of header
 Peers in the GNUnet overlay network need address information so that they
 can connect with other peers. GNUnet uses so called HELLO messages to
@@ -5664,7 +5679,7 @@ manual effort or the use of a HOSTLIST to obtain HELLOs.
 @node HELLOs
 @subsection HELLOs
-@c %**end of header
 The basic information peers require to connect to other peers are
 contained in so called HELLO messages you can think of as a business card.
@@ -5676,7 +5691,7 @@ contact other peers.
 @node Overview for the HOSTLIST subsystem
 @subsection Overview for the HOSTLIST subsystem
-@c %**end of header
 The HOSTLIST subsystem provides a way to distribute and obtain contact
 information to connect to other peers using a simple HTTP GET request.
@@ -5702,7 +5717,7 @@ service.
 @node Features
 @subsubsection Features
-@c %**end of header
 The HOSTLIST daemon can:
@@ -5720,7 +5735,7 @@ peers
 @node HOSTLIST - Limitations
 @subsubsection HOSTLIST - Limitations
-@c %**end of header
 The HOSTLIST daemon does not:
@@ -5732,7 +5747,7 @@ The HOSTLIST daemon does not:
 @node Interacting with the HOSTLIST daemon
 @subsection Interacting with the HOSTLIST daemon
-@c %**end of header
 The HOSTLIST subsystem is currently implemented as a daemon, so there is
 no need for the user to interact with it and therefore there is no
@@ -5760,7 +5775,7 @@ download frequency).
 @node Hostlist security address validation
 @subsection Hostlist security address validation
-@c %**end of header
 Since information obtained from other parties cannot be trusted without
 validation, we have to distinguish between @emph{validated} and
@@ -5781,12 +5796,13 @@ to the TRANSPORT server to validate the addresses.
 @node The HOSTLIST daemon
 @subsection The HOSTLIST daemon
-@c %**end of header
 The hostlist daemon is the main component of the HOSTLIST subsystem. It is
 started by the ARM service and (if configured) starts the HOSTLIST client
 and server components.
+@pindex GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT
 If the daemon provides a hostlist itself it can advertise it's own
 hostlist to other peers. To do so it sends a
 @code{GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT} message to other peers
@@ -5811,7 +5827,7 @@ subsystems and disconnecting from CORE.
 @node The HOSTLIST server
 @subsection The HOSTLIST server
-@c %**end of header
 The server provides a way for other peers to obtain HELLOs. Basically it
 is a small web server other peers can connect to and download a list of
@@ -5827,7 +5843,7 @@ to other peers connecting on CORE level.
 @node The HTTP Server
 @subsubsection The HTTP Server
-@c %**end of header
 During startup, the server starts a web server listening on the port
 specified with the HTTPPORT value (default 8080). In addition it connects
@@ -5853,7 +5869,7 @@ The connection will be closed immediately if no hostlist is available.
 @node Advertising the URL
 @subsubsection Advertising the URL
-@c %**end of header
 The server also advertises the URL to download the hostlist to other peers
 if hostlist advertisement is enabled.
@@ -5865,7 +5881,7 @@ peer using the CORE service.
 @node The HOSTLIST client
 @subsection The HOSTLIST client
-@c %**end of header
 The client provides the functionality to download the list of HELLOs from
 a set of URLs.
@@ -5889,7 +5905,7 @@ The client supports two modes of operation:
 @node Bootstrapping
 @subsubsection Bootstrapping
-@c %**end of header
 For bootstrapping, it schedules a task to download the hostlist from the
 set of known URLs.
@@ -5918,7 +5934,7 @@ quality of this URL is updated.
 @node Learning
 @subsubsection Learning
-@c %**end of header
 The client also manages hostlist advertisements from other peers. The
 HOSTLIST daemon forwards @code{GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT}
@@ -5937,7 +5953,7 @@ never discarded.
 @node Usage
 @subsection Usage
-@c %**end of header
 To start HOSTLIST by default, it has to be added to the DEFAULTSERVICES
 section for the ARM services. This is done in the default configuration.
@@ -5951,7 +5967,7 @@ Configuring your peer to provide a hostlist
 @node IDENTITY Subsystem
 @section IDENTITY Subsystem
-@c %**end of header
 Identities of "users" in GNUnet are called egos.
 Egos can be used as pseudonyms ("fake names") or be tied to an
@@ -6007,7 +6023,7 @@ between anonymous and pseudonymous egos.
 @cindex libgnunetidentity
 @node libgnunetidentity
 @subsection libgnunetidentity
-@c %**end of header
 @menu
@@ -6021,7 +6037,7 @@ between anonymous and pseudonymous egos.
 @node Connecting to the service
 @subsubsection Connecting to the service
-@c %**end of header
 First, typical clients connect to the identity service using
 @code{GNUNET_IDENTITY_connect}. This function takes a callback as a
@@ -6057,7 +6073,7 @@ ego's handle.
 @node Operations on Egos
 @subsubsection Operations on Egos
-@c %**end of header
 Given an ego handle, the main operations are to get its associated private
 key using @code{GNUNET_IDENTITY_ego_get_private_key} or its associated
@@ -6080,7 +6096,7 @@ only the continuation will no longer be called.
 @node The anonymous Ego
 @subsubsection The anonymous Ego
-@c %**end of header
 A special way to obtain an ego handle is to call
 @code{GNUNET_IDENTITY_ego_get_anonymous}, which returns an ego for the
@@ -6115,7 +6131,7 @@ using @code{GNUNET_IDENTITY_get}.
 @node The IDENTITY Client-Service Protocol
 @subsection The IDENTITY Client-Service Protocol
-@c %**end of header
 A client connecting to the identity service first sends a message with
 type
@@ -6206,7 +6222,7 @@ private key.}
 @node Editing Zone Information
 @subsubsection Editing Zone Information
-@c %**end of header
 NAMESTORE provides functions to lookup records stored under a label in a
 zone and to store records under a label in a zone.
@@ -6246,7 +6262,7 @@ the operation.
 @node Iterating Zone Information
 @subsubsection Iterating Zone Information
-@c %**end of header
 A client can iterate over all information in a zone or all zones managed
 by NAMESTORE.
@@ -6266,7 +6282,7 @@ NULL value to indicate.
 @node Monitoring Zone Information
 @subsubsection Monitoring Zone Information
-@c %**end of header
 Clients can also monitor zones to be notified about changes. Here the
 clients uses the @code{GNUNET_NAMESTORE_zone_monitor_start} function and
@@ -6287,7 +6303,7 @@ from the function to start the monitoring.
 @node PEERINFO Subsystem
 @section PEERINFO Subsystem
-@c %**end of header
 The PEERINFO subsystem is used to store verified (validated) information
 about known peers in a persistent way. It obtains these addresses for
@@ -6320,7 +6336,7 @@ service providing this functionality.
 @node PEERINFO - Features
 @subsection PEERINFO - Features
-@c %**end of header
 @itemize @bullet
 @item Persistent storage
@@ -6340,7 +6356,7 @@ service providing this functionality.
 @node DeveloperPeer Information
 @subsection DeveloperPeer Information
-@c %**end of header
 The PEERINFO subsystem stores these information in the form of HELLO
 messages you can think of as business cards.
@@ -6374,7 +6390,7 @@ subsystem using these information to maintain connections to other peers.
 @node Startup
 @subsection Startup
-@c %**end of header
 During startup the PEERINFO services loads persistent HELLOs from disk.
 First PEERINFO parses the directory configured in the HOSTS value of the
@@ -6390,7 +6406,7 @@ The use of these HELLOs can be prevented by setting the
 @node Managing Information
 @subsection Managing Information
-@c %**end of header
 The PEERINFO services stores information about known PEERS and a single
 HELLO message for every peer.
@@ -6412,7 +6428,7 @@ from the disk.
 @node Obtaining Information
 @subsection Obtaining Information
-@c %**end of header
 When a client requests information from PEERINFO, PEERINFO performs a
 lookup for the respective peer or all peers if desired and transmits this
@@ -6429,7 +6445,7 @@ merge for example) or a new peer was added.
 @node The PEERINFO Client-Service Protocol
 @subsection The PEERINFO Client-Service Protocol
-@c %**end of header
 To connect and disconnect to and from the PEERINFO Service PEERINFO
 utilizes the util client/server infrastructure, so no special messages
@@ -6461,7 +6477,7 @@ message, it can proceed with the next request if any is pending.
 @node libgnunetpeerinfo
 @subsection libgnunetpeerinfo
-@c %**end of header
 The PEERINFO API consists mainly of three different functionalities:
@@ -6480,7 +6496,7 @@ The PEERINFO API consists mainly of three different functionalities:
 @node Connecting to the PEERINFO Service
 @subsubsection Connecting to the PEERINFO Service
-@c %**end of header
 To connect to the PEERINFO service the function
 @code{GNUNET_PEERINFO_connect} is used, taking a configuration handle as
@@ -6491,7 +6507,7 @@ handle returned from the connect function has to be called.
 @node Adding Information to the PEERINFO Service
 @subsubsection Adding Information to the PEERINFO Service
-@c %**end of header
 @code{GNUNET_PEERINFO_add_peer} adds a new peer to the PEERINFO subsystem
 storage. This function takes the PEERINFO handle as an argument, the HELLO
@@ -6506,7 +6522,7 @@ can tell PEERINFO to notify if new peer information are available.
 @node Obtaining Information from the PEERINFO Service
 @subsubsection Obtaining Information from the PEERINFO Service
-@c %**end of header
 To iterate over information in PEERINFO you use
 @code{GNUNET_PEERINFO_iterate}.
@@ -6531,7 +6547,7 @@ with @code{GNUNET_PEERINFO_notify_cancel}.
 @node PEERSTORE Subsystem
 @section PEERSTORE Subsystem
-@c %**end of header
 GNUnet's PEERSTORE subsystem offers persistent per-peer storage for other
 GNUnet subsystems. GNUnet subsystems can use PEERSTORE to persistently
@@ -6555,7 +6571,7 @@ Each data record stored with PEERSTORE contains the following fields:
 @node Functionality
 @subsection Functionality
-@c %**end of header
 Subsystems can store any type of value under a (subsystem, peerid, key)
 combination. A "replace" flag set during store operations forces the
@@ -6581,7 +6597,7 @@ request to PEERSTORE.
 @node Architecture
 @subsection Architecture
-@c %**end of header
 PEERSTORE implements the following components:
@@ -6597,7 +6613,7 @@ only an "sqlite" plugin is implemented.
 @node libgnunetpeerstore
 @subsection libgnunetpeerstore
-@c %**end of header
 libgnunetpeerstore is the library containing the PEERSTORE API. Subsystems
 wishing to communicate with the PEERSTORE service use this API to open a
@@ -6645,7 +6661,7 @@ destroyed as well.
 @node SET Subsystem
 @section SET Subsystem
-@c %**end of header
 The SET service implements efficient set operations between two peers
 over a mesh tunnel.
@@ -6668,7 +6684,7 @@ The size of an element's data is limited to around 62 KB.
 @node Local Sets
 @subsection Local Sets
-@c %**end of header
 Sets created by a local client can be modified and reused for multiple
 operations. As each set operation requires potentially expensive special
@@ -6682,7 +6698,7 @@ type.
 @node Set Modifications
 @subsection Set Modifications
-@c %**end of header
 Even when set operations are active, one can add to and remove elements
 from a set.
@@ -6695,7 +6711,7 @@ attaching @emph{generation information} to each element and operation.
 @node Set Operations
 @subsection Set Operations
-@c %**end of header
 Set operations can be started in two ways: Either by accepting an
 operation request from a remote peer, or by requesting a set operation
@@ -6712,7 +6728,7 @@ request (providing a local set for the operation) or reject it.
 @node Result Elements
 @subsection Result Elements
-@c %**end of header
 The SET service has three @emph{result modes} that determine how an
 operation's result set is delivered to the client:
@@ -6737,7 +6753,7 @@ actually interested in the result of the set operation.
 @node libgnunetset
 @subsection libgnunetset
-@c %**end of header
 @menu
 * Sets::
@@ -6750,7 +6766,7 @@ actually interested in the result of the set operation.
 @node Sets
 @subsubsection Sets
-@c %**end of header
 New sets are created with @code{GNUNET_SET_create}. Both the local peer's
 configuration (as each set has its own client connection) and the
@@ -6766,7 +6782,7 @@ Elements are added and removed with @code{GNUNET_SET_add_element} and
 @node Listeners
 @subsubsection Listeners
-@c %**end of header
 Listeners are created with @code{GNUNET_SET_listen}. Each time time a
 remote peer suggests a set operation with an application id and operation
@@ -6779,7 +6795,7 @@ until the client calls @code{GNUNET_SET_commit}
 @node Operations
 @subsubsection Operations
-@c %**end of header
 Operations to be initiated by the local peer are created with
 @code{GNUNET_SET_prepare}. Note that the operation will not be started
@@ -6789,7 +6805,7 @@ until the client calls @code{GNUNET_SET_commit}
 @node Supplying a Set
 @subsubsection Supplying a Set
-@c %**end of header
 To create symmetry between the two ways of starting a set operation
 (accepting and initiating it), the operation handles returned by
@@ -6803,7 +6819,7 @@ operation.
 @node The Result Callback
 @subsubsection The Result Callback
-@c %**end of header
 Clients must specify both a result mode and a result callback with
 @code{GNUNET_SET_accept} and @code{GNUNET_SET_prepare}. The result
@@ -6817,7 +6833,7 @@ or if it is in the difference between the original set and the final set.
 @node The SET Client-Service Protocol
 @subsection The SET Client-Service Protocol
-@c %**end of header
 @menu
 * Creating Sets::
@@ -6831,7 +6847,7 @@ or if it is in the difference between the original set and the final set.
 @node Creating Sets
 @subsubsection Creating Sets
-@c %**end of header
 For each set of a client, there exists a client connection to the service.
 Sets are created by sending the @code{GNUNET_SERVICE_SET_CREATE} message
@@ -6842,7 +6858,7 @@ the client.
 @node Listeners2
 @subsubsection Listeners2
-@c %**end of header
 Each listener also requires a seperate client connection. By sending the
 @code{GNUNET_SERVICE_SET_LISTEN} message, the client notifies the service
@@ -6856,7 +6872,7 @@ is supplied for the set operation.
 @node Initiating Operations
 @subsubsection Initiating Operations
-@c %**end of header
 Operations with remote peers are initiated by sending a
 @code{GNUNET_SERVICE_SET_EVALUATE} message to the service. The@ client
@@ -6865,7 +6881,7 @@ connection that this message is sent by determines the set to use.
 @node Modifying Sets
 @subsubsection Modifying Sets
-@c %**end of header
 Sets are modified with the @code{GNUNET_SERVICE_SET_ADD} and
 @code{GNUNET_SERVICE_SET_REMOVE} messages.
@@ -6878,7 +6894,7 @@ Sets are modified with the @code{GNUNET_SERVICE_SET_ADD} and
 @node Results and Operation Status
 @subsubsection Results and Operation Status
-@c %**end of header
 The service notifies the client of result elements and success/failure of
 a set operation with the @code{GNUNET_SERVICE_SET_RESULT} message.
@@ -6886,7 +6902,7 @@ a set operation with the @code{GNUNET_SERVICE_SET_RESULT} message.
 @node Iterating Sets
 @subsubsection Iterating Sets
-@c %**end of header
 All elements of a set can be requested by sending
 @code{GNUNET_SERVICE_SET_ITER_REQUEST}. The server responds with
@@ -6899,7 +6915,7 @@ iteration may be active for a set at any given time.
 @node The SET Intersection Peer-to-Peer Protocol
 @subsection The SET Intersection Peer-to-Peer Protocol
-@c %**end of header
 The intersection protocol operates over CADET and starts with a
 GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST being sent by the peer
@@ -6931,7 +6947,7 @@ just the initial handshake.
 @node The Bloom filter exchange
 @subsubsection The Bloom filter exchange
-@c %**end of header
 In this phase, each peer transmits a Bloom filter over the remaining
 keys of the local set to the other peer using a
@@ -6958,7 +6974,7 @@ this time as the sender.
 @node Salt
 @subsubsection Salt
-@c %**end of header
 Bloomfilter operations are probabilistic: With some non-zero probability
 the test may incorrectly say an element is in the set, even though it is
@@ -6978,7 +6994,7 @@ sets of the same size, and where the XOR over all keys computes the same
 @node The SET Union Peer-to-Peer Protocol
 @subsection The SET Union Peer-to-Peer Protocol
-@c %**end of header
 The SET union protocol is based on Eppstein's efficient set reconciliation
 without prior context. You should read this paper first if you want to
@@ -7021,7 +7037,7 @@ succeeding if they failed due to collisions before.
 @node STATISTICS Subsystem
 @section STATISTICS Subsystem
-@c %**end of header
 In GNUnet, the STATISTICS subsystem offers a central place for all
 subsystems to publish unsigned 64-bit integer run-time statistics.
@@ -7073,7 +7089,7 @@ to STATISTICS during shutdown.
 @node libgnunetstatistics
 @subsection libgnunetstatistics
-@c %**end of header
 @strong{libgnunetstatistics} is the library containing the API for the
 STATISTICS subsystem. Any process requiring to use STATISTICS should use
@@ -7104,7 +7120,7 @@ functions from the API can be used.
 @node Statistics retrieval
 @subsubsection Statistics retrieval
-@c %**end of header
 Once a connection to the statistics service is obtained, information
 about any other system which uses statistics can be retrieved with the
@@ -7127,7 +7143,7 @@ when we want to shutdown and cleanup everything.
 @node Setting statistics and updating them
 @subsubsection Setting statistics and updating them
-@c %**end of header
 So far we have seen how to retrieve statistics, here we will learn how we
 can set statistics and update them so that other subsystems can retrieve
@@ -7157,7 +7173,7 @@ to worry about sending requests too quickly.
 @node Watches
 @subsubsection Watches
-@c %**end of header
 As interesting feature of STATISTICS lies in serving notifications
 whenever a statistic of our interest is modified.
@@ -7177,7 +7193,7 @@ parameters that are used for registering the watch.
 @node The STATISTICS Client-Service Protocol
 @subsection The STATISTICS Client-Service Protocol
-@c %**end of header
 @menu
@@ -7189,7 +7205,7 @@ parameters that are used for registering the watch.
 @node Statistics retrieval2
 @subsubsection Statistics retrieval2
-@c %**end of header
 To retrieve statistics, the client transmits a message of type
 @code{GNUNET_MESSAGE_TYPE_STATISTICS_GET} containing the given subsystem
@@ -7203,7 +7219,7 @@ type @code{GNUNET_MESSAGE_TYPE_STATISTICS_END}.
 @node Setting and updating statistics
 @subsubsection Setting and updating statistics
-@c %**end of header
 The subsystem name, parameter name, its value and the persistence flag are
 communicated to the service through the message
@@ -7226,7 +7242,7 @@ the message should be treated as an update value.
 @node Watching for updates
 @subsubsection Watching for updates
-@c %**end of header
 The function registers the watch at the service by sending a message of
 type @code{GNUNET_MESSAGE_TYPE_STATISTICS_WATCH}. The service then sends
@@ -7239,7 +7255,7 @@ parameter's value is changed.
 @node Distributed Hash Table (DHT)
 @section Distributed Hash Table (DHT)
-@c %**end of header
 GNUnet includes a generic distributed hash table that can be used by
 developers building P2P applications in the framework.
@@ -7285,7 +7301,7 @@ loss of performance or quality of service is expected in this case).
 @node Block library and plugins
 @subsection Block library and plugins
-@c %**end of header
 @menu
 * What is a Block?::
@@ -7298,7 +7314,7 @@ loss of performance or quality of service is expected in this case).
 @node What is a Block?
 @subsubsection What is a Block?
-@c %**end of header
 Blocks are small (< 63k) pieces of data stored under a key (struct
 GNUNET_HashCode). Blocks have a type (enum GNUNET_BlockType) which defines
@@ -7315,7 +7331,7 @@ available for any type of block.
 @node The API of libgnunetblock
 @subsubsection The API of libgnunetblock
-@c %**end of header
 The block library requires for each (family of) block type(s) a block
 plugin (implementing @file{gnunet_block_plugin.h}) that provides basic
@@ -7347,7 +7363,7 @@ If a plugin fails to do this, responses may loop in the network.
 @node Queries
 @subsubsection Queries
-@c %**end of header
 The query format for any block in GNUnet consists of four main components.
 First, the type of the desired block must be specified. Second, the query
@@ -7375,7 +7391,7 @@ Depending on the results from the plugin, the DHT will then discard the
 @node Sample Code
 @subsubsection Sample Code
-@c %**end of header
 The source code in @strong{plugin_block_test.c} is a good starting point
 for new block plugins --- it does the minimal work by implementing a
@@ -7386,7 +7402,7 @@ block plugin.
 @node Conclusion2
 @subsubsection Conclusion2
-@c %**end of header
 In conclusion, GNUnet subsystems that want to use the DHT need to define a
 block format and write a plugin to match queries and replies. For testing,
@@ -7400,7 +7416,7 @@ of error checking that results from this primitive implementation.
 @node libgnunetdht
 @subsection libgnunetdht
-@c %**end of header
 The DHT API itself is pretty simple and offers the usual GET and PUT
 functions that work as expected. The specified block type refers to the
@@ -7418,7 +7434,7 @@ data stored in the network.
 @node GET
 @subsubsection GET
-@c %**end of header
 When using GET, the main consideration for developers (other than the
 block library) should be that after issuing a GET, the DHT will
@@ -7446,7 +7462,7 @@ bandwidth consumption.
 @node PUT
 @subsubsection PUT
-@c %**end of header
 @c inconsistent use of ``must'' above it's written ``MUST''
 In contrast to GET operations, developers @strong{must} manually re-run
@@ -7468,7 +7484,7 @@ DHT PUT operations should be repeated at least every 1-2 hours.
 @node MONITOR
 @subsubsection MONITOR
-@c %**end of header
 The DHT API also allows applications to monitor messages crossing the
 local DHT service.
@@ -7491,7 +7507,7 @@ number of workers will process the distributed workload.
 @node DHT Routing Options
 @subsubsection DHT Routing Options
-@c %**end of header
 There are two important options for GET and PUT requests:
@@ -7521,7 +7537,7 @@ in the future offer performance improvements for clique topologies.
 @node The DHT Client-Service Protocol
 @subsection The DHT Client-Service Protocol
-@c %**end of header
 @menu
 * PUTting data into the DHT::
@@ -7532,7 +7548,7 @@ in the future offer performance improvements for clique topologies.
 @node PUTting data into the DHT
 @subsubsection PUTting data into the DHT
-@c %**end of header
 To store (PUT) data into the DHT, the client sends a
 @code{struct GNUNET_DHT_ClientPutMessage} to the service.
@@ -7553,7 +7569,7 @@ in the P2P interaction.
 @node GETting data from the DHT
 @subsubsection GETting data from the DHT
-@c %**end of header
 To retrieve (GET) data from the DHT, the client sends a
 @code{struct GNUNET_DHT_ClientGetMessage} to the service. The message
@@ -7592,7 +7608,7 @@ service --- and to stop them individually.
 @node Monitoring the DHT
 @subsubsection Monitoring the DHT
-@c %**end of header
 To begin monitoring, the client sends a
 @code{struct GNUNET_DHT_MonitorStartStop} message to the DHT service.
@@ -7607,7 +7623,7 @@ these messages contains all of the information about the event.
 @node The DHT Peer-to-Peer Protocol
 @subsection The DHT Peer-to-Peer Protocol
-@c %**end of header
 @menu
@@ -7619,7 +7635,7 @@ these messages contains all of the information about the event.
 @node Routing GETs or PUTs
 @subsubsection Routing GETs or PUTs
-@c %**end of header
 When routing GETs or PUTs, the DHT service selects a suitable subset of
 neighbours for forwarding. The exact number of neighbours can be zero or
@@ -7634,7 +7650,7 @@ traversed; those peers are also excluded from the selection.
 @node PUTting data into the DHT2
 @subsubsection PUTting data into the DHT2
-@c %**end of header
 To PUT data into the DHT, the service sends a @code{struct PeerPutMessage}
 of type @code{GNUNET_MESSAGE_TYPE_DHT_P2P_PUT} to the respective
@@ -7656,7 +7672,7 @@ its own identity (this is done to reduce bandwidth).
 @node GETting data from the DHT2
 @subsubsection GETting data from the DHT2
-@c %**end of header
 A peer can search the DHT by sending @code{struct PeerGetMessage}s of type
 @code{GNUNET_MESSAGE_TYPE_DHT_P2P_GET} to other peers. In addition to the
@@ -7695,7 +7711,7 @@ The DHT service may also cache forwarded results locally if the
 @node GNU Name System (GNS)
 @section GNU Name System (GNS)
-@c %**end of header
 The GNU Name System (GNS) is a decentralized database that enables users
 to securely resolve names to values.
@@ -7750,7 +7766,7 @@ record types.
 @node libgnunetgns
 @subsection libgnunetgns
-@c %**end of header
 The GNS API itself is extremely simple. Clients first connect to the
 GNS service using @code{GNUNET_GNS_connect}.
@@ -7768,7 +7784,7 @@ Once finished, clients disconnect using @code{GNUNET_GNS_disconnect}.
 @node Looking up records
 @subsubsection Looking up records
-@c %**end of header
 @code{GNUNET_GNS_lookup} takes a number of arguments:
@@ -7810,7 +7826,7 @@ must no longer be canceled.
 @node Accessing the records
 @subsubsection Accessing the records
-@c %**end of header
 The @code{libgnunetgnsrecord} library provides an API to manipulate the
 GNS record array that is given to proc. In particular, it offers
@@ -7824,7 +7840,7 @@ functions for parsing (and serializing) common types of DNS records.
 @node Creating records
 @subsubsection Creating records
-@c %**end of header
 Creating GNS records is typically done by building the respective record
 information (possibly with the help of @code{libgnunetgnsrecord} and
@@ -7835,7 +7851,7 @@ operation.
 @node Future work
 @subsubsection Future work
-@c %**end of header
 In the future, we want to expand @code{libgnunetgns} to allow
 applications to observe shortening operations performed during GNS
@@ -7845,7 +7861,7 @@ this happens.
 @node libgnunetgnsrecord
 @subsection libgnunetgnsrecord
-@c %**end of header
 The @code{libgnunetgnsrecord} library is used to manipulate GNS
 records (in plaintext or in their encrypted format).
@@ -7871,7 +7887,7 @@ standard GNS record types.
 @node Value handling
 @subsubsection Value handling
-@c %**end of header
 @code{GNUNET_GNSRECORD_value_to_string} can be used to convert
 the (binary) representation of a GNS record value to a human readable,
@@ -7886,7 +7902,7 @@ a GNS record value.
 @node Type handling
 @subsubsection Type handling
-@c %**end of header
 @code{GNUNET_GNSRECORD_typename_to_number} can be used to obtain the
 numeric value associated with a given typename. For example, given the
@@ -7904,7 +7920,7 @@ typename "A".
 @node GNS plugins
 @subsection GNS plugins
-@c %**end of header
 Adding a new GNS record type typically involves writing (or extending) a
 GNSRECORD plugin. The plugin needs to implement the
@@ -7930,7 +7946,7 @@ typenames and numbers documented in the previous subsection.
 @node The GNS Client-Service Protocol
 @subsection The GNS Client-Service Protocol
-@c %**end of header
 The GNS client-service protocol consists of two simple messages, the
 @code{LOOKUP} message and the @code{LOOKUP_RESULT}. Each @code{LOOKUP}
@@ -7950,7 +7966,7 @@ They can thus be deserialized using
 @node Hijacking the DNS-Traffic using gnunet-service-dns
 @subsection Hijacking the DNS-Traffic using gnunet-service-dns
-@c %**end of header
 This section documents how the gnunet-service-dns (and the
 gnunet-helper-dns) intercepts DNS queries from the local system.
@@ -7987,7 +8003,7 @@ interface with the original nameserver as source address.
 @node Network Setup Details
 @subsubsection Network Setup Details
-@c %**end of header
 The DNS interceptor adds the following rules to the Linux kernel:
 @example
@@ -8008,7 +8024,7 @@ arbitrarily). The third line adds a routing policy based on this mark
 @node Serving DNS lookups via GNS on W32
 @subsection Serving DNS lookups via GNS on W32
-@c %**end of header
 This section documents how the libw32nsp (and
 gnunet-gns-helper-service-w32) do DNS resolutions of DNS queries on the
@@ -8078,10 +8094,9 @@ This includes some of well known utilities, like "ping" and "nslookup".
 @node Importing DNS Zones into GNS
 @subsection Importing DNS Zones into GNS
-@c %**end of header
 This section discusses the challenges and problems faced when writing the
-Ascension tool. It also takes a look at possible improvements in the future.
+Ascension tool. It also takes a look at possible improvements in the
+future.
 @menu
 * Conversions between DNS and GNS::
@@ -8089,29 +8104,31 @@ Ascension tool. It also takes a look at possible improvements in the future.
 * Performance::
 @end menu
+@cindex DNS Conversion
 @node Conversions between DNS and GNS
 @subsubsection Conversions between DNS and GNS
 The differences between the two name systems lies in the details
-and is not always transparent. For instance an SRV record is converted to a
+and is not always transparent.
-GNS only BOX record.
+For instance an SRV record is converted to a GNS only BOX record.
 This is done by converting to a BOX record from an existing SRV record:
 @example
 # SRV
 # _service._proto.name. TTL class SRV priority weight port target
-_sip._tcp.example.com. 14000 IN SRV     0 0 5060 www.example.com.
+_sip._tcp.example.com. 14000 IN SRV     0 0 5060 www.example.com.
 # BOX
 # TTL BOX flags port protocol recordtype priority weight port target
 14000 BOX n 5060 6 33 0 0 5060 www.example.com
 @end example
-Other records that have such a transformation is the MX record type, as well as
+Other records that have such a transformation is the MX record type,
-the SOA record type.
+as well as the SOA record type.
+Transformation of a SOA record into GNS works as described in the
+following example. Very important to note are the rname and mname keys.
-Transformation of a SOA record into GNS works as described in the following
-example. Very important to note are the rname and mname keys.
 @example
 # BIND syntax for a clean SOA record
 @   IN SOA master.example.com. hostmaster.example.com. (
@@ -8235,7 +8252,7 @@ that uses the C API would be cleaner and better.
 @node GNS Namecache
 @section GNS Namecache
-@c %**end of header
 The NAMECACHE subsystem is responsible for caching (encrypted) resolution
 results of the GNU Name System (GNS). GNS makes zone information available
@@ -8274,7 +8291,7 @@ plugin API.
 @node libgnunetnamecache
 @subsection libgnunetnamecache
-@c %**end of header
 The NAMECACHE API consists of five simple functions. First, there is
 @code{GNUNET_NAMECACHE_connect} to connect to the NAMECACHE service.
@@ -8297,7 +8314,7 @@ The maximum size of a block that can be stored in the NAMECACHE is
 @node The NAMECACHE Client-Service Protocol
 @subsection The NAMECACHE Client-Service Protocol
-@c %**end of header
 All messages in the NAMECACHE IPC protocol start with the
 @code{struct GNUNET_NAMECACHE_Header} which adds a request
@@ -8315,7 +8332,7 @@ out-of-order.
 @node Lookup
 @subsubsection Lookup
-@c %**end of header
 The @code{struct LookupBlockMessage} is used to lookup a block stored in
 the cache.
@@ -8329,7 +8346,7 @@ of the block.
 @node Store
 @subsubsection Store
-@c %**end of header
 The @code{struct BlockCacheMessage} is used to cache a block in the
 NAMECACHE.
@@ -8341,7 +8358,7 @@ message as well.
 @node The NAMECACHE Plugin API
 @subsection The NAMECACHE Plugin API
-@c %**end of header
 The NAMECACHE plugin API consists of two functions, @code{cache_block} to
 store a block in the database, and @code{lookup_block} to lookup a block
@@ -8356,7 +8373,7 @@ in the database.
 @node Lookup2
 @subsubsection Lookup2
-@c %**end of header
 The @code{lookup_block} function is expected to return at most one block
 to the iterator, and return @code{GNUNET_NO} if there were no non-expired
@@ -8367,7 +8384,7 @@ supposed to return the result with the largest expiration time.
 @node Store2
 @subsubsection Store2
-@c %**end of header
 The @code{cache_block} function is expected to try to store the block in
 the database, and return @code{GNUNET_SYSERR} if this was not possible
@@ -8384,7 +8401,7 @@ block is more recent during the store operation.
 @cindex REVOCATION Subsystem
 @node REVOCATION Subsystem
 @section REVOCATION Subsystem
-@c %**end of header
 The REVOCATION subsystem is responsible for key revocation of Egos.
 If a user learns that theis private key has been compromised or has lost
@@ -8404,7 +8421,7 @@ propagate revocation messages.
 @node Dissemination
 @subsection Dissemination
-@c %**end of header
 When a revocation is performed, the revocation is first of all
 disseminated by flooding the overlay network.
@@ -8428,7 +8445,7 @@ The SET service is used to perform this operation efficiently.
 @node Revocation Message Design Requirements
 @subsection Revocation Message Design Requirements
-@c %**end of header
 However, flooding is also quite costly, creating O(|E|) messages on a
 network with |E| edges.
@@ -8450,7 +8467,7 @@ revocation message ahead of time and store it in a secure location.
 @node libgnunetrevocation
 @subsection libgnunetrevocation
-@c %**end of header
 The REVOCATION API consists of two parts, to query and to issue
 revocations.
@@ -8465,7 +8482,7 @@ revocations.
 @node Querying for revoked keys
 @subsubsection Querying for revoked keys
-@c %**end of header
 @code{GNUNET_REVOCATION_query} is used to check if a given ECDSA public
 key has been revoked.
@@ -8476,7 +8493,7 @@ the return value.
 @node Preparing revocations
 @subsubsection Preparing revocations
-@c %**end of header
 It is often desirable to create a revocation record ahead-of-time and
 store it in an off-line location to be used later in an emergency.
@@ -8544,7 +8561,7 @@ successfully.
 @node The REVOCATION Peer-to-Peer Protocol
 @subsection The REVOCATION Peer-to-Peer Protocol
-@c %**end of header
 Revocation uses two disjoint ways to spread revocation information among
 peers.
@@ -8579,7 +8596,7 @@ larger hashed peer identity.
 @node File-sharing (FS) Subsystem
 @section File-sharing (FS) Subsystem
-@c %**end of header
 This chapter describes the details of how the file-sharing service works.
 As with all services, it is split into an API (libgnunetfs), the service
@@ -8617,7 +8634,7 @@ NOTE: The documentation in this chapter is quite incomplete.
 @node Encoding for Censorship-Resistant Sharing (ECRS)
 @subsection Encoding for Censorship-Resistant Sharing (ECRS)
-@c %**end of header
 When GNUnet shares files, it uses a content encoding that is called ECRS,
 the Encoding for Censorship-Resistant Sharing.
@@ -8639,7 +8656,7 @@ thus did not warrant space in the research report.
 @node Namespace Advertisements
 @subsubsection Namespace Advertisements
-@c %**end of header
 @c %**FIXME: all zeroses -> ?
 An @code{SBlock} with identifier all zeros is a signed
@@ -8654,7 +8671,7 @@ can search for @code{SBlock}s in order to find out more about a namespace.
 @node KSBlocks
 @subsubsection KSBlocks
-@c %**end of header
 GNUnet implements @code{KSBlocks} which are @code{KBlocks} that, instead
 of encrypting a CHK and metadata, encrypt an @code{SBlock} instead.
@@ -8680,7 +8697,7 @@ Collections are also advertised using @code{KSBlock}s.
 @node File-sharing persistence directory structure
 @subsection File-sharing persistence directory structure
-@c %**end of header
 This section documents how the file-sharing library implements
 persistence of file-sharing operations and specifically the resulting
@@ -8766,7 +8783,7 @@ Note that unindex operations cannot have associated child operations.
 @node REGEX Subsystem
 @section REGEX Subsystem
-@c %**end of header
 Using the REGEX subsystem, you can discover peers that offer a particular
 service using regular expressions.
@@ -8789,7 +8806,7 @@ thesis.
 @node How to run the regex profiler
 @subsection How to run the regex profiler
-@c %**end of header
 The gnunet-regex-profiler can be used to profile the usage of mesh/regex
 for a given set of regular expressions and strings.
@@ -8922,7 +8939,7 @@ regular expressions.
 @node REST Subsystem
 @section REST Subsystem
-@c %**end of header
 Using the REST subsystem, you can expose REST-based APIs or services.
 The REST service is designed as a pluggable architecture.
diff --git a/doc/handbook/chapters/installation.texi b/doc/handbook/chapters/installation.texi
index a907a1046..ad848b4a0 100644
--- a/doc/handbook/chapters/installation.texi
+++ b/doc/handbook/chapters/installation.texi
@@ -12,9 +12,9 @@ package manager.
 * Create @code{gnunet} user and group::
 * Preparing and Compiling the Source Code::
 * Installation::
-* MOVED FROM USER Checking the Installation::
+* Checking the Installation::
-* MOVED FROM USER The graphical configuration interface::
+* The graphical configuration interface::
-* MOVED FROM USER Config Leftovers::
+* Config Leftovers::
 @end menu
 @c -----------------------------------------------------------------------
@@ -27,36 +27,54 @@ link to the project websites.
 The mandatory libraries and applications are
 @itemize @bullet
-@item libtool
 @item autoconf 2.59 or above
 @item automake 1.11.1 or above
-@item pkg-config
+@item gettext
+@item glibc (read below, other libcs should work)
+@item gnutls 3.2.12 or above, recommended to be linked against libunbound
+@item iptables (on Linux systems)
+@item libtool 2.2 or above
+@item libltdl (part of libtool)
 @item libgcrypt 1.6 or above
 @item libextractor
-@item libidn
+@item libidn2 or libidn
 @item libmicrohttpd 0.9.52 or above
-@item libnss
 @item libunistring
-@item gettext
-@item glibc
 @item libgmp
-@item gnutls
+@item libgnurl or libcurl (libcurl has to be linked to GnuTLS) 7.35.0 or above
-@item libcurl (has to be linked to GnuTLS) or libgnurl
+@item Texinfo 5.2 or above (for building the documentation)
+@item Texlive 2012 or above (for building the documentation, and for gnunet-bcd)
+@item makeinfo 4.8 or above
 @item zlib
 @end itemize
+Glibc is required for certain NSS features:
+@example
+One mechanism of integrating GNS with legacy applications via NSS is
+not available if this is disabled. But applications that don't use the
+glibc for NS resolution won't work anyway with this, so little is lost
+on BSD systems.
+GNS via direct use or via the HTTP or DNS proxies is unaffected.
+@end example
+Other libcs should work, the resulting builds just don't include the
+glibc NSS specific code. One example is the build against NetBSD's libc
+as detailed in @uref{https://bugs.gnunet.org/view.php?id=5605}.
 In addition GNUnet needs one of of these three databases
 @itemize @bullet
-@item sqlite + libsqlite (the default, requires no further configuration)
+@item sqlite + libsqlite 3.8 or above (the default, requires no further configuration)
 @item postgres + libpq
 @item mysql + libmysqlclient
 @end itemize
 These are the dependencies only required for certain features
 @itemize @bullet
-@item Texinfo (for building the documentation)
+@item guile 1.6.4 for gnunet-download-manager
-@item Texlive (for building the documentation)
 @item miniupnpc (for traversing NAT boxes more reliably)
+@item libnss
+@item libglpk 4.45 or above for experimental code
 @item libopus (for running the GNUnet conversation telephony application)
 @item libpulse (for running the GNUnet conversation telephony application)
 @item libogg (for running the GNUnet conversation telephony application)
@@ -65,6 +83,24 @@ These are the dependencies only required for certain features
 (for attribute-based encryption and the identity provider subsystem)
 @item libgabe
 (for attribute-based encryption and the identity provider subsystem)
+@item texi2mdoc (for automatic mdoc generation)
+@item perl5 for some utilities
+@end itemize
+These are the test suite requirements:
+@itemize @bullet
+@item python3.7
+@item gnunet (installation first)
+@item which(1)
+@item a shell (possibly Bash, maybe just POSIX sh)
+@end itemize
+These are runtime requirements:
+@itemize @bullet
+@item nss (the certutil binary, for gnunet-gns-proxy-setup-ca)
+@item openssl (openssl binary, for gnunet-gns-proxy-setup-ca)
+@item python2.7 for gnunet-qr (at the moment only python2.7 supported)
+@item python-zbar 0.10 or above for gnunet-qr
 @end itemize
 @c -----------------------------------------------------------------------
@@ -82,7 +118,7 @@ The archive can be found at
 @uref{https://ftpmirror.gnu.org/gnu/gnunet/}. Extract it using a graphical
 archive tool or @code{tar}:
 @example
-tar xzvf gnunet-0.11.0pre66.tar.gz
+tar xzvf gnunet-@value{VERSION}.tar.gz
 @end example
 In the next chapter we will assume that the source code is available
@@ -116,17 +152,24 @@ running @code{configure} the following options can be specified to
 customize the compilation and installation process:
 @itemize @bullet
-@item @code{--disable-documentation} - don't build the configuration documents
+@item @code{--disable-documentation} - don't build the documentation
 @item @code{--enable-looging=[LOGLEVEL]} - choose a loglevel (@code{debug}, @code{info}, @code{warning} or @code{error})
 @item @code{--prefix=[PATH]} - the directory where the GNUnet libraries and binaries will be installed
 @item @code{--with-extractor=[PATH]} - the path to libextractor
 @item @code{--with-libidn=[PATH]} - the path to libidn
+@item @code{--with-libidn2=[PATH]} - the path to libidn2 (takes priority over libidn if both are found)
 @item @code{--with-microhttpd=[PATH]} - the path to libmicrohttpd
 @item @code{--with-sqlite=[PATH]} - the path to libsqlite
 @item @code{--with-zlib=[PATH]} - the path to zlib
 @item @code{--with-sudo=[PATH]} - path to the sudo binary (no need to run @code{make install} as root if specified)
 @end itemize
+Note that the list above is not always up to date and you
+should check the output of @code{./configure --help}, read
+the @file{configure.ac} or send an email asking for assistance
+if you are in doubt of any configure options or require fixes
+for your operating system.
 The following example configures the installation prefix
 @code{/usr/lib} and disables building the documentation
 @example
@@ -216,9 +259,9 @@ PLUGINS = tcp
-@node MOVED FROM USER Checking the Installation
+@node Checking the Installation
-@section MOVED FROM USER Checking the Installation
+@section Checking the Installation
-@c %**end of header
 This section describes a quick, casual way to check if your GNUnet
 installation works. However, if it does not, we do not cover
@@ -240,7 +283,7 @@ as part of this handbook!.
 @cindex GTK user interface
 @node gnunet-gtk
 @subsection gnunet-gtk
-@c %**end of header
 The @command{gnunet-gtk} package contains several graphical
 user interfaces for the respective GNUnet applications.
@@ -251,17 +294,24 @@ Currently these interfaces cover:
 @item Peer Information
 @item GNU Name System
 @item File Sharing
-@item Identity Management
 @item Conversation
+@item Setup
 @end itemize
+Previously, many of these interfaces were combined into one application
+called @command{gnunet-gtk}, with different tabs for each interface. This
+combined application has been removed in version 0.11.0, but each of the
+interfaces is still available as a standalone application
+(@command{gnunet-statistics-gtk} for statistics, @command{gnunet-fs-gtk}
+for filesharing, etc).
 @node Statistics
 @subsection Statistics
-@c %**end of header
 We assume that you have started gnunet via @code{gnunet-arm} or via your
 system-provided method for starting services.
-First, you should launch GNUnet gtk.
+First, you should launch GNUnet's graphical statistics interface.
 You can do this from the command-line by typing
 @example
@@ -274,7 +324,7 @@ least if your peer has been running for more than a few seconds). The
 lines indicate how many other peers your peer is connected to (via
 different mechanisms) and how large the entire overlay network is
 currently estimated to be. The X-axis represents time (in seconds
-since the start of @command{gnunet-gtk}).
+since the start of @command{gnunet-statistics-gtk}).
 You can click on "Traffic" to see information about the amount of
 bandwidth your peer has consumed, and on "Storage" to check the amount
@@ -290,10 +340,10 @@ whatever it is you are looking at the Gtk+ interface describes a
 @node Peer Information
 @subsection Peer Information
-@c %**end of header
-First, you should launch the graphical user interface.  You can do
-this from the command-line by typing
+First, you should launch the peer information graphical user interface.
+You can do this from the command-line by typing
 @example
 $ gnunet-peerinfo-gtk
@@ -310,8 +360,8 @@ configuration.
 @c NOTE: Inserted from Installation Handbook in original ``order'':
 @c FIXME: Move this to User Handbook.
-@node MOVED FROM USER The graphical configuration interface
+@node The graphical configuration interface
-@section MOVED FROM USER The graphical configuration interface
+@section The graphical configuration interface
 If you also would like to use @command{gnunet-gtk} and
 @command{gnunet-setup} (highly recommended for beginners), do:
@@ -347,7 +397,7 @@ If you also would like to use @command{gnunet-gtk} and
 * Configuring the GNUnet VPN::
 * Bandwidth Configuration::
 * Configuring NAT::
-* Peer configuration for distributions::
+* Peer configuration for distributors (e.g. Operating Systems)::
 @end menu
 @node Configuring your peer
@@ -358,7 +408,7 @@ This chapter will describe the various configuration options in GNUnet.
 The easiest way to configure your peer is to use the
 @command{gnunet-setup} tool.
 @command{gnunet-setup} is part of the @command{gnunet-gtk}
-application. You might have to install it separately.
+package. You might have to install it separately.
 Many of the specific sections from this chapter actually are linked from
 within @command{gnunet-setup} to help you while using the setup tool.
@@ -837,7 +887,7 @@ a @code{gn090} table here, it probably works.
 @node Configuring the datacache
 @subsection Configuring the datacache
-@c %**end of header
 The datacache is what GNUnet uses for storing temporary data. This data is
 expected to be wiped completely each time GNUnet is restarted (or the
@@ -889,7 +939,8 @@ strength of the adversary).
 @node Configuring logging
 @subsection Configuring logging
-Logging in GNUnet 0.9.0 is controlled via the "-L" and "-l" options.
+Since version 0.9.0, logging in GNUnet is controlled via the
+@code{-L} and @code{-l} options.
 Using @code{-L}, a log level can be specified. With log level
 @code{ERROR} only serious errors are logged.
 The default log level is @code{WARNING} which causes anything of
@@ -1765,7 +1816,7 @@ The other options as shown on the gnunet-setup tool are:
 @node IPv4 address for interface
 @subsubsection IPv4 address for interface
-This is the IPv4 address the VPN interface will get. You should pick an
+This is the IPv4 address the VPN interface will get. You should pick a
 'private' IPv4 network that is not yet in use for you system. For example,
 if you use @code{10.0.0.1/255.255.0.0} already, you might use
 @code{10.1.0.1/255.255.0.0}.
@@ -1920,29 +1971,29 @@ connect to NATed peers using autonomous NAT traversal, you need to check
 the "Enable connecting to NATed peers using ICMP method" box.
-@node Peer configuration for distributions
+@node Peer configuration for distributors (e.g. Operating Systems)
-@subsection Peer configuration for distributions
+@subsection Peer configuration for distributors (e.g. Operating Systems)
 The "GNUNET_DATA_HOME" in "[path]" in @file{/etc/gnunet.conf} should be
 manually set to "/var/lib/gnunet/data/" as the default
 "~/.local/share/gnunet/" is probably not that appropriate in this case.
-Similarly, distributions may consider pointing "GNUNET_RUNTIME_DIR" to
+Similarly, distributors may consider pointing "GNUNET_RUNTIME_DIR" to
 "/var/run/gnunet/" and "GNUNET_HOME" to "/var/lib/gnunet/". Also, should a
-distribution decide to override system defaults, all of these changes
+distributor decide to override system defaults, all of these changes
 should be done in a custom @file{/etc/gnunet.conf} and not in the files
 in the @file{config.d/} directory.
 Given the proposed access permissions, the "gnunet-setup" tool must be
 run as use "gnunet" (and with option "-c /etc/gnunet.conf" so that it
 modifies the system configuration). As always, gnunet-setup should be run
-after the GNUnet peer was stopped using "gnunet-arm -e". Distributions
+after the GNUnet peer was stopped using "gnunet-arm -e". Distributors
 might want to include a wrapper for gnunet-setup that allows the
 desktop-user to "sudo" (i.e. using gtksudo) to the "gnunet" user account
 and then runs "gnunet-arm -e", "gnunet-setup" and "gnunet-arm -s" in
 sequence.
-@node MOVED FROM USER Config Leftovers
+@node Config Leftovers
-@section MOVED FROM USER Config Leftovers
+@section Config Leftovers
 This section describes how to start a GNUnet peer. It assumes that you
 have already compiled and installed GNUnet and its' dependencies.
@@ -2201,7 +2252,7 @@ However, as TCP is generally less efficient and it is rarely the case
 that a single GNUnet peer is supposed to serve an entire local network,
 the default configuration should disable TCP access to all GNUnet
 services on systems with support for UNIX domain sockets.
-As of GNUnet 0.9.2, configuration files with TCP access disabled should be
+Since GNUnet 0.9.2, configuration files with TCP access disabled should be
 generated by default. Users can re-enable TCP access to particular
 services simply by specifying a non-zero port number in the section of
 the respective service.
diff --git a/doc/handbook/chapters/keyconcepts.texi b/doc/handbook/chapters/keyconcepts.texi
index 829fed82e..4b49a7ffb 100644
--- a/doc/handbook/chapters/keyconcepts.texi
+++ b/doc/handbook/chapters/keyconcepts.texi
@@ -246,7 +246,7 @@ encryption as the link-encryption between the nodes.  GNUnet has
 encryption on the network layer (link encryption, confidentiality,
 authentication) and again on the application layer (provided
 by @command{gnunet-publish}, @command{gnunet-download},
-@command{gnunet-search} and @command{gnunet-gtk}).
+@command{gnunet-search} and @command{gnunet-fs-gtk}).
 Refer to the following paper for more:
 Christian Grothoff, Krista Grothoff, Tzvetan Horozov,
diff --git a/doc/handbook/chapters/preface.texi b/doc/handbook/chapters/preface.texi
index 386cefa6d..636458eeb 100644
--- a/doc/handbook/chapters/preface.texi
+++ b/doc/handbook/chapters/preface.texi
@@ -1,13 +1,17 @@
 @node Preface
 @chapter Preface
-This collection of manuals describes how to use GNUnet, a framework
+@c FIXME: Do we have to mention that this is Free Software?
+@c FIXME: where did 'Free Software' in this sentence fit before
+@c FIXME: we changed it?
+This collection of manuals describes GNUnet, a framework
 for secure peer-to-peer networking with the high-level goal to provide
-a strong foundation Free Software for a global, distributed network
+a strong foundation for a global, distributed network
-that provides security and privacy.  GNUnet in that sense aims to
+that provides security and privacy.
-replace the current Internet protocol stack.  Along with an
+GNUnet in that sense aims to replace the current Internet protocol stack.
-application for secure publication of files, it has grown to include
+Along with an application for secure publication of files, it has grown to
-all kinds of basic applications for the foundation of a new Internet.
+include all kinds of basic applications for the foundation of a new
+Internet.
 @menu
 * About this book::
@@ -22,47 +26,74 @@ all kinds of basic applications for the foundation of a new Internet.
 The books (described as ``book'' or ``books'' in the following)
 bundled as the ``GNUnet Reference Manual'' are based on the historic
-work of all contributors to GNUnet's documentation.  It is our hope
+work of all contributors to previous documentation of GNUnet.
+It is our hope
 that the content is described in a way that does not require any
 academic background, although some concepts will require further
 reading.
-Our (long-term) goal with these books is to keep them self-contained. If
+Our (long-term) goal with these books is to keep them
-you see references to Wikipedia and other external sources (except for
+self-contained. If you see references to Wikipedia and other external
-our academic papers) it means that we are working on a solution to
+sources (except for our academic papers) it means that we are working
-describe the explanations found there which fits our use-case and licensing.
+on a solution to describe the explanations found there which fits our
+use-case and licensing.
-The first chapter (``Preface'') as well as the the second
-chapter (``Philosophy'') give an introduction to GNUnet as a project,
+Previously the documentation was contained in Drupal books, on the
-what GNUnet tries to achieve.
+old website. This format was considered unmaintainable for the future, so
+Texinfo was chosen. You might find old and very old sections in
+here in addition to more recent content. It took a long time to
+finish the move to Texinfo (from Drupal to LaTeX to wrong Texinfo
+output dump to good Texinfo) and only recently (late 2018, early
+2019) content checking started. We apologize to the reader for
+any inconvenience and hope you apply logic where bad advice from
+10 years ago can be found (pipe to sudo to install software is
+one example). Patches (contributions) to this documentation are more
+than welcome!
+The first chapter (``Preface'') as well as the the second chapter
+(``Philosophy'') give an introduction to GNUnet as a project, what
+GNUnet tries to achieve. ``Key Concepts'' explains the key concepts
+in GNUnet.
+These three chapters are the most complete in the documentation.
+They are followed by chapters which explain specific parts of
+GNUnet (and need more work):
+``Installing GNUnet'', ``GNUnet Contributors Handbook'' and
+``GNUnet Developer Handbook''.
 @node Contributing to this book
 @section Contributing to this book
+@c FIXME: There's a good amount of repetition here, we should
+@c FIXME: fix this.
 The GNUnet Reference Manual is a collective work produced by various
-people throughout the years. The version you are reading is derived
+people throughout the years.
-from many individual efforts hosted on our website. This was a failed
-experiment, and with the conversion to Texinfo we hope to address this
+The version you are reading is derived
-in the longterm. Texinfo is the documentation language of the GNU project.
+from many individual efforts hosted on one of our old websites.
+In the end it was considered to be impractical to read by
+those who required the information.
+With the conversion to Texinfo --- the version you are reading
+right now --- we hope to address this in the longterm.
+Texinfo is the documentation language of the GNU project.
 While it can be intimidating at first and look scary or complicated,
-it is just another way to express text format instructions. We encourage
+it is just another way to express text format instructions.
-you to take this opportunity and learn about Texinfo, learn about GNUnet,
-and one word at a time we will arrive at a book which explains GNUnet in
+We encourage you to take this opportunity and learn about Texinfo,
-the least complicated way to you. Even when you don't want or can't learn
+learn about GNUnet, and one word at a time we will arrive at a
-Texinfo, you can contribute. Send us an Email or join our IRC chat room
+book which explains GNUnet in the least complicated way to you.
-on freenode and talk with us about the documentation (the prefered way
-to reach out is the mailinglist, since you can communicate with us
+Even when you don't want to or can't learn Texinfo, you can contribute.
-without waiting on someone in the chatroom). One way or another you
+Send us an Email or join our IRC chat room on freenode and talk with
-can help shape the understanding of GNUnet without the ability to read
+us about the documentation (the prefered way to reach out is the
-and understand its sourcecode.
+mailinglist, since you can communicate with us without waiting on
+someone in the chatroom).
+One way or another you can help shape the understanding of GNUnet
+without the ability to read and understand its sourcecode.
 @node Introduction
 @section Introduction
-@c In less than 2 printed pages describe the history of GNUnet here,
-@c what we have now and what's still missing (could be split into
-@c subchapters).
 GNUnet in its current version is the result of almost 20 years of work
 from many contributors.  So far, most contributions were made by
 volunteers or people paid to do fundamental research.  At this stage,
@@ -109,12 +140,17 @@ social network, resulting in a significant growth of the core team.
 In 2013, we launched @uref{https://taler.net, GNU Taler} to address
 the challenge of convenient
 and privacy-preserving online payments.  In 2015, the
-@c TODO: Maybe even markup for the E if it renders in most outputs.
+@c XXX: It is not correct to refer to pEp as pEp stylistic,
-@uref{https://pep.foundation/, pEp} (pretty Easy privacy) project
+@c XXX: but the correct version would lead to problems with
+@c XXX: some of our outputs and/or older versions of texinfo
+@c XXX: and devices that display versions on consoles etc.
+@c XXX: This is why we keep the pEp until proven that p(tripple bar)p
+@c XXX: does not create broken outputs.
+@uref{https://pep.foundation/, pretty Easy privacy} (pEp) project
 announced that they will use GNUnet as the technology for their
 meta-data protection layer, ultimately resulting in GNUnet e.V.
 entering into a formal long-term collaboration with the pEp
-foundation.  In 2016, Taler Systems SA, a first startup using GNUnet
+Foundation.  In 2016, Taler Systems SA, a first startup using GNUnet
 technology, was founded with support from the community.
 GNUnet is not merely a technical project, but also a political
@@ -131,7 +167,7 @@ Similarly its flaws are not limited to the protocol design.  Thus,
 technical excellence by itself will not suffice to create a better
 network. We also need to build a community that is wise, humble and
 has a sense of humor to achieve our goal to create a technical
-foundation for a society we would like to live in. 
+foundation for a society we would like to live in.
 @node Project governance
@@ -142,15 +178,12 @@ follows the governance model of a benevolent dictator.  This means
 that ultimately, the GNU project appoints the GNU maintainer and can
 overrule decisions made by the GNUnet maintainer. Similarly, the
 GNUnet maintainer can overrule any decisions made by individual
-@c TODO: Should we mention if this is just about GNUnet? Other projects
-@c TODO: in GNU seem to have rare issues (GCC, the 2018 documentation
-@c TODO: discussion.
 developers.  Still, in practice neither has happened in the last 20
-years, and we hope to keep it that way.
+years for GNUnet, and we hope to keep it that way.
 @c TODO: Actually we are a Swiss association, or just a German association
 @c TODO: with Swiss bylaws/Satzung?
-@c TODO: Rewrite one of the 'GNUnet eV may also' sentences.
+@c TODO: Rewrite one of the 'GNUnet eV may also' sentences?
 The GNUnet project is supported by GNUnet e.V., a German association
 where any developer can become a member.  GNUnet e.V. serves as a
 legal entity to hold the copyrights to GNUnet.  GNUnet e.V. may also
diff --git a/doc/handbook/chapters/user.texi b/doc/handbook/chapters/user.texi
index 1300b2bb6..37c5849ab 100644
--- a/doc/handbook/chapters/user.texi
+++ b/doc/handbook/chapters/user.texi
@@ -1,6 +1,6 @@
 @node Using GNUnet
 @chapter Using GNUnet
-@c %**end of header
 This tutorial is supposed to give a first introduction for users
 trying to do something real with GNUnet. Installation and
@@ -47,7 +47,7 @@ $ gnunet-arm -e
 @node First steps - Using the GNU Name System
 @section First steps - Using the GNU Name System
-@c %**end of header
 @menu
 * Preliminaries::
@@ -65,7 +65,7 @@ $ gnunet-arm -e
 @node Preliminaries
 @subsection Preliminaries
-@c %**end of header
 ``.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
@@ -106,7 +106,7 @@ rules - GO0T87F9BPMF8NKD5A54L2AH1T0GRML539TPFSRMCEA98182QD30
 @node The GNS Tab
 @subsection The GNS Tab
-@c %**end of header
 Maintaing your zones is through the NAMESTORE service and is discussed
 here.  You can manage your zone using @command{gnunet-identity} and
@@ -138,7 +138,7 @@ bottom of the window contains the existing entries in the selected zone.
 @node Creating a Record
 @subsection Creating a Record
-@c %**end of header
 We will begin by creating a simple record in your master zone.
 To do this, click on the text "<new name>" in the table. The field is
@@ -168,7 +168,7 @@ to edit it later.
 @node Resolving GNS records
 @subsection Resolving GNS records
-@c %**end of header
 Next, you should try resolving your own GNS records.  The method we
 found to be the most uncomplicated is to do this by explicitly
@@ -191,7 +191,7 @@ the application.
 @node Integration with Browsers
 @subsection Integration with Browsers
-@c %**end of header
 While we recommend integrating GNS using the NSS module in the
 GNU libc Name Service Switch, you can also integrate GNS
@@ -271,7 +271,7 @@ apt-get install texlive-full
 @noindent
 Start creating a business card by clicking the "Copy" button
-in @command{gnunet-gtk}'s GNS tab. Next, you should start
+in @command{gnunet-namestore-gtk}. Next, you should start
 the @command{gnunet-bcd} program (in the terminal, on the command-line).
 You do not need to pass any options, and please be not surprised if
 there is no output:
@@ -286,7 +286,7 @@ where @code{gnunet-bcd} is running a Web server!
 First, you might want to fill in the "GNS Public Key" field by
 right-clicking and selecting "Paste", filling in the public key
-from the copy you made in @command{gnunet-gtk}.
+from the copy you made in @command{gnunet-namestore-gtk}.
 Then, fill in all of the other fields, including your @b{GNS NICKname}.
 Adding a GPG fingerprint is optional.
 Once finished, click "Submit Query".
@@ -302,7 +302,7 @@ You can now go back to the shell running @code{gnunet-bcd} and press
 @node Be Social
 @subsection Be Social
-@c %**end of header
 Next, you should print out your business card and be social.
 Find a friend, help them install GNUnet and exchange business cards with
@@ -424,7 +424,7 @@ performed by using the @command{-p} option of @command{gnunet-revocation}.
 @node What's Next?
 @subsection What's Next?
-@c %**end of header
 This may seem not like much of an application yet, but you have
 just been one of the first to perform a decentralized secure name
@@ -443,7 +443,7 @@ using this new public key infrastructure.
 @pindex gnunet-conservation-gtk
 @node First steps - Using GNUnet Conversation
 @section First steps - Using GNUnet Conversation
-@c %**end of header
 First, you should launch the graphical user interface.  You can do
 this from the command-line by typing
@@ -459,7 +459,7 @@ $ gnunet-conversation-gtk
 @node Testing your Audio Equipment
 @subsection Testing your Audio Equipment
-@c %**end of header
 First, you should use @code{gnunet-conversation-test} to check that your
 microphone and speaker are working correctly. You will be prompted to
@@ -471,7 +471,7 @@ that the correct device is being associated with GNUnet's audio tools.
 @node GNS Zones
 @subsection GNS Zones
-@c %**end of header
 @code{gnunet-conversation} uses GNS for addressing. This means that
 you need to have a GNS zone created before using it. Information
@@ -485,7 +485,7 @@ about how to create GNS zones can be found here.
 @node Picking an Identity
 @subsubsection Picking an Identity
-@c %**end of header
 To make a call with @code{gnunet-conversation}, you first
 need to choose an identity. This identity is both the caller ID
@@ -542,7 +542,7 @@ manually. Save the record.
 @node Calling somebody
 @subsubsection Calling somebody
-@c %**end of header
 Now you can call a buddy. Obviously, your buddy will have to have GNUnet
 installed and must have performed the same steps. Also, you must have
@@ -568,7 +568,7 @@ Either of you can end the call using @command{/cancel}. You can exit
 @node First steps - Using the GNUnet VPN
 @section First steps - Using the GNUnet VPN
-@c %**end of header
 @menu
@@ -581,7 +581,7 @@ Either of you can end the call using @command{/cancel}. You can exit
 @node VPN Preliminaries
 @subsection VPN Preliminaries
-@c %**end of header
 To test the GNUnet VPN, we should first run a web server.
 The easiest way to do this is to just start @code{gnunet-bcd},
@@ -622,7 +622,7 @@ to install the NSS plugins in the proper location.
 @node GNUnet-Exit configuration
 @subsection GNUnet-Exit configuration
-@c %**end of header
 Stop your peer (as user @code{gnunet}, run @command{gnunet-arm -e}) and
 run @command{gnunet-setup}. In @command{gnunet-setup}, make sure to
@@ -638,10 +638,10 @@ Now exit @command{gnunet-setup} and restart your peer
 @node GNS configuration
 @subsection GNS configuration
-@c %**end of header
 Now, using your normal user (not the @code{gnunet} system user), run
-@command{gnunet-gtk}. Select the GNS icon and add a new label www in your
+@command{gnunet-namestore-gtk}. Add a new label www in your
 master zone. For the record type, select @code{VPN}. You should then
 see the VPN dialog:
@@ -654,11 +654,11 @@ identifier that we used in the Exit setup earlier, so here supply "bcd".
 If you want others to be able to use the service, you should probably make
 the record public. For non-public services, you should use a passphrase
 instead of the string "bcd". Save the record and
-exit @command{gnunet-gtk}.
+exit @command{gnunet-namestore-gtk}.
 @node Accessing the service
 @subsection Accessing the service
-@c %**end of header
 You should now be able to access your webserver. Type in:
@@ -681,7 +681,7 @@ your business card.
 @node Using a Browser
 @subsection Using a Browser
-@c %**end of header
 Sadly, modern browsers tend to bypass the Name Services Switch and
 attempt DNS resolution directly. You can either run
@@ -693,7 +693,7 @@ using the HTTP proxy with Chrome does work.
 @node File-sharing
 @section File-sharing
-@c %**end of header
 This chapter documents the GNUnet file-sharing application. The original
 file-sharing implementation for GNUnet was designed to provide
@@ -726,7 +726,7 @@ files.
 @node fs-Searching
 @subsection Searching
-@c %**end of header
 The command @command{gnunet-search} can be used to search
 for content on GNUnet. The format is:
@@ -784,7 +784,7 @@ the file in bytes.
 @node fs-Downloading
 @subsection Downloading
-@c %**end of header
 In order to download a file, you need the whole line returned by
 @command{gnunet-search}.
@@ -823,7 +823,7 @@ current number of bytes downloaded whenever new data was received.
 @node fs-Publishing
 @subsection Publishing
-@c %**end of header
 The command @command{gnunet-publish} can be used to add content
 to the network. The basic format of the command is
@@ -844,7 +844,7 @@ $ gnunet-publish -m "description:GNU License" -k gpl -k test -m "mimetype:text/p
 @node Important command-line options
 @subsubsection Important command-line options
-@c %**end of header
 The option @code{-k} is used to specify keywords for the file that
 should be inserted. You can supply any number of keywords,
@@ -871,7 +871,7 @@ man gnunet-publish
 @node Indexing vs. Inserting
 @subsubsection Indexing vs Inserting
-@c %**end of header
 By default, GNUnet indexes a file instead of making a full copy.
 This is much more efficient, but requires the file to stay unaltered
@@ -907,7 +907,7 @@ able to crack the encryption (e.g. by guessing the keyword.
 @node fs-Concepts
 @subsection Concepts
-@c %**end of header
 For better results with filesharing it is useful to understand the
 following concepts.
@@ -936,7 +936,7 @@ concepts that are used to achieve these goals.
 @node Files
 @subsubsection Files
-@c %**end of header
 A file in GNUnet is just a sequence of bytes. Any file-format is allowed
 and the maximum file size is theoretically @math{2^64 - 1} bytes, except
@@ -946,7 +946,7 @@ using GNU libextractor to obtain keywords.
 @node Keywords
 @subsubsection Keywords
-@c %**end of header
 Keywords are the most simple mechanism to find files on GNUnet.
 Keywords are @strong{case-sensitive} and the search string
@@ -963,7 +963,7 @@ request.
 @node Directories
 @subsubsection Directories
-@c %**end of header
 A directory in GNUnet is a list of file identifiers with meta data.
 The file identifiers provide sufficient information about the files
@@ -986,7 +986,7 @@ other meta information, and possibly even the full original file
 @node Pseudonyms
 @subsubsection Pseudonyms
-@c %**end of header
 @b{Please note that the text in this subsection is outdated and needs}
 @b{to be rewritten for version 0.10!}
@@ -1005,7 +1005,7 @@ to copy around).
 @node Namespaces
 @subsubsection Namespaces
-@c %**end of header
 @b{Please note that the text in this subsection is outdated and needs}
 @b{to be rewritten for version 0.10!}
@@ -1020,7 +1020,7 @@ same entity (which does not have to be the same person).
 @node Advertisements
 @subsubsection Advertisements
-@c %**end of header
 @b{Please note that the text in this subsection is outdated and needs}
 @b{to be rewritten for version 0.10!}
@@ -1045,7 +1045,7 @@ confusion.
 @node Anonymity level
 @subsubsection Anonymity level
-@c %**end of header
 The anonymity level determines how hard it should be for an adversary to
 determine the identity of the publisher or the searcher/downloader. An
@@ -1059,7 +1059,7 @@ it can also significantly hurt performance.
 @node Content Priority
 @subsubsection Content Priority
-@c %**end of header
 Depending on the peer's configuration, GNUnet peers migrate content
 between peers. Content in this sense are individual blocks of a file,
@@ -1076,7 +1076,7 @@ when the block was published initially.
 @node Replication
 @subsubsection Replication
-@c %**end of header
 When peers migrate content to other systems, the replication level
 of a block is used to decide which blocks need to be migrated most
@@ -1088,7 +1088,7 @@ selection is simply random.
 @node Namespace Management
 @subsection Namespace Management
-@c %**end of header
 @b{Please note that the text in this subsection is outdated and needs}
 @b{to be rewritten for version 0.10!}
@@ -1108,7 +1108,7 @@ lists all locally available pseudonyms.
 @node Creating Pseudonyms
 @subsubsection Creating Pseudonyms
-@c %**end of header
 @b{Please note that the text in this subsection is outdated and needs}
 @b{to be rewritten for version 0.10!}
@@ -1123,7 +1123,7 @@ used.
 @node Deleting Pseudonyms
 @subsubsection Deleting Pseudonyms
-@c %**end of header
 @b{Please note that the text in this subsection is outdated and needs}
 @b{to be rewritten for version 0.10!}
@@ -1137,7 +1137,7 @@ unavailable.
 @node Advertising namespaces
 @subsubsection Advertising namespaces
-@c %**end of header
 @b{Please note that the text in this subsection is outdated and needs}
 @b{to be rewritten for version 0.10!}
@@ -1157,7 +1157,7 @@ the quality of the content found in it.
 @node Namespace names
 @subsubsection Namespace names
-@c %**end of header
 @b{Please note that the text in this subsection is outdated and needs}
 @b{to be rewritten for version 0.10!}
@@ -1172,7 +1172,7 @@ to the NICKNAME to get a unique identifier.
 @node Namespace root
 @subsubsection Namespace root
-@c %**end of header
 @b{Please note that the text in this subsection is outdated and needs}
 @b{to be rewritten for version 0.10!}
@@ -1185,7 +1185,7 @@ entry point to the content of the namespace.
 @node File-Sharing URIs
 @subsection File-Sharing URIs
-@c %**end of header
 GNUnet (currently) uses four different types of URIs for
 file-sharing. They all begin with "gnunet://fs/".
@@ -1207,7 +1207,7 @@ into two OR-ed keywords 'foo' and 'bar', not into '"foo bar"'.
 @node Encoding of hash values in URIs
 @subsubsection Encoding of hash values in URIs
-@c %**end of header
 Most URIs include some hash values. Hashes are encoded using
 base32hex (RFC 2938).
@@ -1215,7 +1215,7 @@ base32hex (RFC 2938).
 @cindex chk-uri
 @node Content Hash Key (chk)
 @subsubsection Content Hash Key (chk)
-@c %**end of header
 A chk-URI is used to (uniquely) identify a file or directory
 and to allow peers to download the file. Files are stored in
@@ -1232,7 +1232,7 @@ of the encrypted block).
 @cindex loc-uri
 @node Location identifiers (loc)
 @subsubsection Location identifiers (loc)
-@c %**end of header
 For non-anonymous file-sharing, loc-URIs are used to specify which
 peer is offering the data (in addition to specifying all of the
@@ -1248,7 +1248,7 @@ base32hex) and EXPTIME specifies when the signature expires
 @cindex ksk-uri
 @node Keyword queries (ksk)
 @subsubsection Keyword queries (ksk)
-@c %**end of header
 A keyword-URI is used to specify that the desired operation
 is the search using a particular keyword. The format is simply
@@ -1263,7 +1263,7 @@ Furthermore they must not contain '++'.
 @cindex sks-uri
 @node Namespace content (sks)
 @subsubsection Namespace content (sks)
-@c %**end of header
 @b{Please note that the text in this subsection is outdated and needs}
 @b{to be rewritten for version 0.10!}
@@ -1298,7 +1298,7 @@ looking for for testing, we need to begin by publishing a file.
 @node gtk-Publishing
 @subsubsection Publishing
-@c %**end of header
 To publish a file, select "File Sharing" in the menu bar just below the
 "Statistics" icon, and then select "Publish" from the menu.
@@ -1361,7 +1361,7 @@ with progress indicators):
 @node gtk-Searching
 @subsubsection Searching
-@c %**end of header
 Below the menu bar, there are four entry widges labeled "Namespace",
 "Keywords", "Anonymity" and "Mime-type" (from left to right). These
@@ -1386,7 +1386,7 @@ a little area for downloading appears.
 @node gtk-Downloading
 @subsubsection Downloading
-@c %**end of header
 In the downloading area, you can select the target directory (default is
 "Downloads") and specify the desired filename (by default the filename it
@@ -1413,7 +1413,7 @@ That's it, you now know the basics for file-sharing with GNUnet!
 @node The GNU Name System
 @section The GNU Name System
-@c %**end of header
 The GNU Name System (GNS) is secure and decentralized naming system.
@@ -1915,8 +1915,8 @@ Ascension
 Usage:
    ascension <domain> [-d] [-p]
    ascension <domain> <port> [-d] [-p]
-    ascension <domain> -ns <transferns> [-d] [-p]
+    ascension <domain> -n <transferns> [-d] [-p]
-    ascension <domain> -ns <transferns> <port> [-d] [-p]
+    ascension <domain> -n <transferns> <port> [-d] [-p]
    ascension -p | --public
    ascension -h | --help
    ascension -v | --version
@@ -1940,7 +1940,7 @@ To migrate the Syrian top level domain - one of the few top level domains that
 still supports zone transfers - into GNS use the following command:
 @example
-$ ascension sy. -ns ns1.tld.sy. -p
+$ ascension sy. -n ns1.tld.sy. -p
 @end example
 The -p flag will tell GNS to put these records on the DHT so that other users
@@ -1982,10 +1982,14 @@ and enable the service, so that your zone is migrated automatically.
 @section reclaimID Identity Provider
 The reclaimID Identity Provider (IdP) is a decentralized IdP service.
-It allows its users to manage and authorize third parties to access their identity attributes such as email or shipping addresses.
+It allows its users to manage and authorize third parties to access
+their identity attributes such as email or shipping addresses.
-It basically mimics the concepts of centralized IdPs, such as those offered by Google or Facebook.
-Like other IdPs, reclaimID features an (optional) OpenID-Connect 1.0-compliant protocol layer that can be used for websites to integrate reclaimID as an Identity Provider with little effort.
+It basically mimics the concepts of centralized IdPs, such as those
+offered by Google or Facebook.
+Like other IdPs, reclaimID features an (optional) OpenID-Connect
+1.0-compliant protocol layer that can be used for websites to
+integrate reclaimID as an Identity Provider with little effort.
 @menu
 * Managing Attributes::
diff --git a/doc/handbook/gnunet.texi b/doc/handbook/gnunet.texi
index a479d2059..75a9f1f2b 100644
--- a/doc/handbook/gnunet.texi
+++ b/doc/handbook/gnunet.texi
@@ -14,7 +14,7 @@
 @c @set OPENPGP-SIGNING-KEY-ID
 @copying
-Copyright @copyright{} 2001-2018 GNUnet e.V.
+Copyright @copyright{} 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
@@ -72,11 +72,11 @@ This document is the Reference Manual for GNUnet version @value{VERSION}.
 @menu
-* Preface::                         Chapter 0
+* Preface::                         Preface
 * Philosophy::                      About GNUnet
 * Key Concepts::                    Key concepts of GNUnet
 @c * Vocabulary::                      Vocabulary
-* Installing GNUnet::               Installing GNUnet
+* Installing GNUnet::               Installing GNUnet
 * Using GNUnet::                    Using GNUnet
 @c * Configuration Handbook::          Configuring GNUnet
 * GNUnet Contributors Handbook::    Contributing to GNUnet
@@ -122,9 +122,9 @@ Installing GNUnet
 * Create @code{gnunet} user and group::
 * Preparing and Compiling the Source Code::
 * Installation::
-* MOVED FROM USER Checking the Installation::
+* Checking the Installation::
-* MOVED FROM USER The graphical configuration interface::
+* The graphical configuration interface::
-* MOVED FROM USER Config Leftovers::
+* Config Leftovers::
 Using GNUnet
diff --git a/doc/handbook/manual.css b/doc/handbook/manual.css
index 404525dc2..0fe08b83c 100644
--- a/doc/handbook/manual.css
+++ b/doc/handbook/manual.css
@@ -1,6 +1,6 @@
 /* Style-sheet to use for manuals (copied from Emacs) */
-@import url('/style.css');
+@import url('style.css');
 /* makeinfo 6.5 converts @quotation to <blockquote>.  Highlight them.  */
 blockquote {
diff --git a/doc/handbook/run-gendocs.sh b/doc/handbook/run-gendocs.sh
index 5e60a2d0f..e52ae0d23 100755
--- a/doc/handbook/run-gendocs.sh
+++ b/doc/handbook/run-gendocs.sh
@@ -2,7 +2,7 @@
 make version.texi/replacement
-./gendocs.sh --email gnunet-developers@gnu.org gnunet-c-tutorial "GNUnet C Tutorial" -o "manual/gnunet-c-tutorial"
+#./gendocs.sh --email gnunet-developers@gnu.org gnunet-c-tutorial "GNUnet C Tutorial" -o "manual/gnunet-c-tutorial"
 #cd manual
 #mkdir gnunet-c-tutorial
 #mv * gnunet-c-tutorial/
diff --git a/doc/handbook/style.css b/doc/handbook/style.css
index 0c4525437..e5271197b 100644
--- a/doc/handbook/style.css
+++ b/doc/handbook/style.css
@@ -1,6 +1,6 @@
 /* This stylesheet is used by manuals and a few older resources. */
-@import url('/reset.css');
+@import url('reset.css');
 /***  PAGE LAYOUT  ***/
diff --git a/doc/man/.gitignore b/doc/man/.gitignore
index ffd69e11b..38ed67872 100644
--- a/doc/man/.gitignore
+++ b/doc/man/.gitignore
@@ -1 +1,5 @@
 gnunet.conf.5
+groff_lint.log
+*.html
+gnunet-c-tutorial.7
+gnunet-documentation.7
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 53d97b6b9..509e33be7 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -5,7 +5,23 @@ do_subst = $(SED) -e 's,[@]SYSCONFDIR[@],$(sysconfdir),g'
 gnunet.conf.5: gnunet.conf.5.in Makefile
        $(do_subst) < $(srcdir)/gnunet.conf.5.in > gnunet.conf.5
-CLEANFILES = gnunet.conf.5
+if TEXI2MDOC_GENERATION
+gnunet-c-tutorial.7: Makefile gnunet-tutorial.7
+        @echo generated texi2mdoc output || true
+gnunet-tutorial.7: Makefile
+        $(SH) $(srcdir)/texi2mdoc-generation.sh || true
+endif
+CLEANFILES = gnunet.conf.5 *.html
+if TEXI2MDOC_GENERATION
+CLEANFILES += gnunet-documentation.7 gnunet-c-tutorial.7
+endif
+html:
+        $(SH) $(srcdir)/produce_html.sh
 man_MANS = \
  gnunet.conf.5 \
@@ -26,6 +42,7 @@ man_MANS = \
  gnunet-fs.1 \
  gnunet-gns.1 \
  gnunet-gns-proxy.1 \
+  gnunet-gns-proxy-setup-ca.1 \
  gnunet-identity.1 \
  gnunet-cadet.1 \
  gnunet-namecache.1 \
@@ -34,6 +51,7 @@ man_MANS = \
  gnunet-nat.1 \
  gnunet-nat-auto.1 \
  gnunet-nat-server.1 \
+  gnunet-nse.1 \
  gnunet-peerinfo.1 \
  gnunet-publish.1 \
  gnunet-qr.1 \
@@ -53,10 +71,15 @@ man_MANS = \
  gnunet-vpn.1 \
  gnunet-zoneimport.1
+if TEXI2MDOC_GENERATION
+man_MANS += gnunet-c-tutorial.7 gnunet-documentation.7
+endif
 EXTRA_DIST = ${man_MANS} \
- gnunet.conf.5.in
+ gnunet.conf.5.in \
+ texi2mdoc-generation.sh \
+ README
 if TEXI2MDOC_GENERATION
-EXTRA_DIST += gnunet-documentation.7 \
+EXTRA_DIST += gnunet-documentation.7 gnunet-c-tutorial.7
-              gnunet-c-tutorial.7
 endif
diff --git a/doc/man/README b/doc/man/README
new file mode 100644
index 000000000..fb95a11f2
--- /dev/null
+++ b/doc/man/README
@@ -0,0 +1,8 @@
+Please note that new edits in files which already are in mdoc format
+should only be done in mdoc format.
+TODO:
+* incomplete pages:
+  - gnunet-timeout
+  
+\ No newline at end of file
diff --git a/doc/man/gnunet-arm.1 b/doc/man/gnunet-arm.1
index b17e74a73..c25b10bb5 100644
--- a/doc/man/gnunet-arm.1
+++ b/doc/man/gnunet-arm.1
@@ -1,78 +1,134 @@
-.TH GNUNET\-ARM 1 "January 4, 2012" "GNUnet"
+.\" This file is part of GNUnet.
-.SH NAME
+.\" Copyright (C) 2001-2019 GNUnet e.V.
-gnunet\-arm \- control GNUnet services
+.\"
-.SH SYNOPSIS
+.\" Permission is granted to copy, distribute and/or modify this document
-.B gnunet\-arm
+.\" under the terms of the GNU Free Documentation License, Version 1.3 or
-.RI [ options ]
+.\" any later version published by the Free Software Foundation; with no
-.SH DESCRIPTION
+.\" Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A
-\fBgnunet\-arm\fP can be used to start or stop GNUnet services, including
+.\" copy of the license is included in the file
-the ARM service itself.  The ARM service is a supervisor for GNUnet's
+.\" ``FDL-1.3''.
-service processes.  ARM starts services on-demand or as configured and
+.\"
-re-starts them if they crash.
+.\" A copy of the license is also available from the Free Software
-.SH OPTIONS
+.\" Foundation Web site at @url{http://www.gnu.org/licenses/fdl.html}.
-.B
+.\"
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+.\" 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 @url{http://www.gnu.org/licenses/gpl.html}.
+.\"
+.\" SPDX-License-Identifier: GPL3.0-or-later OR FDL1.3-or-later
+.\"
+.Dd January 4, 2012
+.Dt GNUNET-ARM 1
+.Os
+.Sh NAME
+.Nm gnunet-arm
+.Nd
+control GNUnet services
+.Sh SYNOPSIS
+.Nm
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
+.Op Fl d | \-delete
+.Op Fl e | \-end
+.Op Fl E | \-no-stderr
+.Op Fl h | \-help
+.Op Fl i Ar SERVICE | Fl \-init= Ns Ar SERVICE
+.Op Fl I | \-info
+.Op Fl k Ar SERVICE | Fl \-kill= Ns Ar SERVICE
+.Op Fl l Ar FILENAME | Fl \-logfile= Ns Ar FILENAME
+.Op Fl L Ar LOGLEVEL |  Fl \-loglevel= Ns Ar LOGLEVEL
+.Op Fl m | \-monitor
+.Op Fl O | \-no-stdout
+.Op Fl q | \-quiet
+.Op Fl r | \-restart
+.Op Fl s | \-start
+.Op Fl T DELAY | \-timeout= Ns Ar TIMEOUT
+.Op Fl v | \-version
+.Sh DESCRIPTION
+.Nm
+can be used to start or stop GNUnet services, including the ARM service itself.
+The ARM service is a supervisor for GNUnet's service processes.
+ARM starts services on-demand or as configured and restarts them if they crash.
+.Bl -tag -width Ds
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.B
+.It Fl d | \-delete
-.IP "\-e, \-\-end"
+Delete config file and directory on exit.
-Shutdown all GNUnet services (including ARM itself).  Running
+.It Fl e | \-end
-"gnunet-arm \-e" is the usual way to shutdown a GNUnet peer.
+Shutdown all GNUnet services (including ARM itself).
-.B
+Running "gnunet-arm \-e" is the usual way to shutdown a GNUnet peer.
-.IP "\-h, \-\-help"
+.It Fl E | \-no-stderr
+Don't let gnunet-arm inherit standard error.
+.It Fl h | \-help
 Print short help on options.
-.B
+.It Fl i Ar SERVICE | Fl \-init= Ns Ar SERVICE
-.IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
+Starts the specified SERVICE if it is not already running.
-Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
+More specifically, this makes the service behave as if it were in the default services list.
-.B
+.It Fl I | \-info
-.IP "\-i SERVICE,  \-\-init=SERVICE"
-Starts the specified SERVICE if it is not already running.  More specifically,
-this makes the service behave as if it were in the default services list.
-.B
-.IP "\-k SERVICE,  \-\-kill=SERVICE"
-Stop the specified SERVICE if it is running.  While this will kill the service
-right now, the service may be restarted immediately if other services depend
-on it (service is then started 'on-demand').  If the service used to be a 'default'
-service, its default-service status will be revoked.  If the
-service was not a default service, it will just be (temporarily) stopped,
-but could be re-started on-demand at any time.
-.B
-.IP "\-m, \-\-monitor"
-Monitor service activity of ARM.  In this mode, the command will not terminate
-until the user presses CTRL-C.
-.B
-.IP "\-s, \-\-start"
-Start all GNUnet default services on this system (and also ARM).  Naturally,
-if a service is demanded by a default service, it will then also be started.
-Running "gnunet-arm \-s" is the usual way to start a GNUnet peer.
-.B
-.IP "\-I, \-\-info"
 List all running services.
-.B
+.It Fl k Ar SERVICE | Fl \-kill= Ns Ar SERVICE
-.IP "\-v, \-\-version"
+Stop the specified SERVICE if it is running.
+While this will kill the service right now, the service may be restarted immediately if other services depend on it (service is then started 'on-demand').
+If the service used to be a 'default' service, its default-service status will be revoked.
+If the service was not a default service, it will just be (temporarily) stopped, but could be re-started on-demand at any time.
+.It Fl l Ar FILENAME | Fl \-logfile= Ns Ar FILENAME
+Write logs to FILENAME.
+.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 service activity of ARM.
+In this mode, the command will not terminate until the user presses CTRL-C.
+.It Fl O | \-no-stdout
+Don't let gnunet-arm inherit standard output
+.It Fl q | \-quiet
+Don't print status messages.
+.It Fl r | \-restart
+Stop and start all GNUnet default services.
+.It Fl s | \-start
+Start all GNUnet default services on this system (and also ARM).
+Naturally, if a service is demanded by a default service, it will then also be started.
+Running "gnunet-arm \-s" is the usual way to start a GNUnet peer.
+.It Fl T DELAY | \-timeout= Ns Ar DELAY
+Exit with error status if operation does not finish after DELAY
+.It Fl v | \-version
 Print GNUnet version number.
-.SH BUGS
+.El
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
+.Sh EXAMPLES
-electronic mail to <gnunet\-developers@gnu.org>
+Start the gnunet-arm for the user:
-.SH SEE ALSO
+.Pp
-gnunet\-config(1), gnunet\-setup(1)
+.Dl gnunet-arm -s
-.PP
+.Pp
-The full documentation for
+Stop the gnunet-arm for the user:
-.B gnunet
+.Pp
-is maintained as a Texinfo manual.
+.Dl $ gnunet-arm -e
+.Sh SEE ALSO
+.Xr gnunet-config 1 ,
+.Xr gnunet-setup 1
+.sp
+The full documentation for gnunet is maintained as a Texinfo manual.
 If the
-.B info
+.Xr info 1
-and
+and gnunet programs are properly installed at your site, the command
-.B gnunet
+.Pp
-programs are properly installed at your site, the command
+.Dl info gnunet
-.IP
+.Pp
-.B info gnunet
-.PP
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.sp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Xr gnunet-c-tutorial 7 .
+.\".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-ats.1 b/doc/man/gnunet-ats.1
index c098ed576..1e7b7731c 100644
--- a/doc/man/gnunet-ats.1
+++ b/doc/man/gnunet-ats.1
@@ -1,85 +1,110 @@
-.TH GNUNET\-ATS 1 "October 16, 2015" "GNUnet"
+.\" This file is part of GNUnet.
-.SH NAME
+.\" Copyright (C) 2001-2019 GNUnet e.V.
-gnunet\-ats \- display information about transport resource allocation
+.\"
-.SH SYNOPSIS
+.\" Permission is granted to copy, distribute and/or modify this document
-.B gnunet\-ats
+.\" under the terms of the GNU Free Documentation License, Version 1.3 or
-.RI [ options ]
+.\" any later version published by the Free Software Foundation; with no
-.br
+.\" Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A
-.SH DESCRIPTION
+.\" copy of the license is included in the file
-\fBgnunet\-ats\fP can be used to display information about the GNUnet's
+.\" ``FDL-1.3''.
-transport selection mechanism. It shows information about the
+.\"
-addresses and the assigned input and output bandwidth.
+.\" A copy of the license is also available from the Free Software
-.SH OPTIONS
+.\" Foundation Web site at @url{http://www.gnu.org/licenses/fdl.html}.
-.B
+.\"
-.IP "\-a,  \-\-aa"
+.\" 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 @url{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 Ds
+.It Fl a | \-all
 List all addresses currently known to ats.
-.B
+.It Fl C Ar PEERID | Fl \-connect= Ns Ar PEERID
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+Ask ATS to suggest an address for PEERID to transport to establish a connection.
+Note that you can use the gnunet-transport commandline tool to force disconnects.
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.B
+.It Fl h | \-help
-.IP "\-C, \-\-connect=PEERID"
-Ask ATS to suggest an address for PEERID to transport to establish a
-connection.
-Note that you can use the gnunet\-transport command\-line tool to
-force disconnects.
-.B
-.IP "\-h, \-\-help"
 Print short help on options.
-.B
+.It Fl i Ar PEERID | Fl \-id= Ns Ar PEERID
-.IP "\-i, \-\-id=PEERID"
+Print information for a specific peer identity only.
-Print information for a specific peer identity only
+.It Fl k Ar VALUE | Fl \-value= Ns Ar VALUE
-.B
+Value to set for when changing preference values.
-.IP "\-k, \-\-value=VALUE"
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-Value to set for when changing preference values
-.B
-.IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.
 Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
+.It Fl m | \-monitor
-.IP "\-m, \-\-monitor"
+Monitor changes to the bandwidth assignments continuously.
-Monitor changes to the bandwidth assignments continuously
+.It Fl n | \-numeric
-.B
+Do not resolve IP addresses to hostnames.
-.IP "\-n, \-\-numeric"
+.It Fl p Ar PREFERENCE | Fl \-preference= Ns Ar PREFERENCE
-Do not resolve IP addresses to hostnames
+Set preference values, -i, -k and -t required.
-.B
+.It Fl q | \-quotas
-.IP "\-k, \-\-preference=E"
-Set preference values, \-i, \-k and \-t required
-.B
-.IP "\-q, \-\-quotas"
 Print quotas for all network types
-.B
+.It Fl t Ar TYPE | Fl \-type= Ns Ar TYPE
-.IP "\-t, \-\-type=VALUE"
 Preference type to change: latency | bandwidth
-.B
+.It Fl u | \-used
-.IP "\-u, \-\-used"
 Print addresses actively used only
-.B
+.It Fl V | \-verbose
-.IP "\-V, \-\-verbose"
 Print verbose output (include ATS address properties)
-.B
+.It v | \-version
-.IP "\-v, \-\-version"
 Print GNUnet version number.
-.SH BUGS
+.El
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
+.Sh SEE ALSO
-electronic mail to <bug\-gnunet@gnu.org>
+.Xr gnunet-transport 1
-.SH SEE ALSO
+.sp
-gnunet\-transport(1)
+The full documentation for gnunet is maintained as a Texinfo manual.
-The full documentation for
+If the
-.B gnunet
+.Xr info 1
-is maintained as a Texinfo manual.  If the
+and gnunet programs are properly installed at your site, the command
-.B info
+.Pp
-and
+.Dl info gnunet
-.B gnunet
+.Pp
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.Pp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.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-bcd.1 b/doc/man/gnunet-bcd.1
index 02b4397de..9b37a097b 100644
--- a/doc/man/gnunet-bcd.1
+++ b/doc/man/gnunet-bcd.1
@@ -13,19 +13,14 @@ installed.  If it does not work for you, try installing the full
 TeXLive distribution first, for example using the package\-manager
 apt: "apt-get install texlive-full".
 .SH OPTIONS
-.B
 .IP "\-p PORT, \-\-port=PORT"
 Run the HTTP server on port PORT.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-cadet.1 b/doc/man/gnunet-cadet.1
index 8404f085c..44d7fffca 100644
--- a/doc/man/gnunet-cadet.1
+++ b/doc/man/gnunet-cadet.1
@@ -21,42 +21,30 @@ For one\-to\-many communication \fBgnunet\-social\fP may be better
 suited, however.
 .SH SPECIFIC OPTIONS
-.B
 .IP "\-C CONNECTION_ID,  \-\-connection=CONNECTION_ID"
 Provide information about a particular connection.
-.B
 .IP "\-d,  \-\-dump"
 Dump debug information to STDERR.
-.B
 .IP "\-e,  \-\-echo"
 Activate echo mode.
-.B
 .IP "\-o SHARED_SECRET,  \-\-open-port=SHARED_SECRET"
 Listen for connections using a shared secret among sender and recipient.
-.B
 .IP "\-p PEER_ID,  \-\-peer=PEER_ID"
 Provide information about a patricular peer.
-.B
 .IP "\-P,  \-\-peers"
 Provide information about all peers.
-.B
 .IP "\-T,  \-\-tunnels"
 Provide information about all tunnels.
 .SH STANDARD OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-l LOGFILE, \-\-logfile=LOGFILE"
 Configure logging to write logs to LOGFILE.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
diff --git a/doc/man/gnunet-config.1 b/doc/man/gnunet-config.1
index f1443283f..8eca8de10 100644
--- a/doc/man/gnunet-config.1
+++ b/doc/man/gnunet-config.1
@@ -7,38 +7,28 @@ gnunet\-config \- manipulate GNUnet configuration files
 .SH DESCRIPTION
 \fBgnunet\-config\fP can be used to read or modify GNUnet configuration files.
 .SH OPTIONS
-.B
 .IP "\-f, \-\-filename"
-When accessing a specific option using \-s and \-o, perform expansions as if the
+Try to perform expansions as if the option values represent filenames (will
-value represents a filename.
+also be applied even if the option is not really a filename).
-.B
 .IP "\-s SECTION, \-\-section=SECTION"
 Which configuration section should be accessed or edited. Required option.
-.B
 .IP "\-S, \-\-list\-sections"
 List available configuration sections for use with \-\-section.
-.B
 .IP "\-W, \-\-rewrite"
 Consider differences to defaults only.
-.B
 .IP "\-o OPTION, \-\-option=OPTION"
 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".
-.B
 .IP "\-V VALUE, \-\-value VALUE"
 Configuration value to store in the given section under the given option.
 Must only be given together with \-s and \-o options.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-conversation-test.1 b/doc/man/gnunet-conversation-test.1
index 5c08d3dab..477da5042 100644
--- a/doc/man/gnunet-conversation-test.1
+++ b/doc/man/gnunet-conversation-test.1
@@ -17,17 +17,13 @@ known to your computer).
 You can use gnunet\-conversation\-test without having a peer running
 on your computer.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.
 Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-conversation.1 b/doc/man/gnunet-conversation.1
index 5925871da..3815b3887 100644
--- a/doc/man/gnunet-conversation.1
+++ b/doc/man/gnunet-conversation.1
@@ -15,25 +15,19 @@ your zone in the GNU Name System (using gnunet\-namestore).
 gnunet\-conversation has an interactive help system via the /help
 command.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-e NAME,  \-\-ego=NAME"
 Specifies the NAME of the ego to use (for caller ID).
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.
 Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-p LINE,  \-\-phone=LINE"
 Optional argument that can be used to specify the phone LINE to be used with
 the conversation service.
 The default LINE is zero, which should be fine for most users.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-dns2gns.1 b/doc/man/gnunet-dns2gns.1
index 552df25b6..f61a0a8b3 100644
--- a/doc/man/gnunet-dns2gns.1
+++ b/doc/man/gnunet-dns2gns.1
@@ -1,60 +1,60 @@
-.TH GNUNET\-DNS2GNS 1 "March 5, 2018" "GNUnet"
+.Dd March 5, 2018
+.Dt GNUNET-DNS2GNS 1
-.SH NAME
+.Os
-gnunet\-dns2gns \- run a DNS-to-GNS proxy
+.Sh NAME
+.Nm gnunet-dns2gns
-.SH SYNOPSIS
+.Nd
-.B gnunet\-dns2gns
+run a DNS-to-GNS proxy
-.RI [ options ]
+.Sh SYNOPSIS
-.br
+.Nm
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
-.SH DESCRIPTION
+.Op Fl d Ar IP | Fl \-dns= Ns Ar IP
-Most users will not want to run an DNS to GNS proxy/gateway and thus will not
+.Op Fl h | \-help
-need this program.
+.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+.Op Fl v | \-version
-\fBgnunet\-dns2gns\fP runs a DNS resolver which delegates requests GNS if
+.Sh DESCRIPTION
-the TLD matches one configured for GNS.  All other requests are forwarded
+.Nm
-to DNS.  This DNS proxy is useful for enabling non-personalized
+runs a DNS resolver which delegates requests GNS if the TLD matches one configured for GNS.
-GNS\-resolution to an entire network or to offer GNS\-resolution to DNS users.
+All other requests are forwarded to DNS.
+This DNS proxy is useful for enabling non-personalized GNS\-resolution to an entire network or to offer GNS\-resolution to DNS users.
-.SH OPTIONS
+.Bl -tag -width Ds
-.B
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
-.IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
+.It Fl d Ar IP | Fl \-dns= Ns Ar IP
-.IP "\-d IP,  \-\-dns=IP"
 IP address of a recursive DNS resolver that should be used for non-GADS hostnames.
-.B
+.It Fl h | \-help
-.IP "\-h, \-\-help"
 Print short help on options.
-.B
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-.IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
+Use LOGLEVEL for logging.
-Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
+Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
+.It Fl v | \-version
-.IP "\-v, \-\-version"
 Print GNUnet version number.
+.El
-.SH BUGS
+.Sh SEE ALSO
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
+.Xr gnunet-gns-fcfs 1 ,
-electronic mail to <bug\-gnunet@gnu.org>
+.Xr gnunet-gns 1 ,
-.SH SEE ALSO
+.Xr gnunet-identity 1
-gnunet\-gns\-fcfs(1), gnunet\-gns(1), gnunet\-identity(1)
+.sp
-The full documentation for
+The full documentation for gnunet is maintained as a Texinfo manual.
-.B gnunet
+If the
-is maintained as a Texinfo manual.  If the
+.Xr info 1
-.B info
+and gnunet programs are properly installed at your site, the command
-and
+.Pp
-.B gnunet
+.Dl info gnunet
-programs are properly installed at your site, the command
+.Pp
-.IP
-.B info gnunet
-.PP
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.sp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Xr gnunet-c-tutorial 7 .
+.\".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-ecc.1 b/doc/man/gnunet-ecc.1
index aedc0bc49..2aa7743b2 100644
--- a/doc/man/gnunet-ecc.1
+++ b/doc/man/gnunet-ecc.1
@@ -17,33 +17,25 @@ take a while.  If the option \-p is given, the corresponding public
 key will be printed to the console.
 .SH OPTIONS
-.B
 .IP "\-g COUNT, \-\-generate-keys=COUNT"
 Create COUNT public-private key pairs and write them to FILENAME.
 Used for creating a file for testing.
-.B
 .IP "\-p, \-\-print-public-key"
 Print the corresponding public key to stdout.  This is the value used
 for PKEY records in GNS.
-.B
 .IP "\-P, \-\-print-private-key"
 Print the corresponding private key to stdout.  This is the value used
 for PKEY records in GNS.
-.B
 .IP "\-x, \-\-print-hex"
 Print the corresponding public key to stdout in HEX format.  Useful
 for comparing to Ed25519 keys in X.509 tools.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and
 ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
diff --git a/doc/man/gnunet-gns-proxy-setup-ca.1 b/doc/man/gnunet-gns-proxy-setup-ca.1
new file mode 100644
index 000000000..54df856eb
--- /dev/null
+++ b/doc/man/gnunet-gns-proxy-setup-ca.1
@@ -0,0 +1,64 @@
+.Dd March 6, 2019
+.Dt GNUNET-GNS-PROXY-SETUP-CA 1
+.Os
+.Sh NAME
+.Nm gnunet-gns-proxy-setup-ca
+.Nd generate an X509 certificate for gnunet-gns-proxy and install it
+.Sh SYNOPSIS
+.Nm
+.Op Fl c Ar FILE
+.\".Op Fl f Ar FILE
+.Op Fl h
+.Op Fl v
+.Op Fl V
+.Sh DESCRIPTION
+.Nm
+is a shell script to generate X509 certificates for your gnunet-gns-proxy and to install it for both GNUnet and your web browser.
+It currently supports Firefox and Chrome based browsers through the help of external helpers: certutil (nss) is used for the  import into webbrowsers, openssl is used to generated the CA.
+.Bl -tag -width Ds
+.It Fl c Ar FILE
+Use the configuration file FILE.
+.\" .It Fl f
+.\" Perform expansions of the variables used in the config value of gns-proxy.
+.\" This will usually expand $GNUNET_DATA_HOME to represents its path.
+.It Fl h
+Print short help on options
+.It Fl v
+Print the version
+.It Fl V
+be verbose
+.El
+.Sh FILES
+.Pa gnunet.conf
+.Sh SEE ALSO
+.Xr gnunet-gns 1 ,
+.Xr gnunet-gns-proxy 1 ,
+.Xr gnunet.conf 5
+.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
+.Bd -literal -offset indent -compact
+        info gnunet
+.Ed
+should give you access to the complete handbook,
+.Bd -literal -offset indent -compact
+        info gnunet-c-tutorial
+.Ed
+will give you access to a tutorial for developers.
+.sp
+Depending on your installation, this information is also
+available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.Sh HISTORY
+This man page first appeared in GNUnet 0.11.1.
+.Sh AUTHORS
+This page was written by
+.An ng0 Aq Mt ng0@gnunet.org .
+.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-gns-proxy.1 b/doc/man/gnunet-gns-proxy.1
index 6c12e2c09..603c5a28c 100644
--- a/doc/man/gnunet-gns-proxy.1
+++ b/doc/man/gnunet-gns-proxy.1
@@ -15,26 +15,20 @@ CA certificate has to be generated that is used by the proxy. Thus
 of this proxy or the \-\-authority switch is used to specify an
 appropriate CA certificate that is already trusted by the browser.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-a AUTHORITY,  \-\-authority=AUTHORITY"
 Path to a PEM CA file that contains the certificate and private key of
 the CA to use to assert the validity of GNS names. The default port is
 specified in the configuration file for the gns service under
 "[gns-proxy]" PROXY_CACERT.
-.B
 .IP "\-p PORT,  \-\-port=PORT"
 The port this proxy should listen on. Default is 7777.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and
 ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-gns.1 b/doc/man/gnunet-gns.1
index 597297629..750c72d95 100644
--- a/doc/man/gnunet-gns.1
+++ b/doc/man/gnunet-gns.1
@@ -8,33 +8,26 @@ gnunet\-gns \- Access to GNU Name System
 \fBgnunet\-gns\fP can be used to lookup and process GNU Name Service
 names.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-r, \-\-raw"
 No unneeded output.
 This is a quiet mode where only important information is displayed.
 For example a lookup for an IP address will only yield the IP address,
 no descriptive text.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.
 Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-u NAME, \-\-lookup=NAME"
 Name to lookup.
 Resolve the specified name using the GNU Name System.
-.B
 .IP "\-t TYPE, \-\-type=TYPE"
 Resource Record Type (TYPE) to look for.
 Supported TYPE's are: A, AAAA, CNAME, NS, PKEY, PSEU, TLSA, SRV, SOA,
 MX, LEHO, VPN, REV, PTR, TXT.
 Defaults to "A".
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH RETURN VALUE
diff --git a/doc/man/gnunet-namecache.1 b/doc/man/gnunet-namecache.1
index 78acb017b..06946e387 100644
--- a/doc/man/gnunet-namecache.1
+++ b/doc/man/gnunet-namecache.1
@@ -13,23 +13,17 @@ gnunet\-namecache \- inspect namecache
 namecache.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and
 ERROR.
-.B
 .IP "\-n NAME, \-\-name=NAME"
 Name (label) of the record to display (mandatory option)
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
-.B
 .IP "\-z PKEY, \-\-zone=PKEY"
 Specifies the public key of the zone to inspect (mandatory option)
diff --git a/doc/man/gnunet-namestore-fcfsd.1 b/doc/man/gnunet-namestore-fcfsd.1
index a6c9d2b32..c1eca224f 100644
--- a/doc/man/gnunet-namestore-fcfsd.1
+++ b/doc/man/gnunet-namestore-fcfsd.1
@@ -27,20 +27,15 @@ pseudonym (using "gnunet\-identity \-C NAME"), and use it with the
 "-z" option.  After that, you can start the FCFSD service (possibly using
 gnunet\-arm).
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and
 ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
-.B
 .IP "\-z EGO, \-\-zone=EGO"
 Specifies for which EGO should FCFSD manage the zone.
 .SH BUGS
diff --git a/doc/man/gnunet-namestore.1 b/doc/man/gnunet-namestore.1
index 7517a4f5e..6a824cc47 100644
--- a/doc/man/gnunet-namestore.1
+++ b/doc/man/gnunet-namestore.1
@@ -12,13 +12,10 @@ gnunet\-namestore \- manipulate GNU Name System (GNS) zone data
 \fBgnunet\-namestore\fP can be used to manipulate records in a GNS zone.
 .SH OPTIONS
-.B
 .IP "\-a, \-\-add"
 Desired operation is adding a record
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-d, \-\-delete"
 Desired operation is deleting records under the given name that match
 the specified type (\-t) and value (\-V).  If type or value are not
@@ -26,41 +23,31 @@ specified, it means that all types (or values) should be assumed to
 match (and possibly multiple or all values under the given label will
 be deleted).  Specifying a label (\-n) is mandatory.  Note that
 matching by expiration time or flags is (currently) not supported.
-.B
 .IP "\-D, \-\-display"
 Desired operation is listing of matching records
-.B
 .IP "\-e TIME, \-\-expiration=TIME"
 Specifies expiration time of record to add; format is relative time,
 i.e "1 h" or "7 d 30 m".  Supported units are "ms", "s", "min" or
 "minutes", "h" (hours), "d" (days) and "a" (years).
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-i NICKNAME, \-\-nick=NICKNAME"
 Set the desired NICKNAME for the zone. The nickname will be included
 in all (public) records and used as the suggested name for this zone.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and
 ERROR.
-.B
 .IP "\-m, \-\-monitor"
 Monitor changes to the zone on an ongoing basis (in contrast to \-D,
 which merely displays the current records)
-.B
 .IP "\-n NAME, \-\-name=NAME"
 Label or name of the record to add/delete/display
-.B
 .IP "\-p, \-\-public"
 Create a record that is public (shared with other users that know the
 label)
-.B
 .IP "\-r PKEY, \-\-reverse=PKEY"
 Determine our GNS name for the given public key (reverse lookup of the
 PKEY) in the given zone.
-.B
 .IP "\-R RECORDLINE, \-\-replace=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
@@ -69,29 +56,23 @@ same label will be deleted. The format for the RECORDLINE is
 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.
-.B
 .IP "\-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.
-.B
 .IP "\-t TYPE, \-\-type=TYPE"
 Type of the record to add/delete/display (i.e. "A", "AAAA", "NS",
 "PKEY", "MX" etc.)
-.B
 .IP "\-u URI, \-\-uri=URI"
 Add PKEY record from gnunet://gns/-URI to our zone; the record type is
 always PKEY, if no expiration is given FOREVER is used
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
-.B
 .IP "\-V VALUE, \-\-value=VALUE"
 Value to store or remove from the GNS zone.  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.
-.B
 .IP "\-z EGO, \-\-zone=EGO"
 Specifies the name of the ego controlling the private key for the zone
 (mandatory option)
diff --git a/doc/man/gnunet-nat-auto.1 b/doc/man/gnunet-nat-auto.1
index 8514a5c99..efd4b5df1 100644
--- a/doc/man/gnunet-nat-auto.1
+++ b/doc/man/gnunet-nat-auto.1
@@ -8,22 +8,17 @@ gnunet\-nat\-auto \- autoconfigure and test NAT traversal
 This tool allows testing various NAT traversal functions, as well
 as attempting auto\-configuration.
 .SH OPTIONS
-.B
 .IP "\-a,  \-\-auto"
 Attempt auto\-configuration for NAT traversal.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-S NAME,  \-\-section=NAME"
 Name of the configuration section with details about the configuration
 to test. For example "transport-tcp".
 .IP "\-t,  \-\-tcp"
 Use TCP.
-.B
 .IP "\-u,  \-\-udp"
 Use UDP.
-.B
 .IP "\-w,  \-\-write"
 Write configuration to configuration file, useful in combination with
 autoconfiguration (\-a).
diff --git a/doc/man/gnunet-nat-server.1 b/doc/man/gnunet-nat-server.1
index f31e69b26..8cb995f7c 100644
--- a/doc/man/gnunet-nat-server.1
+++ b/doc/man/gnunet-nat-server.1
@@ -41,7 +41,6 @@ gnunet\-nat\-server is run on should be specified in the NATSERVER
 option in the [setup] section of the configuration file of hosts that
 are supposed to autoconfigure with this server.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
 .SH BUGS
diff --git a/doc/man/gnunet-nat.1 b/doc/man/gnunet-nat.1
index 4a6a56e97..fe9272ea5 100644
--- a/doc/man/gnunet-nat.1
+++ b/doc/man/gnunet-nat.1
@@ -8,38 +8,28 @@ gnunet\-nat \- interact with the NAT service
 This tool allows testing various NAT traversal functions, as well as
 attempting auto\-configuration.
 .SH OPTIONS
-.B
 .IP "\-b ADDRESS,  \-\-bind=ADDRESS"
 Assume that the service is (locally) bound to ADDRESS.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-e ADDRESS,  \-\-external=ADDRESS"
 Assume that ADDRESS is the globally visible address of the peer.
-.B
 .IP "\-i ADDRESS,  \-\-in=ADDRESS"
 Assuming we are listening at ADDRESS for connection reversal requests.
-.B
 .IP "\-r ADDRESS,  \-\-remote=ADDRESS"
 Ask the peer at ADDRESS for connection reversal, using the local
 address for the target address of the reversal.
-.B
 .IP "\-S NAME,  \-\-section=NAME"
 Name of section in configuration file to use for additional options.
-.B
 .IP "\-s,  \-\-stun"
 Enable processing of STUN requests.
 Will try to read UDP packets from the bind address and handle the
 packets if they are STUN packets.
 Will only work with UDP.
-.B
 .IP "\-t,  \-\-tcp"
 Use TCP.
-.B
 .IP "\-u,  \-\-udp"
 Use UDP.
-.B
 .IP "\-W,  \-\-watch"
 Watch for connection reversal requests.
 .SH EXAMPLES
diff --git a/doc/man/gnunet-nse.1 b/doc/man/gnunet-nse.1
new file mode 100644
index 000000000..151ba4957
--- /dev/null
+++ b/doc/man/gnunet-nse.1
@@ -0,0 +1,65 @@
+.Dd March 6, 2019
+.Dt GNUNET-NSE 1
+.Os
+.Sh NAME
+.Nm gnunet-nse
+.Nd show network size estimates from NSE service
+.Sh SYNOPSIS
+.Nm
+.Op Fl c Ar file | Fl -config Ns = Ns file
+.Op Fl h | \-help
+.Op Fl l file | Fl -logfile Ns = Ns file
+.Op Fl L Ar loglevel | Fl -loglevel Ns = Ns loglevel
+.Op Fl v | \-version
+.Sh DESCRIPTION
+.Nm
+is a command line tool to show network size estimates from the NSE service of GNUnet.
+.Bl -tag -width Ds
+.It Fl c Ar file | Fl -config Ns = Ns file
+Use the configuration file FILENAME.
+.It Fl h | \-help
+Print short help on options.
+.It Fl l file | Fl -logfile Ns = Ns file
+Configure logging to write logs to LOGFILE.
+.It Fl L Ar loglevel | Fl -loglevel Ns = Ns loglevel
+Use LOGLEVEL for logging.
+Valid values are DEBUG, INFO, WARNING and ERROR.
+.It Fl v | \-version
+Print GNUnet version number.
+.El
+.Sh FILES
+.Pa gnunet.conf
+Configuration file for gnunet.
+.Sh SEE ALSO
+.Xr gnunet.conf 5
+.sp
+The full documentation for gnunet is maintained as a Texinfo manual.
+If the
+.Xr info 1
+gnunet programs are properly installed at your site, the command
+.Bd -literal -offset indent -compact
+        info gnunet
+.Ed
+should give you access to the complete handbook,
+.Bd -literal -offset indent -compact
+        info gnunet-c-tutorial
+.Ed
+will give you access to a tutorial for developers.
+.sp
+Depending on your installation, this information is also
+available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.Sh HISTORY
+This man page first appeared in GNUnet 0.11.1.
+.Sh AUTHORS
+This page was originally written by
+.An Bertrand Marc Aq Mt bmarc@debian.org
+for Debian's gnunet package (man page date: 2014).
+Further edits and conversion to mdoc were done by
+.An ng0 Aq Mt ng0@gnunet.org .
+.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-peerinfo.1 b/doc/man/gnunet-peerinfo.1
index bd37fa635..88094fa10 100644
--- a/doc/man/gnunet-peerinfo.1
+++ b/doc/man/gnunet-peerinfo.1
@@ -8,39 +8,28 @@ gnunet\-peerinfo \- Display information about other peers.
 .PP
 \fBgnunet\-peerinfo\fP display the known addresses and trust of known peers.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME, \-\-config=FILENAME"
 Load config file (default: ~/.config/gnunet.conf)
-.B
 .IP "\-g, \-\-get\-hello"
 Output HELLO uri(s)
-.B
 .IP "\-h, \-\-help"
 Print help page
-.B
 .IP "\-i, \-\-info"
 List all known peers (and their addresses)
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Set the loglevel
-.B
 .IP "\-l LOGFILE, \-\-logfile=LOGFILE"
 Log messages to LOGFILE
-.B
 .IP "\-n, \-\-numeric"
 Disable resolution of IPs to hostnames
-.B
 .IP "\-p, \-\-put\-hello=HELLO"
 Add given HELLO uri to the database
-.B
 .IP "\-q, \-\-quiet"
 Do not print anything but the peer identities
-.B
 .IP "\-s, \-\-self"
 Print only our own identity (together with "\-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).
-.B
 .IP "\-v, \-\-version"
 Print the version number
 .SH BUGS
diff --git a/doc/man/gnunet-publish.1 b/doc/man/gnunet-publish.1
index b07208732..5f774580b 100644
--- a/doc/man/gnunet-publish.1
+++ b/doc/man/gnunet-publish.1
@@ -112,9 +112,9 @@ default is ~/.config/gnunet.conf).
 Disable use of GNU libextractor for finding additional keywords and
 metadata.
 .TP
-\fB\-d\fR, \fB\-\-disable\-creation\-time\fR
+\fB\-E\fR, \fB\-\-enable\-creation\-time\fR
-Disable use of creation time timestamp in metadata.
+Enable use of creation time timestamp in metadata.
-Useful to make created directories deterministic and to avoid leaking
+Setting this information will leak
 information about the time at which a file was made available.
 .TP
 \fB\-e\fR, \fB\-\-extract\fR
diff --git a/doc/man/gnunet-qr.1 b/doc/man/gnunet-qr.1
index 0145a3523..2aabe6b22 100644
--- a/doc/man/gnunet-qr.1
+++ b/doc/man/gnunet-qr.1
@@ -1,49 +1,53 @@
-.TH GNUNET\-QR 1 "September 13, 2014" "GNUnet"
+.Dd September 13, 2014
-.SH NAME
+.Dt GNUNET-QR 1
-gnunet\-qr \- Scan a QR code using a video device and import.
+.Os
-.SH SYNOPSIS
+.Sh NAME
-.B gnunet\-qr
+.Nm gnunet-qr
-.RI [ options ]
+.Nd
-.br
+scan a QR code using a video device and import
-.SH DESCRIPTION
+.Sh SYNOPSIS
-\fBgnunet\-qr\fP is a command line tool to scan a QR code using a
+.Nm
-video device and import.
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
-.SH OPTIONS
+.Op Fl d Ar DEVICE | Fl \-device= Ns Ar DEVICE
-.B
+.Op Fl h | \-help
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+.Op Fl s | \-silent
+.Op Fl v | \-verbose
+.Sh DESCRIPTION
+.Nm
+is a command line tool to scan a QR code using a video device and import.
+.Bl -tag -width Ds
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.B
+.It Fl d Ar DEVICE | Fl \-device= Ns Ar DEVICE
-.IP "\-d DEVICE,  \-\-device=DEVICE"
 Use device DEVICE.
-.B
+.It Fl h | \-help
-.IP "\-h, \-\-help"
 Print short help on options.
-.B
+.It Fl s | \-silent
-.IP "\-s,  \-\-silent"
 Do not show preview windows.
-.B
+.It Fl v | \-verbose
-.IP "\-v, \-\-verbose"
 Be verbose.
-.SH BUGS
+.El
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
+.Sh SEE ALSO
-electronic mail to <gnunet\-developers@gnu.org>
+The full documentation for gnunet is maintained as a Texinfo manual.
-.SH SEE ALSO
+If the
-The full documentation for
+.Xr info 1
-.B gnunet
+and gnunet programs are properly installed at your site, the command
-is maintained as a Texinfo manual.  If the
+.Pp
-.B info
+.Dl info gnunet
-and
+.Pp
-.B gnunet
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.sp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Xr gnunet-c-tutorial 7 .
+.\".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-resolver.1 b/doc/man/gnunet-resolver.1
index 66f1ba9a8..494131d01 100644
--- a/doc/man/gnunet-resolver.1
+++ b/doc/man/gnunet-resolver.1
@@ -7,23 +7,17 @@ gnunet\-resolver \- build-in GNUnet stub resolver
 .SH DESCRIPTION
 \fBgnunet\-resolver\fP uses build-in GNUnet stub resolver.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and
 ERROR.
-.B
 .IP "\-l LOGFILE, \-\-logfile=LOGFILE"
 Configure logging to write logs to LOGFILE.
-.B
 .IP "\-r, \-\-reverse"
 Perform a reverse lookup.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-revocation.1 b/doc/man/gnunet-revocation.1
index f21f82612..6fae373e7 100644
--- a/doc/man/gnunet-revocation.1
+++ b/doc/man/gnunet-revocation.1
@@ -28,19 +28,15 @@ expensive.  Depending on your CPU, the calculation can take days or
 weeks.
 .SH OPTIONS
-.B
 .IP "\-t KEY, \-\-test=KEY"
 Check if the given KEY (ASCII\-encoded public key required) has been
 revoked.
-.B
 .IP "\-R NAME, \-\-revoke=NAME"
 Calculate or perform revocation for the ego with the given NAME.
-.B
 .IP "\-p, \-\-perform"
 Actually perform the revocation as soon as possible (do not just
 generate a revocation certificate, use it).  Must be supplied to
 actually perform the revocation.
-.B
 .IP "\-f NAME, \-\-filename=NAME"
 Use NAME as the name of the file that is to contain the revocation
 certificate.  Intermediate computation results will be stored here, as
@@ -51,17 +47,13 @@ be performed instantly.  If the given file contains anything (a valid
 certificate, with or without the completed proof-of-work) there is no
 need to supply the "\-R" option or to still have the private key of
 the ego to perform the revocation.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and
 ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
diff --git a/doc/man/gnunet-scalarproduct.1 b/doc/man/gnunet-scalarproduct.1
index 1c8938daf..34d5e4ef0 100644
--- a/doc/man/gnunet-scalarproduct.1
+++ b/doc/man/gnunet-scalarproduct.1
@@ -42,34 +42,26 @@ The protocol by definition relies on \fBAlice\fP and \fBBob\fP being
 benign, thus \fBBob\fP can arbitrarily falsify his information. Both
 peers collaborate to achieve a correct result.
 .SH OPTIONS
-.B
 .IP "\-e ELEMENTS, \-\-elements=ELEMENTS"
 The element-vector the vectorproduct should be computed over in signed
 decimal form, eg: \"42,1,-3,3,7\". Zero value elements will be automatically masked.
-.B
 .IP "\-m MASK, \-\-mask=MASK"
 Elements in the vector can be masked. There must be at least two
 elements left in the vector to compute a vectorproduct. Non-Zero
 values indicate an element is not maskes.
-.B
 .IP "\-k KEY, \-\-key=KEY"
 The session key, a shared string of arbitrary length from which the
 SID will be generated
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-p PEERID, \-\-peer=PEERID"
 The remote peer\'s ASCII-armored gnunet-peer ID as output by
 gnunet-peerinfo. If this option is not given, the peer will take the
 \fBBob\fP\'s role.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-scrypt.1 b/doc/man/gnunet-scrypt.1
index 01ac4205a..545af37e9 100644
--- a/doc/man/gnunet-scrypt.1
+++ b/doc/man/gnunet-scrypt.1
@@ -5,34 +5,24 @@ gnunet\-scrypt \- Manipulate GNUnet proof of work files.
 .B gnunet\-scrypt
 .RI [ options ]
 .SH DESCRIPTION
-\fBgnunet\-scrypt\fP is a command line tool to manipulate GNUnet proof
+\fBgnunet\-scrypt\fP is a command line tool to manipulate GNUnet proof of work files.
-of work files.
 .SH OPTIONS
-.B
 .IP "\-b BITS,  \-\-bits=BITS"
 Number of bits to require for the proof of work.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-k FILE, \-\-keyfile=FILE"
 File with private key, otherwise default is used.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-l LOGFILE, \-\-logfile=LOGFILE"
 Configure logging to write logs to LOGFILE.
-.B
 .IP "\-o FILE, \-\-outfile=FILE"
 File with proof of work, otherwise default is used.
-.B
 .IP "\-t TIME, \-\-timeout=TIME"
 Time to wait between calculations.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-statistics.1 b/doc/man/gnunet-statistics.1
index e61a8493c..c0d5e8fe3 100644
--- a/doc/man/gnunet-statistics.1
+++ b/doc/man/gnunet-statistics.1
@@ -1,73 +1,91 @@
-.TH GNUNET-STATISTICS 1 "January 4, 2012" "GNUnet"
+.Dd January 4, 2012
-.SH NAME
+.Dt GNUNET-STATISTICS 1
-gnunet\-statistics \- Display statistics about your GNUnet system
+.Os
-.SH SYNOPSIS
+.Sh NAME
-.B gnunet\-statistics
+.Nm gnunet-statistics
-.RI [ options ]
+.Nd display statistics about your GNUnet system
-.RI [ VALUE ]
+.Sh SYNOPSIS
-.SH DESCRIPTION
+.Nm
-\fBgnunet\-statistics\fP is used to display detailed information about
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
-various aspect of GNUnet's operation.  This tool only works if the
+.Op Fl h | \-help
-"statistics" service is available.
+.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-gnunet\-statistics can be used to set a value by giving the options
+.Op Fl l Ar FILENAME | Fl \-logfile= Ns Ar FILENAME
-\-n, \-s and also a VALUE.
+.Op Fl n Ar NAME | Fl \-name= Ns Ar NAME
-.SH OPTIONS
+.Op Fl o Ar PORT | Fl \-port= Ns Ar PORT
-.B
+.Op Fl p | \-persistent
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+.Op Fl q | \-quiet
+.Op Fl r Ar REMOTE | Fl \-remote= Ns Ar REMOTE
+.Op Fl S Ar SEPARATOR | Fl \-csv-separator= Ns Ar SEPARATOR
+.Op Fl s Ar SUBSYSTEM | Fl \-subsystem= Ns Ar SUBSYSTEM
+.Op Fl t Ar PATH | Fl \-testbed= Ns Ar PATH
+.Op Fl v | \-version
+.Op Fl w | \-watch
+.Ao Ar VALUE Ac
+.Sh DESCRIPTION
+.Nm
+is used to display detailed information about various aspect of GNUnet's operation.
+This tool only works if the "statistics" service is available.
+gnunet-statistics can be used to set a value by giving the options \-n, \-s and also a VALUE.
+.Bl -tag -width Ds
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.B
+.It Fl h | \-help
-.IP "\-h, \-\-help"
 Print short help on options.
-.B
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-.IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
+.It Fl l Ar FILENAME | Fl \-logfile= Ns Ar FILENAME
-.IP "\-n NAME,  \-\-name=NAME"
+Configure logging to write logs to FILENAME
-Each statistic has a name that is unique with in its subsystem.  With
+.It Fl n Ar NAME | Fl \-name= Ns Ar NAME
-this option, the output can be restricted to statistics that have a
+Each statistic has a NAME that is unique with in its subsystem.
-particular name.
+With this option, the output can be restricted to statistics that have a particular NAME.
-.B
+.It Fl o Ar PORT | Fl \-port= Ns Ar PORT
-.IP "\-p,  \-\-persistent"
+PORT for remote host
-When setting a value, make the value persistent.  If the value used to
+.It Fl p | \-persistent
-be persistent and this flag is not given, it will be marked as
+When setting a value, make the value persistent.
-non\-persistent.
+If the value used to be persistent and this flag is not given, it will be marked as non-persistent.
-.B
+.It Fl q | \-quiet
-.IP "\-s SUBSYSTEM,  \-\-subsystem=SUBSYSTEM"
+Just print the statistics value
-Statistics are kept for various subsystems.  With this option, the
+.It Fl r Ar REMOTE | Fl \-remote= Ns Ar REMOTE
-output can be restricted to a particular subsystem only.
+Connect to a remote host given as REMOTE.
-.B
+.It Fl S Ar SEPARATOR | Fl \-csv-separator= Ns Ar SEPARATOR
-.IP "\-S SEPARATOR,  \-\-csv-separator=SEPARATOR"
 Specify a separator for generating csv-output.
-.B
+.It Fl s Ar SUBSYSTEM | Fl \-subsystem= Ns Ar SUBSYSTEM
-.IP "\-t TESTBED_PATH,  \-\-subsystem=TESTBED_PATH"
+Statistics are kept for various subsystems.
+With this option, the output can be restricted to a particular subsystem only.
+.It Fl t Ar PATH | Fl \-testbed= Ns Ar PATH
 When running testbed, you can get statistics of all peers with specefying the
-folder containing the data of all testbed nodes like \fBgnunet\-statistics -t /tmp/testbedARtmQv\fP.
+folder containing the data of all testbed nodes like
-.B
+.Pp
-.IP "\-v, \-\-version"
+.Dl $ gnunet-statistics -t /tmp/testbedARtmQv
+.Pp
+.It Fl v | \-version
 Print GNUnet version number.
-.SH BUGS
+.It Fl w | \-watch
-Report bugs by using Mantis <https://gnunet.org/mantis/> or by sending
+Watch value continuously.
-electronic mail to <gnunet\-developers@gnu.org>
+.El
-.SH SEE ALSO
+.Sh SEE ALSO
-gnunet\-service\-statistics(1)
+.Xr gnunet-service-statistics 1
-.PP
+.sp
-The full documentation for
+The full documentation for gnunet is maintained as a Texinfo manual.
-.B gnunet
-is maintained as a Texinfo manual.
 If the
-.B info
+.Xr info 1
-and
+and gnunet programs are properly installed at your site, the command
-.B gnunet
+.Pp
-programs are properly installed at your site, the command
+.Dl info gnunet
-.IP
+.Pp
-.B info gnunet
-.PP
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.sp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Xr gnunet-c-tutorial 7 .
+.\".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-testbed-profiler.1 b/doc/man/gnunet-testbed-profiler.1
index b1dde99dd..fe9d713b3 100644
--- a/doc/man/gnunet-testbed-profiler.1
+++ b/doc/man/gnunet-testbed-profiler.1
@@ -1,61 +1,67 @@
-.TH GNUNET\-TESTBED\-PROFILER 1 "September 13, 2014" "GNUnet"
+.Dd September 13, 2014
-.SH NAME
+.Dt GNUNET-TESTBED-PROFILER 1
-gnunet\-testbed\-profiler \- Profiling driver for the testbed.
+.Os
-.SH SYNOPSIS
+.Sh NAME
-.B gnunet\-testbed\-profiler
+.Nm gnunet-testbed-profiler
-.RI [ options ]
+.Nd
-.br
+profiling driver for the testbed
-.SH DESCRIPTION
+.Sh SYNOPSIS
-\fBgnunet\-testbed\-profiler\fP is a command line profiling driver for the testbed.
+.Nm
-.SH OPTIONS
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
-.B
+.Op Fl e Ar COUNT | Fl \-num-errors= Ns Ar COUNT
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+.Op Fl H Ar FILENAME |  Fl \-hosts= 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 n | \-non-interactive
+.Op Fl p Ar COUNT | Fl \-num-peers= Ns Ar COUNT
+.Op Fl v | \-version
+.Sh DESCRIPTION
+.Nm
+is a command line profiling driver for the testbed.
+.Sh OPTIONS
+.Bl -tag -width Ds
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.B
+.It Fl e Ar COUNT | Fl \-num-errors= Ns Ar COUNT
-.IP "\-e COUNT,  \-\-num\-errors=COUNT"
 Tolerate COUNT number of continious timeout failures.
-.B
+.It Fl H Ar FILENAME |  Fl \-hosts= Ns Ar FILENAME
-.IP "\-H FILENAME,  \-\-hosts=FILENAME"
 Name of the file with the login information for the testbed.
-.B
+.It Fl h | \-help
-.IP "\-h, \-\-help"
 Print short help on options.
-.B
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-.IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
+Use LOGLEVEL for logging.
-Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
+Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
+.It Fl l Ar LOGFILE |  Fl \-logfile= Ns Ar LOGFILE
-.IP "\-l LOGFILE, \-\-logfile=LOGFILE"
 Configure logging to write logs to LOGFILE.
-.B
+.It Fl n | \-non-interactive
-.IP "\-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.
-Run profiler in non-interactive mode where upon testbed setup the
+.It Fl p Ar COUNT | Fl \-num-peers= Ns Ar COUNT
-profiler does not wait for a keystroke but continues to run until a
-termination signal is received.
-.B
-.IP "\-p COUNT, \-\-num\-peers=COUNT"
 Create COUNT number of peers.
-.B
+.It Fl v | \-version
-.IP "\-v, \-\-version"
 Print GNUnet version number.
-.SH BUGS
+.El
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+.Sh SEE ALSO
-.SH "SEE ALSO"
+The full documentation for gnunet is maintained as a Texinfo manual.
-The full documentation for
+If the
-.B gnunet
+.Xr info 1
-is maintained as a Texinfo manual.  If the
+and gnunet programs are properly installed at your site, the command
-.B info
+.Pp
-and
+.Dl info gnunet
-.B gnunet
+.Pp
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.sp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Xr gnunet-c-tutorial 7 .
+.\".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-testing-run-service.1 b/doc/man/gnunet-testing-run-service.1
index 43fdb8ecf..903810c7f 100644
--- a/doc/man/gnunet-testing-run-service.1
+++ b/doc/man/gnunet-testing-run-service.1
@@ -1,52 +1,53 @@
-.TH GNUNET-TESTING-RUN-SERVICE 1 "August 25, 2013" "GNUnet"
+.Dd August 25, 2013
-.SH NAME
+.Dt GNUNET-TESTING-RUN-SERVICE 1
-gnunet\-testing\-run\-service \- Command line tool to start a service for testing.
+.Os
-.SH SYNOPSIS
+.Sh NAME
-.B gnunet\-testing\-run\-service
+.Nm gnunet-testing-run-service
-.RI [ options ]
+.Nd
-.SH DESCRIPTION
+command line tool to start a service for testing
-\fBgnunet\-testing\-run\-service\fP is a command line tool to start a
+.Sh SYNOPSIS
-service for testing. It starts a peer, running only the service
+.Nm
-specified on the command line, outputs the path to the temporary
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
-configuration file to stdout.
+.Op Fl h | \-help
-.PP
+.Op Fl s Ar SERVICE | Fl \-service= Ns Ar SERVICE
-The peer will run until this program is killed, or stdin is
+.Sh DESCRIPTION
-closed. When reading the character 'r' from stdin, the running service
+.Nm
-is restarted with the same configuration.
+is a command line tool to start a service for testing.
-.PP
+It starts a peer, running only the service specified on the command line, outputs the path to the temporary configuration file to stdout.
-This executable is intended to be used by gnunet-java, in order to
+.Pp
-reliably start and stop services for test cases.
+The peer will run until this program is killed, or stdin is closed.
-.SH OPTIONS
+When reading the character 'r' from stdin, the running service is restarted with the same configuration.
-.B
+.Pp
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+This executable is intended to be used by gnunet-java, in order to reliably start and stop services for test cases.
+.Bl -tag -width Ds
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Name of the template configuration file to use (optional).
-.B
+.It Fl h | \-help
-.IP "\-h, \-\-help"
 Print short help on options.
-.B
+.It Fl s Ar SERVICE | Fl \-service= Ns Ar SERVICE
-.IP "\-s SERVICE, \-\-service=SERVICE"
 Name of the service to run.
-.SH BUGS
+.El
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
+.Sh SEE ALSO
-electronic mail to <gnunet\-developers@gnu.org>
+The full documentation for gnunet is maintained as a Texinfo manual.
-.SH SEE ALSO
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.
 If the
-.B info
+.Xr info 1
-and
+and gnunet programs are properly installed at your site, the command
-.B gnunet
+.Pp
-programs are properly installed at your site, the command
+.Dl info gnunet
-.IP
+.Pp
-.B info gnunet
-.PP
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.sp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Xr gnunet-c-tutorial 7 .
+.\".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-testing.1 b/doc/man/gnunet-testing.1
index 357d0df44..182da613d 100644
--- a/doc/man/gnunet-testing.1
+++ b/doc/man/gnunet-testing.1
@@ -1,65 +1,69 @@
-.TH GNUNET\-TESTING 1 "January 4, 2012" "GNUnet"
+.Dd January 4, 2012
-.SH NAME
+.Dt GNUNET-TESTING 1
-gnunet\-testing \- Command line tool to access the testing library.
+.Os
-.SH SYNOPSIS
+.Sh NAME
-.B gnunet\-testing
+.Nm gnunet-testing
-.RI [ options ]
+.Nd
-.br
+command line tool to access the testing library
-.SH DESCRIPTION
+.Sh SYNOPSIS
-\fBgnunet\-testing\fP is a command line tool to access the testing
+.Nm
-library.
+.Op Fl C | \-cfg
-.SH OPTIONS
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
-.B
+.Op Fl H | \-hostkeys
-.IP "\-C,  \-\-cfg"
+.Op Fl h | \-help
+.Op Fl k | \-key
+.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+.Op Fl l Ar LOGFILE | Fl \-logfile= Ns Ar LOFILE
+.Op Fl n | \-number
+.Op Fl t | \-template
+.Op Fl v | \-version
+.Sh DESCRIPTION
+.Nm
+is a command line tool to access the testing library.
+.Sh OPTIONS
+.Bl -tag -width Ds
+.It Fl C | \-cfg
 Create unique configuration files.
-.B
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
-.IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
+.It Fl H | \-hostkeys
-.IP "\-H, \-\-hostkeys"
 Host key file.
-.B
+.It Fl h | \-help
-.IP "\-h, \-\-help"
 Print short help on options.
-.B
+.It Fl k | \-key
-.IP "\-k, \-\-key"
 Create hostkey files from pre-computed hostkey list.
-.B
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-.IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
+.It Fl l Ar LOGFILE | Fl \-logfile= Ns Ar LOFILE
-.IP "\-l LOGFILE, \-\-logfile=LOGFILE"
 Configure logging to write logs to LOGFILE.
-.B
+.It Fl n | \-number
-.IP "\-n, \-\-number"
 Number of unique configuration files or hostkeys to create.
-.B
+.It Fl t | \-template
-.IP "\-t, \-\-template"
 Configuration template.
-.B
+.It Fl v | \-version
-.IP "\-v, \-\-version"
 Print GNUnet version number.
-.SH BUGS
+.El
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
+.Sh SEE ALSO
-electronic mail to <gnunet\-developers@gnu.org>
+The full documentation for gnunet is maintained as a Texinfo manual.
-.SH SEE ALSO
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.
 If the
-.B info
+.Xr info 1
-and
+and gnunet programs are properly installed at your site, the command
-.B gnunet
+.Pp
-programs are properly installed at your site, the command
+.Dl info gnunet
-.IP
+.Pp
-.B info gnunet
-.PP
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.sp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Xr gnunet-c-tutorial 7 .
+.\".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-timeout.1 b/doc/man/gnunet-timeout.1
index 653f211cd..15abfe351 100644
--- a/doc/man/gnunet-timeout.1
+++ b/doc/man/gnunet-timeout.1
@@ -1,36 +1,42 @@
-.TH GNUNET-TIMOUET 1 "June 5, 2018" "GNUnet"
+.Dd June 5, 2018
-.SH NAME
+.Dt GNUNET-TIMEOUT 1
-gnunet\-timeout \- run process with timeout
+.Os
-.SH SYNOPSIS
+.Sh NAME
-.B gnunet\-timeout
+.Nm gnunet-timeout
-.RI TIMEOUT PROGRAM ARGS
+.Nd
-.SH DESCRIPTION
+run process with timeout
-\fBgnunet\-timeout\fP can be used to run another process with a
+.Sh SYNOPSIS
-timeout.  Provided as the standard "timout" utility may not be
+.Nm
-available on all platforms.
+.Ao Ar duration Ac
-.SH BUGS
+.Ao Ar command Ac
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
+.Ao args ... Ac
-electronic mail to <gnunet\-developers@gnu.org>
+.Sh DESCRIPTION
-.SH SEE ALSO
+.Nm
-timeout(1)
+can be used to run another process with a timeout.
-.PP
+It is provided because the standard "timout" utility may not be available on all platforms.
-The full documentation for
+.Sh SEE ALSO
-.B gnunet
+.Xr timeout 1
-is maintained as a Texinfo manual.
+.sp
+The full documentation for gnunet is maintained as a Texinfo manual.
 If the
-.B info
+.Xr info 1
-and
+and gnunet programs are properly installed at your site, the command
-.B gnunet
+.Pp
-programs are properly installed at your site, the command
+.Dl info gnunet
-.IP
+.Pp
-.B info gnunet
-.PP
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.sp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Xr gnunet-c-tutorial 7 .
+.\".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-transport-certificate-creation.1 b/doc/man/gnunet-transport-certificate-creation.1
index 9dc572acf..e896363e4 100644
--- a/doc/man/gnunet-transport-certificate-creation.1
+++ b/doc/man/gnunet-transport-certificate-creation.1
@@ -1,35 +1,40 @@
-.TH GNUNET\-TRANSPORT-CERTIFICATE-CREATION 1 "January 31, 2014" "GNUnet"
+.Dd January 31, 2014
-.SH NAME
+.Dt GNUNET-TRANSPORT-CERTIFICATE-CREATION 1
-gnunet\-transport\-certificate\-creation \- create certificate for HTTPS transport
+.Os
-.SH SYNOPSIS
+.Sh NAME
-.B gnunet\-transport\-certificate\-creation
+.Nm gnunet-transport-certificate-creation
-.I privatekey certificate
+.Nd
-.SH DESCRIPTION
+create certificate for HTTPS transport
-\fBgnunet\-transport\-certificate\-creation\fP uses openssl to generate a RSA
+.Sh SYNOPSIS
-private key and then a self-signed certificate for HTTPS transport.
+.Nm
-.SH BUGS
+.Op privatekey
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
+.Op certificate
-electronic mail to <gnunet\-developers@gnu.org>
+.Sh DESCRIPTION
-.SH SEE ALSO
+.Nm
-gnunet\-transport(1)
+uses openssl to generate a RSA private key and then a self-signed certificate for HTTPS transport.
-.PP
+.Sh SEE ALSO
-The full documentation for
+.Xr gnunet-transport 1
-.B gnunet
+.sp
-is maintained as a Texinfo manual.
+The full documentation for gnunet is maintained as a Texinfo manual.
 If the
-.B info
+.Xr info 1
-and
+and gnunet programs are properly installed at your site, the command
-.B gnunet
+.Pp
-programs are properly installed at your site, the command
+.Dl info gnunet
-.IP
+.Pp
-.B info gnunet
-.PP
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.sp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Xr gnunet-c-tutorial 7 .
+.\".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-transport.1 b/doc/man/gnunet-transport.1
index eef762174..f5ed47ad1 100644
--- a/doc/man/gnunet-transport.1
+++ b/doc/man/gnunet-transport.1
@@ -1,84 +1,92 @@
-.TH GNUNET\-TRANSPORT "1" "October 17, 2015" "GNUnet"
+.Dd October 17, 2015
-.SH NAME
+.Dt GNUNET-TRANSPORT 1
-gnunet\-transport \- measure and control the transport subsystem
+.Os
-.SH SYNOPSIS
+.Sh NAME
-.B gnunet\-transport
+.Nm gnunet-transport
-[\fIOPTIONS\fR]
+.Nd
-.SH DESCRIPTION
+measure and control the transport subsystem
-.PP
+.Sh SYNOPSIS
-gnunet\-transport is a tool to access various functions of GNUnet's
+.Nm
-transport subsystem from the command\-line.  Most of these are not
+.Op Fl b | \-benchmark
-expected to be useful for end-users.  gnunet\-transport can be used to
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
-evaluate the performance of the transports, force a peer to connect to
+.Op Fl D | \-disconnect
-another peer (if possible).  Other functions should be added in the
+.Op Fl e | \-events
-near future.
+.Op Fl h | \-help
-.TP
+.Op Fl i | \-information
-\fB\-b\fR, \fB\-\-benchmark\fR
+.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-measure how fast we are receiving data (from all connections).  On
+.Op Fl l Ar LOGFILE | Fl \-logfile= Ns Ar LOGFILE
-exit, the data rate will be reported.  Runs until aborted with CTRL-C.
+.Op Fl m | \-monitor
-.TP
+.Op Fl p Ar PEER | Fl \-peer= Ns Ar PEER
-\fB\-D\fR, \fB\-\-disconnect\fR
+.Op Fl P | \-plugins
-force disconnection from a peer (used in conjunction with \-p).
+.Op Fl s | \-send
-Note that you can use the gnunet\-ats command\-line tool to suggest connects.
+.Op Fl v | \-version
-.TP
+.Op Fl V | \-verbose
-\fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR
+.Sh DESCRIPTION
+.Nm
+is a tool to access various functions of GNUnet's transport subsystem from the command-line.
+Most of these are not expected to be useful for end-users.
+gnunet-transport can be used to evaluate the performance of the transports, force a peer to connect to another peer (if possible).
+Other functions should be added in the near future.
+.Bl -tag -width Ds
+.It Fl b | \-benchmark
+measure how fast we are receiving data (from all connections).
+On exit, the data rate will be reported.
+Runs until aborted with CTRL-C.
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 configuration file to use
-.TP
+.It Fl D | \-disconnect
-\fB\-e \fB\-\-events\fR
+force disconnection from a peer (used in conjunction with \-p).
+Note that you can use the gnunet-ats command-line tool to suggest connects.
+.It Fl e | \-events
 provide information about all connect and disconnect events (continuously)
-.TP
+.It Fl h | \-help
-\fB\-h\fR, \fB\-\-help\fR
 print help page
-.TP
+.It Fl i | \-information
-\fB\-i\fR, \fB\-\-information\fR
 print information about our current connections (once)
-.TP
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-\fB\-L \fILOGLEVEL\fR, \fB\-\-loglevel=LOGLEVEL\fR
 Change the loglevel.  Possible values for LOGLEVEL are ERROR, WARNING, INFO and DEBUG.
-.TP
+.It Fl l Ar LOGFILE | Fl \-logfile= Ns Ar LOGFILE
-\fB\-l \fILOGFILE\fR, \fB\-\-logfile=LOGFILE\fR
 configure logging to write logs to LOGFILE
-.TP
+.It Fl m | \-monitor
-\fB\-m\fR, \fB\-\-monitor\fR
 print information about our current connections (continuously)
-.TP
+.It Fl p Ar PEER | Fl \-peer= Ns Ar PEER
-\fB\-p \fIPEER\fR, \fB\-\-peer=PEER\fR
 the peer identity to connect to or monitor
-.TP
+.It Fl P | \-plugins
-\fB\-P, \fB\-\-plugins\fR
 monitor session state of transport plugins
-.TP
+.It Fl s | \-send
-\fB\-s\fR, \fB\-\-send\fR
 transmit (dummy) traffic as quickly as possible to the peer specified
 with the \-p option.  The rate will still be limited by the quota(s)
 determined by the peers (ATS subsystem).  Will run until CTRL\-C is
 pressed or until the connection to the other peer is disrupted.
-.TP
+.It Fl v | \-version
-\fB\-v\fR, \fB\-\-version\fR
 print the version number
-.TP
+.It Fl V | \-verbose
-\fB\-V\fR, \fB\-\-verbose\fR
 be verbose
-.SH "REPORTING BUGS"
+.El
-Report bugs by using mantis <https://bugs.gnunet.org/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+.Sh SEE ALSO
-.SH "SEE ALSO"
+.Xr gnunet-arm 1 ,
-\fBgnunet\-arm\fP(1), \fBgnunet\-ats\fP(1)
+.Xr gnunet-ats 1
-The full documentation for
+.sp
-.B gnunet
+The full documentation for gnunet is maintained as a Texinfo manual.
-is maintained as a Texinfo manual.  If the
+If the
-.B info
+.Xr info 1
-and
+and gnunet programs are properly installed at your site, the command
-.B gnunet
+.Pp
-programs are properly installed at your site, the command
+.Dl info gnunet
-.IP
+.Pp
-.B info gnunet
-.PP
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.sp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Xr gnunet-c-tutorial 7 .
+.\".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-unindex.1 b/doc/man/gnunet-unindex.1
index 6aee4f62e..e953ce23a 100644
--- a/doc/man/gnunet-unindex.1
+++ b/doc/man/gnunet-unindex.1
@@ -1,58 +1,67 @@
-.TH GNUNET-UNINDEX "1" "September 6, 2009" "GNUnet"
+.Dd September 6, 2009
-.SH NAME
+.Dt GNUNET-UNINDEX 1
-gnunet\-unindex \- a command line interface for deleting indexed files from GNUnet
+.Sh NAME
-.SH SYNOPSIS
+.Nm gnunet-unindex
-.B gnunet\-unindex
+.Nd
-[\fIOPTIONS\fR] FILENAME
+a command line interface for deleting indexed files from GNUnet
-.SH DESCRIPTION
+.Sh SYNOPSIS
-.PP
+.Nm
-gnunet\-unindex is used for deleting indexed files from GNUnet.
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
-.TP
+.Op Fl h | \-help
-\fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR
+.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-use config file (defaults: ~/.config/gnunet.conf)
+.Op Fl v | \-version
-.TP
+.Op Fl V | \-verbose
-\fB\-h\fR, \fB\-\-help\fR
+FILENAME
+.Sh DESCRIPTION
+.Nm
+is used for deleting indexed files from GNUnet.
+.Bl -tag -width Ds
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
+Use config file FILENAME as config (default: ~/.config/gnunet.conf).
+.It Fl h | \-help
 print help page
-.TP
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-\fB\-L \fILOGLEVEL\fR, \fB\-\-loglevel=LOGLEVEL\fR
+Change the loglevel.
-Change the loglevel.  Possible values for LOGLEVEL are NOTHING,
+Possible values for LOGLEVEL are NOTHING, ERROR, WARNING, INFO and DEBUG.
-ERROR, WARNING, INFO and DEBUG.
+.It Fl v | \-version
-.TP
-\fB\-v\fR, \fB\-\-version\fR
 print the version number
-.TP
+.It Fl V | \-verbose
-\fB\-V\fR, \fB\-\-verbose\fR
 be verbose
-.SH NOTES
+.El
-You can only unindex files that you indexed and that you still have
+.Sh NOTES
-available locally in full.  You should use gnunet\-unindex on files
+You can only unindex files that you indexed and that you still have available locally in full.
-that you indexed (not inserted) and that you are going to delete or
+You should use gnunet-unindex on files that you indexed (not inserted) and that you are going to delete or move locally.
-move locally.
+.Sh FILES
-.TP
-.SH FILES
 .TP
 ~/.config/gnunet.conf
 GNUnet configuration file
-.SH "REPORTING BUGS"
+.Sh SEE ALSO
-Report bugs to <https://bugs.gnunet.org/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+.Xr gnunet-fs-gtk 1 ,
-.SH "SEE ALSO"
+.Xr gnunet-publish 1 ,
-\fBgnunet\-fs\-gtk\fP(1), \fBgnunet\-publish\fP(1), \fBgnunet\-search\fP(1), \fBgnunet\-download\fP(1), \fBgnunet.conf\fP(5)
+.Xr gnunet-search 1 ,
-The full documentation for
+.Xr gnunet-download 1 ,
-.B gnunet
+.Xr gnunet.conf 5
-is maintained as a Texinfo manual.  If the
+.sp
-.B info
+The full documentation for gnunet is maintained as a Texinfo manual.
-and
+If the
-.B gnunet
+.Xr info 1
-programs are properly installed at your site, the command
+and gnunet programs are properly installed at your site, the command
-.IP
+.Pp
-.B info gnunet
+.Dl info gnunet
-.PP
+.Pp
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.sp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Xr gnunet-c-tutorial 7 .
+.\".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-uri.1 b/doc/man/gnunet-uri.1
index 2fe1a05d2..bb525ef7f 100644
--- a/doc/man/gnunet-uri.1
+++ b/doc/man/gnunet-uri.1
@@ -1,49 +1,54 @@
-.TH GNUNET-URI 1 "June 26, 2012" "GNUnet"
+.Dd June 26, 2012
-.SH NAME
+.Dt GNUNET-URI 1
-gnunet\-uri \- invoke default handler for GNUnet URIs
+.Os
-.SH SYNOPSIS
+.Sh NAME
-.B gnunet\-uri
+.Nm gnunet-uri
-.RI URI
+.Nd
-.SH DESCRIPTION
+invoke default handler for GNUnet URIs
-\fBgnunet\-uri\fP can be used to invoke the correct tool to handle a
+.Sh SYNOPSIS
-GNUnet URI.  GNUnet URIs have the format "gnunet://SUBSYSTEM/DETAILS"
+.Nm
-and thus the specific tool to handle the URI depends on the subsystem.
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
-gnunet\-uri will determine the correct tool (by looking for SUBSYSTEM
+.Op Fl h | \-help
-in the configuration section "uri") and invoke it.
+.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-.SH OPTIONS
+.Op Fl v | \-version
-.B
+URI
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+.Sh DESCRIPTION
+.Nm
+can be used to invoke the correct tool to handle a GNUnet URI.
+GNUnet URIs have the format "gnunet://SUBSYSTEM/DETAILS" and thus the specific tool to handle the URI depends on the subsystem.
+gnunet-uri will determine the correct tool (by looking for SUBSYSTEM in the configuration section "uri") and invoke it.
+.Bl -tag -width Ds
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.B
+.It Fl h | \-help
-.IP "\-h, \-\-help"
 Print short help on options.
-.B
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-.IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
+Use LOGLEVEL for logging.
-Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
+Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
+.It Fl v | \-version
-.IP "\-v, \-\-version"
 Print GNUnet version number.
-.SH BUGS
+.El
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
+.Sh SEE ALSO
-electronic mail to <gnunet\-developers@gnu.org>
+The full documentation for gnunet is maintained as a Texinfo manual.
-.SH SEE ALSO
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.
 If the
-.B info
+.Xr info 1
-and
+and gnunet programs are properly installed at your site, the command
-.B gnunet
+.Pp
-programs are properly installed at your site, the command
+.Dl info gnunet
-.IP
+.Pp
-.B info gnunet
-.PP
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.sp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Xr gnunet-c-tutorial 7 .
+.\".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-vpn.1 b/doc/man/gnunet-vpn.1
index ddb53a7bd..e0fd2b78c 100644
--- a/doc/man/gnunet-vpn.1
+++ b/doc/man/gnunet-vpn.1
@@ -1,101 +1,98 @@
-.TH GNUNET\-VPN 1 "February 25, 2012" "GNUnet"
+.Dd February 25, 2012
-.SH NAME
+.Dt GNUNET-VPN 1
-gnunet\-vpn \- manually setup a GNUnet VPN tunnel
+.Sh NAME
-.SH SYNOPSIS
+.Nm gnunet-vpn
-.B gnunet\-vpn
+.Nd
-.RI [ options ]
+manually setup a GNUnet VPN tunnel
-.br
+.Sh SYNOPSIS
-.SH DESCRIPTION
+.Nm
-\fBgnunet\-vpn\fP can be used to manually setup a VPN tunnel via the
+.Op Fl 4 | \-ipv4
-GNUnet network.
+.Op Fl 6 | \-ipv6
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
+.Op Fl d Ar TIME | Fl \-duration Ar TIME
+.Op Fl h | \-help
+.Op Fl i Ar IP | Fl \-ip Ar IP
+.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+.Op Fl p Ar PEERID | Fl \-peer= Ns Ar PEERID
+.Op Fl s Ar NAME | Fl \-service= Ns Ar NAME
+.Op Fl t | \-tcp
+.Op Fl u | \-udp
+.Op Fl V | \-verbose
+.Op Fl v | \-version
+.Sh DESCRIPTION
+.Nm
+can be used to manually setup a VPN tunnel via the GNUnet network.
 There are two main types of tunnels.
-Tunnels to an exit node which routes the traffic to the global
+Tunnels to an exit node which routes the traffic to the global Internet, and tunnels to a node that runs a service only within GNUnet.
-Internet, and tunnels to a node that runs a service only within
-GNUnet.
 Depending on the type of tunnel, gnunet\-vpn takes different options.
-The "\-i" option is required for tunnels to an exit node, whereas the
+The "\-i" option is required for tunnels to an exit node, whereas the "\-p" and "\-s" options in conjunction with either "\-u" or "\-t" are required for tunnels to services.
-"\-p" and "\-s" options in conjunction with either "\-u" or "\-t" are
-required for tunnels to services.
 For exit tunnels, both UDP and TCP traffic will be redirected.
-For service tunnels, either UDP ("\-u") or TCP ("\-t") traffic will
+For service tunnels, either UDP ("\-u") or TCP ("\-t") traffic will be redirected.
-be redirected.
 The tool will display the IP address for this end of the tunnel.
-The address can be displayed as soon as it has been allocated, or only
+The address can be displayed as soon as it has been allocated, or only after ("\-a") the tunnel has been created.
-after ("\-a") the tunnel has been created.
+.Bl -tag -width Ds
-.SH OPTIONS
+.It Fl 4 | \-ipv4
-.B
-.IP "\-4, \-\-ipv4"
 Desired IP address on this end of the tunnel should be an IPv4 address.
-.B
+.It Fl 6 | \-ipv6
-.IP "\-6, \-\-ipv6"
 Desired IP address on this end of the tunnel should be an IPv6 address.
-.B
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
-.IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
+.It Fl d Ar TIME | Fl \-duration Ar TIME
-.IP "\-d TIME, \-\-duration TIME"
 The mapping should be established for TIME.
-The value given must be a number followed by a space and a time unit,
+The value given must be a number followed by a space and a time unit, for example "500 ms".
-for example "500 ms".
 Note that the quotes are required on the shell.
 Default is 5 minutes.
-.B
+.It Fl h | \-help
-.IP "\-h, \-\-help"
 Print short help on options.
-.B
+.It Fl i Ar IP | Fl \-ip Ar IP
-.IP "\-i IP, \-\-ip IP"
 Tunnel should be to an exit node and connect to the given IPv4 or IPv6
 IP address.
 Note that you can specify an IPv6 address as the target here, even in
 combination with "\-4" (4to6) and similarly you can specify an IPv4
 address in combination with "\-6" (6to4).
-.B
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-.IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.
 Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
+.It Fl p Ar PEERID | Fl \-peer= Ns Ar PEERID
-.IP "\-p PEERID,  \-\-peer=PEERID"
 Name of the peer offering the service to connect to.
 Cannot be used in conjunction with "\-i", requires "\-s".
-.B
+.It Fl s Ar NAME | Fl \-service= Ns Ar NAME
-.IP "\-s NAME,  \-\-service=NAME"
 Name of the service running on the target peer.
 Cannot be used in conjunction with "\-i", requires "\-p".
-.B
+.It Fl t | \-tcp
-.IP "\-t, \-\-tcp"
 Service runs TCP.
 Either "\-t" or "\-u" must be specified when using "\-s".
-.B
+.It Fl u | \-udp
-.IP "\-u, \-\-udp"
 Service runs UDP.
 Either "\-t" or "\-u" must be specified when using "\-s".
-.B
+.It Fl V | \-verbose
-.IP "\-V, \-\-verbose"
 Be verbose.
-.B
+.It Fl v | \-version
-.IP "\-v, \-\-version"
 Print GNUnet version number.
-.SH BUGS
+.El
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
+.Sh SEE ALSO
-electronic mail to <gnunet\-developers@gnu.org>
+.Xr gnunet-setup 1
-.SH SEE ALSO
+.sp
-gnunet\-setup(1)
+The full documentation for gnunet is maintained as a Texinfo manual.
-The full documentation for
+If the
-.B gnunet
+.Xr info 1
-is maintained as a Texinfo manual.  If the
+and gnunet programs are properly installed at your site, the command
-.B info
+.Pp
-and
+.Dl info gnunet
-.B gnunet
+.Pp
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.sp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Xr gnunet-c-tutorial 7 .
+.\".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-zoneimport.1 b/doc/man/gnunet-zoneimport.1
index 2a67718f9..e99b235b8 100644
--- a/doc/man/gnunet-zoneimport.1
+++ b/doc/man/gnunet-zoneimport.1
@@ -1,90 +1,106 @@
-.TH GNUNET-ZONEIMPORT 1 "April 23, 2018" "GNUnet"
+.\" This file is part of GNUnet.
-.SH NAME
+.\" Copyright (C) 2018, 2019 GNUnet e.V.
-gnunet\-zoneimport \- import DNS zone into GNS zone
+.\"
-.SH SYNOPSIS
+.\" Permission is granted to copy, distribute and/or modify this document
-.B gnunet\-zoneimport [IP]+
+.\" under the terms of the GNU Free Documentation License, Version 1.3 or
-.SH DESCRIPTION
+.\" any later version published by the Free Software Foundation; with no
-\fBgnunet\-zoneimport\fP reads a list of domain names (FQDN) from
+.\" Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A
-stdin and issues DNS queries for each of the domain names given.  It
+.\" copy of the license is included in the file
-then checks if a local ego with a name matching the domain
+.\" ``FDL-1.3''.
-exists. Specifically, if the domain name is "example.fr", it will
+.\"
-check if an ego "fr" exists, while for a domain "example.com.fr" it
+.\" A copy of the license is also available from the Free Software
-will look for an ego called "com.fr"). If so, it will convert the DNS
+.\" Foundation Web site at @url{http://www.gnu.org/licenses/fdl.html}.
-records into GNS records (in particular converting NS records and glue
+.\"
-records to GNS2DNS records) and add them to the namestore under the
+.\" Alternately, this document is also available under the General
-label ("example" in the examples above).
+.\" Public License, version 3 or later, as published by the Free Software
-.PP
+.\" Foundation.  A copy of the license is included in the file
-The arguments given to gnunet\-zoneimport is a list of IP addresses of
+.\" ``GPL3''.
-DNS servers to query.
+.\"
-.PP
+.\" A copy of the license is also available from the Free Software
-gnunet\-zoneimport will usually never terminate: it will check when
+.\" Foundation Web site at @url{http://www.gnu.org/licenses/gpl.html}.
-DNS records expire, and re-issue requests when the old DNS records
+.\"
-have expired so that GNS always has the latest data.
+.\" SPDX-License-Identifier: GPL3.0-or-later OR FDL1.3-or-later
-.PP
+.\"
-gnunet\-zoneimport will issue many DNS queries in parallel, but is
+.Dd April 23, 2018
-rate-limited in various ways, so most DNS servers should easily handle
+.Dt GNUNET-ZONEIMPORT 1
-the load.  gnunet\-zoneimport will perform a limited number of retries
+.Os
-if queries fail.
+.Sh NAME
-.PP
+.Nm gnunet-zoneimport
-gnunet\-zoneimport operates incrementally. It will check if the
+.Nd
-namestore already has (non-expired) records stored for a given name in
+import DNS zone into GNS zone
-the respective zone and not issue those requests again.  Thus, it is
+.Sh SYNOPSIS
-fine to restart gnunet\-zoneimport whenever the list of domain names
+.Nm
-changes.
+.Op Fl c Ar FILENAME | \-config= Ns Ar FILENAME
-.PP
+.Op Fl h | \-help
-Finally, gnunet\-zoneimport keeps information for each domain name in
+.Op Fl m Ar RELATIVETIME | Fl \-minimum-expiration= Ns Ar RELATIVETIME
-memory.  This consumes about 200 bytes per domain name, or 1 GB for 5
+.Op Fl s Ar MAPSIZE | Fl \-size= Ns Ar MAPSIZE
-million labels.
+.Op Ar \IP
-.SH OPTIONS
+.Sh DESCRIPTION
-.B
+.Nm
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+reads a list of domain names (FQDN) from stdin and issues DNS queries for each of the domain names given.
+It then checks if a local ego with a name matching the domain exists.
+Specifically, if the domain name is "example.fr", it will check if an ego "fr" exists, while for a domain "example.com.fr" it will look for an ego called "com.fr").
+If so, it will convert the DNS records into GNS records (in particular converting NS records and glue records to GNS2DNS records) and add them to the namestore under the label ("example" in the examples above).
+.Pp
+The arguments given to gnunet-zoneimport is a list of IP addresses of DNS servers to query.
+.Pp
+gnunet-zoneimport will usually never terminate: it will check when DNS records expire, and re-issue requests when the old DNS records have expired so that GNS always has the latest data.
+.Pp
+gnunet-zoneimport will issue many DNS queries in parallel, but is rate-limited in various ways, so most DNS servers should easily handle the load.
+gnunet-zoneimport will perform a limited number of retries if queries fail.
+.Pp
+gnunet-zoneimport operates incrementally.
+It will check if the namestore already has (non-expired) records stored for a given name in the respective zone and not issue those requests again.
+Thus, it is fine to restart gnunet-zoneimport whenever the list of domain names changes.
+.Pp
+Finally, gnunet-zoneimport keeps information for each domain name in memory.
+This consumes about 200 bytes per domain name, or 1 GB for 5 million labels.
+.Bl -tag -width Ds
+.It Fl c Ar FILENAME | \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.B
+.It Fl h | \-help
-.IP "\-h, \-\-help"
 Print short help on options.
-.B
+.It Fl m Ar RELATIVETIME | Fl \-minimum-expiration= Ns Ar RELATIVETIME
-.IP "\-m RELATIVETIME, \-\-minimum-expiration=RELATIVETIME"
+Ensure that imported DNS records never have an expiration time that is less than RELATIVETIME into the future.
-.B
+RELATIVETIME is a time given like "1 week" or "1 h".
-Ensure that imported DNS records never have an expiration time that
+If DNS returns records with a shorter lifetime, gnunet\-zoneimport will simply bump the lifetime to the specified value (relative to the time of the import).
-is less than RELATIVETIME into the future.  RELATIVETIME is a time
+Default is zero.
-given like "1 week" or "1 h".   If DNS returns records with a shorter
+.It Fl s Ar MAPSIZE | Fl \-size= Ns Ar MAPSIZE
-lifetime, gnunet\-zoneimport will simply bump the lifetime to the
+Specifies the size (in number of entries) to use for the main hash map.
-specified value (relative to the time of the import). Default is zero.
+The value provided should be at least twice the number of domain names that will be given to the tool.
-.IP "\-s MAPSIZE, \-\-size=MAPSIZE"
+This option is required for very large zones where the number of records encountered is too large for the automatic growth mechanism to work (that one is limited to at most 16 MB allocations for security reasons).
-Specifies the size (in number of entries) to use for the main hash
+Do not worry about this unless you are importing millions of domain names from a zone.
-map.  The value provided should be at least twice the number of domain
+.It Ar \IP
-names that will be given to the tool. This option is required for very
+IP Is the list of IPs given.
-large zones where the number of records encountered is too large for
+.El
-the automatic growth mechanism to work (that one is limited to at most
+.Sh EXAMPLES
-16 MB allocations for security reasons).  Do not worry about this
-unless you are importing millions of domain names from a zone.
-.SH NOTES
-.TP
 Typical invocaton would be:
-$ gnunet\-zoneimport 1.2.3.4 < names.txt
+.Pp
-.SH BUGS
+.Dl $ gnunet\-zoneimport 1.2.3.4 < names.txt
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
+.Sh SEE ALSO
-electronic mail to <gnunet\-developers@gnu.org>
+.Xr gnunet-gns 1 ,
-.SH SEE ALSO
+.Xr gnunet-namestore 1
-gnunet\-gns(1), gnunet\-namestore(1)
+.sp
-.PP
+The full documentation for gnunet is maintained as a Texinfo manual.
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.
 If the
-.B info
+.Xr info 1
-and
+and gnunet programs are properly installed at your site, the command
-.B gnunet
+.Pp
-programs are properly installed at your site, the command
+.Dl info gnunet
-.IP
+.Pp
-.B info gnunet
-.PP
 should give you access to the complete handbook,
-.IP
+.Pp
-.B info gnunet-c-tutorial
+.Dl info gnunet-c-tutorial
-.PP
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.sp
-Depending on your installation, this information is also
+Depending on your installation, this information is also available in
-available in
+.Xr gnunet 7 and
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Xr gnunet-c-tutorial 7 .
+.\".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.conf.5.in b/doc/man/gnunet.conf.5.in
index 560704784..82340996a 100644
--- a/doc/man/gnunet.conf.5.in
+++ b/doc/man/gnunet.conf.5.in
@@ -1,4 +1,27 @@
 .\" -*- mode: nroff -*-
+.\" This file is part of Ascension.
+.\" Copyright (C) 2012-2015,2018,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 @url{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 @url{http://www.gnu.org/licenses/gpl.html}.
+.\"
+.\" SPDX-License-Identifier: GPL3.0-or-later OR FDL1.3-or-later
+.\"
 .TH GNUNET.CONF "5" "October 26, 2018" "GNUnet"
 .SH NAME
 gnunet.conf \- GNUnet configuration file
@@ -27,7 +50,7 @@ Default values for all of the options can be found in the files in the
 "$GNUNET_PREFIX/share/gnunet/config.d/" directory. A typical setup will
 work out of the box with those. See the examples section below for
 some common setups on top of that.
-.SH General OPTIONS
+.SS GENERAL OPTIONS
 Many options will be common between sections. They can be repeated under
 each section with different values.  The "[PATHS]" section is special.
 Here, it is possible to specify values for variables like "GNUNET_HOME".
@@ -85,7 +108,7 @@ The following options are generic and shared by all services:
    Set to YES if this service should be run per-user, NO if this is a system
    service.  End-users should never have to change the defaults GNUnet provides
    for this option.
-.SH ATS Options
+.SS ATS OPTIONS
 .IP UNSPECIFIED_QUOTA_IN
    quotes in KiB or MiB per seconds.  Or use the word "unlimited"
 .IP UNSPECIFIED_QUOTA_OUT
@@ -109,12 +132,11 @@ The following options are generic and shared by all services:
 .SH EXAMPLES
 This example is a simple way to get started, using a server that has a known
 list of peers to get you started. Most users will be behind a firewall on
-IPv4, as such NAT is enabled.  Please rememeber to change your IP address
+IPv4, as such NAT is enabled.  Please remember to change your IP address
 to the actual external address for your usage.
 .PP
    [hostlist]
-    OPTIONS = \-b
+    OPTIONS = \-b \-e
-    SERVERS = http://v9.gnunet.org:58080/
    [nat]
    BEHIND_NAT = YES
@@ -129,9 +151,6 @@ to the actual external address for your usage.
 .TP
 ~/.config/gnunet.conf
 GNUnet configuration file
-.SH BUGS
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
-electronic mail to <bug-gnunet@gnu.org>
 .SH SEE ALSO
 \fBgnunet\-setup\fP(1), \fBgnunet\-arm\fP(1)
 .PP
@@ -155,3 +174,9 @@ will give you access to a tutorial for developers.
 Depending on your installation, this information is also
 available in
 \fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.SH HISTORY
+.PP
+This man page first appeared in October 2012 in GNUnet.
+.SH BUGS
+Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
+electronic mail to <bug-gnunet@gnu.org>
diff --git a/doc/man/produce_html.sh b/doc/man/produce_html.sh
new file mode 100755
index 000000000..ce6dea304
--- /dev/null
+++ b/doc/man/produce_html.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+existence()
+{
+    command -v "$1" >/dev/null 2>&1
+}
+if existence mandoc;
+then
+    for f in `find . -name \*\.[1-9]`;
+    do
+        mandoc -T html $f > $f.html;
+    done
+fi
diff --git a/doc/man/texi2mdoc-generation.sh b/doc/man/texi2mdoc-generation.sh
new file mode 100755
index 000000000..b88987cda
--- /dev/null
+++ b/doc/man/texi2mdoc-generation.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+# This script is in the public-domain.
+# GNUnet e.V. 2019
+#
+# Commentary: generate texi2mdoc output. This would be easier with
+# bmake / BSDmake, oh well.
+#
+# Excercise for future readers: don't fix this.
+# echo $(pwd)
+cd ../tutorial
+texi2mdoc -I$(pwd):$(pwd)/chapters gnunet-tutorial.texi > ../man/gnunet-c-tutorial.7
+# echo $(pwd)
+cd ../handbook
+texi2mdoc -I$(pwd):$(pwd)/chapters gnunet.texi > ../man/gnunet-documentation.7
diff --git a/doc/tutorial/Makefile.am b/doc/tutorial/Makefile.am
index d0fd14a4a..f3908aa99 100644
--- a/doc/tutorial/Makefile.am
+++ b/doc/tutorial/Makefile.am
@@ -8,7 +8,7 @@ docdir = $(datadir)/doc/gnunet/
 #       $(DOT_FILES:%.dot=%.pdf)
 # See ../handbook/Makefile.am comment!
-AM_MAKEINFOHTMLFLAGS = --no-split --css-include=docstyle.css
+AM_MAKEINFOHTMLFLAGS = --no-split --css-include=style.css --css-include=manual.css
 #DOT_OPTIONS =                                                  \
 #       -Gratio=.9 -Gnodesep=.005 -Granksep=.00005              \
@@ -93,12 +93,7 @@ version.texi/replacement/revert:
        @echo "@set VERSION GPACKAGE_VERSION" > gversion.texi
        @echo "@set EDITION GPACKAGE_VERSION" >> gversion.texi
-if TEXI2MDOC_GENERATION
-gnunet-tutorial.7: version.texi/replacement
-        @echo Attempting to output an mdoc formatted section 7 document
-        @texi2mdoc -I$(pwd):$(pwd)/chapters gnunet-c-tutorial.texi > ../man/gnunet-c-tutorial.7
-# TODO: (Maybe) other outputs resulting from this.
-endif
 # FIXME: rm *.html and *.pdf
 #doc-clean:
diff --git a/doc/tutorial/gnunet-tutorial.texi b/doc/tutorial/gnunet-tutorial.texi
index ef3318cad..df75fb995 100644
--- a/doc/tutorial/gnunet-tutorial.texi
+++ b/doc/tutorial/gnunet-tutorial.texi
@@ -1,10 +1,10 @@
 \input texinfo
-@c %**start of header
 @setfilename gnunet-tutorial.info
 @documentencoding UTF-8
 @settitle GNUnet Tutorial
 @c @exampleindent 2
-@c %**end of header
 @include version.texi
diff --git a/doc/tutorial/manual.css b/doc/tutorial/manual.css
index 404525dc2..0fe08b83c 100644
--- a/doc/tutorial/manual.css
+++ b/doc/tutorial/manual.css
@@ -1,6 +1,6 @@
 /* Style-sheet to use for manuals (copied from Emacs) */
-@import url('/style.css');
+@import url('style.css');
 /* makeinfo 6.5 converts @quotation to <blockquote>.  Highlight them.  */
 blockquote {
diff --git a/doc/tutorial/run-gendocs.sh b/doc/tutorial/run-gendocs.sh
index 5e60a2d0f..b4899722c 100755
--- a/doc/tutorial/run-gendocs.sh
+++ b/doc/tutorial/run-gendocs.sh
@@ -7,7 +7,7 @@ make version.texi/replacement
 #mkdir gnunet-c-tutorial
 #mv * gnunet-c-tutorial/
 #cd ..
-./gendocs.sh --email gnunet-developers@gnu.org gnunet "GNUnet Reference Manual" -o "manual/gnunet"
+#./gendocs.sh --email gnunet-developers@gnu.org gnunet "GNUnet Reference Manual" -o "manual/gnunet"
 #cd manual
 #mkdir handbook
 #mkdir ../tmp-gnunet
diff --git a/doc/tutorial/style.css b/doc/tutorial/style.css
index 0c4525437..e5271197b 100644
--- a/doc/tutorial/style.css
+++ b/doc/tutorial/style.css
@@ -1,6 +1,6 @@
 /* This stylesheet is used by manuals and a few older resources. */
-@import url('/reset.css');
+@import url('reset.css');
 /***  PAGE LAYOUT  ***/