46 files changed, 327 insertions, 324 deletions

diff --git a/doc/man/gnunet-arm.1 b/doc/man/gnunet-arm.1
index 599478a07..7e15b171d 100644
--- a/doc/man/gnunet-arm.1
+++ b/doc/man/gnunet-arm.1
@@ -6,18 +6,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
 .\"
@@ -29,23 +29,23 @@
 .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
+.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,
@@ -53,25 +53,25 @@ 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
+.Bl -tag -width indent
+.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.It Fl d | \-delete
+.It Fl d | -delete
 Delete config file and directory on exit.
-.It Fl e | \-end
+.It Fl e | -end
 Shutdown all GNUnet services (including ARM itself).
 Running "gnunet-arm -e" is the usual way to shutdown a GNUnet peer.
-.It Fl E | \-no-stderr
+.It Fl E | -no-stderr
 Don't let gnunet-arm inherit standard error.
-.It Fl h | \-help
+.It Fl h | -help
 Print short help on options.
-.It Fl i Ar SERVICE | Fl \-init= Ns Ar SERVICE
+.It Fl i Ar SERVICE | Fl -init= Ns Ar 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.
-.It Fl I | \-info
+.It Fl I | -info
 List all running services.
-.It Fl k Ar SERVICE | Fl \-kill= Ns Ar SERVICE
+.It Fl k Ar SERVICE | Fl -kill= Ns Ar 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
@@ -80,28 +80,28 @@ 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
+.It Fl l Ar FILENAME | Fl -logfile= Ns Ar FILENAME
 Write logs to FILENAME.
-.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 m | \-monitor
+.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
+.It Fl O | -no-stdout
 Don't let gnunet-arm inherit standard output
-.It Fl q | \-quiet
+.It Fl q | -quiet
 Don't print status messages.
-.It Fl r | \-restart
+.It Fl r | -restart
 Stop and start all GNUnet default services.
-.It Fl s | \-start
+.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
+.It Fl T DELAY | -timeout= Ns Ar DELAY
 Exit with error status if operation does not finish after DELAY
-.It Fl v | \-version
+.It Fl v | -version
 Print GNUnet version number.
 .El
 .Sh EXAMPLES
diff --git a/doc/man/gnunet-ats.1 b/doc/man/gnunet-ats.1
index 1e7b7731c..311501002 100644
--- a/doc/man/gnunet-ats.1
+++ b/doc/man/gnunet-ats.1
@@ -6,18 +6,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
 .\"
@@ -26,62 +26,66 @@
 .Os
 .Sh NAME
 .Nm gnunet-ats
-.Nd
-display information about transport resource allocation
+.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
+.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.
+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
+.Bl -tag -width indent
+.It Fl a | -all
 List all addresses currently known to ats.
-.It Fl C Ar PEERID | Fl \-connect= Ns Ar PEERID
-Ask ATS to suggest an address for PEERID to transport to establish a connection.
-Note that you can use the gnunet-transport commandline tool to force disconnects.
-.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
+.It Fl C Ar PEERID | Fl -connect= Ns Ar PEERID
+Ask ATS to suggest an address for PEERID to transport
+to establish a connection.
+Note that you can use the
+.Xr gnunet-transport 1
+commandline tool to force disconnects.
+.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.It Fl h | \-help
+.It Fl h | -help
 Print short help on options.
-.It Fl i Ar PEERID | Fl \-id= Ns Ar PEERID
+.It Fl i Ar PEERID | Fl -id= Ns Ar PEERID
 Print information for a specific peer identity only.
-.It Fl k Ar VALUE | Fl \-value= Ns Ar VALUE
+.It Fl k Ar VALUE | Fl -value= Ns Ar VALUE
 Value to set for when changing preference values.
-.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+.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
+.It Fl m | -monitor
 Monitor changes to the bandwidth assignments continuously.
-.It Fl n | \-numeric
+.It Fl n | -numeric
 Do not resolve IP addresses to hostnames.
-.It Fl p Ar PREFERENCE | Fl \-preference= Ns Ar PREFERENCE
+.It Fl p Ar PREFERENCE | Fl -preference= Ns Ar PREFERENCE
 Set preference values, -i, -k and -t required.
