43 files changed, 1230 insertions, 999 deletions

diff --git a/doc/man/.gitignore b/doc/man/.gitignore
index ffd69e11b..38ed67872 100644
--- a/doc/man/.gitignore
+++ b/doc/man/.gitignore
@@ -1 +1,5 @@
 gnunet.conf.5
+groff_lint.log
+*.html
+gnunet-c-tutorial.7
+gnunet-documentation.7
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 53d97b6b9..509e33be7 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -5,7 +5,23 @@ do_subst = $(SED) -e 's,[@]SYSCONFDIR[@],$(sysconfdir),g'
 gnunet.conf.5: gnunet.conf.5.in Makefile
         $(do_subst) < $(srcdir)/gnunet.conf.5.in > gnunet.conf.5
 
-CLEANFILES = gnunet.conf.5
+if TEXI2MDOC_GENERATION
+gnunet-c-tutorial.7: Makefile gnunet-tutorial.7
+        @echo generated texi2mdoc output || true
+
+gnunet-tutorial.7: Makefile
+        $(SH) $(srcdir)/texi2mdoc-generation.sh || true
+
+endif
+
+CLEANFILES = gnunet.conf.5 *.html
+
+if TEXI2MDOC_GENERATION
+CLEANFILES += gnunet-documentation.7 gnunet-c-tutorial.7
+endif
+
+html:
+        $(SH) $(srcdir)/produce_html.sh
 
 man_MANS = \
   gnunet.conf.5 \
@@ -26,6 +42,7 @@ man_MANS = \
   gnunet-fs.1 \
   gnunet-gns.1 \
   gnunet-gns-proxy.1 \
+  gnunet-gns-proxy-setup-ca.1 \
   gnunet-identity.1 \
   gnunet-cadet.1 \
   gnunet-namecache.1 \
@@ -34,6 +51,7 @@ man_MANS = \
   gnunet-nat.1 \
   gnunet-nat-auto.1 \
   gnunet-nat-server.1 \
+  gnunet-nse.1 \
   gnunet-peerinfo.1 \
   gnunet-publish.1 \
   gnunet-qr.1 \
@@ -53,10 +71,15 @@ man_MANS = \
   gnunet-vpn.1 \
   gnunet-zoneimport.1
 
+if TEXI2MDOC_GENERATION
+man_MANS += gnunet-c-tutorial.7 gnunet-documentation.7
+endif
+
 EXTRA_DIST = ${man_MANS} \
- gnunet.conf.5.in
+ gnunet.conf.5.in \
+ texi2mdoc-generation.sh \
+ README
 
 if TEXI2MDOC_GENERATION
-EXTRA_DIST += gnunet-documentation.7 \
-              gnunet-c-tutorial.7
+EXTRA_DIST += gnunet-documentation.7 gnunet-c-tutorial.7
 endif
diff --git a/doc/man/README b/doc/man/README
new file mode 100644
index 000000000..fb95a11f2
--- /dev/null
+++ b/doc/man/README
@@ -0,0 +1,8 @@
+Please note that new edits in files which already are in mdoc format
+should only be done in mdoc format.
+
+TODO:
+
+* incomplete pages:
+  - gnunet-timeout
+  
\ No newline at end of file
diff --git a/doc/man/gnunet-arm.1 b/doc/man/gnunet-arm.1
index b17e74a73..c25b10bb5 100644
--- a/doc/man/gnunet-arm.1
+++ b/doc/man/gnunet-arm.1
@@ -1,78 +1,134 @@
-.TH GNUNET\-ARM 1 "January 4, 2012" "GNUnet"
-.SH NAME
-gnunet\-arm \- control GNUnet services
-.SH SYNOPSIS
-.B gnunet\-arm
-.RI [ options ]
-.SH DESCRIPTION
-\fBgnunet\-arm\fP can be used to start or stop GNUnet services, including
-the ARM service itself.  The ARM service is a supervisor for GNUnet's
-service processes.  ARM starts services on-demand or as configured and
-re-starts them if they crash.
-.SH OPTIONS
-.B
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+.\" This file is part of GNUnet.
+.\" Copyright (C) 2001-2019 GNUnet e.V.
+.\"
+.\" Permission is granted to copy, distribute and/or modify this document
+.\" under the terms of the GNU Free Documentation License, Version 1.3 or
+.\" any later version published by the Free Software Foundation; with no
+.\" Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A
+.\" copy of the license is included in the file
+.\" ``FDL-1.3''.
+.\"
+.\" A copy of the license is also available from the Free Software
+.\" Foundation Web site at @url{http://www.gnu.org/licenses/fdl.html}.
+.\"
+.\" Alternately, this document is also available under the General
+.\" Public License, version 3 or later, as published by the Free Software
+.\" Foundation.  A copy of the license is included in the file
+.\" ``GPL3''.
+.\"
+.\" A copy of the license is also available from the Free Software
+.\" Foundation Web site at @url{http://www.gnu.org/licenses/gpl.html}.
+.\"
+.\" SPDX-License-Identifier: GPL3.0-or-later OR FDL1.3-or-later
+.\"
+.Dd January 4, 2012
+.Dt GNUNET-ARM 1
+.Os
+.Sh NAME
+.Nm gnunet-arm
+.Nd
+control GNUnet services
+.Sh SYNOPSIS
+.Nm
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
+.Op Fl d | \-delete
+.Op Fl e | \-end
+.Op Fl E | \-no-stderr
+.Op Fl h | \-help
+.Op Fl i Ar SERVICE | Fl \-init= Ns Ar SERVICE
+.Op Fl I | \-info
+.Op Fl k Ar SERVICE | Fl \-kill= Ns Ar SERVICE
+.Op Fl l Ar FILENAME | Fl \-logfile= Ns Ar FILENAME
+.Op Fl L Ar LOGLEVEL |  Fl \-loglevel= Ns Ar LOGLEVEL
+.Op Fl m | \-monitor
+.Op Fl O | \-no-stdout
+.Op Fl q | \-quiet
+.Op Fl r | \-restart
+.Op Fl s | \-start
+.Op Fl T DELAY | \-timeout= Ns Ar TIMEOUT
+.Op Fl v | \-version
+.Sh DESCRIPTION
+.Nm
+can be used to start or stop GNUnet services, including the ARM service itself.
+The ARM service is a supervisor for GNUnet's service processes.
+ARM starts services on-demand or as configured and restarts them if they crash.
+.Bl -tag -width Ds
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.B
-.IP "\-e, \-\-end"
-Shutdown all GNUnet services (including ARM itself).  Running
-"gnunet-arm \-e" is the usual way to shutdown a GNUnet peer.
-.B
-.IP "\-h, \-\-help"
+.It Fl d | \-delete
+Delete config file and directory on exit.
+.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
+Don't let gnunet-arm inherit standard error.
+.It Fl h | \-help
 Print short help on options.
-.B
-.IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
-Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
-.IP "\-i SERVICE,  \-\-init=SERVICE"
-Starts the specified SERVICE if it is not already running.  More specifically,
-this makes the service behave as if it were in the default services list.
-.B
-.IP "\-k SERVICE,  \-\-kill=SERVICE"
-Stop the specified SERVICE if it is running.  While this will kill the service
-right now, the service may be restarted immediately if other services depend
-on it (service is then started 'on-demand').  If the service used to be a 'default'
-service, its default-service status will be revoked.  If the
-service was not a default service, it will just be (temporarily) stopped,
-but could be re-started on-demand at any time.
-.B
-.IP "\-m, \-\-monitor"
-Monitor service activity of ARM.  In this mode, the command will not terminate
-until the user presses CTRL-C.
-.B
-.IP "\-s, \-\-start"
-Start all GNUnet default services on this system (and also ARM).  Naturally,
-if a service is demanded by a default service, it will then also be started.
-Running "gnunet-arm \-s" is the usual way to start a GNUnet peer.
-.B
-.IP "\-I, \-\-info"
+.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
 List all running services.
-.B
-.IP "\-v, \-\-version"
+.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 then started 'on-demand').
+If the service used to be a 'default' service, its default-service status will be revoked.
+If the service was not a default service, it will just be (temporarily) stopped, but could be re-started on-demand at any time.
+.It Fl l Ar FILENAME | Fl \-logfile= Ns Ar FILENAME
+Write logs to FILENAME.
+.It Fl L Ar LOGLEVEL |  Fl \-loglevel= Ns Ar LOGLEVEL
+Use LOGLEVEL for logging.
+Valid values are DEBUG, INFO, WARNING and ERROR.
+.It Fl m | \-monitor
+Monitor service activity of ARM.
+In this mode, the command will not terminate until the user presses CTRL-C.
+.It Fl O | \-no-stdout
+Don't let gnunet-arm inherit standard output
+.It Fl q | \-quiet
+Don't print status messages.
+.It Fl r | \-restart
+Stop and start all GNUnet default services.
+.It Fl s | \-start
+Start all GNUnet default services on this system (and also ARM).
+Naturally, if a service is demanded by a default service, it will then also be started.
+Running "gnunet-arm \-s" is the usual way to start a GNUnet peer.
+.It Fl T DELAY | \-timeout= Ns Ar DELAY
+Exit with error status if operation does not finish after DELAY
+.It Fl v | \-version
 Print GNUnet version number.
-.SH BUGS
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
-electronic mail to <gnunet\-developers@gnu.org>
-.SH SEE ALSO
-gnunet\-config(1), gnunet\-setup(1)
-.PP
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.
+.El
+.Sh EXAMPLES
+Start the gnunet-arm for the user:
+.Pp
+.Dl gnunet-arm -s
+.Pp
+Stop the gnunet-arm for the user:
+.Pp
+.Dl $ gnunet-arm -e
+.Sh SEE ALSO
+.Xr gnunet-config 1 ,
+.Xr gnunet-setup 1
+.sp
+The full documentation for gnunet is maintained as a Texinfo manual.
 If the
-.B info
-and
-.B gnunet
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.Pp
 should give you access to the complete handbook,
-.IP
-.B info gnunet-c-tutorial
-.PP
+.Pp
+.Dl info gnunet-c-tutorial
+.Pp
 will give you access to a tutorial for developers.
-.PP
-Depending on your installation, this information is also
-available in
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.sp
+Depending on your installation, this information is also available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-ats.1 b/doc/man/gnunet-ats.1
index c098ed576..1e7b7731c 100644
--- a/doc/man/gnunet-ats.1
+++ b/doc/man/gnunet-ats.1
@@ -1,85 +1,110 @@
-.TH GNUNET\-ATS 1 "October 16, 2015" "GNUnet"
-.SH NAME
-gnunet\-ats \- display information about transport resource allocation
-.SH SYNOPSIS
-.B gnunet\-ats
-.RI [ options ]
-.br
-.SH DESCRIPTION
-\fBgnunet\-ats\fP 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
-.B
-.IP "\-a,  \-\-aa"
+.\" This file is part of GNUnet.
+.\" Copyright (C) 2001-2019 GNUnet e.V.
+.\"
+.\" Permission is granted to copy, distribute and/or modify this document
+.\" under the terms of the GNU Free Documentation License, Version 1.3 or
+.\" any later version published by the Free Software Foundation; with no
+.\" Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A
+.\" copy of the license is included in the file
+.\" ``FDL-1.3''.
+.\"
+.\" A copy of the license is also available from the Free Software
+.\" Foundation Web site at @url{http://www.gnu.org/licenses/fdl.html}.
+.\"
+.\" Alternately, this document is also available under the General
+.\" Public License, version 3 or later, as published by the Free Software
+.\" Foundation.  A copy of the license is included in the file
+.\" ``GPL3''.
+.\"
+.\" A copy of the license is also available from the Free Software
+.\" Foundation Web site at @url{http://www.gnu.org/licenses/gpl.html}.
+.\"
+.\" SPDX-License-Identifier: GPL3.0-or-later OR FDL1.3-or-later
+.\"
+.Dd October 16, 2015
+.Dt GNUNET-ATS 1
+.Os
+.Sh NAME
+.Nm gnunet-ats
+.Nd
+display information about transport resource allocation
+.Sh SYNOPSIS
+.Nm
+.Op Fl a | \-all
+.Op Fl C Ar PEERID | Fl \-connect= Ns Ar PEERID
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
+.Op Fl h | \-help
+.Op Fl i Ar PEERID | Fl \-id= Ns Ar PEERID
+.Op Fl k Ar VALUE | Fl \-value= Ns Ar VALUE
+.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+.Op Fl m | \-monitor
+.Op Fl n | \-numeric
+.Op Fl p Ar PREFERENCE | Fl \-preference= Ns Ar PREFERENCE
+.Op Fl q | \-quotas
+.Op Fl t Ar TYPE | Fl \-type= Ns Ar TYPE
+.Op Fl u | \-used
+.Op Fl V | \-verbose
+.Op Fl v | \-version
+.Sh DESCRIPTION
+.Nm
+can be used to display information about the GNUnet's transport selection mechanism.
+It shows information about the addresses and the assigned input and output bandwidth.
+.Sh OPTIONS
+.Bl -tag -width Ds
+.It Fl a | \-all
 List all addresses currently known to ats.
