6 files changed, 345 insertions, 238 deletions

diff --git a/doc/man/gnunet-core.1 b/doc/man/gnunet-core.1
index 5fae7b858..5b61ab953 100644
--- a/doc/man/gnunet-core.1
+++ b/doc/man/gnunet-core.1
@@ -26,39 +26,41 @@
 .Os
 .Sh NAME
 .Nm gnunet-core
-.Nd
-monitor CORE subsystem
+.Nd monitor CORE subsystem
 .Sh SYNOPSIS
 .Nm
-.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
-.Op Fl h | \-help
-.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-.Op Fl m | \-monitor
-.Op Fl v | \-version
-.Op Fl V | \-verbose
+.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
+.Op Fl h | -help
+.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
+.Op Fl m | -monitor
+.Op Fl v | -version
+.Op Fl V | -verbose
 .Sh DESCRIPTION
 .Nm
-is a tool to access various functions of GNUnet's core subsystem from the command-line.
-The only function right now is to monitor the status of peers known to the CORE service.
-.Bl -tag -width Ds
-.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
+is a tool to access various functions of GNUnet's core subsystem
+from the command-line.
+The only function right now is to monitor the status of peers
+known to the CORE service.
+.Bl -tag -width indent
+.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
 Configuration file to use.
-.It Fl h | \-help
+.It Fl h | -help
 Print the help page.
-.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
 Change the loglevel.
 Possible values for LOGLEVEL are ERROR, WARNING, INFO and DEBUG.
-.It Fl m | \-monitor
-in monitor mode, gnunet-core will continuously print the connection status, instead of giving just a snapshot.
-.It Fl v | \-version
+.It Fl m | -monitor
+In monitor mode, gnunet-core will continuously print the connection status,
+instead of giving just a snapshot.
+.It Fl v | -version
 Print the version number.
-.It Fl V | \-verbose
+.It Fl V | -verbose
 Be verbose.
 .El
 .\".Sh EXAMPLES
 .Sh SEE ALSO
 .Xr gnunet-transport 1
-.sp
+.Pp
 The full documentation for gnunet is maintained as a Texinfo manual.
 If the
 .Xr info 1
diff --git a/doc/man/gnunet-dns2gns.1 b/doc/man/gnunet-dns2gns.1
index cf7fd2319..5507a148d 100644
--- a/doc/man/gnunet-dns2gns.1
+++ b/doc/man/gnunet-dns2gns.1
@@ -26,38 +26,41 @@
 .Os
 .Sh NAME
 .Nm gnunet-dns2gns
-.Nd
-run a DNS-to-GNS proxy
+.Nd run a DNS-to-GNS proxy
 .Sh SYNOPSIS
 .Nm
-.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
-.Op Fl d Ar IP | Fl \-dns= Ns Ar IP
-.Op Fl h | \-help
-.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-.Op Fl v | \-version
+.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
+.Op Fl d Ar IP | Fl -dns= Ns Ar IP
+.Op Fl h | -help
+.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
+.Op Fl v | -version
 .Sh DESCRIPTION
 .Nm
-runs a DNS resolver which delegates requests GNS if the TLD matches one configured for GNS.
+runs a DNS resolver which delegates requests GNS if the TLD
+matches one configured for GNS.
 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.
-.Bl -tag -width Ds
-.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
-Use the configuration file FILENAME.
-.It Fl d Ar IP | Fl \-dns= Ns Ar IP
-IP address of a recursive DNS resolver that should be used for non-GADS hostnames.
-.It Fl h | \-help
+This DNS proxy is useful for enabling non-personalized GNS-resolution to an
+entire network or to offer GNS-resolution to DNS users.
+.Bl -tag -width indent
+.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
+Use the configuration file
+.Ar FILENAME .
+.It Fl d Ar IP | Fl -dns= Ns Ar IP
+IP address of a recursive DNS resolver that should be used
+for non-GADS hostnames.
+.It Fl h | -help
 Print short help on options.
-.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
 Use LOGLEVEL for logging.
 Valid values are DEBUG, INFO, WARNING and ERROR.
-.It Fl v | \-version
+.It Fl v | -version
 Print GNUnet version number.
 .El
 .Sh SEE ALSO
 .Xr gnunet-gns-fcfs 1 ,
 .Xr gnunet-gns 1 ,
 .Xr gnunet-identity 1
-.sp
+.Pp
 The full documentation for gnunet is maintained as a Texinfo manual.
 If the
 .Xr info 1