-.It Fl q | \-quotas
+.It Fl q | -quotas
 Print quotas for all network types
-.It Fl t Ar TYPE | Fl \-type= Ns Ar TYPE
+.It Fl t Ar TYPE | Fl -type= Ns Ar TYPE
 Preference type to change: latency | bandwidth
-.It Fl u | \-used
+.It Fl u | -used
 Print addresses actively used only
-.It Fl V | \-verbose
+.It Fl V | -verbose
 Print verbose output (include ATS address properties)
-.It v | \-version
+.It v | -version
 Print GNUnet version number.
 .El
 .Sh SEE ALSO
diff --git a/doc/man/gnunet-auto-share.1 b/doc/man/gnunet-auto-share.1
index 01d927105..0a0e8f702 100644
--- a/doc/man/gnunet-auto-share.1
+++ b/doc/man/gnunet-auto-share.1
@@ -6,18 +6,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
 .\"
@@ -54,7 +54,7 @@ gnunet-auto-share has many options in common with gnunet-publish, but can only b
 .Pp
 You can use automatic meta-data extraction (based on libextractor).
 The options are as follows:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl a Ar LEVEL | Fl \-anonymity= Ns Ar LEVEL
 This option can be used to specify additional anonymity constraints.
 The default is 1.
diff --git a/doc/man/gnunet-bcd.1 b/doc/man/gnunet-bcd.1
index ca01c0d92..0a1399ba3 100644
--- a/doc/man/gnunet-bcd.1
+++ b/doc/man/gnunet-bcd.1
@@ -6,18 +6,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
 .\"