-.B
-.IP "\-c FILENAME,  \-\-config=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 gnunet-transport commandline tool to force disconnects.
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.B
-.IP "\-C, \-\-connect=PEERID"
-Ask ATS to suggest an address for PEERID to transport to establish a
-connection.
-Note that you can use the gnunet\-transport command\-line tool to
-force disconnects.
-.B
-.IP "\-h, \-\-help"
+.It Fl h | \-help
 Print short help on options.
-.B
-.IP "\-i, \-\-id=PEERID"
-Print information for a specific peer identity only
-.B
-.IP "\-k, \-\-value=VALUE"
-Value to set for when changing preference values
-.B
-.IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
+.It Fl i Ar PEERID | Fl \-id= Ns Ar PEERID
+Print information for a specific peer identity only.
+.It Fl k Ar VALUE | Fl \-value= Ns Ar VALUE
+Value to set for when changing preference values.
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
 Use LOGLEVEL for logging.
 Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
-.IP "\-m, \-\-monitor"
-Monitor changes to the bandwidth assignments continuously
-.B
-.IP "\-n, \-\-numeric"
-Do not resolve IP addresses to hostnames
-.B
-.IP "\-k, \-\-preference=E"
-Set preference values, \-i, \-k and \-t required
-.B
-.IP "\-q, \-\-quotas"
+.It Fl m | \-monitor
+Monitor changes to the bandwidth assignments continuously.
+.It Fl n | \-numeric
+Do not resolve IP addresses to hostnames.
+.It Fl p Ar PREFERENCE | Fl \-preference= Ns Ar PREFERENCE
+Set preference values, -i, -k and -t required.
+.It Fl q | \-quotas
 Print quotas for all network types
-.B
-.IP "\-t, \-\-type=VALUE"
+.It Fl t Ar TYPE | Fl \-type= Ns Ar TYPE
 Preference type to change: latency | bandwidth
-.B
-.IP "\-u, \-\-used"
+.It Fl u | \-used
 Print addresses actively used only
-.B
-.IP "\-V, \-\-verbose"
+.It Fl V | \-verbose
 Print verbose output (include ATS address properties)
-.B
-.IP "\-v, \-\-version"
+.It v | \-version
 Print GNUnet version number.
-.SH BUGS
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
-electronic mail to <bug\-gnunet@gnu.org>
-.SH SEE ALSO
-gnunet\-transport(1)
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B gnunet
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
+.El
+.Sh SEE ALSO
+.Xr gnunet-transport 1
+.sp
+The full documentation for gnunet is maintained as a Texinfo manual.
+If the
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.Pp
 should give you access to the complete handbook,
-.IP
-.B info gnunet-c-tutorial
-.PP
+.Pp
+.Dl info gnunet-c-tutorial
+.Pp
 will give you access to a tutorial for developers.
-.PP
-Depending on your installation, this information is also
-available in
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.Pp
+Depending on your installation, this information is also available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt bug-gnunet@gnu.org .
diff --git a/doc/man/gnunet-bcd.1 b/doc/man/gnunet-bcd.1
index 02b4397de..9b37a097b 100644
--- a/doc/man/gnunet-bcd.1
+++ b/doc/man/gnunet-bcd.1
@@ -13,19 +13,14 @@ installed.  If it does not work for you, try installing the full
 TeXLive distribution first, for example using the package\-manager
 apt: "apt-get install texlive-full".
 .SH OPTIONS
-.B
 .IP "\-p PORT, \-\-port=PORT"
 Run the HTTP server on port PORT.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-cadet.1 b/doc/man/gnunet-cadet.1
index 8404f085c..44d7fffca 100644
--- a/doc/man/gnunet-cadet.1
+++ b/doc/man/gnunet-cadet.1
@@ -21,42 +21,30 @@ For one\-to\-many communication \fBgnunet\-social\fP may be better
 suited, however.
 
 .SH SPECIFIC OPTIONS
-.B
 .IP "\-C CONNECTION_ID,  \-\-connection=CONNECTION_ID"
 Provide information about a particular connection.
-.B
 .IP "\-d,  \-\-dump"
 Dump debug information to STDERR.
-.B
 .IP "\-e,  \-\-echo"
 Activate echo mode.
-.B
 .IP "\-o SHARED_SECRET,  \-\-open-port=SHARED_SECRET"
 Listen for connections using a shared secret among sender and recipient.
-.B
 .IP "\-p PEER_ID,  \-\-peer=PEER_ID"
 Provide information about a patricular peer.
-.B
 .IP "\-P,  \-\-peers"
 Provide information about all peers.
-.B
 .IP "\-T,  \-\-tunnels"
 Provide information about all tunnels.
 
 .SH STANDARD OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-l LOGFILE, \-\-logfile=LOGFILE"
 Configure logging to write logs to LOGFILE.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 
diff --git a/doc/man/gnunet-config.1 b/doc/man/gnunet-config.1
index f1443283f..8eca8de10 100644
--- a/doc/man/gnunet-config.1
+++ b/doc/man/gnunet-config.1
@@ -7,38 +7,28 @@ gnunet\-config \- manipulate GNUnet configuration files
 .SH DESCRIPTION
 \fBgnunet\-config\fP can be used to read or modify GNUnet configuration files.
 .SH OPTIONS
-.B
 .IP "\-f, \-\-filename"
-When accessing a specific option using \-s and \-o, perform expansions as if the
-value represents a filename.
-.B
+Try to perform expansions as if the option values represent filenames (will
+also be applied even if the option is not really a filename).
 .IP "\-s SECTION, \-\-section=SECTION"
 Which configuration section should be accessed or edited. Required option.
-.B
 .IP "\-S, \-\-list\-sections"
 List available configuration sections for use with \-\-section.
-.B
 .IP "\-W, \-\-rewrite"
 Consider differences to defaults only.
-.B
 .IP "\-o OPTION, \-\-option=OPTION"
 Which configuration option should be accessed or edited.  Required to set a value.
 If not given, all values of a given section will be printed in the
 format "OPTION = VALUE".
-.B
 .IP "\-V VALUE, \-\-value VALUE"
 Configuration value to store in the given section under the given option.
 Must only be given together with \-s and \-o options.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-conversation-test.1 b/doc/man/gnunet-conversation-test.1
index 5c08d3dab..477da5042 100644
--- a/doc/man/gnunet-conversation-test.1
+++ b/doc/man/gnunet-conversation-test.1
@@ -17,17 +17,13 @@ known to your computer).
 You can use gnunet\-conversation\-test without having a peer running
 on your computer.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.
 Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-conversation.1 b/doc/man/gnunet-conversation.1
index 5925871da..3815b3887 100644
--- a/doc/man/gnunet-conversation.1
+++ b/doc/man/gnunet-conversation.1
@@ -15,25 +15,19 @@ your zone in the GNU Name System (using gnunet\-namestore).
 gnunet\-conversation has an interactive help system via the /help
 command.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-e NAME,  \-\-ego=NAME"
 Specifies the NAME of the ego to use (for caller ID).
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.
 Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-p LINE,  \-\-phone=LINE"
 Optional argument that can be used to specify the phone LINE to be used with
 the conversation service.
 The default LINE is zero, which should be fine for most users.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-dns2gns.1 b/doc/man/gnunet-dns2gns.1
index 552df25b6..f61a0a8b3 100644
--- a/doc/man/gnunet-dns2gns.1
+++ b/doc/man/gnunet-dns2gns.1
@@ -1,60 +1,60 @@
-.TH GNUNET\-DNS2GNS 1 "March 5, 2018" "GNUnet"
-
-.SH NAME
-gnunet\-dns2gns \- run a DNS-to-GNS proxy
-
-.SH SYNOPSIS
-.B gnunet\-dns2gns
-.RI [ options ]
-.br
-
-.SH DESCRIPTION
-Most users will not want to run an DNS to GNS proxy/gateway and thus will not
-need this program.
-
-\fBgnunet\-dns2gns\fP 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.
-
-.SH OPTIONS
-.B
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+.Dd March 5, 2018
+.Dt GNUNET-DNS2GNS 1
+.Os
+.Sh NAME
+.Nm gnunet-dns2gns
+.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
+.Sh DESCRIPTION
+.Nm
+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.
-.B
-.IP "\-d IP,  \-\-dns=IP"
+.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.
-.B
-.IP "\-h, \-\-help"
+.It Fl h | \-help
 Print short help on options.
-.B
-.IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
-Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
-.IP "\-v, \-\-version"
+.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
 Print GNUnet version number.
-
-.SH BUGS
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
-electronic mail to <bug\-gnunet@gnu.org>
-.SH SEE ALSO
-gnunet\-gns\-fcfs(1), gnunet\-gns(1), gnunet\-identity(1)
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B gnunet
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
+.El
+.Sh SEE ALSO
+.Xr gnunet-gns-fcfs 1 ,
+.Xr gnunet-gns 1 ,
+.Xr gnunet-identity 1
+.sp
+The full documentation for gnunet is maintained as a Texinfo manual.
+If the
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.Pp
 should give you access to the complete handbook,
-.IP
-.B info gnunet-c-tutorial
-.PP
+.Pp
+.Dl info gnunet-c-tutorial
+.Pp
 will give you access to a tutorial for developers.
-.PP
-Depending on your installation, this information is also
-available in
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.sp
+Depending on your installation, this information is also available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-ecc.1 b/doc/man/gnunet-ecc.1
index aedc0bc49..2aa7743b2 100644
--- a/doc/man/gnunet-ecc.1
+++ b/doc/man/gnunet-ecc.1
@@ -17,33 +17,25 @@ take a while.  If the option \-p is given, the corresponding public
 key will be printed to the console.
 
 .SH OPTIONS
-.B
 .IP "\-g COUNT, \-\-generate-keys=COUNT"
 Create COUNT public-private key pairs and write them to FILENAME.
 Used for creating a file for testing.
-.B
 .IP "\-p, \-\-print-public-key"
 Print the corresponding public key to stdout.  This is the value used
 for PKEY records in GNS.
-.B
 .IP "\-P, \-\-print-private-key"
 Print the corresponding private key to stdout.  This is the value used
 for PKEY records in GNS.
-.B
 .IP "\-x, \-\-print-hex"
 Print the corresponding public key to stdout in HEX format.  Useful
 for comparing to Ed25519 keys in X.509 tools.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and
 ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 