diff --git a/doc/man/gnunet-qr.1 b/doc/man/gnunet-qr.1
index d445df0f2..16ce7857d 100644
--- a/doc/man/gnunet-qr.1
+++ b/doc/man/gnunet-qr.1
@@ -26,28 +26,29 @@
 .Os
 .Sh NAME
 .Nm gnunet-qr
-.Nd
-scan a QR code using a video device and import
+.Nd scan a QR code using a video device and import
 .Sh SYNOPSIS
 .Nm
-.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
-.Op Fl d Ar DEVICE | Fl \-device= Ns Ar DEVICE
-.Op Fl h | \-help
-.Op Fl s | \-silent
-.Op Fl v | \-verbose
+.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
+.Op Fl d Ar DEVICE | Fl -device= Ns Ar DEVICE
+.Op Fl h | -help
+.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.
-.It Fl d Ar DEVICE | Fl \-device= Ns Ar DEVICE
-Use device DEVICE.
-.It Fl h | \-help
+.Bl -tag -width indent
+.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
+Use the configuration file
+.Ar FILENAME .
+.It Fl d Ar DEVICE | Fl -device= Ns Ar DEVICE
+Use device
+.Ar DEVICE .
+.It Fl h | -help
 Print short help on options.
-.It Fl s | \-silent
+.It Fl s | -silent
 Do not show preview windows.
-.It Fl v | \-verbose
+.It Fl v | -verbose
 Be verbose.
 .El
 .Sh SEE ALSO
diff --git a/doc/man/gnunet-scalarproduct.1 b/doc/man/gnunet-scalarproduct.1
index a5c7413ad..88ebb93e7 100644
--- a/doc/man/gnunet-scalarproduct.1
+++ b/doc/man/gnunet-scalarproduct.1
@@ -26,86 +26,83 @@
 .Os
 .Sh NAME
 .Nm gnunet-scalarproduct
-.Nd
-compute a vectorproduct
+.Nd compute a vectorproduct
 .Sh SYNOPSIS
 .Nm
-.Op Fl e Ar ELEMENTS | Fl \-elements= Ns Ar ELEMENTS
-.Op Fl m Ar MASK | Fl \-mask= Ns Ar MASK
-.Op Fl k Ar KEY | Fl \-key= Ns Ar KEY
-.Op Fl c Ar FILENAME | \-config= Ns Ar FILENAME
-.Op Fl p Ar PEERID | Fl \-peer= Ns Ar PEERID
-.Op Fl h | \-help
-.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-.Op Fl v | \-version
+.Op Fl e Ar ELEMENTS | Fl -elements= Ns Ar ELEMENTS
+.Op Fl m Ar MASK | Fl -mask= Ns Ar MASK
+.Op Fl k Ar KEY | Fl -key= Ns Ar KEY
+.Op Fl c Ar FILENAME | -config= Ns Ar FILENAME
+.Op Fl p Ar PEERID | Fl -peer= Ns Ar PEERID
+.Op Fl h | -help
+.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
+.Op Fl v | -version
 .Sh DESCRIPTION
 .Nm
-enables you to compute a vectorproduct across two peers \fBAlice\fP and \fBBob\fP.
+enables you to compute a vectorproduct across two peers
+.Sy Alice
+and
+.Sy Bob .
 .Pp
 A client can issue one of two messages to its service:
-.TS
-tab (@);
-l lx.
-1@T{
-A request to compute a vectorproduct with another peer (\fBAlice\fP)
-T}
-2@T{
-Elements to support a peer in computing a vectorproduct (\fBBob\fP)
-T}
-.TE
+.Bl -enum -width 3n -offset indent
+.It
+A request to compute a vectorproduct with another peer (Alice)
+.It
+Elements to support a peer in computing a vectorproduct (Bob)
+.El
+.Pp
 Both requests must share the same SID, which can be an arbitrary
 string identifying the session. SIDs should be unique, however it is
 sufficient to guarantee the uniqueness of the tupel element count and
 session ID.
 .Pp
-\fBAlice\fP\'s client must supply the ASCII encoded peer ID of bob\'s
+Alice's client must supply the ASCII encoded peer ID of bob's
 service, it will internally be checked by the client for
 validity. Invalid values here result in the client or the service
 failing the session.
 .Pp
 Elements are handed over as signed decimal integers, the element count
-supplied by \fBAlice\fP and \fBBob\fP must match. \fBAlice\fP can also
+supplied by Alice and Bob must match. Alice can also
 supply a mask for these values to her service, which allows partial
 vector products to be computed across the vector. Elements can be
 masked by setting their the corresponding mask element to zero, any