@@ -44,7 +44,7 @@ gnunet-bcd requires LaTeX (
 If it does not work for you, try installing the full TeXLive distribution first, for example if you are using the package-manager
 .Xr apt 1
 execute "apt-get install texlive-full".
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl p Ar PORT | Fl \-port= Ns Ar PORT
 Run the HTTP server on port PORT.
 .It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
diff --git a/doc/man/gnunet-cadet.1 b/doc/man/gnunet-cadet.1
index 76465a66a..bb2ce637e 100644
--- a/doc/man/gnunet-cadet.1
+++ b/doc/man/gnunet-cadet.1
@@ -6,18 +6,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
 .\"
@@ -62,7 +62,7 @@ can be issued to satisfy multiple requests.
 For one-to-many communication
 .Xr gnunet-social 1
 may be better suited, however.
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl C Ar CONNECTION_ID | Fl \-connection= Ns Ar CONNECTION_ID
 Provide information about the connection
 .Ar CONNECTION_ID .
diff --git a/doc/man/gnunet-config.1 b/doc/man/gnunet-config.1
index 24742fe45..0e612fe29 100644
--- a/doc/man/gnunet-config.1
+++ b/doc/man/gnunet-config.1
@@ -6,18 +6,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
 .\"
@@ -43,7 +43,7 @@ manipulate GNUnet configuration files
 .Sh DESCRIPTION
 .Nm
 can be used to read or modify GNUnet configuration files.
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
 .It Fl f | \-filename
diff --git a/doc/man/gnunet-conversation-test.1 b/doc/man/gnunet-conversation-test.1
index 9f72f1157..1cc445f6f 100644
--- a/doc/man/gnunet-conversation-test.1
+++ b/doc/man/gnunet-conversation-test.1
@@ -6,18 +6,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
 .\"
@@ -41,7 +41,7 @@ can be used to check your speaker and microphone settings.
 It will record you for five seconds and then play the recording back to you.
 If this fails, you might want to use the \fBpavucontrol\fP tool to check which microphone or speaker were assigned to GNUnet by PulseAudio (you may have more than one set of microphones or speakers known to your computer).
 You can use gnunet\-conversation\-test without having a peer running on your computer.
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
 .It Fl h | \-help
diff --git a/doc/man/gnunet-conversation.1 b/doc/man/gnunet-conversation.1
index 3daf44734..62909224d 100644
--- a/doc/man/gnunet-conversation.1
+++ b/doc/man/gnunet-conversation.1
@@ -6,18 +6,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
 .\"
@@ -44,7 +44,7 @@ You can make calls and receive incoming calls.
 You need to setup an ego using gnunet\-identity first.
 For others to be able to call you, you must add a PHONE record to your zone in the GNU Name System (using gnunet\-namestore).
 gnunet\-conversation has an interactive help system via the /help command.
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
 .It Fl e Ar NAME | Fl \-ego= Ns Ar NAME
diff --git a/doc/man/gnunet-core.1 b/doc/man/gnunet-core.1
index 5b61ab953..745a666b8 100644
--- a/doc/man/gnunet-core.1
+++ b/doc/man/gnunet-core.1
@@ -6,18 +6,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
 .\"
diff --git a/doc/man/gnunet-directory.1 b/doc/man/gnunet-directory.1
index e4be45b28..4a0696179 100644
--- a/doc/man/gnunet-directory.1
+++ b/doc/man/gnunet-directory.1
@@ -6,18 +6,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
 .\"
@@ -41,7 +41,7 @@ lists the contents of one or more GNUnet directories.
 A GNUnet directory is a binary file that contains a list of GNUnet file-sharing URIs and meta data.
 The names of the directory files must be passed as command-line arguments to gnunet-directory.
 The options are as follows:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Configuration file to use.
 This option is useless, since gnunet-directory does not really depend on any configuration options.
diff --git a/doc/man/gnunet-dns2gns.1 b/doc/man/gnunet-dns2gns.1
index 5507a148d..0993fb419 100644
--- a/doc/man/gnunet-dns2gns.1
+++ b/doc/man/gnunet-dns2gns.1
@@ -6,18 +6,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
 .\"
diff --git a/doc/man/gnunet-download.1 b/doc/man/gnunet-download.1
index 51bb1473b..56f18e050 100644
--- a/doc/man/gnunet-download.1
+++ b/doc/man/gnunet-download.1
@@ -6,18 +6,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
 .\"
@@ -46,7 +46,7 @@ a command line interface for downloading files from GNUnet
 .Sh DESCRIPTION
 Download files from GNUnet.
 The options are as follows:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl a Ar LEVEL | Fl \-anonymity= Ns Ar LEVEL
 This option can be used to specify additional anonymity constraints.
 The default is 1.
diff --git a/doc/man/gnunet-ecc.1 b/doc/man/gnunet-ecc.1
index 4929749b3..d99b6c00b 100644
--- a/doc/man/gnunet-ecc.1
+++ b/doc/man/gnunet-ecc.1
@@ -6,18 +6,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
 .\"
@@ -49,7 +49,7 @@ This may then take a while.
 If the option
 .Fl p
 is given, the corresponding public key will be printed to the console.
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl g Ar COUNT | Fl \-generate-keys= Ns Ar COUNT
 Create COUNT public-private key pairs and write them to FILENAME.
 Used for creating a file for testing.
diff --git a/doc/man/gnunet-fs.1 b/doc/man/gnunet-fs.1
index b61485ebf..e87d9a3e2 100644
--- a/doc/man/gnunet-fs.1
+++ b/doc/man/gnunet-fs.1
@@ -6,18 +6,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
 .\"
@@ -42,7 +42,7 @@ from the command-line.
 Most of these are not expected to be useful for end-users.
 gnunet-fs can currently only be used to obtain a list of indexed files.
 Other functions should be added in the near future.
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Configuration file to use.
 .It Fl h | \-help
diff --git a/doc/man/gnunet-gns-proxy-setup-ca.1 b/doc/man/gnunet-gns-proxy-setup-ca.1
index 5f64c42f8..6c7658bee 100644
--- a/doc/man/gnunet-gns-proxy-setup-ca.1
+++ b/doc/man/gnunet-gns-proxy-setup-ca.1
@@ -6,18 +6,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
 .\"
@@ -38,7 +38,7 @@
 .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
+.Bl -tag -width indent
 .It Fl c Ar FILE
 Use the configuration file FILE.
 .\" .It Fl f
diff --git a/doc/man/gnunet-gns-proxy.1 b/doc/man/gnunet-gns-proxy.1
index 444bad96b..d985ee0d9 100644
--- a/doc/man/gnunet-gns-proxy.1
+++ b/doc/man/gnunet-gns-proxy.1
@@ -6,18 +6,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
 .\"
@@ -43,7 +43,7 @@ It can be used in combination with browsers that support the SOCKS 4a protocol.
 The proxy will perform SSL authentication of GNS names and rewrite GNS enabled HTML content.
 To assert the validity of GNS names a local root CA certificate has to be generated that is used by the proxy.
 Thus "gnunet-gns-proxy-setup-ca" should be executed before the first launch of this proxy or the \-\-authority switch is used to specify an appropriate CA certificate that is already trusted by the browser.
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
 .It Fl a Ar AUTHORITY | Fl \-authority= Ns Ar AUTHORITY
diff --git a/doc/man/gnunet-gns.1 b/doc/man/gnunet-gns.1
index 95b4b0040..8309fd5de 100644
--- a/doc/man/gnunet-gns.1
+++ b/doc/man/gnunet-gns.1
@@ -6,18 +6,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
 .\"
@@ -41,7 +41,7 @@ access to GNU Name System
 .Sh DESCRIPTION
 .Nm
 can be used to lookup and process GNU Name Service names.
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
 .It Fl h | \-help
diff --git a/doc/man/gnunet-identity.1 b/doc/man/gnunet-identity.1
index f1bb9295d..cfb727885 100644
--- a/doc/man/gnunet-identity.1
+++ b/doc/man/gnunet-identity.1
@@ -6,18 +6,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
 .\"
@@ -56,7 +56,7 @@ the new ego.
 This identifier is only used locally for this peer and not shared
 with other peers.
 The options are as follows:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl C Ar NAME | Fl \-create= Ns Ar NAME
 Creates a new ego with the given
 .Ar NAME .
diff --git a/doc/man/gnunet-namecache.1 b/doc/man/gnunet-namecache.1
index f601d9104..a040622b0 100644
--- a/doc/man/gnunet-namecache.1
+++ b/doc/man/gnunet-namecache.1
@@ -6,18 +6,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
 .\"
@@ -40,7 +40,7 @@ inspect namecache
 .Nm
 can be used to inspect values in the namecache.
 It is passed the mandatory option 'z' ('--zone=') with the argument PKEY, and the mandatory option 'n' ('--name=') with the argument NAME.
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
 .It Fl h | \-help
diff --git a/doc/man/gnunet-namestore-fcfsd.1 b/doc/man/gnunet-namestore-fcfsd.1
index cbfe39719..e1a09afe4 100644
--- a/doc/man/gnunet-namestore-fcfsd.1
+++ b/doc/man/gnunet-namestore-fcfsd.1
@@ -6,18 +6,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
 .\"
@@ -57,7 +57,7 @@ After that, you can start the FCFSD service (possibly using
 .Xr gnunet-arm 1 Ns ).
 .Pp
 The options are as follows:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
 .It Fl h | \-help
diff --git a/doc/man/gnunet-namestore.1 b/doc/man/gnunet-namestore.1
index 6a399c360..98d1839b9 100644
--- a/doc/man/gnunet-namestore.1
+++ b/doc/man/gnunet-namestore.1
@@ -6,18 +6,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
 .\"
@@ -54,7 +54,7 @@ manipulate GNU Name System (GNS) zone data
 can be used to manipulate records in a GNS zone.
 .Pp
 The options are as follows:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl a | \-add
 Desired operation is adding a record.
 .It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
diff --git a/doc/man/gnunet-nat-auto.1 b/doc/man/gnunet-nat-auto.1
index 664001930..2dbfaa599 100644
--- a/doc/man/gnunet-nat-auto.1
+++ b/doc/man/gnunet-nat-auto.1
@@ -6,18 +6,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
 .\"
@@ -40,7 +40,7 @@ autoconfigure and test NAT traversal
 .Nm
 allows testing various NAT traversal functions, as well as attempting auto-configuration.
 The options are as follows:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl a | \-auto
 Attempt auto-configuration for NAT traversal.
 .It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
diff --git a/doc/man/gnunet-nat-server.1 b/doc/man/gnunet-nat-server.1
index b8462d9da..77a5eec26 100644
--- a/doc/man/gnunet-nat-server.1
+++ b/doc/man/gnunet-nat-server.1
@@ -6,18 +6,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
 .\"
@@ -59,7 +59,7 @@ Normal GNUnet end-users should not concern themselves with gnunet-nat-server.
 In fact, distributions are encouraged to consider not shipping it at all.
 .Pp
 The options are as follows:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file
 .Ar FILENAME .
diff --git a/doc/man/gnunet-nat.1 b/doc/man/gnunet-nat.1
index 1a99d60fe..1ffdc5c7c 100644
--- a/doc/man/gnunet-nat.1
+++ b/doc/man/gnunet-nat.1
@@ -6,18 +6,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
 .\"
@@ -43,7 +43,7 @@ interact with the NAT service
 .Sh DESCRIPTION
 This tool allows testing various NAT traversal functions, as well as attempting auto-configuration.
 .Sh OPTIONS
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl b Ar ADDRESS | Fl \-bind= Ns Ar ADDRESS
 Assume that the service is (locally) bound to ADDRESS.
 .It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
diff --git a/doc/man/gnunet-nse.1 b/doc/man/gnunet-nse.1
index 6c89848d2..5f2d02bfa 100644
--- a/doc/man/gnunet-nse.1
+++ b/doc/man/gnunet-nse.1
@@ -6,18 +6,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
 .\"
@@ -38,7 +38,7 @@
 .Nm
 is a command line tool to show network size estimates from
 the NSE service of GNUnet.
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
 Use the configuration file FILENAME.
 .It Fl h | -help
diff --git a/doc/man/gnunet-peerinfo.1 b/doc/man/gnunet-peerinfo.1
index d329de430..143295dad 100644
--- a/doc/man/gnunet-peerinfo.1
+++ b/doc/man/gnunet-peerinfo.1
@@ -6,18 +6,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
 .\"
@@ -44,7 +44,7 @@ display information about other peers
 .Sh DESCRIPTION
 .Nm
 displays the known addresses and trust of known peers.
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Load config file, default FILENAME of the config is 
 .Pa ~/.config/gnunet.conf .
diff --git a/doc/man/gnunet-publish.1 b/doc/man/gnunet-publish.1
index 0cd3c6036..04293102c 100644
--- a/doc/man/gnunet-publish.1
+++ b/doc/man/gnunet-publish.1
@@ -6,18 +6,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
 .\"
@@ -127,7 +127,7 @@ Regardless of which method is used to publish the file, the file will be slowly
 If you publish or index a file and then leave the network, it will almost always NOT be available anymore.
 .Pp
 The options are as follows:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl a Ar LEVEL | Fl \-anonymity= Ns Ar LEVEL
 This option can be used to specify additional anonymity constraints.
 The default is 1.
diff --git a/doc/man/gnunet-qr.1 b/doc/man/gnunet-qr.1
index 16ce7857d..eec19c14a 100644
--- a/doc/man/gnunet-qr.1
+++ b/doc/man/gnunet-qr.1
@@ -6,18 +6,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
 .\"
diff --git a/doc/man/gnunet-reclaim.1 b/doc/man/gnunet-reclaim.1
index 933d72b86..c1ab0d1aa 100644
--- a/doc/man/gnunet-reclaim.1
+++ b/doc/man/gnunet-reclaim.1
@@ -6,18 +6,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
 .\"
@@ -50,7 +50,7 @@ Command-line tools for re:claimID subsystem
 .Sh DESCRIPTION
 .Nm
 allows you to manage identity attributes and manage authorizations.
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
 .It Fl h | \-help
diff --git a/doc/man/gnunet-resolver.1 b/doc/man/gnunet-resolver.1
index 5f32174b5..843b4e2a0 100644
--- a/doc/man/gnunet-resolver.1
+++ b/doc/man/gnunet-resolver.1
@@ -6,18 +6,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
 .\"
@@ -40,7 +40,7 @@ built-in GNUnet stub resolver
 .Sh DESCRIPTION
 .Nm
 allows you to use the build-in GNUnet stub resolver.
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
 .It Fl h | \-help
diff --git a/doc/man/gnunet-revocation.1 b/doc/man/gnunet-revocation.1
index 24780ac0b..16f954a2e 100644
--- a/doc/man/gnunet-revocation.1
+++ b/doc/man/gnunet-revocation.1
@@ -6,18 +6,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
 .\"
@@ -48,7 +48,7 @@ The computation can be performed ahead of time, with the resulting revocation ce
 gnunet-revocation also makes is possible to resume the pre-calculation of a revocation --- simply abort a running proof-of-work calculation with CTRL-C, and the existing revocation certificate file will contain the status of the computation.
 Note that performing a revocation proof-of-work is deliberately VERY expensive.
 Depending on your CPU, the calculation can take days or weeks.
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl t Ar KEY | Fl \-test= Ns Ar KEY
 Check if the given KEY (ASCII\-encoded public key required) has been revoked.
 .It Fl R Ar NAME | Fl \-revoke= Ns Ar NAME
diff --git a/doc/man/gnunet-scalarproduct.1 b/doc/man/gnunet-scalarproduct.1
index 88ebb93e7..ff0bcb6e1 100644
--- a/doc/man/gnunet-scalarproduct.1
+++ b/doc/man/gnunet-scalarproduct.1
@@ -6,18 +6,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
 .\"
diff --git a/doc/man/gnunet-scrypt.1 b/doc/man/gnunet-scrypt.1
index eadb8e26e..16a377443 100644
--- a/doc/man/gnunet-scrypt.1
+++ b/doc/man/gnunet-scrypt.1
@@ -6,18 +6,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
 .\"
@@ -41,7 +41,7 @@
 .Sh DESCRIPTION
 .Nm
 is a command line tool to manipulate GNUnet proof of work files.
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl b Ar BITS | Fl \-bits= Ns Ar BITS
 Number of bits to require for the proof of work.
 .It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
diff --git a/doc/man/gnunet-search.1 b/doc/man/gnunet-search.1
index 801efbe3f..59263c1b1 100644
--- a/doc/man/gnunet-search.1
+++ b/doc/man/gnunet-search.1
@@ -6,18 +6,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
 .\"
@@ -48,7 +48,7 @@ The keywords are case-sensitive.
 .Nm
 can be used both for a search in the global namespace as well as for searching a private subspace.
 The options are as follows:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl a Ar LEVEL | Fl \-anonymity= Ns Ar LEVEL
 This option can be used to specify additional anonymity constraints.
 The default is 1.
diff --git a/doc/man/gnunet-statistics.1 b/doc/man/gnunet-statistics.1
index 1d2360c7b..a2ada90a4 100644
--- a/doc/man/gnunet-statistics.1
+++ b/doc/man/gnunet-statistics.1
@@ -6,18 +6,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
 .\"
@@ -49,7 +49,7 @@
 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
+.Bl -tag -width indent
 .It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
 .It Fl h | \-help
diff --git a/doc/man/gnunet-testbed-profiler.1 b/doc/man/gnunet-testbed-profiler.1
index ce28e89ca..475884df2 100644
--- a/doc/man/gnunet-testbed-profiler.1
+++ b/doc/man/gnunet-testbed-profiler.1
@@ -6,18 +6,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
 .\"
@@ -43,7 +43,7 @@ profiling driver for the testbed
 .Nm
 is a command line profiling driver for the testbed.
 .Sh OPTIONS
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
 .It Fl e Ar COUNT | Fl \-num-errors= Ns Ar COUNT
diff --git a/doc/man/gnunet-testing-run-service.1 b/doc/man/gnunet-testing-run-service.1
index 478d00ead..4f3c5c74b 100644
--- a/doc/man/gnunet-testing-run-service.1
+++ b/doc/man/gnunet-testing-run-service.1
@@ -6,18 +6,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
 .\"
@@ -42,7 +42,7 @@ The peer will run until this program is killed, or stdin is closed.
 When reading the character 'r' from stdin, the running service is restarted with the same configuration.
 .Pp
 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
+.Bl -tag -width indent
 .It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Name of the template configuration file to use (optional).
 .It Fl h | \-help
diff --git a/doc/man/gnunet-testing.1 b/doc/man/gnunet-testing.1
index 38d74fc58..659e46fbc 100644
--- a/doc/man/gnunet-testing.1
+++ b/doc/man/gnunet-testing.1
@@ -6,18 +6,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
 .\"
@@ -44,7 +44,7 @@ command line tool to access the testing library
 .Nm
 is a command line tool to access the testing library.
 .Sh OPTIONS
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl C | \-cfg
 Create unique configuration files.
 .It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
diff --git a/doc/man/gnunet-timeout.1 b/doc/man/gnunet-timeout.1
index 1a1a753a9..1ac99cebd 100644
--- a/doc/man/gnunet-timeout.1
+++ b/doc/man/gnunet-timeout.1
@@ -6,18 +6,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
 .\"
diff --git a/doc/man/gnunet-transport-certificate-creation.1 b/doc/man/gnunet-transport-certificate-creation.1
index eae8b270c..7e4086d83 100644
--- a/doc/man/gnunet-transport-certificate-creation.1
+++ b/doc/man/gnunet-transport-certificate-creation.1
@@ -6,18 +6,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
 .\"
diff --git a/doc/man/gnunet-transport.1 b/doc/man/gnunet-transport.1
index 3c463d76e..b8f509dc2 100644
--- a/doc/man/gnunet-transport.1
+++ b/doc/man/gnunet-transport.1
@@ -6,18 +6,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
 .\"
diff --git a/doc/man/gnunet-unindex.1 b/doc/man/gnunet-unindex.1
index 7d8c22c61..886793ed9 100644
--- a/doc/man/gnunet-unindex.1
+++ b/doc/man/gnunet-unindex.1
@@ -6,18 +6,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
 .\"
@@ -39,7 +39,7 @@ FILENAME
 .Sh DESCRIPTION
 .Nm
 is used for deleting indexed files from GNUnet.
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use config file FILENAME as config (default:
 .Pa ~/.config/gnunet.conf Ns ).
diff --git a/doc/man/gnunet-uri.1 b/doc/man/gnunet-uri.1
index edfab2f4f..1d8380631 100644
--- a/doc/man/gnunet-uri.1
+++ b/doc/man/gnunet-uri.1
@@ -6,18 +6,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
 .\"
@@ -42,7 +42,7 @@ 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
+.Bl -tag -width indent
 .It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
 .It Fl h | \-help
diff --git a/doc/man/gnunet-vpn.1 b/doc/man/gnunet-vpn.1
index 8bd3de8bc..477358f22 100644
--- a/doc/man/gnunet-vpn.1
+++ b/doc/man/gnunet-vpn.1
@@ -6,18 +6,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
 .\"
@@ -26,8 +26,7 @@
 .Os
 .Sh NAME
 .Nm gnunet-vpn
-.Nd
-manually setup a GNUnet VPN tunnel
+.Nd manually setup a GNUnet VPN tunnel
 .Sh SYNOPSIS
 .Nm
 .Op Fl 4 | \-ipv4
@@ -70,7 +69,7 @@ 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 after
 .Pq Fl a
 the tunnel has been created.
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl 4 | \-ipv4
 Desired IP address on this end of the tunnel should be an IPv4 address.
 .It Fl 6 | \-ipv6
diff --git a/doc/man/gnunet-zoneimport.1 b/doc/man/gnunet-zoneimport.1
index 2209f58df..f09544912 100644
--- a/doc/man/gnunet-zoneimport.1
+++ b/doc/man/gnunet-zoneimport.1
@@ -6,18 +6,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
 .\"
@@ -55,7 +55,7 @@ Thus, it is fine to restart gnunet-zoneimport whenever the list of domain names
 .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
+.Bl -tag -width indent
 .It Fl c Ar FILENAME | \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
 .It Fl h | \-help
diff --git a/doc/man/gnunet.conf.5.in b/doc/man/gnunet.conf.5.in
index 4ec58fe52..116e7de3b 100644
--- a/doc/man/gnunet.conf.5.in
+++ b/doc/man/gnunet.conf.5.in
@@ -110,7 +110,7 @@ and finally, if
 is undefined,
 .Pa /tmp/gnunet/foo .
 The following options are generic and shared by all services:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It HOSTNAME
 The hostname specifies the machine on which the service is running.
 This is usually "localhost".
@@ -156,7 +156,7 @@ 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.
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It YES
 Set to YES if this service should be run per-user.
 .It NO
@@ -248,7 +248,7 @@ Default value:
 Default value:
 .El
 .Ss ATS
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It PORT
 Default value: 2098
 .It HOSTNAME
@@ -317,7 +317,7 @@ Default value: 128 KiB
 .It PROP_PROPORTIONALITY_FACTOR
 How proportional to preferences is bandwidth distribution in a network?
 Default value: 2.00
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It 1.0
 Fair with respect to addresses without preferences.
 .It > 1.0
@@ -396,10 +396,10 @@ Default value: 0.1
 Default value: 1
 .El
 .Ss AUCTION
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .El
 .Ss CADET
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It IMMEDIATE_START
 Default value: YES
 .It START_ON_DEMAND
@@ -471,12 +471,12 @@ How often do we advance the ratched if there is traffic?
 Default value: 64
 .El
 .Ss COMMUNICATOR-UNIX
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It UNIXPATH
 Default value: $GNUNET_RUNTIME_DIR/gnunet-communicator-unix.sock
 .El
 .Ss CONSENSUS
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It START_ON_DEMAND
 Default value: YES
 .It PORT
@@ -497,7 +497,7 @@ Default value: YES
 Default value: YES
 .El
 .Ss CORE
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It START_ON_DEMAND
 Default value: YES
 .It PORT
@@ -533,12 +533,12 @@ 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
+.Bl -tag -width indent
 .It CONFIG
 Default value: postgres:///gnunet
 .El
 .Ss DATASTORE
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It START_ON_DEMAND
 Default value: YES
 .It UNIXPATH
@@ -567,17 +567,17 @@ Default value: sqlite
 Default value: NO
 .El
 .Ss DATASTORE-SQLITE
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It FILENAME
 Default value: $GNUNET_DATA_HOME/datastore/sqlite.db
 .El
 .Ss DATASTORE-POSTGRES
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It CONFIG
 Default value: postgres:///gnunet
 .El
 .Ss DATASTORE-MYSQL
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It DATABASE
 Default value: gnunet
 .It CONFIG
@@ -591,7 +591,7 @@ Default value: localhost
 Default value: 3306
 .El
 .Ss DATASTORE-HEAP
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It HASHMAPSIZE
 Default value: 1024
 .El
@@ -648,52 +648,52 @@ Disable RC-file for Bloom filter?
 .Pp
 Default value: NO
 .Ss EXIT
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .El
 .Ss FS
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .El
 .Ss GNS
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .El
 .Ss HOSTLIST
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .El
 .Ss IDENTITY
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .El
 .Ss NAMECACHE
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .El
 .Ss NAMESTORE
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .El
 .Ss NAT-AUTO
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .El
 .Ss NAT
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .El
 .Ss NSE
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .El
 .Ss PEERINFO
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .El
 .Ss PEERSTORE
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .El
 .Ss PT
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .El
 .Ss REGEX
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .El
 .Ss RESOLVER
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .El
 .Ss REST
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It UNIXPATH
 Default value: $GNUNET_USER_RUNTIME_DIR/gnunet-service-rest.sock
 .It BINARY
@@ -721,7 +721,7 @@ Default value: true
 .Ss TESTBED
 .Ss TESTING
 .Ss TOPOLOGY
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It IMMEDIATE_START
 Default value: YES
 .It NOARMBIND
@@ -740,7 +740,7 @@ Default value: gnunet-daemon-topology
 .Ss TRANSPORT
 .Ss UTIL
 .Ss VPN
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It START_ON_DEMAND
 Default value: YES
 .It PORT
@@ -775,7 +775,7 @@ Default value: 1234::17
 Default value: vpn-gnunet
 .El
 .Ss ZONEMASTER
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It START_ON_DEMAND
 Default value: YES
 .It IMMEDIATE_START