diff --git a/doc/man/gnunet-gns-proxy-setup-ca.1 b/doc/man/gnunet-gns-proxy-setup-ca.1
new file mode 100644
index 000000000..54df856eb
--- /dev/null
+++ b/doc/man/gnunet-gns-proxy-setup-ca.1
@@ -0,0 +1,64 @@
+.Dd March 6, 2019
+.Dt GNUNET-GNS-PROXY-SETUP-CA 1
+.Os
+.Sh NAME
+.Nm gnunet-gns-proxy-setup-ca
+.Nd generate an X509 certificate for gnunet-gns-proxy and install it
+.Sh SYNOPSIS
+.Nm
+.Op Fl c Ar FILE
+.\".Op Fl f Ar FILE
+.Op Fl h
+.Op Fl v
+.Op Fl V
+.Sh DESCRIPTION
+.Nm
+is a shell script to generate X509 certificates for your gnunet-gns-proxy and to install it for both GNUnet and your web browser.
+It currently supports Firefox and Chrome based browsers through the help of external helpers: certutil (nss) is used for the  import into webbrowsers, openssl is used to generated the CA.
+.Bl -tag -width Ds
+.It Fl c Ar FILE
+Use the configuration file FILE.
+.\" .It Fl f
+.\" Perform expansions of the variables used in the config value of gns-proxy.
+.\" This will usually expand $GNUNET_DATA_HOME to represents its path.
+.It Fl h
+Print short help on options
+.It Fl v
+Print the version
+.It Fl V
+be verbose
+.El
+.Sh FILES
+.Pa gnunet.conf
+.Sh SEE ALSO
+.Xr gnunet-gns 1 ,
+.Xr gnunet-gns-proxy 1 ,
+.Xr gnunet.conf 5
+.sp
+The full documentation for gnunet is maintained as a Texinfo manual.
+If the
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Bd -literal -offset indent -compact
+        info gnunet
+.Ed
+should give you access to the complete handbook,
+.Bd -literal -offset indent -compact
+        info gnunet-c-tutorial
+.Ed
+will give you access to a tutorial for developers.
+.sp
+Depending on your installation, this information is also
+available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.Sh HISTORY
+This man page first appeared in GNUnet 0.11.1.
+.Sh AUTHORS
+This page was written by
+.An ng0 Aq Mt ng0@gnunet.org .
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt bug-gnunet@gnu.org .
diff --git a/doc/man/gnunet-gns-proxy.1 b/doc/man/gnunet-gns-proxy.1
index 6c12e2c09..603c5a28c 100644
--- a/doc/man/gnunet-gns-proxy.1
+++ b/doc/man/gnunet-gns-proxy.1
@@ -15,26 +15,20 @@ CA certificate has to be generated that is used by the proxy. Thus
 of this proxy or the \-\-authority switch is used to specify an
 appropriate CA certificate that is already trusted by the browser.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-a AUTHORITY,  \-\-authority=AUTHORITY"
 Path to a PEM CA file that contains the certificate and private key of
 the CA to use to assert the validity of GNS names. The default port is
 specified in the configuration file for the gns service under
 "[gns-proxy]" PROXY_CACERT.
-.B
 .IP "\-p PORT,  \-\-port=PORT"
 The port this proxy should listen on. Default is 7777.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and
 ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-gns.1 b/doc/man/gnunet-gns.1
index 597297629..750c72d95 100644
--- a/doc/man/gnunet-gns.1
+++ b/doc/man/gnunet-gns.1
@@ -8,33 +8,26 @@ gnunet\-gns \- Access to GNU Name System
 \fBgnunet\-gns\fP can be used to lookup and process GNU Name Service
 names.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-r, \-\-raw"
 No unneeded output.
 This is a quiet mode where only important information is displayed.
 For example a lookup for an IP address will only yield the IP address,
 no descriptive text.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.
 Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-u NAME, \-\-lookup=NAME"
 Name to lookup.
 Resolve the specified name using the GNU Name System.
-.B
 .IP "\-t TYPE, \-\-type=TYPE"
 Resource Record Type (TYPE) to look for.
 Supported TYPE's are: A, AAAA, CNAME, NS, PKEY, PSEU, TLSA, SRV, SOA,
 MX, LEHO, VPN, REV, PTR, TXT.
 Defaults to "A".
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH RETURN VALUE
diff --git a/doc/man/gnunet-namecache.1 b/doc/man/gnunet-namecache.1
index 78acb017b..06946e387 100644
--- a/doc/man/gnunet-namecache.1
+++ b/doc/man/gnunet-namecache.1
@@ -13,23 +13,17 @@ gnunet\-namecache \- inspect namecache
 namecache.
 
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and
 ERROR.
-.B
 .IP "\-n NAME, \-\-name=NAME"
 Name (label) of the record to display (mandatory option)
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
-.B
 .IP "\-z PKEY, \-\-zone=PKEY"
 Specifies the public key of the zone to inspect (mandatory option)
 
diff --git a/doc/man/gnunet-namestore-fcfsd.1 b/doc/man/gnunet-namestore-fcfsd.1
index a6c9d2b32..c1eca224f 100644
--- a/doc/man/gnunet-namestore-fcfsd.1
+++ b/doc/man/gnunet-namestore-fcfsd.1
@@ -27,20 +27,15 @@ pseudonym (using "gnunet\-identity \-C NAME"), and use it with the
 "-z" option.  After that, you can start the FCFSD service (possibly using
 gnunet\-arm).
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and
 ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
-.B
 .IP "\-z EGO, \-\-zone=EGO"
 Specifies for which EGO should FCFSD manage the zone.
 .SH BUGS
diff --git a/doc/man/gnunet-namestore.1 b/doc/man/gnunet-namestore.1
index 7517a4f5e..6a824cc47 100644
--- a/doc/man/gnunet-namestore.1
+++ b/doc/man/gnunet-namestore.1
@@ -12,13 +12,10 @@ gnunet\-namestore \- manipulate GNU Name System (GNS) zone data
 \fBgnunet\-namestore\fP can be used to manipulate records in a GNS zone.
 
 .SH OPTIONS
-.B
 .IP "\-a, \-\-add"
 Desired operation is adding a record
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-d, \-\-delete"
 Desired operation is deleting records under the given name that match
 the specified type (\-t) and value (\-V).  If type or value are not
@@ -26,41 +23,31 @@ specified, it means that all types (or values) should be assumed to
 match (and possibly multiple or all values under the given label will
 be deleted).  Specifying a label (\-n) is mandatory.  Note that
 matching by expiration time or flags is (currently) not supported.
-.B
 .IP "\-D, \-\-display"
 Desired operation is listing of matching records
-.B
 .IP "\-e TIME, \-\-expiration=TIME"
 Specifies expiration time of record to add; format is relative time,
 i.e "1 h" or "7 d 30 m".  Supported units are "ms", "s", "min" or
 "minutes", "h" (hours), "d" (days) and "a" (years).
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-i NICKNAME, \-\-nick=NICKNAME"
 Set the desired NICKNAME for the zone. The nickname will be included
 in all (public) records and used as the suggested name for this zone.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and
 ERROR.
-.B
 .IP "\-m, \-\-monitor"
 Monitor changes to the zone on an ongoing basis (in contrast to \-D,
 which merely displays the current records)
-.B
 .IP "\-n NAME, \-\-name=NAME"
 Label or name of the record to add/delete/display
-.B
 .IP "\-p, \-\-public"
 Create a record that is public (shared with other users that know the
 label)
-.B
 .IP "\-r PKEY, \-\-reverse=PKEY"
 Determine our GNS name for the given public key (reverse lookup of the
 PKEY) in the given zone.
-.B
 .IP "\-R RECORDLINE, \-\-replace=RECORDLINE"
 Sets record set to values given in RECORDLINE.  This option can be specified multiple
 times to provide multiple records for the record set.  Existing records under the
@@ -69,29 +56,23 @@ same label will be deleted. The format for the RECORDLINE is
 be given explicitly, seconds is always implied), TYPE is the
 DNS/GNS record type, FLAGS is "(N)ORMAL", "(S)HADOW" or "(P)UBLIC".  The VALUE
 follows the usual human-readable value format(s) of DNS/GNS.
-.B
 .IP "\-s, \-\-shadow"
 Create a record that is a shadow record.  Shadow records are only used
 once all other records of the same type under the same label have
 expired.
-.B
 .IP "\-t TYPE, \-\-type=TYPE"
 Type of the record to add/delete/display (i.e. "A", "AAAA", "NS",
 "PKEY", "MX" etc.)
-.B
 .IP "\-u URI, \-\-uri=URI"
 Add PKEY record from gnunet://gns/-URI to our zone; the record type is
 always PKEY, if no expiration is given FOREVER is used
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
-.B
 .IP "\-V VALUE, \-\-value=VALUE"
 Value to store or remove from the GNS zone.  Specific format depends
 on the record type.  A records expect a dotted decimal IPv4 address,
 AAAA records an IPv6 address, PKEY a public key in GNUnet's printable
 format, and CNAME and NS records should be a domain name.
-.B
 .IP "\-z EGO, \-\-zone=EGO"
 Specifies the name of the ego controlling the private key for the zone
 (mandatory option)
diff --git a/doc/man/gnunet-nat-auto.1 b/doc/man/gnunet-nat-auto.1
index 8514a5c99..efd4b5df1 100644
--- a/doc/man/gnunet-nat-auto.1
+++ b/doc/man/gnunet-nat-auto.1
@@ -8,22 +8,17 @@ gnunet\-nat\-auto \- autoconfigure and test NAT traversal
 This tool allows testing various NAT traversal functions, as well
 as attempting auto\-configuration.
 .SH OPTIONS
-.B
 .IP "\-a,  \-\-auto"
 Attempt auto\-configuration for NAT traversal.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-S NAME,  \-\-section=NAME"
 Name of the configuration section with details about the configuration
 to test. For example "transport-tcp".
 .IP "\-t,  \-\-tcp"
 Use TCP.
-.B
 .IP "\-u,  \-\-udp"
 Use UDP.
-.B
 .IP "\-w,  \-\-write"
 Write configuration to configuration file, useful in combination with
 autoconfiguration (\-a).
diff --git a/doc/man/gnunet-nat-server.1 b/doc/man/gnunet-nat-server.1
index f31e69b26..8cb995f7c 100644
--- a/doc/man/gnunet-nat-server.1
+++ b/doc/man/gnunet-nat-server.1
@@ -41,7 +41,6 @@ gnunet\-nat\-server is run on should be specified in the NATSERVER
 option in the [setup] section of the configuration file of hosts that
 are supposed to autoconfigure with this server.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
 .SH BUGS
diff --git a/doc/man/gnunet-nat.1 b/doc/man/gnunet-nat.1
index 4a6a56e97..fe9272ea5 100644
--- a/doc/man/gnunet-nat.1
+++ b/doc/man/gnunet-nat.1
@@ -8,38 +8,28 @@ gnunet\-nat \- interact with the NAT service
 This tool allows testing various NAT traversal functions, as well as
 attempting auto\-configuration.
 .SH OPTIONS
-.B
 .IP "\-b ADDRESS,  \-\-bind=ADDRESS"
 Assume that the service is (locally) bound to ADDRESS.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-e ADDRESS,  \-\-external=ADDRESS"
 Assume that ADDRESS is the globally visible address of the peer.
-.B
 .IP "\-i ADDRESS,  \-\-in=ADDRESS"
 Assuming we are listening at ADDRESS for connection reversal requests.
-.B
 .IP "\-r ADDRESS,  \-\-remote=ADDRESS"
 Ask the peer at ADDRESS for connection reversal, using the local
 address for the target address of the reversal.
-.B
 .IP "\-S NAME,  \-\-section=NAME"
 Name of section in configuration file to use for additional options.
-.B
 .IP "\-s,  \-\-stun"
 Enable processing of STUN requests.
 Will try to read UDP packets from the bind address and handle the
 packets if they are STUN packets.
 Will only work with UDP.
-.B
 .IP "\-t,  \-\-tcp"
 Use TCP.
-.B
 .IP "\-u,  \-\-udp"
 Use UDP.
-.B
 .IP "\-W,  \-\-watch"
 Watch for connection reversal requests.
 .SH EXAMPLES