-other value means the element will not be masked. \fBAlice\fP\'s
+other value means the element will not be masked. Alice's
 client will also mask all 0-values to avoid information leakage to
-\fBBob\fP.
+Bob.
 .Pp
-The protocol by definition relies on \fBAlice\fP and \fBBob\fP being
-benign, thus \fBBob\fP can arbitrarily falsify his information. Both
+The protocol by definition relies on Alice and Bob being
+benign, thus Bob can arbitrarily falsify his information. Both
 peers collaborate to achieve a correct result.
 .Pp
-The options of
-.Nm
-are:
-.Bl -tag -width Ds
-.It Fl e Ar ELEMENTS | Fl \-elements= Ns Ar ELEMENTS
-The element-vector the vectorproduct should be computed over in signed decimal form, eg: "42,1,-3,3,7".
+The options are as follows:
+.Bl -tag -width indent
+.It Fl e Ar ELEMENTS | Fl -elements= Ns Ar 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.
-.It Fl m Ar MASK | Fl \-mask= Ns Ar MASK
+.It Fl m Ar MASK | Fl -mask= Ns Ar MASK
 Elements in the vector can be masked.
-There must be at least two elements left in the vector to compute a vectorproduct.
+There must be at least two elements left in the vector to
+compute a vectorproduct.
 Non-Zero values indicate an element is not maskes.
-.It Fl k Ar KEY | Fl \-key= Ns Ar KEY
-The session key, a shared string of arbitrary length from which the SID will be generated.
-.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
+.It Fl k Ar KEY | Fl -key= Ns Ar KEY
+The session key, a shared string of arbitrary length from which
+the SID will be generated.
+.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.It Fl p Ar PEERID | Fl \-peer= Ns Ar PEERID
+.It Fl p Ar PEERID | Fl -peer= Ns Ar PEERID
 The remote peer's ASCII-armored gnunet-peer ID as output by
 .Xr gnunet-peerinfo 1 .
-If this option is not given, the peer will take the \fBBob\fP\'s role.
-.It Fl h | \-help
+If this option is not given, the peer will take the Bob's role.
+.It Fl h | -help
 Print short help on options.
-.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
 Use LOGLEVEL for logging.
 Valid values are DEBUG, INFO, WARNING and ERROR.
-.It Fl v | \-version
+.It Fl v | -version
 Print GNUnet version number.
 .El
-.Sh BUGS
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
-electronic mail to <gnunet\-developers@gnu.org>
 .Sh SEE ALSO
 .Xr gnunet-peerinfo 1
 .sp
diff --git a/doc/man/gnunet-transport.1 b/doc/man/gnunet-transport.1
index 64cfce385..3c463d76e 100644
--- a/doc/man/gnunet-transport.1
+++ b/doc/man/gnunet-transport.1
@@ -26,66 +26,70 @@
 .Os
 .Sh NAME
 .Nm gnunet-transport
-.Nd
-measure and control the transport subsystem
+.Nd measure and control the transport subsystem
 .Sh SYNOPSIS
 .Nm
-.Op Fl b | \-benchmark
-.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
-.Op Fl D | \-disconnect
-.Op Fl e | \-events
-.Op Fl h | \-help
-.Op Fl i | \-information
-.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
-.Op Fl l Ar LOGFILE | Fl \-logfile= Ns Ar LOGFILE
-.Op Fl m | \-monitor
-.Op Fl p Ar PEER | Fl \-peer= Ns Ar PEER
-.Op Fl P | \-plugins
-.Op Fl s | \-send
-.Op Fl v | \-version
-.Op Fl V | \-verbose
+.Op Fl b | -benchmark
+.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
+.Op Fl D | -disconnect
+.Op Fl e | -events
+.Op Fl h | -help
+.Op Fl i | -information
+.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
+.Op Fl l Ar LOGFILE | Fl -logfile= Ns Ar LOGFILE
+.Op Fl m | -monitor
+.Op Fl p Ar PEER | Fl -peer= Ns Ar PEER
+.Op Fl P | -plugins
+.Op Fl s | -send
+.Op Fl v | -version
+.Op Fl V | -verbose
 .Sh DESCRIPTION
 .Nm
-is a tool to access various functions of GNUnet's transport subsystem from the command-line.
+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).
+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).
+.Bl -tag -width indent
+.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
+.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
 configuration file to use
-.It Fl D | \-disconnect
-force disconnection from a peer (used in conjunction with \-p).
+.It Fl D | -disconnect
+Force disconnection from a peer (used in conjunction with
+.Fl p Ns ).
 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)
-.It Fl h | \-help
+.It Fl e | -events
+Provide information about all connect and disconnect events (continuously).
+.It Fl h | -help
 Print the help page.
-.It Fl i | \-information
-print information about our current connections (once)
-.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+.It Fl i | -information
+Print information about our current connections (once).
+.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
 Change the loglevel.
 Possible values for LOGLEVEL are ERROR, WARNING, INFO and DEBUG.
-.It Fl l Ar LOGFILE | Fl \-logfile= Ns Ar LOGFILE
+.It Fl l Ar LOGFILE | Fl -logfile= Ns Ar LOGFILE
 Configure logging to write logs to LOGFILE.
-.It Fl m | \-monitor
-print information about our current connections (continuously)
-.It Fl p Ar PEER | Fl \-peer= Ns Ar PEER
-the peer identity to connect to or monitor
-.It Fl P | \-plugins
-monitor session state of transport plugins
-.It Fl s | \-send
+.It Fl m | -monitor
+Print information about our current connections (continuously).
+.It Fl p Ar PEER | Fl -peer= Ns Ar PEER
+The peer identity to connect to or monitor.
+.It Fl P | -plugins
+Monitor session state of transport plugins.
+.It Fl s | -send
 Transmit (dummy) traffic as quickly as possible to the peer specified with the
 .Fl 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.
-.It Fl v | \-version
-print the version number
-.It Fl V | \-verbose
+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.
+.It Fl v | -version
+Print out the version number.
+.It Fl V | -verbose
 be verbose
 .El
 .Sh SEE ALSO
diff --git a/doc/man/gnunet.conf.5.in b/doc/man/gnunet.conf.5.in
index 69f9c59da..4ec58fe52 100644
--- a/doc/man/gnunet.conf.5.in
+++ b/doc/man/gnunet.conf.5.in
@@ -7,18 +7,18 @@
 .\" 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''.
+.\" 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}.
+.\" Foundation Web site at http://www.gnu.org/licenses/fdl.html.
 .\"
 .\" Alternately, this document is also available under the General
 .\" Public License, version 3 or later, as published by the Free Software
 .\" Foundation.  A copy of the license is included in the file
-.\" ``GPL3''.
+.\" 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}.
+.\" Foundation Web site at http://www.gnu.org/licenses/gpl.html.
 .\"
 .\" SPDX-License-Identifier: GPL3.0-or-later OR FDL1.3-or-later
 .\"
@@ -27,17 +27,19 @@
 .Os
 .Sh NAME
 .Nm gnunet.conf
-.Nd
-GNUnet configuration file
+.Nd GNUnet configuration file
 .Sh DESCRIPTION
-A GNUnet setup typically consists of a set of service processes run by a user "gnunet" and a set of user-interface processes run by a standard account.
+A GNUnet setup typically consists of a set of service processes run by a
+user "gnunet" and a set of user-interface processes run by a standard account.
 The default location for the configuration file for the services is
 .Pa ~gnunet/.config/gnunet.conf Ns .
-However, as normal users also may need read-access to this configuration, you might want to instead put the service process configuration in
+However, as normal users also may need read-access to this configuration,
+you might want to instead put the service process configuration in
 .Pa @SYSCONFDIR@/gnunet.conf Ns .
 .Xr gnunet-setup 1 ,
 part of gnunet-gtk, can be used to edit this configuration.
-The parts of GNUnet that are run as a normal user may have config options too and they read from
+The parts of GNUnet that are run as a normal user may have config
+options too and they read from
 .Pa $HOME/.config/gnunet.conf Ns .
 The latter config file can skip any options for the services.
 .Pp
@@ -46,36 +48,48 @@ The basic structure of the configuration file is the following.
 .It
 The file is split into sections.
 .It
-Every section begins with "[SECTIONNAME]".
+Every section begins with a token in square brakets.
+The current section ends when a new section starts or end of file is
+encountered.
+.It
 A section contains a number of options of the form "OPTION=VALUE".
 .It
+Whitespace surounding the "=" token is striped out, in other words
+"OPTION = VALUE" and "OPTION=VALUE" are treated equal.
+.It
 Empty lines and lines beginning with a "#" are treated as comments.
 .It
-Almost all options are optional.
-The tools resort to reasonable defaults if an option is not present.
+Boolean values are given as "YES" and "NO".
 .El
 .Pp
+Almost all options are optional.
+The tools resort to reasonable defaults if an option is not present.
 Default values for all of the options can be found in the files in the
 .Pa $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.
 .Ss Variable naming conventions and data types