diff --git a/doc/man/gnunet-nse.1 b/doc/man/gnunet-nse.1
new file mode 100644
index 000000000..151ba4957
--- /dev/null
+++ b/doc/man/gnunet-nse.1
@@ -0,0 +1,65 @@
+.Dd March 6, 2019
+.Dt GNUNET-NSE 1
+.Os
+.Sh NAME
+.Nm gnunet-nse
+.Nd show network size estimates from NSE service
+.Sh SYNOPSIS
+.Nm
+.Op Fl c Ar file | Fl -config Ns = Ns file
+.Op Fl h | \-help
+.Op Fl l file | Fl -logfile Ns = Ns file
+.Op Fl L Ar loglevel | Fl -loglevel Ns = Ns loglevel
+.Op Fl v | \-version
+.Sh DESCRIPTION
+.Nm
+is a command line tool to show network size estimates from the NSE service of GNUnet.
+.Bl -tag -width Ds
+.It Fl c Ar file | Fl -config Ns = Ns file
+Use the configuration file FILENAME.
+.It Fl h | \-help
+Print short help on options.
+.It Fl l file | Fl -logfile Ns = Ns file
+Configure logging to write logs to LOGFILE.
+.It Fl L Ar loglevel | Fl -loglevel Ns = Ns loglevel
+Use LOGLEVEL for logging.
+Valid values are DEBUG, INFO, WARNING and ERROR.
+.It Fl v | \-version
+Print GNUnet version number.
+.El
+.Sh FILES
+.Pa gnunet.conf
+Configuration file for gnunet.
+.Sh SEE ALSO
+.Xr gnunet.conf 5
+.sp
+The full documentation for gnunet is maintained as a Texinfo manual.
+If the
+.Xr info 1
+gnunet programs are properly installed at your site, the command
+.Bd -literal -offset indent -compact
+        info gnunet
+.Ed
+should give you access to the complete handbook,
+.Bd -literal -offset indent -compact
+        info gnunet-c-tutorial
+.Ed
+will give you access to a tutorial for developers.
+.sp
+Depending on your installation, this information is also
+available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.Sh HISTORY
+This man page first appeared in GNUnet 0.11.1.
+.Sh AUTHORS
+This page was originally written by
+.An Bertrand Marc Aq Mt bmarc@debian.org
+for Debian's gnunet package (man page date: 2014).
+Further edits and conversion to mdoc were done by
+.An ng0 Aq Mt ng0@gnunet.org .
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt bug-gnunet@gnu.org .
diff --git a/doc/man/gnunet-peerinfo.1 b/doc/man/gnunet-peerinfo.1
index bd37fa635..88094fa10 100644
--- a/doc/man/gnunet-peerinfo.1
+++ b/doc/man/gnunet-peerinfo.1
@@ -8,39 +8,28 @@ gnunet\-peerinfo \- Display information about other peers.
 .PP
 \fBgnunet\-peerinfo\fP display the known addresses and trust of known peers.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME, \-\-config=FILENAME"
 Load config file (default: ~/.config/gnunet.conf)
-.B
 .IP "\-g, \-\-get\-hello"
 Output HELLO uri(s)
-.B
 .IP "\-h, \-\-help"
 Print help page
-.B
 .IP "\-i, \-\-info"
 List all known peers (and their addresses)
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Set the loglevel
-.B
 .IP "\-l LOGFILE, \-\-logfile=LOGFILE"
 Log messages to LOGFILE
-.B
 .IP "\-n, \-\-numeric"
 Disable resolution of IPs to hostnames
-.B
 .IP "\-p, \-\-put\-hello=HELLO"
 Add given HELLO uri to the database
-.B
 .IP "\-q, \-\-quiet"
 Do not print anything but the peer identities
-.B
 .IP "\-s, \-\-self"
 Print only our own identity (together with "\-q", this is the exact
 line that other peers would have to put in to their friends file in
 order to consider this peer one of their friends in F2F mode).
-.B
 .IP "\-v, \-\-version"
 Print the version number
 .SH BUGS
diff --git a/doc/man/gnunet-publish.1 b/doc/man/gnunet-publish.1
index b07208732..5f774580b 100644
--- a/doc/man/gnunet-publish.1
+++ b/doc/man/gnunet-publish.1
@@ -112,9 +112,9 @@ default is ~/.config/gnunet.conf).
 Disable use of GNU libextractor for finding additional keywords and
 metadata.
 .TP
-\fB\-d\fR, \fB\-\-disable\-creation\-time\fR
-Disable use of creation time timestamp in metadata.
-Useful to make created directories deterministic and to avoid leaking
+\fB\-E\fR, \fB\-\-enable\-creation\-time\fR
+Enable use of creation time timestamp in metadata.
+Setting this information will leak
 information about the time at which a file was made available.
 .TP
 \fB\-e\fR, \fB\-\-extract\fR
diff --git a/doc/man/gnunet-qr.1 b/doc/man/gnunet-qr.1
index 0145a3523..2aabe6b22 100644
--- a/doc/man/gnunet-qr.1
+++ b/doc/man/gnunet-qr.1
@@ -1,49 +1,53 @@
-.TH GNUNET\-QR 1 "September 13, 2014" "GNUnet"
-.SH NAME
-gnunet\-qr \- Scan a QR code using a video device and import.
-.SH SYNOPSIS
-.B gnunet\-qr
-.RI [ options ]
-.br
-.SH DESCRIPTION
-\fBgnunet\-qr\fP is a command line tool to scan a QR code using a
-video device and import.
-.SH OPTIONS
-.B
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+.Dd September 13, 2014
+.Dt GNUNET-QR 1
+.Os
+.Sh NAME
+.Nm gnunet-qr
+.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
+.Sh DESCRIPTION
+.Nm
+is a command line tool to scan a QR code using a video device and import.
+.Bl -tag -width Ds
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.B
-.IP "\-d DEVICE,  \-\-device=DEVICE"
+.It Fl d Ar DEVICE | Fl \-device= Ns Ar DEVICE
 Use device DEVICE.
-.B
-.IP "\-h, \-\-help"
+.It Fl h | \-help
 Print short help on options.
-.B
-.IP "\-s,  \-\-silent"
+.It Fl s | \-silent
 Do not show preview windows.
-.B
-.IP "\-v, \-\-verbose"
+.It Fl v | \-verbose
 Be verbose.
-.SH BUGS
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
-electronic mail to <gnunet\-developers@gnu.org>
-.SH SEE ALSO
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B gnunet
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
+.El
+.Sh SEE ALSO
+The full documentation for gnunet is maintained as a Texinfo manual.
+If the
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.Pp
 should give you access to the complete handbook,
-.IP
-.B info gnunet-c-tutorial
-.PP
+.Pp
+.Dl info gnunet-c-tutorial
+.Pp
 will give you access to a tutorial for developers.
-.PP
-Depending on your installation, this information is also
-available in
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.sp
+Depending on your installation, this information is also available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-resolver.1 b/doc/man/gnunet-resolver.1
index 66f1ba9a8..494131d01 100644
--- a/doc/man/gnunet-resolver.1
+++ b/doc/man/gnunet-resolver.1
@@ -7,23 +7,17 @@ gnunet\-resolver \- build-in GNUnet stub resolver
 .SH DESCRIPTION
 \fBgnunet\-resolver\fP uses build-in GNUnet stub resolver.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and
 ERROR.
-.B
 .IP "\-l LOGFILE, \-\-logfile=LOGFILE"
 Configure logging to write logs to LOGFILE.
-.B
 .IP "\-r, \-\-reverse"
 Perform a reverse lookup.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-revocation.1 b/doc/man/gnunet-revocation.1
index f21f82612..6fae373e7 100644
--- a/doc/man/gnunet-revocation.1
+++ b/doc/man/gnunet-revocation.1
@@ -28,19 +28,15 @@ expensive.  Depending on your CPU, the calculation can take days or
 weeks.
 
 .SH OPTIONS
-.B
 .IP "\-t KEY, \-\-test=KEY"
 Check if the given KEY (ASCII\-encoded public key required) has been
 revoked.
-.B
 .IP "\-R NAME, \-\-revoke=NAME"
 Calculate or perform revocation for the ego with the given NAME.
-.B
 .IP "\-p, \-\-perform"
 Actually perform the revocation as soon as possible (do not just
 generate a revocation certificate, use it).  Must be supplied to
 actually perform the revocation.
-.B
 .IP "\-f NAME, \-\-filename=NAME"
 Use NAME as the name of the file that is to contain the revocation
 certificate.  Intermediate computation results will be stored here, as
@@ -51,17 +47,13 @@ be performed instantly.  If the given file contains anything (a valid
 certificate, with or without the completed proof-of-work) there is no
 need to supply the "\-R" option or to still have the private key of
 the ego to perform the revocation.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and
 ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 
diff --git a/doc/man/gnunet-scalarproduct.1 b/doc/man/gnunet-scalarproduct.1
index 1c8938daf..34d5e4ef0 100644
--- a/doc/man/gnunet-scalarproduct.1
+++ b/doc/man/gnunet-scalarproduct.1
@@ -42,34 +42,26 @@ The protocol by definition relies on \fBAlice\fP and \fBBob\fP being
 benign, thus \fBBob\fP can arbitrarily falsify his information. Both
 peers collaborate to achieve a correct result.
 .SH OPTIONS
-.B
 .IP "\-e ELEMENTS, \-\-elements=ELEMENTS"
 The element-vector the vectorproduct should be computed over in signed
 decimal form, eg: \"42,1,-3,3,7\". Zero value elements will be automatically masked.
-.B
 .IP "\-m MASK, \-\-mask=MASK"
 Elements in the vector can be masked. There must be at least two
 elements left in the vector to compute a vectorproduct. Non-Zero
 values indicate an element is not maskes.
-.B
 .IP "\-k KEY, \-\-key=KEY"
 The session key, a shared string of arbitrary length from which the
 SID will be generated
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-p PEERID, \-\-peer=PEERID"
 The remote peer\'s ASCII-armored gnunet-peer ID as output by
 gnunet-peerinfo. If this option is not given, the peer will take the
 \fBBob\fP\'s role.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-scrypt.1 b/doc/man/gnunet-scrypt.1
index 01ac4205a..545af37e9 100644
--- a/doc/man/gnunet-scrypt.1
+++ b/doc/man/gnunet-scrypt.1
@@ -5,34 +5,24 @@ gnunet\-scrypt \- Manipulate GNUnet proof of work files.
 .B gnunet\-scrypt
 .RI [ options ]
 .SH DESCRIPTION
-\fBgnunet\-scrypt\fP is a command line tool to manipulate GNUnet proof
-of work files.
+\fBgnunet\-scrypt\fP is a command line tool to manipulate GNUnet proof of work files.
 .SH OPTIONS
-.B
 .IP "\-b BITS,  \-\-bits=BITS"
 Number of bits to require for the proof of work.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-k FILE, \-\-keyfile=FILE"
 File with private key, otherwise default is used.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-l LOGFILE, \-\-logfile=LOGFILE"
 Configure logging to write logs to LOGFILE.
-.B
 .IP "\-o FILE, \-\-outfile=FILE"
 File with proof of work, otherwise default is used.
-.B
 .IP "\-t TIME, \-\-timeout=TIME"
 Time to wait between calculations.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-statistics.1 b/doc/man/gnunet-statistics.1
index e61a8493c..c0d5e8fe3 100644
--- a/doc/man/gnunet-statistics.1
+++ b/doc/man/gnunet-statistics.1
@@ -1,73 +1,91 @@
-.TH GNUNET-STATISTICS 1 "January 4, 2012" "GNUnet"
-.SH NAME
-gnunet\-statistics \- Display statistics about your GNUnet system
-.SH SYNOPSIS
-.B gnunet\-statistics
-.RI [ options ]
-.RI [ VALUE ]
-.SH DESCRIPTION
-\fBgnunet\-statistics\fP 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.
-.SH OPTIONS
-.B
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+.Dd January 4, 2012
+.Dt GNUNET-STATISTICS 1
+.Os
+.Sh NAME
+.Nm gnunet-statistics
+.Nd display statistics about your GNUnet system
+.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 l Ar FILENAME | Fl \-logfile= Ns Ar FILENAME
+.Op Fl n Ar NAME | Fl \-name= Ns Ar NAME
+.Op Fl o Ar PORT | Fl \-port= Ns Ar PORT
+.Op Fl p | \-persistent
+.Op Fl q | \-quiet
+.Op Fl r Ar REMOTE | Fl \-remote= Ns Ar REMOTE
+.Op Fl S Ar SEPARATOR | Fl \-csv-separator= Ns Ar SEPARATOR
+.Op Fl s Ar SUBSYSTEM | Fl \-subsystem= Ns Ar SUBSYSTEM
+.Op Fl t Ar PATH | Fl \-testbed= Ns Ar PATH
+.Op Fl v | \-version
+.Op Fl w | \-watch
+.Ao Ar VALUE Ac
+.Sh DESCRIPTION
+.Nm
+is used to display detailed information about various aspect of GNUnet's operation.
+This tool only works if the "statistics" service is available.
+gnunet-statistics can be used to set a value by giving the options \-n, \-s and also a VALUE.
+.Bl -tag -width Ds
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.B
-.IP "\-h, \-\-help"
+.It Fl h | \-help
 Print short help on options.
-.B
-.IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
-.IP "\-n NAME,  \-\-name=NAME"
-Each statistic has a name that is unique with in its subsystem.  With
-this option, the output can be restricted to statistics that have a
-particular name.
-.B
-.IP "\-p,  \-\-persistent"
-When setting a value, make the value persistent.  If the value used to
-be persistent and this flag is not given, it will be marked as
-non\-persistent.
-.B
-.IP "\-s SUBSYSTEM,  \-\-subsystem=SUBSYSTEM"
-Statistics are kept for various subsystems.  With this option, the
-output can be restricted to a particular subsystem only.
-.B
-.IP "\-S SEPARATOR,  \-\-csv-separator=SEPARATOR"
+.It Fl l Ar FILENAME | Fl \-logfile= Ns Ar FILENAME
+Configure logging to write logs to FILENAME
+.It Fl n Ar NAME | Fl \-name= Ns Ar NAME
+Each statistic has a NAME that is unique with in its subsystem.
+With this option, the output can be restricted to statistics that have a particular NAME.
+.It Fl o Ar PORT | Fl \-port= Ns Ar PORT
+PORT for remote host
+.It Fl p | \-persistent
+When setting a value, make the value persistent.
+If the value used to be persistent and this flag is not given, it will be marked as non-persistent.
+.It Fl q | \-quiet
+Just print the statistics value
+.It Fl r Ar REMOTE | Fl \-remote= Ns Ar REMOTE
+Connect to a remote host given as REMOTE.
+.It Fl S Ar SEPARATOR | Fl \-csv-separator= Ns Ar SEPARATOR
 Specify a separator for generating csv-output.
-.B
-.IP "\-t TESTBED_PATH,  \-\-subsystem=TESTBED_PATH"
+.It Fl s Ar SUBSYSTEM | Fl \-subsystem= Ns Ar SUBSYSTEM
+Statistics are kept for various subsystems.
+With this option, the output can be restricted to a particular subsystem only.
+.It Fl t Ar PATH | Fl \-testbed= Ns Ar PATH
 When running testbed, you can get statistics of all peers with specefying the
-folder containing the data of all testbed nodes like \fBgnunet\-statistics -t /tmp/testbedARtmQv\fP.
-.B
-.IP "\-v, \-\-version"
+folder containing the data of all testbed nodes like
+.Pp
+.Dl $ gnunet-statistics -t /tmp/testbedARtmQv
+.Pp
+.It Fl v | \-version
 Print GNUnet version number.
-.SH BUGS
-Report bugs by using Mantis <https://gnunet.org/mantis/> or by sending
-electronic mail to <gnunet\-developers@gnu.org>
-.SH SEE ALSO
-gnunet\-service\-statistics(1)
-.PP
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.
+.It Fl w | \-watch
+Watch value continuously.
+.El
+.Sh SEE ALSO
+.Xr gnunet-service-statistics 1
+.sp
+The full documentation for gnunet is maintained as a Texinfo manual.
 If the
-.B info
-and
-.B gnunet
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.Pp
 should give you access to the complete handbook,
-.IP
-.B info gnunet-c-tutorial
-.PP
+.Pp
+.Dl info gnunet-c-tutorial
+.Pp
 will give you access to a tutorial for developers.
-.PP
-Depending on your installation, this information is also
-available in
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.sp
+Depending on your installation, this information is also available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-testbed-profiler.1 b/doc/man/gnunet-testbed-profiler.1
index b1dde99dd..fe9d713b3 100644
--- a/doc/man/gnunet-testbed-profiler.1
+++ b/doc/man/gnunet-testbed-profiler.1
@@ -1,61 +1,67 @@
-.TH GNUNET\-TESTBED\-PROFILER 1 "September 13, 2014" "GNUnet"
-.SH NAME
-gnunet\-testbed\-profiler \- Profiling driver for the testbed.
-.SH SYNOPSIS
-.B gnunet\-testbed\-profiler
-.RI [ options ]
-.br
-.SH DESCRIPTION
-\fBgnunet\-testbed\-profiler\fP is a command line profiling driver for the testbed.
-.SH OPTIONS
-.B
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+.Dd September 13, 2014
+.Dt GNUNET-TESTBED-PROFILER 1
+.Os
+.Sh NAME
+.Nm gnunet-testbed-profiler
+.Nd
+profiling driver for the testbed
+.Sh SYNOPSIS
+.Nm
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
+.Op Fl e Ar COUNT | Fl \-num-errors= Ns Ar COUNT
+.Op Fl H Ar FILENAME |  Fl \-hosts= Ns Ar FILENAME
+.Op Fl h | \-help
+.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+.Op Fl l Ar LOGFILE |  Fl \-logfile= Ns Ar LOGFILE
+.Op Fl n | \-non-interactive
+.Op Fl p Ar COUNT | Fl \-num-peers= Ns Ar COUNT
+.Op Fl v | \-version
+.Sh DESCRIPTION
+.Nm
+is a command line profiling driver for the testbed.
+.Sh OPTIONS
+.Bl -tag -width Ds
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.B
-.IP "\-e COUNT,  \-\-num\-errors=COUNT"
+.It Fl e Ar COUNT | Fl \-num-errors= Ns Ar COUNT
 Tolerate COUNT number of continious timeout failures.
-.B
-.IP "\-H FILENAME,  \-\-hosts=FILENAME"
+.It Fl H Ar FILENAME |  Fl \-hosts= Ns Ar FILENAME
 Name of the file with the login information for the testbed.
-.B
-.IP "\-h, \-\-help"
+.It Fl h | \-help
 Print short help on options.
-.B
-.IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
-Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
-.IP "\-l LOGFILE, \-\-logfile=LOGFILE"
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+Use LOGLEVEL for logging.
+Valid values are DEBUG, INFO, WARNING and ERROR.
+.It Fl l Ar LOGFILE |  Fl \-logfile= Ns Ar LOGFILE
 Configure logging to write logs to LOGFILE.
-.B
-.IP "\-n, \-\-non\-interactive"
-Run profiler in non-interactive mode where upon testbed setup the
-profiler does not wait for a keystroke but continues to run until a
-termination signal is received.
-.B
-.IP "\-p COUNT, \-\-num\-peers=COUNT"
+.It Fl n | \-non-interactive
+Run profiler in non-interactive mode where upon testbed setup the profiler does not wait for a keystroke but continues to run until a termination signal is received.
+.It Fl p Ar COUNT | Fl \-num-peers= Ns Ar COUNT
 Create COUNT number of peers.
-.B
-.IP "\-v, \-\-version"
+.It Fl v | \-version
 Print GNUnet version number.
-.SH BUGS
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending electronic mail to <gnunet\-developers@gnu.org>
-.SH "SEE ALSO"
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B gnunet
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
+.El
+.Sh SEE ALSO
+The full documentation for gnunet is maintained as a Texinfo manual.
+If the
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.Pp
 should give you access to the complete handbook,
-.IP
-.B info gnunet-c-tutorial
-.PP
+.Pp
+.Dl info gnunet-c-tutorial
+.Pp
 will give you access to a tutorial for developers.
-.PP
-Depending on your installation, this information is also
-available in
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.sp
+Depending on your installation, this information is also available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-testing-run-service.1 b/doc/man/gnunet-testing-run-service.1
index 43fdb8ecf..903810c7f 100644
--- a/doc/man/gnunet-testing-run-service.1
+++ b/doc/man/gnunet-testing-run-service.1
@@ -1,52 +1,53 @@
-.TH GNUNET-TESTING-RUN-SERVICE 1 "August 25, 2013" "GNUnet"
-.SH NAME
-gnunet\-testing\-run\-service \- Command line tool to start a service for testing.
-.SH SYNOPSIS
-.B gnunet\-testing\-run\-service
-.RI [ options ]
-.SH DESCRIPTION
-\fBgnunet\-testing\-run\-service\fP is a command line tool to start a
-service for testing. It starts a peer, running only the service
-specified on the command line, outputs the path to the temporary
-configuration file to stdout.
-.PP
-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.
-.SH OPTIONS
-.B
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+.Dd August 25, 2013
+.Dt GNUNET-TESTING-RUN-SERVICE 1
+.Os
+.Sh NAME
+.Nm gnunet-testing-run-service
+.Nd
+command line tool to start a service for testing
+.Sh SYNOPSIS
+.Nm
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
+.Op Fl h | \-help
+.Op Fl s Ar SERVICE | Fl \-service= Ns Ar SERVICE
+.Sh DESCRIPTION
+.Nm
+is a command line tool to start a service for testing.
+It starts a peer, running only the service specified on the command line, outputs the path to the temporary configuration file to stdout.
+.Pp
+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
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Name of the template configuration file to use (optional).
-.B
-.IP "\-h, \-\-help"
+.It Fl h | \-help
 Print short help on options.
-.B
-.IP "\-s SERVICE, \-\-service=SERVICE"
+.It Fl s Ar SERVICE | Fl \-service= Ns Ar SERVICE
 Name of the service to run.
-.SH BUGS
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
-electronic mail to <gnunet\-developers@gnu.org>
-.SH SEE ALSO
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.
+.El
+.Sh SEE ALSO
+The full documentation for gnunet is maintained as a Texinfo manual.
 If the
-.B info
-and
-.B gnunet
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.Pp
 should give you access to the complete handbook,
-.IP
-.B info gnunet-c-tutorial
-.PP
+.Pp
+.Dl info gnunet-c-tutorial
+.Pp
 will give you access to a tutorial for developers.
-.PP
-Depending on your installation, this information is also
-available in
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.sp
+Depending on your installation, this information is also available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-testing.1 b/doc/man/gnunet-testing.1
index 357d0df44..182da613d 100644
--- a/doc/man/gnunet-testing.1
+++ b/doc/man/gnunet-testing.1
@@ -1,65 +1,69 @@
-.TH GNUNET\-TESTING 1 "January 4, 2012" "GNUnet"
-.SH NAME
-gnunet\-testing \- Command line tool to access the testing library.
-.SH SYNOPSIS
-.B gnunet\-testing
-.RI [ options ]
-.br
-.SH DESCRIPTION
-\fBgnunet\-testing\fP is a command line tool to access the testing
-library.
-.SH OPTIONS
-.B
-.IP "\-C,  \-\-cfg"
+.Dd January 4, 2012
+.Dt GNUNET-TESTING 1
+.Os
+.Sh NAME
+.Nm gnunet-testing
+.Nd
+command line tool to access the testing library
+.Sh SYNOPSIS
+.Nm
+.Op Fl C | \-cfg
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
+.Op Fl H | \-hostkeys
+.Op Fl h | \-help
+.Op Fl k | \-key
+.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+.Op Fl l Ar LOGFILE | Fl \-logfile= Ns Ar LOFILE
+.Op Fl n | \-number
+.Op Fl t | \-template
+.Op Fl v | \-version
+.Sh DESCRIPTION
+.Nm
+is a command line tool to access the testing library.
+.Sh OPTIONS
+.Bl -tag -width Ds
+.It Fl C | \-cfg
 Create unique configuration files.