-Boolean values for options are set via "YES" or "NO" values, without the double-quotes.
-.sp
-Options which include "PATH" or "path" define a path on the file-system and can take additional variables in the path, such as
+Boolean values for options are set via "YES" or "NO" values, without the
+double-quotes.
+.Pp
+Options which include "PATH" or "path" define a path on the file-system
+and can take additional variables in the path, such as
 .Ev $GNUNET_TMP .
-.sp
-Section names as listed more in detail below, are small letters only enclosed by square brakets.
+.Pp
+Section names as listed more in detail below, are small letters only
+enclosed by square brakets.
 .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".
-Then, in all filenames that begin with "$GNUNET_HOME" the "$GNUNET_HOME" will be replaced with the respective value at runtime.
+Then, in all filenames that begin with "$GNUNET_HOME" the "$GNUNET_HOME" will
+be replaced with the respective value at runtime.
 The main use of this is to redefine "$GNUNET_HOME", which by default points to
 .Pa $HOME/.config/ Ns .
-By setting this variable, you can change the location where GNUnet stores its internal data.
+By setting this variable, you can change the location where GNUnet stores
+its internal data.
 .Pa gnunet.conf
 accepts the variable
 .Ev GNUNET_TMP
@@ -105,32 +119,43 @@ The filename that implements the service.
 For example "gnunet-service-ats".
 .It IMMEDIATE_START
 Start the service always when the peer starts.
-Set to YES for services that should always be launched, even if no other service explicitly needs them.
+Set to YES for services that should always be launched, even if no other
+service explicitly needs them.
 .It START_ON_DEMAND
-Set to YES to automatically start the service when it is requested by another service.
+Set to YES to automatically start the service when it is requested by another
+service.
 YES for most GNUnet services.
 .It NOARMBIND
 Set to YES to never have ARM bind to the respective socket.
-This option is mostly for debugging in situations where ARM cannot pass the pre-bound socket to the child due to interference from PREFIX-commands.
+This option is mostly for debugging in situations where ARM cannot pass the
+pre-bound socket to the child due to interference from PREFIX-commands.
 This option is only effective in combination with IMMEDIATE_START being YES.
 NO by default.
 .It PREFIX
-PREFIX the given command (with its arguments) to the actual BINARY to be executed.
-Useful to run certain services under special supervisors (like strace or valgrind).
+PREFIX the given command (with its arguments) to the actual BINARY
+to be executed.
+Useful to run certain services under special supervisors like strace,
+dtrace, or valgrind.
 Typically used in combination with IMMEDIATE_START and NOARMBIND.
 Empty by default.
 .It ACCEPT_FROM
-A semi-column separated list of IPv4 addresses that are allowed to use the service; usually 127.0.0.1.
+A semi-column separated list of IPv4 addresses that are allowed to use
+the service; usually 127.0.0.1.
 .It ACCEPT_FROM6
-A semi-column separated list of IPv6 addresses that are allowed to use the service; usually ::1.
+A semi-column separated list of IPv6 addresses that are allowed to use
+the service; usually ::1.
 .It UNIXPATH
-Path to use for the UNIX domain socket for inter process communication with the service on POSIX systems.
+Path to use for the UNIX domain socket for inter process communication with
+the service on POSIX systems.
 .It UNIX_MATCH_UID
-If UNIX domain sockets are used, set this to YES if only users with the same UID are allowed to access the service.
+If UNIX domain sockets are used, set this to YES if only users with the
+same UID are allowed to access the service.
 .It UNIX_MATCH_GID
-If UNIX domain sockets are used, set this to YES if only users with the same GID are allowed to access the service.
+If UNIX domain sockets are used, set this to YES if only users with the
+same GID are allowed to access the service.
 .It RUN_PER_USER
-End-users should never have to change the defaults GNUnet provides for this option.
+End-users should never have to change the defaults GNUnet provides for
+this option.
 .Bl -tag -width Ds
 .It YES
 Set to YES if this service should be run per-user.
@@ -138,9 +163,10 @@ Set to YES if this service should be run per-user.
 Set to NO if this is a system service.
 .El
 .El
-In the following sections the absence of a default value is either expressed as "Default value:" followed by nothing, or the lack of this line.
+In the following sections the absence of a default value is either
+expressed as "Default value:" followed by nothing, or the lack of this line.
 .Ss ARM
-.Bl -tag -width Ds
+.Bl -tag -width indent 
 .It PORT
 Default value: 2087
 .It HOSTNAME
@@ -153,7 +179,7 @@ Default value: 127.0.0.1;
 Default value: ::1;
 .It UNIXPATH
 Special case, uses user runtime dir even for per-system service.