-.B
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.B
-.IP "\-H, \-\-hostkeys"
+.It Fl H | \-hostkeys
 Host key file.
-.B
-.IP "\-h, \-\-help"
+.It Fl h | \-help
 Print short help on options.
-.B
-.IP "\-k, \-\-key"
+.It Fl k | \-key
 Create hostkey files from pre-computed hostkey list.
-.B
-.IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
-.IP "\-l LOGFILE, \-\-logfile=LOGFILE"
+.It Fl l Ar LOGFILE | Fl \-logfile= Ns Ar LOFILE
 Configure logging to write logs to LOGFILE.
-.B
-.IP "\-n, \-\-number"
+.It Fl n | \-number
 Number of unique configuration files or hostkeys to create.
-.B
-.IP "\-t, \-\-template"
+.It Fl t | \-template
 Configuration template.
-.B
-.IP "\-v, \-\-version"
+.It Fl v | \-version
 Print GNUnet version number.
-.SH BUGS
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
-electronic mail to <gnunet\-developers@gnu.org>
-.SH SEE ALSO
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.
+.El
+.Sh SEE ALSO
+The full documentation for gnunet is maintained as a Texinfo manual.
 If the
-.B info
-and
-.B gnunet
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.Pp
 should give you access to the complete handbook,
-.IP
-.B info gnunet-c-tutorial
-.PP
+.Pp
+.Dl info gnunet-c-tutorial
+.Pp
 will give you access to a tutorial for developers.
-.PP
-Depending on your installation, this information is also
-available in
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.sp
+Depending on your installation, this information is also available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-timeout.1 b/doc/man/gnunet-timeout.1
index 653f211cd..15abfe351 100644
--- a/doc/man/gnunet-timeout.1
+++ b/doc/man/gnunet-timeout.1
@@ -1,36 +1,42 @@
-.TH GNUNET-TIMOUET 1 "June 5, 2018" "GNUnet"
-.SH NAME
-gnunet\-timeout \- run process with timeout
-.SH SYNOPSIS
-.B gnunet\-timeout
-.RI TIMEOUT PROGRAM ARGS
-.SH DESCRIPTION
-\fBgnunet\-timeout\fP can be used to run another process with a
-timeout.  Provided as the standard "timout" utility may not be
-available on all platforms.
-.SH BUGS
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
-electronic mail to <gnunet\-developers@gnu.org>
-.SH SEE ALSO
-timeout(1)
-.PP
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.
+.Dd June 5, 2018
+.Dt GNUNET-TIMEOUT 1
+.Os
+.Sh NAME
+.Nm gnunet-timeout
+.Nd
+run process with timeout
+.Sh SYNOPSIS
+.Nm
+.Ao Ar duration Ac
+.Ao Ar command Ac
+.Ao args ... Ac
+.Sh DESCRIPTION
+.Nm
+can be used to run another process with a timeout.
+It is provided because the standard "timout" utility may not be available on all platforms.
+.Sh SEE ALSO
+.Xr timeout 1
+.sp
+The full documentation for gnunet is maintained as a Texinfo manual.
 If the
-.B info
-and
-.B gnunet
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.Pp
 should give you access to the complete handbook,
-.IP
-.B info gnunet-c-tutorial
-.PP
+.Pp
+.Dl info gnunet-c-tutorial
+.Pp
 will give you access to a tutorial for developers.
-.PP
-Depending on your installation, this information is also
-available in
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.sp
+Depending on your installation, this information is also available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-transport-certificate-creation.1 b/doc/man/gnunet-transport-certificate-creation.1
index 9dc572acf..e896363e4 100644
--- a/doc/man/gnunet-transport-certificate-creation.1
+++ b/doc/man/gnunet-transport-certificate-creation.1
@@ -1,35 +1,40 @@
-.TH GNUNET\-TRANSPORT-CERTIFICATE-CREATION 1 "January 31, 2014" "GNUnet"
-.SH NAME
-gnunet\-transport\-certificate\-creation \- create certificate for HTTPS transport
-.SH SYNOPSIS
-.B gnunet\-transport\-certificate\-creation
-.I privatekey certificate
-.SH DESCRIPTION
-\fBgnunet\-transport\-certificate\-creation\fP uses openssl to generate a RSA
-private key and then a self-signed certificate for HTTPS transport.
-.SH BUGS
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
-electronic mail to <gnunet\-developers@gnu.org>
-.SH SEE ALSO
-gnunet\-transport(1)
-.PP
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.
+.Dd January 31, 2014
+.Dt GNUNET-TRANSPORT-CERTIFICATE-CREATION 1
+.Os
+.Sh NAME
+.Nm gnunet-transport-certificate-creation
+.Nd
+create certificate for HTTPS transport
+.Sh SYNOPSIS
+.Nm
+.Op privatekey
+.Op certificate
+.Sh DESCRIPTION
+.Nm
+uses openssl to generate a RSA private key and then a self-signed certificate for HTTPS transport.
+.Sh SEE ALSO
+.Xr gnunet-transport 1
+.sp
+The full documentation for gnunet is maintained as a Texinfo manual.
 If the
-.B info
-and
-.B gnunet
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.Pp
 should give you access to the complete handbook,
-.IP
-.B info gnunet-c-tutorial
-.PP
+.Pp
+.Dl info gnunet-c-tutorial
+.Pp
 will give you access to a tutorial for developers.
-.PP
-Depending on your installation, this information is also
-available in
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.sp
+Depending on your installation, this information is also available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-transport.1 b/doc/man/gnunet-transport.1
index eef762174..f5ed47ad1 100644
--- a/doc/man/gnunet-transport.1
+++ b/doc/man/gnunet-transport.1
@@ -1,84 +1,92 @@
-.TH GNUNET\-TRANSPORT "1" "October 17, 2015" "GNUnet"
-.SH NAME
-gnunet\-transport \- measure and control the transport subsystem
-.SH SYNOPSIS
-.B gnunet\-transport
-[\fIOPTIONS\fR]
-.SH DESCRIPTION
-.PP
-gnunet\-transport is a tool to access various functions of GNUnet's
-transport subsystem from the command\-line.  Most of these are not
-expected to be useful for end-users.  gnunet\-transport can be used to
-evaluate the performance of the transports, force a peer to connect to
-another peer (if possible).  Other functions should be added in the
-near future.
-.TP
-\fB\-b\fR, \fB\-\-benchmark\fR
-measure how fast we are receiving data (from all connections).  On
-exit, the data rate will be reported.  Runs until aborted with CTRL-C.
-.TP
-\fB\-D\fR, \fB\-\-disconnect\fR
-force disconnection from a peer (used in conjunction with \-p).
-Note that you can use the gnunet\-ats command\-line tool to suggest connects.
-.TP
-\fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR
+.Dd October 17, 2015
+.Dt GNUNET-TRANSPORT 1
+.Os
+.Sh NAME
+.Nm gnunet-transport
+.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
+.Sh DESCRIPTION
+.Nm
+is a tool to access various functions of GNUnet's transport subsystem from the command-line.
+Most of these are not expected to be useful for end-users.
+gnunet-transport can be used to evaluate the performance of the transports, force a peer to connect to another peer (if possible).
+Other functions should be added in the near future.
+.Bl -tag -width Ds
+.It Fl b | \-benchmark
+measure how fast we are receiving data (from all connections).
+On exit, the data rate will be reported.
+Runs until aborted with CTRL-C.
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 configuration file to use
-.TP
-\fB\-e \fB\-\-events\fR
+.It Fl D | \-disconnect
+force disconnection from a peer (used in conjunction with \-p).
+Note that you can use the gnunet-ats command-line tool to suggest connects.
+.It Fl e | \-events
 provide information about all connect and disconnect events (continuously)
-.TP
-\fB\-h\fR, \fB\-\-help\fR
+.It Fl h | \-help
 print help page
-.TP
-\fB\-i\fR, \fB\-\-information\fR
+.It Fl i | \-information
 print information about our current connections (once)
-.TP
-\fB\-L \fILOGLEVEL\fR, \fB\-\-loglevel=LOGLEVEL\fR
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
 Change the loglevel.  Possible values for LOGLEVEL are ERROR, WARNING, INFO and DEBUG.
-.TP
-\fB\-l \fILOGFILE\fR, \fB\-\-logfile=LOGFILE\fR
+.It Fl l Ar LOGFILE | Fl \-logfile= Ns Ar LOGFILE
 configure logging to write logs to LOGFILE
-.TP
-\fB\-m\fR, \fB\-\-monitor\fR
+.It Fl m | \-monitor
 print information about our current connections (continuously)
-.TP
-\fB\-p \fIPEER\fR, \fB\-\-peer=PEER\fR
+.It Fl p Ar PEER | Fl \-peer= Ns Ar PEER
 the peer identity to connect to or monitor
-.TP
-\fB\-P, \fB\-\-plugins\fR
+.It Fl P | \-plugins
 monitor session state of transport plugins
-.TP
-\fB\-s\fR, \fB\-\-send\fR
+.It Fl s | \-send
 transmit (dummy) traffic as quickly as possible to the peer specified
 with the \-p option.  The rate will still be limited by the quota(s)
 determined by the peers (ATS subsystem).  Will run until CTRL\-C is
 pressed or until the connection to the other peer is disrupted.
-.TP
-\fB\-v\fR, \fB\-\-version\fR
+.It Fl v | \-version
 print the version number
-.TP
-\fB\-V\fR, \fB\-\-verbose\fR
+.It Fl V | \-verbose
 be verbose
-.SH "REPORTING BUGS"
-Report bugs by using mantis <https://bugs.gnunet.org/> or by sending electronic mail to <gnunet\-developers@gnu.org>
-.SH "SEE ALSO"
-\fBgnunet\-arm\fP(1), \fBgnunet\-ats\fP(1)
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B gnunet
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
+.El
+.Sh SEE ALSO
+.Xr gnunet-arm 1 ,
+.Xr gnunet-ats 1
+.sp
+The full documentation for gnunet is maintained as a Texinfo manual.
+If the
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.Pp
 should give you access to the complete handbook,
-.IP
-.B info gnunet-c-tutorial
-.PP
+.Pp
+.Dl info gnunet-c-tutorial
+.Pp
 will give you access to a tutorial for developers.
-.PP
-Depending on your installation, this information is also
-available in
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.sp
+Depending on your installation, this information is also available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-unindex.1 b/doc/man/gnunet-unindex.1
index 6aee4f62e..e953ce23a 100644
--- a/doc/man/gnunet-unindex.1
+++ b/doc/man/gnunet-unindex.1
@@ -1,58 +1,67 @@
-.TH GNUNET-UNINDEX "1" "September 6, 2009" "GNUnet"
-.SH NAME
-gnunet\-unindex \- a command line interface for deleting indexed files from GNUnet
-.SH SYNOPSIS
-.B gnunet\-unindex
-[\fIOPTIONS\fR] FILENAME
-.SH DESCRIPTION
-.PP
-gnunet\-unindex is used for deleting indexed files from GNUnet.
-.TP
-\fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR
-use config file (defaults: ~/.config/gnunet.conf)
-.TP
-\fB\-h\fR, \fB\-\-help\fR
+.Dd September 6, 2009
+.Dt GNUNET-UNINDEX 1
+.Sh NAME
+.Nm gnunet-unindex
+.Nd
+a command line interface for deleting indexed files from GNUnet
+.Sh SYNOPSIS
+.Nm
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
+.Op Fl h | \-help
+.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+.Op Fl v | \-version
+.Op Fl V | \-verbose
+FILENAME
+.Sh DESCRIPTION
+.Nm
+is used for deleting indexed files from GNUnet.
+.Bl -tag -width Ds
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
+Use config file FILENAME as config (default: ~/.config/gnunet.conf).
+.It Fl h | \-help
 print help page
-.TP
-\fB\-L \fILOGLEVEL\fR, \fB\-\-loglevel=LOGLEVEL\fR
-Change the loglevel.  Possible values for LOGLEVEL are NOTHING,
-ERROR, WARNING, INFO and DEBUG.
-.TP
-\fB\-v\fR, \fB\-\-version\fR
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+Change the loglevel.
+Possible values for LOGLEVEL are NOTHING, ERROR, WARNING, INFO and DEBUG.
+.It Fl v | \-version
 print the version number
-.TP
-\fB\-V\fR, \fB\-\-verbose\fR
+.It Fl V | \-verbose
 be verbose
-.SH NOTES
-You can only unindex files that you indexed and that you still have
-available locally in full.  You should use gnunet\-unindex on files
-that you indexed (not inserted) and that you are going to delete or
-move locally.
-.TP
-.SH FILES
+.El
+.Sh NOTES
+You can only unindex files that you indexed and that you still have available locally in full.
+You should use gnunet-unindex on files that you indexed (not inserted) and that you are going to delete or move locally.
+.Sh FILES
 .TP
 ~/.config/gnunet.conf
 GNUnet configuration file
-.SH "REPORTING BUGS"
-Report bugs to <https://bugs.gnunet.org/> or by sending electronic mail to <gnunet\-developers@gnu.org>
-.SH "SEE ALSO"
-\fBgnunet\-fs\-gtk\fP(1), \fBgnunet\-publish\fP(1), \fBgnunet\-search\fP(1), \fBgnunet\-download\fP(1), \fBgnunet.conf\fP(5)
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B gnunet
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
+.Sh SEE ALSO
+.Xr gnunet-fs-gtk 1 ,
+.Xr gnunet-publish 1 ,
+.Xr gnunet-search 1 ,
+.Xr gnunet-download 1 ,
+.Xr gnunet.conf 5
+.sp
+The full documentation for gnunet is maintained as a Texinfo manual.
+If the
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.Pp
 should give you access to the complete handbook,
-.IP
-.B info gnunet-c-tutorial
-.PP
+.Pp
+.Dl info gnunet-c-tutorial
+.Pp
 will give you access to a tutorial for developers.
-.PP
-Depending on your installation, this information is also
-available in
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.sp
+Depending on your installation, this information is also available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-uri.1 b/doc/man/gnunet-uri.1
index 2fe1a05d2..bb525ef7f 100644
--- a/doc/man/gnunet-uri.1
+++ b/doc/man/gnunet-uri.1
@@ -1,49 +1,54 @@
-.TH GNUNET-URI 1 "June 26, 2012" "GNUnet"
-.SH NAME
-gnunet\-uri \- invoke default handler for GNUnet URIs
-.SH SYNOPSIS
-.B gnunet\-uri
-.RI URI
-.SH DESCRIPTION
-\fBgnunet\-uri\fP can be used to invoke the correct tool to handle a
-GNUnet URI.  GNUnet URIs have the format "gnunet://SUBSYSTEM/DETAILS"
-and thus the specific tool to handle the URI depends on the subsystem.
-gnunet\-uri will determine the correct tool (by looking for SUBSYSTEM
-in the configuration section "uri") and invoke it.
-.SH OPTIONS
-.B
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+.Dd June 26, 2012
+.Dt GNUNET-URI 1
+.Os
+.Sh NAME
+.Nm gnunet-uri
+.Nd
+invoke default handler for GNUnet URIs
+.Sh SYNOPSIS
+.Nm
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
+.Op Fl h | \-help
+.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+.Op Fl v | \-version
+URI
+.Sh DESCRIPTION
+.Nm
+can be used to invoke the correct tool to handle a GNUnet URI.
+GNUnet URIs have the format "gnunet://SUBSYSTEM/DETAILS" and thus the specific tool to handle the URI depends on the subsystem.
+gnunet-uri will determine the correct tool (by looking for SUBSYSTEM in the configuration section "uri") and invoke it.
+.Bl -tag -width Ds
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.B
-.IP "\-h, \-\-help"
+.It Fl h | \-help
 Print short help on options.
-.B
-.IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
-Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
-.IP "\-v, \-\-version"
+.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
 Print GNUnet version number.
-.SH BUGS
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
-electronic mail to <gnunet\-developers@gnu.org>
-.SH SEE ALSO
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.
+.El
+.Sh SEE ALSO
+The full documentation for gnunet is maintained as a Texinfo manual.
 If the
-.B info
-and
-.B gnunet
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.Pp
 should give you access to the complete handbook,
-.IP
-.B info gnunet-c-tutorial
-.PP
+.Pp
+.Dl info gnunet-c-tutorial
+.Pp
 will give you access to a tutorial for developers.
-.PP
-Depending on your installation, this information is also
-available in
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.sp
+Depending on your installation, this information is also available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-vpn.1 b/doc/man/gnunet-vpn.1
index ddb53a7bd..e0fd2b78c 100644
--- a/doc/man/gnunet-vpn.1
+++ b/doc/man/gnunet-vpn.1
@@ -1,101 +1,98 @@
-.TH GNUNET\-VPN 1 "February 25, 2012" "GNUnet"
-.SH NAME
-gnunet\-vpn \- manually setup a GNUnet VPN tunnel
-.SH SYNOPSIS
-.B gnunet\-vpn
-.RI [ options ]
-.br
-.SH DESCRIPTION
-\fBgnunet\-vpn\fP can be used to manually setup a VPN tunnel via the
-GNUnet network.
+.Dd February 25, 2012
+.Dt GNUNET-VPN 1
+.Sh NAME
+.Nm gnunet-vpn
+.Nd
+manually setup a GNUnet VPN tunnel
+.Sh SYNOPSIS
+.Nm
+.Op Fl 4 | \-ipv4
+.Op Fl 6 | \-ipv6
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
+.Op Fl d Ar TIME | Fl \-duration Ar TIME
+.Op Fl h | \-help
+.Op Fl i Ar IP | Fl \-ip Ar IP
+.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+.Op Fl p Ar PEERID | Fl \-peer= Ns Ar PEERID
+.Op Fl s Ar NAME | Fl \-service= Ns Ar NAME
+.Op Fl t | \-tcp
+.Op Fl u | \-udp
+.Op Fl V | \-verbose
+.Op Fl v | \-version
+.Sh DESCRIPTION
+.Nm
+can be used to manually setup a VPN tunnel via the GNUnet network.
 There are two main types of tunnels.
-Tunnels to an exit node which routes the traffic to the global
-Internet, and tunnels to a node that runs a service only within
-GNUnet.
+Tunnels to an exit node which routes the traffic to the global Internet, and tunnels to a node that runs a service only within GNUnet.
 Depending on the type of tunnel, gnunet\-vpn takes different options.
-The "\-i" option is required for tunnels to an exit node, whereas the
-"\-p" and "\-s" options in conjunction with either "\-u" or "\-t" are
-required for tunnels to services.
+The "\-i" option is required for tunnels to an exit node, whereas the "\-p" and "\-s" options in conjunction with either "\-u" or "\-t" are required for tunnels to services.
 For exit tunnels, both UDP and TCP traffic will be redirected.
-For service tunnels, either UDP ("\-u") or TCP ("\-t") traffic will
-be redirected.
+For service tunnels, either UDP ("\-u") or TCP ("\-t") traffic will be redirected.
 The tool will display the IP address for this end of the tunnel.
-The address can be displayed as soon as it has been allocated, or only
-after ("\-a") the tunnel has been created.
-.SH OPTIONS
-.B
-.IP "\-4, \-\-ipv4"
+The address can be displayed as soon as it has been allocated, or only after ("\-a") the tunnel has been created.
+.Bl -tag -width Ds
+.It Fl 4 | \-ipv4
 Desired IP address on this end of the tunnel should be an IPv4 address.
-.B
-.IP "\-6, \-\-ipv6"
+.It Fl 6 | \-ipv6
 Desired IP address on this end of the tunnel should be an IPv6 address.
-.B
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.B
-.IP "\-d TIME, \-\-duration TIME"
+.It Fl d Ar TIME | Fl \-duration Ar TIME
 The mapping should be established for TIME.
-The value given must be a number followed by a space and a time unit,
-for example "500 ms".
+The value given must be a number followed by a space and a time unit, for example "500 ms".
 Note that the quotes are required on the shell.
 Default is 5 minutes.
-.B
-.IP "\-h, \-\-help"
+.It Fl h | \-help
 Print short help on options.
-.B
-.IP "\-i IP, \-\-ip IP"
+.It Fl i Ar IP | Fl \-ip Ar IP
 Tunnel should be to an exit node and connect to the given IPv4 or IPv6
 IP address.
 Note that you can specify an IPv6 address as the target here, even in
 combination with "\-4" (4to6) and similarly you can specify an IPv4
 address in combination with "\-6" (6to4).
-.B
-.IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
 Use LOGLEVEL for logging.
 Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
-.IP "\-p PEERID,  \-\-peer=PEERID"
+.It Fl p Ar PEERID | Fl \-peer= Ns Ar PEERID
 Name of the peer offering the service to connect to.
 Cannot be used in conjunction with "\-i", requires "\-s".
-.B
-.IP "\-s NAME,  \-\-service=NAME"
+.It Fl s Ar NAME | Fl \-service= Ns Ar NAME
 Name of the service running on the target peer.
 Cannot be used in conjunction with "\-i", requires "\-p".
-.B
-.IP "\-t, \-\-tcp"
+.It Fl t | \-tcp
 Service runs TCP.
 Either "\-t" or "\-u" must be specified when using "\-s".
-.B
-.IP "\-u, \-\-udp"
+.It Fl u | \-udp
 Service runs UDP.
 Either "\-t" or "\-u" must be specified when using "\-s".
-.B
-.IP "\-V, \-\-verbose"
+.It Fl V | \-verbose
 Be verbose.
-.B
-.IP "\-v, \-\-version"
+.It Fl v | \-version
 Print GNUnet version number.
-.SH BUGS
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
-electronic mail to <gnunet\-developers@gnu.org>
-.SH SEE ALSO
-gnunet\-setup(1)
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B gnunet
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
+.El
+.Sh SEE ALSO
+.Xr gnunet-setup 1
+.sp
+The full documentation for gnunet is maintained as a Texinfo manual.
+If the
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.Pp
 should give you access to the complete handbook,
-.IP
-.B info gnunet-c-tutorial
-.PP
+.Pp
+.Dl info gnunet-c-tutorial
+.Pp
 will give you access to a tutorial for developers.