-.sp
+.Pp
 Default value: $GNUNET_USER_RUNTIME_DIR/gnunet-service-arm.sock
 .It UNIX_MATCH_UID
 Default value: YES
@@ -164,29 +190,47 @@ In the
 .Fl l
 option, format characters from
 .Xr strftime 3
-are allowed; In the GLOBAL_POSTFIX, "{}" stands for the name of the respective service.
-Thus the following example for this option would introduce per-service logging with a new log file each day.
+are allowed; In the GLOBAL_POSTFIX, "{}" stands for the name of the
+respective service.
+Thus the following example for this option would introduce per-service logging
+with a new log file each day.
 Note that only the last 3 log files are preserved.
-Example: -l $GNUNET_CACHE_HOME/{}-%Y-%m-%d.log
-.sp
+Example:
+.Pp
+.Bd literal
+-l $GNUNET_CACHE_HOME/{}-%Y-%m-%d.log
+.Ed
+.Pp
 Default value:
 .It GLOBAL_PREFIX
 Default value:
 .It START_SYSTEM_SERVICES
-If set to YES, ARM will only start services that are marked as system-level services (and we'll expect a second ARM to be run per-user to run user-level services).
-Note that in this case you must have manually created a different configuration file with the user where at least this and the START_USER_SERVICES options differ.
+If set to YES, ARM will only start services that are marked as system-level
+services (and we'll expect a second ARM to be run per-user to run
+user-level services).
+Note that in this case you must have manually created a different configuration
+file with the user where at least this and the START_USER_SERVICES
+options differ.
 .It START_USER_SERVICES
-If set to YES, ARM will only start services that are marked as per-user services (and we'll expect a system user to run ARM to provide system-level services).
-Per-user services enable better personalization and  priviledge separation and in particular ensures that personal data is stored under $HOME, which might be important in a multi-user system (or if $HOME is encrypted and /var/ is not).
-.sp
-Note that if you have different ARM services for SYSTEM and USER, and you are not on UNIX, you need to change the PORT option for the USER ARM instances to some free port (counting down from 2085 should provide free ports).
+If set to YES, ARM will only start services that are marked as per-user
+services (and we'll expect a system user to run ARM to provide system-level
+services).
+Per-user services enable better personalization and priviledge separation and
+in particular ensures that personal data is stored under $HOME, which might be
+important in a multi-user system (or if $HOME is encrypted and
+.Pa /var/
+is not).
+.Pp
+Note that if you have different ARM services for SYSTEM and USER, and you are
+not on UNIX, you need to change the PORT option for the USER ARM instances to
+some free port (counting down from 2085 should provide free ports).
 .It RESOURCE_DIAGNOSTICS
 File where we should log per-service resource consumption on exit.
-.sp
+.Pp
 Default value: resource.log
 .It USERNAME
 Name of the user that will be used to provide the service.
-.sp
+.Pp
 Default value:
 .It MAXBUF
 Default value:
@@ -224,7 +268,7 @@ Default value: YES
 .It MODE
 Designated assignment mode.
 Possible values: PROPORTIONAL, MLP, RIL.
-.sp
+.Pp
 Default value: proportional
 .It UNSPECIFIED_QUOTA_IN
 quotes in KiB or MiB per seconds.
@@ -282,7 +326,7 @@ The bigger, the more respect is payed to preferences.
 .It PROP_STABILITY_FACTOR
 Should we stick to existing connections are prefer to switch?
 [1.0...2.0], lower value prefers to switch, bigger value is more tolerant.
-.sp
+.Pp
 Default value: 1.25
 .It MLP_MAX_DURATION
 Maximum duration for a solution process (both LP and MILP).
@@ -290,17 +334,17 @@ Default value: 3 s
 .It MLP_MAX_ITERATIONS
 Maximum numbero of iterations for a solution process (only LP).
 Tolerated MIP Gap [0.0 .. 1.0].
-.sp
+.Pp
 Default value: 0.025
 .It MLP_MAX_MIP_GAP
 Tolerated LP/MIP Gap [0.0 .. 1.0].
-.sp
+.Pp
 Default value: 0.025
 .It MLP_MAX_LP_MIP_GAP
 Default value: 0.025
 .It MLP_MAX_ITERATIONS
 Maximum number of iterations for a solution process.
-.sp
+.Pp
 Default value: 1024
 .It MLP_COEFFICIENT_D
 Default value: 1.0
@@ -314,23 +358,23 @@ Default value: 1024
 Default value: 4
 .It MLP_DUMP_PROBLEM_ALL
 Dump all problems to disk.
-.sp
+.Pp
 Default value: YES
 .It MLP_DUMP_SOLUTION_ALL
 Dump all solution to disk.
-.sp
+.Pp
 Default value: YES
 .It MLP_GLPK_VERBOSE
 Print GLPK output.
-.sp
+.Pp
 Default value: YES
 .It MLP_DUMP_PROBLEM_ON_FAIL
 Dump all problems to disk.
-.sp
+.Pp
 Default value: YES
 .It MLP_DUMP_SOLUTION_ON_FAIL
 Dump all solution to disk.
-.sp
+.Pp
 Default value: YES
 .It RIL_STEP_TIME_MIN
 Default value: 500 ms
@@ -338,7 +382,7 @@ Default value: 500 ms
 Default value: 1000 ms
 .It RIL_ALGORITHM
 Possible values: SARSA or Q-LEARNING.
-.sp
+.Pp
 Default value: Q-LEARNING
 .It RIL_DISCOUNT_BETA
 Default value: 0.7
@@ -378,51 +422,52 @@ Default value: NO
 .It UNIX_MATCH_GID
 Default value: YES
 .It REFRESH_CONNECTION_TIME
-How often do we send KEEPALIVE messages on connections to keep them from timing out?
-.sp
+How often do we send KEEPALIVE messages on connections to keep them from
+timing out?
+.Pp
 Default value: 5 min
 .It DROP_PERCENT
 Percentage of packets CADET is artificially dropping.
 Used for testing only!
 .It ID_ANNOUNCE_TIME
 How frequently do we usually anounce our presence in the DHT?
-.sp
+.Pp
 Default value: 1 h
 .It CONNECT_TIMEOUT
 Default value: 30 s
 .It DHT_REPLICATION_LEVEL
 What is the replication level we give to the DHT when announcing our existence?
 Usually there is no need to change this.
-.sp
+.Pp
 Default value: 3
 .It MAX_TUNNELS
 Not implemented
-.sp
+.Pp
 Default value: 1000
 .It MAX_CONNECTIONS
 Not implemented, replaced by MAX_ROUTES in NEW CADET!
-.sp
+.Pp
 Default value: 1000
 .It MAX_ROUTES
 How many routes do we participate in at most?
 Should be smaller than MAX_MSGS_QUEUE.
-.sp
+.Pp
 Default value: 5000
 .It MAX_MSGS_QUEUE
 Not implemented
-.sp
+.Pp
 Default value: 10000
 .It MAX_PEERS
 Not implemented
-.sp
+.Pp
 Default value: 1000
 .It RATCHET_TIME
 How often do we advance the ratchet even if there is not any traffic?
-.sp
+.Pp
 Default value: 1 h
 .It RATCHET_MESSAGES
 How often do we advance the ratched if there is traffic?
-.sp
+.Pp
 Default value: 64
 .El
 .Ss COMMUNICATOR-UNIX
@@ -483,8 +528,9 @@ Default value: NO
 .It PREFIX
 .It USE_EPHEMERAL_KEYS
 Default value: YES
-.sp
-This MUST be set to YES in production, only set to NO for testing for performance (testbed/cluster-scale use!).
+.Pp
+This MUST be set to YES in production, only set to NO for testing for
+performance (testbed/cluster-scale use!).
 .El
 .Ss DATACACHE-POSTGRES
 .Bl -tag -width Ds
@@ -550,8 +596,57 @@ Default value: 3306
 Default value: 1024
 .El
 .Ss DHT
-.Bl -tag -width Ds
+.Bl -tag -width indent
+.It IMMEDIATE_START Ar boolean
+Default value: YES
+.It START_ON_DEMAND Ar boolean
+Default value: YES
+.It PORT Ar integer
+Default value: 2095
+.It HOSTNAME Ar string
+Default value: localhost
+.It BINARY Ar string
+Default value: gnunet-service-dht
+.It ACCEPT_FROM Ar string
+Default value: 127.0.0.1;
+.It ACCEPT_FROM6 Ar string
+Default value: ::1;
+.It BUCKET_SIZE Ar integer
+Default value: 4
+.It UNIXPATH Ar path
+Default value: $GNUNET_RUNTIME_DIR/gnunet-service-dht.sock
+.It UNIX_MATCH_UID Ar boolean
+Default value: NO
+.It UNIX_MATCH_GID Ar boolean
+Default value: YES
+.It DISABLE_SOCKET_FORWARDING Ar boolean
+Default value: NO
+.It USERNAME =
+.It MAXBUF =
+.It TIMEOUT =
+.It DISABLEV6 =
+.It BINDTO =
+.It REJECT_FROM =
+.It REJECT_FROM6 =
+.It PREFIX =
+.It
+# Should the DHT cache results that we are routing in the DATACACHE as well?
+CACHE_RESULTS = YES
+.It
+# Special option to disable DHT calling 'try_connect' (for testing)
+DISABLE_TRY_CONNECT = NO
 .El
+.Ss DHTCACHE
+.Bl -tag -width indent
+.It DATABASE
+Default value: heap
+.It QUOTA
+Default value: 50 MB
+.It DISABLE_BF_RC Ar boolean
+Disable RC-file for Bloom filter?
+(for benchmarking with limited IO availability)
+.Pp
+Default value: NO
 .Ss EXIT
 .Bl -tag -width Ds
 .El
@@ -694,29 +789,30 @@ Default value: $GNUNET_USER_RUNTIME_DIR/gnunet-service-zonemaster.sock
 .It PORT
 Default value: 2123
 .It UNIX_MATCH_UID
-Do we require users that want to access GNS to run this process (usually not a good idea)?
-.sp
+Do we require users that want to access GNS to run this process (usually
+not a good idea)?
+.Pp
 Default value: NO
 .It UNIX_MATCH_GID
 Do we require users that want to access GNS to be in the 'gnunet' group?
-.sp
+.Pp
 Default value: NO
 .It MAX_PARALLEL_BACKGROUND_QUERIES
 How many queries is GNS allowed to perform in the background at the same time?
-.sp
+.Pp
 Default value: 1000
 .It ZONE_PUBLISH_TIME_WINDOW
 How frequently do we try to publish our full zone?
-.sp
+.Pp
 Default value: 4 h
 .It USE_CACHE
 Using caching or always ask DHT?
-.sp
+.Pp
 Default value: YES
 .It PREFIX
 .El
 .Ss ZONEMASTER-MONITOR
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It START_ON_DEMAND
 Default value: YES
 .It IMMEDIATE_START
@@ -730,35 +826,39 @@ Default value: $GNUNET_USER_RUNTIME_DIR/gnunet-service-zonemaster-monitor.sock
 .It PORT
 Default value: 2124
 .It UNIX_MATCH_UID
-Do we require users that want to access GNS to run this process (usually not a good idea)?
-.sp
+Do we require users that want to access GNS to run this process (usually not
+a good idea)?
+.Pp
 Default value: NO
 .It UNIX_MATCH_GID
 Do we require users that want to access GNS to be in the 'gnunet' group?
-.sp
-Default value: NO
+.Pp
+Default value:
+.Li NO
 .El
 .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.
+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 remember to change your IP address to the actual external address for your usage.
+Please remember to change your IP address to the actual external address
+for your usage.
 .Bd -literal -offset indent -compact
-    [hostlist]
-    OPTIONS = \-b \-e
+[hostlist]
+OPTIONS = \-b \-e
 
-    [nat]
-    BEHIND_NAT = YES
-    ENABLE_UPNP = YES
-    DISABLEV6 = YES
-    EXTERNAL_ADDRESS = 157.166.249.10
+[nat]
+BEHIND_NAT = YES
+ENABLE_UPNP = YES
+DISABLEV6 = YES
+EXTERNAL_ADDRESS = 157.166.249.10
 
-    [arm]
-    START_SYSTEM_SERVICES = YES
-    START_USER_SERVICES = NO
+[arm]
+START_SYSTEM_SERVICES = YES
+START_USER_SERVICES = NO
 .Ed
 .Sh FILES
 .Pa ~gnunet/.config/gnunet.conf
-GNUnet syste-user configuration file
+GNUnet system-user configuration file
 .Pa $HOME/.config/gnunet.conf
 User specific GNUnet configuration file
 .Pa @SYSCONFDIR@/gnunet.conf
@@ -769,8 +869,8 @@ GNUnet configuration directory with all default option values
 .Xr env 1 ,
 .Xr gnunet-arm 1 ,
 .Xr gnunet-setup 1 ,
-.Xr strftime 3
-.sp
+.Xr strftime 3 .
+.Pp
 The full documentation for gnunet is maintained as a Texinfo manual.
 If the
 .Xr info 1
@@ -783,7 +883,7 @@ should give you access to the complete handbook,
 .Dl info gnunet-c-tutorial
 .Pp
 will give you access to a tutorial for developers.
-.sp
+.Pp
 Depending on your installation, this information is also available in
 .Xr gnunet 7 and
 .Xr gnunet-c-tutorial 7 .