-.PP
-Depending on your installation, this information is also
-available in
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.sp
+Depending on your installation, this information is also available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-zoneimport.1 b/doc/man/gnunet-zoneimport.1
index 2a67718f9..e99b235b8 100644
--- a/doc/man/gnunet-zoneimport.1
+++ b/doc/man/gnunet-zoneimport.1
@@ -1,90 +1,106 @@
-.TH GNUNET-ZONEIMPORT 1 "April 23, 2018" "GNUnet"
-.SH NAME
-gnunet\-zoneimport \- import DNS zone into GNS zone
-.SH SYNOPSIS
-.B gnunet\-zoneimport [IP]+
-.SH DESCRIPTION
-\fBgnunet\-zoneimport\fP reads a list of domain names (FQDN) from
-stdin and issues DNS queries for each of the domain names given.  It
-then checks if a local ego with a name matching the domain
-exists. Specifically, if the domain name is "example.fr", it will
-check if an ego "fr" exists, while for a domain "example.com.fr" it
-will look for an ego called "com.fr"). If so, it will convert the DNS
-records into GNS records (in particular converting NS records and glue
-records to GNS2DNS records) and add them to the namestore under the
-label ("example" in the examples above).
-.PP
-The arguments given to gnunet\-zoneimport is a list of IP addresses of
-DNS servers to query.
-.PP
-gnunet\-zoneimport will usually never terminate: it will check when
-DNS records expire, and re-issue requests when the old DNS records
-have expired so that GNS always has the latest data.
-.PP
-gnunet\-zoneimport will issue many DNS queries in parallel, but is
-rate-limited in various ways, so most DNS servers should easily handle
-the load.  gnunet\-zoneimport will perform a limited number of retries
-if queries fail.
-.PP
-gnunet\-zoneimport operates incrementally. It will check if the
-namestore already has (non-expired) records stored for a given name in
-the respective zone and not issue those requests again.  Thus, it is
-fine to restart gnunet\-zoneimport whenever the list of domain names
-changes.
-.PP
-Finally, gnunet\-zoneimport keeps information for each domain name in
-memory.  This consumes about 200 bytes per domain name, or 1 GB for 5
-million labels.
-.SH OPTIONS
-.B
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+.\" This file is part of GNUnet.
+.\" Copyright (C) 2018, 2019 GNUnet e.V.
+.\"
+.\" Permission is granted to copy, distribute and/or modify this document
+.\" under the terms of the GNU Free Documentation License, Version 1.3 or
+.\" any later version published by the Free Software Foundation; with no
+.\" Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A
+.\" copy of the license is included in the file
+.\" ``FDL-1.3''.
+.\"
+.\" A copy of the license is also available from the Free Software
+.\" Foundation Web site at @url{http://www.gnu.org/licenses/fdl.html}.
+.\"
+.\" Alternately, this document is also available under the General
+.\" Public License, version 3 or later, as published by the Free Software
+.\" Foundation.  A copy of the license is included in the file
+.\" ``GPL3''.
+.\"
+.\" A copy of the license is also available from the Free Software
+.\" Foundation Web site at @url{http://www.gnu.org/licenses/gpl.html}.
+.\"
+.\" SPDX-License-Identifier: GPL3.0-or-later OR FDL1.3-or-later
+.\"
+.Dd April 23, 2018
+.Dt GNUNET-ZONEIMPORT 1
+.Os
+.Sh NAME
+.Nm gnunet-zoneimport
+.Nd
+import DNS zone into GNS zone
+.Sh SYNOPSIS
+.Nm
+.Op Fl c Ar FILENAME | \-config= Ns Ar FILENAME
+.Op Fl h | \-help
+.Op Fl m Ar RELATIVETIME | Fl \-minimum-expiration= Ns Ar RELATIVETIME
+.Op Fl s Ar MAPSIZE | Fl \-size= Ns Ar MAPSIZE
+.Op Ar \IP
+.Sh DESCRIPTION
+.Nm
+reads a list of domain names (FQDN) from stdin and issues DNS queries for each of the domain names given.
+It then checks if a local ego with a name matching the domain exists.
+Specifically, if the domain name is "example.fr", it will check if an ego "fr" exists, while for a domain "example.com.fr" it will look for an ego called "com.fr").
+If so, it will convert the DNS records into GNS records (in particular converting NS records and glue records to GNS2DNS records) and add them to the namestore under the label ("example" in the examples above).
+.Pp
+The arguments given to gnunet-zoneimport is a list of IP addresses of DNS servers to query.
+.Pp
+gnunet-zoneimport will usually never terminate: it will check when DNS records expire, and re-issue requests when the old DNS records have expired so that GNS always has the latest data.
+.Pp
+gnunet-zoneimport will issue many DNS queries in parallel, but is rate-limited in various ways, so most DNS servers should easily handle the load.
+gnunet-zoneimport will perform a limited number of retries if queries fail.
+.Pp
+gnunet-zoneimport operates incrementally.
+It will check if the namestore already has (non-expired) records stored for a given name in the respective zone and not issue those requests again.
+Thus, it is fine to restart gnunet-zoneimport whenever the list of domain names changes.
+.Pp
+Finally, gnunet-zoneimport keeps information for each domain name in memory.
+This consumes about 200 bytes per domain name, or 1 GB for 5 million labels.
+.Bl -tag -width Ds
+.It Fl c Ar FILENAME | \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.B
-.IP "\-h, \-\-help"
+.It Fl h | \-help
 Print short help on options.
-.B
-.IP "\-m RELATIVETIME, \-\-minimum-expiration=RELATIVETIME"
-.B
-Ensure that imported DNS records never have an expiration time that
-is less than RELATIVETIME into the future.  RELATIVETIME is a time
-given like "1 week" or "1 h".   If DNS returns records with a shorter
-lifetime, gnunet\-zoneimport will simply bump the lifetime to the
-specified value (relative to the time of the import). Default is zero.
-.IP "\-s MAPSIZE, \-\-size=MAPSIZE"
-Specifies the size (in number of entries) to use for the main hash
-map.  The value provided should be at least twice the number of domain
-names that will be given to the tool. This option is required for very
-large zones where the number of records encountered is too large for
-the automatic growth mechanism to work (that one is limited to at most
-16 MB allocations for security reasons).  Do not worry about this
-unless you are importing millions of domain names from a zone.
-.SH NOTES
-.TP
+.It Fl m Ar RELATIVETIME | Fl \-minimum-expiration= Ns Ar RELATIVETIME
+Ensure that imported DNS records never have an expiration time that is less than RELATIVETIME into the future.
+RELATIVETIME is a time given like "1 week" or "1 h".
+If DNS returns records with a shorter lifetime, gnunet\-zoneimport will simply bump the lifetime to the specified value (relative to the time of the import).
+Default is zero.
+.It Fl s Ar MAPSIZE | Fl \-size= Ns Ar MAPSIZE
+Specifies the size (in number of entries) to use for the main hash map.
+The value provided should be at least twice the number of domain names that will be given to the tool.
+This option is required for very large zones where the number of records encountered is too large for the automatic growth mechanism to work (that one is limited to at most 16 MB allocations for security reasons).
+Do not worry about this unless you are importing millions of domain names from a zone.
+.It Ar \IP
+IP Is the list of IPs given.
+.El
+.Sh EXAMPLES
 Typical invocaton would be:
-$ gnunet\-zoneimport 1.2.3.4 < names.txt
-.SH BUGS
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
-electronic mail to <gnunet\-developers@gnu.org>
-.SH SEE ALSO
-gnunet\-gns(1), gnunet\-namestore(1)
-.PP
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.
+.Pp
+.Dl $ gnunet\-zoneimport 1.2.3.4 < names.txt
+.Sh SEE ALSO
+.Xr gnunet-gns 1 ,
+.Xr gnunet-namestore 1
+.sp
+The full documentation for gnunet is maintained as a Texinfo manual.
 If the
-.B info
-and
-.B gnunet
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.Pp
 should give you access to the complete handbook,
-.IP
-.B info gnunet-c-tutorial
-.PP
+.Pp
+.Dl info gnunet-c-tutorial
+.Pp
 will give you access to a tutorial for developers.
-.PP
-Depending on your installation, this information is also
-available in
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.sp
+Depending on your installation, this information is also available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet.conf.5.in b/doc/man/gnunet.conf.5.in
index 560704784..82340996a 100644
--- a/doc/man/gnunet.conf.5.in
+++ b/doc/man/gnunet.conf.5.in
@@ -1,4 +1,27 @@
 .\" -*- mode: nroff -*-
+.\" This file is part of Ascension.
+.\" Copyright (C) 2012-2015,2018,2019 GNUnet e.V.
+.\"
+.\" Permission is granted to copy, distribute and/or modify this document
+.\" under the terms of the GNU Free Documentation License, Version 1.3 or
+.\" any later version published by the Free Software Foundation; with no
+.\" Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A
+.\" copy of the license is included in the file
+.\" ``FDL-1.3''.
+.\"
+.\" A copy of the license is also available from the Free Software
+.\" Foundation Web site at @url{http://www.gnu.org/licenses/fdl.html}.
+.\"
+.\" Alternately, this document is also available under the General
+.\" Public License, version 3 or later, as published by the Free Software
+.\" Foundation.  A copy of the license is included in the file
+.\" ``GPL3''.
+.\"
+.\" A copy of the license is also available from the Free Software
+.\" Foundation Web site at @url{http://www.gnu.org/licenses/gpl.html}.
+.\"
+.\" SPDX-License-Identifier: GPL3.0-or-later OR FDL1.3-or-later
+.\"
 .TH GNUNET.CONF "5" "October 26, 2018" "GNUnet"
 .SH NAME
 gnunet.conf \- GNUnet configuration file
@@ -27,7 +50,7 @@ Default values for all of the options can be found in the files in the
 "$GNUNET_PREFIX/share/gnunet/config.d/" directory. A typical setup will
 work out of the box with those. See the examples section below for
 some common setups on top of that.
-.SH General OPTIONS
+.SS GENERAL OPTIONS
 Many options will be common between sections. They can be repeated under
 each section with different values.  The "[PATHS]" section is special.
 Here, it is possible to specify values for variables like "GNUNET_HOME".
@@ -85,7 +108,7 @@ The following options are generic and shared by all services:
     Set to YES if this service should be run per-user, NO if this is a system
     service.  End-users should never have to change the defaults GNUnet provides
     for this option.
-.SH ATS Options
+.SS ATS OPTIONS
 .IP UNSPECIFIED_QUOTA_IN
     quotes in KiB or MiB per seconds.  Or use the word "unlimited"
 .IP UNSPECIFIED_QUOTA_OUT
@@ -109,12 +132,11 @@ The following options are generic and shared by all services:
 .SH EXAMPLES
 This example is a simple way to get started, using a server that has a known
 list of peers to get you started. Most users will be behind a firewall on
-IPv4, as such NAT is enabled.  Please rememeber to change your IP address
+IPv4, as such NAT is enabled.  Please remember to change your IP address
 to the actual external address for your usage.
 .PP
     [hostlist]
-    OPTIONS = \-b
-    SERVERS = http://v9.gnunet.org:58080/
+    OPTIONS = \-b \-e
 
     [nat]
     BEHIND_NAT = YES
@@ -129,9 +151,6 @@ to the actual external address for your usage.
 .TP
 ~/.config/gnunet.conf
 GNUnet configuration file
-.SH BUGS
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
-electronic mail to <bug-gnunet@gnu.org>
 .SH SEE ALSO
 \fBgnunet\-setup\fP(1), \fBgnunet\-arm\fP(1)
 .PP
@@ -155,3 +174,9 @@ will give you access to a tutorial for developers.
 Depending on your installation, this information is also
 available in
 \fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.SH HISTORY
+.PP
+This man page first appeared in October 2012 in GNUnet.
+.SH BUGS
+Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
+electronic mail to <bug-gnunet@gnu.org>
diff --git a/doc/man/produce_html.sh b/doc/man/produce_html.sh
new file mode 100755
index 000000000..ce6dea304
--- /dev/null
+++ b/doc/man/produce_html.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+existence()
+{
+    command -v "$1" >/dev/null 2>&1
+}
+
+if existence mandoc;
+then
+    for f in `find . -name \*\.[1-9]`;
+    do
+        mandoc -T html $f > $f.html;
+    done
+fi
diff --git a/doc/man/texi2mdoc-generation.sh b/doc/man/texi2mdoc-generation.sh
new file mode 100755
index 000000000..b88987cda
--- /dev/null
+++ b/doc/man/texi2mdoc-generation.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+# This script is in the public-domain.
+# GNUnet e.V. 2019
+#
+# Commentary: generate texi2mdoc output. This would be easier with
+# bmake / BSDmake, oh well.
+#
+# Excercise for future readers: don't fix this.
+
+# echo $(pwd)
+cd ../tutorial
+texi2mdoc -I$(pwd):$(pwd)/chapters gnunet-tutorial.texi > ../man/gnunet-c-tutorial.7
+# echo $(pwd)
+cd ../handbook
+texi2mdoc -I$(pwd):$(pwd)/chapters gnunet.texi > ../man/gnunet-documentation.7