45 files changed, 1570 insertions, 874 deletions
diff --git a/doc/man/gnunet-arm.1 b/doc/man/gnunet-arm.1
index 099978f24..0e7486d28 100644
--- a/doc/man/gnunet-arm.1
+++ b/doc/man/gnunet-arm.1
@@ -1,19 +1,14 @@
-.TH GNUNET\-ARM 1 "Jan 4, 2012" "GNUnet"
+.TH GNUNET\-ARM 1 "January 4, 2012" "GNUnet"
 .SH NAME
 gnunet\-arm \- control GNUnet services
 .SH SYNOPSIS
 .B gnunet\-arm
 .RI [ options ]
-.br
 .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"
@@ -55,11 +50,29 @@ List all running services.
 .B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
 Report bugs by using Mantis <https://gnunet.org/bugs/> 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.
+If the
+.B info
+and
+.B gnunet
+programs are properly installed at your site, the command
+.IP
+.B info gnunet
+.PP
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-ats.1 b/doc/man/gnunet-ats.1
index cac55e79f..895c71942 100644
--- a/doc/man/gnunet-ats.1
+++ b/doc/man/gnunet-ats.1
@@ -1,18 +1,14 @@
-.TH GNUNET\-ATS 1 "Oct 16, 2015" "GNUnet"
+.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"
@@ -22,8 +18,10 @@ List all addresses currently known to ats.
 Use the configuration file FILENAME.
 .B
 .IP "\-C, \-\-connect=PEERID"
-Ask ATS to suggest an address for PEERID to transport to establish a connection.
+Ask ATS to suggest an address for PEERID to transport to establish a
-Note that you can use the gnunet\-transport command\-line tool to force disconnects.
+connection.
+Note that you can use the gnunet\-transport command\-line tool to
+force disconnects.
 .B
 .IP "\-h, \-\-help"
 Print short help on options.
@@ -35,7 +33,8 @@ Print information for a specific peer identity only
 Value to set for when changing preference values
 .B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
-Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
+Use LOGLEVEL for logging.
+Valid values are DEBUG, INFO, WARNING and ERROR.
 .B
 .IP "\-m, \-\-monitor"
 Monitor changes to the bandwidth assignments continuously
@@ -60,10 +59,27 @@ Print verbose output (include ATS address properties)
 .B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
 Report bugs by using Mantis <https://gnunet.org/bugs/> 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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-auto-share.1 b/doc/man/gnunet-auto-share.1
index fc2668d44..3989b1351 100644
--- a/doc/man/gnunet-auto-share.1
+++ b/doc/man/gnunet-auto-share.1
@@ -1,11 +1,11 @@
-.TH GNUNET\-AUTO\-SHARE "1" "18 Jun 2012" "GNUnet"
+.TH GNUNET\-AUTO\-SHARE "1" "June 18, 2012" "GNUnet"
 .SH NAME
-gnunet\-auto\-share \- a command line tool to automatically share an entire directory with other users
+gnunet\-auto\-share \- a command line tool to automatically share an
+entire directory with other users
 .SH SYNOPSIS
 .B gnunet\-auto\-share
 [\fIOPTIONS\fR] DIRNAME
 .SH DESCRIPTION
-.PP
 In order to share files with other GNUnet users, the files must first be made
 available to GNUnet.  This tool can be used to automatically share all files
 from a certain directory.  The program will periodically scan the directory
@@ -17,35 +17,28 @@ has many options in common with gnunet\-publish, but can only be used to
 index files.
 .PP
 You can use automatic meta\-data extraction (based on libextractor).
-.PP
+.TP
 \fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR
 Use alternate config file (if this option is not specified, the
 default is ~/.config/gnunet.conf).
 .TP
 \fB\-D\fR, \fB\-\-disable\-extractor\fR
 Disable use of GNU libextractor for finding additional keywords and metadata.
 .TP
 \fB\-h\fR, \fB\-\-help\fR
 Print a brief help page with all the options.
 .TP
 \fB\-L \fILOGLEVEL\fR, \fB\-\-loglevel=\fILOGLEVEL\fR
 Change the loglevel.  Possible values for LOGLEVEL are
 ERROR, WARNING, INFO and DEBUG.
 .TP
 \fB\-p \fIPRIORITY\fR, \fB\-\-prio=\fIPRIORITY\fR
 Executive summary: You probably don't need it.
 Set the priority of the published content (default: 365).  If the local
 database is full, GNUnet will discard the content with the lowest ranking.
 Note that ranks change over time depending on popularity.  The default
 should be high enough to preserve the locally published content in favor
 of content that migrates from other peers.
 .TP
 \fB\-r \fILEVEL\fR, \fB\-\-replication=\fILEVEL\fR
 Set the desired replication level.  If CONTENT_PUSHING is set to YES, GNUnet
@@ -54,20 +47,15 @@ normal "random" replication of all content.  This option can be used to push
 some content out into the network harder. Note that pushing content LEVEL
 times into the network does not guarantee that there will actually be LEVEL
 replicas.
 .TP
 \fB\-v\fR, \fB\-\-version\fR
 Print the version number.
 .TP
 \fB\-V\fR, \fB\-\-verbose\fR
 Be verbose.  Using this option causes gnunet\-publish to print progress
 information and at the end the file identification that can be used to download
 the file from GNUnet.
 .SH SETTING ANONYMITY LEVEL
 The \fB\-a\fR option can be used to specify additional anonymity constraints.
 If set to 0, GNUnet will publish the file non-anonymously and in fact sign
 the advertisement for the file using your peer's private key.  This will
@@ -81,7 +69,7 @@ anonymity, which increases the amount of cover traffic your own traffic will
 get, at the expense of performance.  Note that regardless of the anonymity
 level you choose, peers that cache content in the network always use anonymity
 level 1.
+.PP
 The definition of the ANONYMITY LEVEL is the following.  0 means no anonymity
 is required.  Otherwise a value of 'v' means that 1 out of v bytes of "anonymous"
 traffic can be from the local user, leaving 'v-1' bytes of cover traffic per
@@ -89,35 +77,50 @@ byte on the wire.  Thus, if GNUnet routes n bytes of messages from foreign
 peers (using anonymous routing), it may originate n/(v-1) bytes of data in
 the same time\-period. The time\-period is twice the average delay that
 GNUnet defers forwarded queries.
+.PP
 The default is 1 and this should be fine for most users.  Also notice that if
 you choose very large values, you may end up having no throughput at all,
 especially if many of your fellow GNUnet\-peers all do the same.
 .SH EXAMPLES
-.PP
 \fBBasic example\fR
+.TP
-Share a directory "$HOME/gnunet\-share/":
+# gnunet\-auto\-share $HOME/gnunet\-share/ &
+Share a directory "$HOME/gnunet\-share/"
- # gnunet\-auto\-share $HOME/gnunet\-share/ &
+.PP
 \fBBasic configuration\fR
+.PP
 Share a directory "$HOME/gnunet\-share/":
 [gnunet-auto-share]
 OPTIONS = $HOME/gnunet\-share
 IMMEDIATE_START = YES # start this service when the peer starts
 .SH FILES
 .TP
 ~/.config/gnunet.conf
 GNUnet configuration file
-.SH "REPORTING BUGS"
+.SH BUGS
-Report bugs to <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+Report bugs to <https://gnunet.org/bugs/> or by sending electronic
-.SH "SEE ALSO"
+mail to <gnunet\-developers@gnu.org>
-\fBgnunet\-fs\-gtk\fP(1), \fBgnunet\-publish\fP(1), \fBgnunet\-search\fP(1), \fBgnunet\-download\fP(1), \fBgnunet.conf\fP(5), \fBextract\fP(1)
+.SH SEE ALSO
+\fBgnunet\-fs\-gtk\fP(1), \fBgnunet\-publish\fP(1),
+\fBgnunet\-search\fP(1), \fBgnunet\-download\fP(1),
+\fBgnunet.conf\fP(5), \fBextract\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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-bcd.1 b/doc/man/gnunet-bcd.1
index f23196687..f10e6f891 100644
--- a/doc/man/gnunet-bcd.1
+++ b/doc/man/gnunet-bcd.1
@@ -1,13 +1,10 @@
-.TH GNUNET\-BCD 1 "Dec 5, 2013" "GNUnet"
+.TH GNUNET\-BCD 1 "December 5, 2013" "GNUnet"
 .SH NAME
 gnunet\-bcd \- run HTTP server to create GNS business cards
 .SH SYNOPSIS
 .B gnunet\-bcd
 .RI [ options ]
 .br
 .SH DESCRIPTION
 \fBgnunet\-bcd\fP can be used to create an business card with a QR code
 containing the public key of a zone from the GNU Name System.
@@ -15,7 +12,6 @@ gnunet\-bcd requires LaTeX (pdflatex) with various packages to be
 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"
@@ -32,7 +28,26 @@ Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
 .B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+Report bugs by using Mantis <https://gnunet.org/bugs/> 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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-cadet.1 b/doc/man/gnunet-cadet.1
index d95cf851c..3551a335d 100644
--- a/doc/man/gnunet-cadet.1
+++ b/doc/man/gnunet-cadet.1
@@ -64,4 +64,25 @@ Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
 Print GNUnet version number.
 .SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+Report bugs by using Mantis <https://gnunet.org/bugs/> 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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-config.1 b/doc/man/gnunet-config.1
index 74839ee0e..c4f979fb0 100644
--- a/doc/man/gnunet-config.1
+++ b/doc/man/gnunet-config.1
@@ -1,16 +1,11 @@
-.TH GNUNET\-CONFIG 1 "Jul 15, 2012" "GNUnet"
+.TH GNUNET-CONFIG 1 "July 15, 2012" "GNUnet"
 .SH NAME
 gnunet\-config \- manipulate GNUnet configuration files
 .SH SYNOPSIS
 .B gnunet\-config
 .RI [ options ]
-.br
 .SH DESCRIPTION
 \fBgnunet\-config\fP can be used to read or modify GNUnet configuration files.
 .SH OPTIONS
 .B
 .IP "\-f, \-\-filename"
@@ -46,7 +41,27 @@ Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
 .B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+Report bugs by using Mantis <https://gnunet.org/bugs/> 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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-conversation-test.1 b/doc/man/gnunet-conversation-test.1
index 3cda104df..046091752 100644
--- a/doc/man/gnunet-conversation-test.1
+++ b/doc/man/gnunet-conversation-test.1
@@ -1,23 +1,21 @@
-.TH GNUNET\-CONVERSATION\-TEST 1 "Oct 30, 2013" "GNUnet"
+.TH GNUNET\-CONVERSATION\-TEST 1 "October 30, 2013" "GNUnet"
 .SH NAME
 gnunet\-conversation\-test \- check your speaker and microphone settings
 .SH SYNOPSIS
 .B gnunet\-conversation\-test [OPTIONS]
 .RI URI
 .br
 .SH DESCRIPTION
-\fBgnunet\-conversation\-test\fP can be used to check your speaker and microphone
+\fBgnunet\-conversation\-test\fP can be used to check your speaker and
-settings.  It will record you for five seconds and then play the recording back
+microphone settings.
-to you.  If this fails, you might want to use the \fBpavucontrol\fP tool to
+It will record you for five seconds and then play the recording back
-check which microphone or speaker were assigned to GNUnet by PulseAudio (you
+to you.
-may have more than one set of microphones or speakers known to your computer).
+If this fails, you might want to use the \fBpavucontrol\fP tool to
+check which microphone or speaker were assigned to GNUnet by
-You can use gnunet\-conversation\-test without having a peer running on your
+PulseAudio (you may have more than one set of microphones or speakers
-computer.
+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"
@@ -27,13 +25,33 @@ Use the configuration file FILENAME.
 Print short help on options.
 .B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
-Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
+Use LOGLEVEL for logging.
+Valid values are DEBUG, INFO, WARNING and ERROR.
 .B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending
-.SH "SEE ALSO"
+electronic mail to <gnunet\-developers@gnu.org>
+.SH SEE ALSO
 \fBgnunet\-conversation\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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-conversation.1 b/doc/man/gnunet-conversation.1
index ae2523f82..fb0596e19 100644
--- a/doc/man/gnunet-conversation.1
+++ b/doc/man/gnunet-conversation.1
@@ -1,20 +1,19 @@
-.TH GNUNET\-CONVERSATION 1 "Oct 5, 2013" "GNUnet"
+.TH GNUNET\-CONVERSATION 1 "October 5, 2013" "GNUnet"
 .SH NAME
 gnunet\-conversation \- have a conversation with your peers
 .SH SYNOPSIS
 .B gnunet\-conversation \-e NAME [OPTIONS]
 .RI URI
 .br
 .SH DESCRIPTION
-\fBgnunet\-conversation\fP can be used to have a conversation with other GNUnet
+\fBgnunet\-conversation\fP can be used to have a conversation with
-users.  You can make calls and receive incoming calls.  You need to setup an
+other GNUnet users.
-ego using gnunet\-identity first.  For others to be able to call you, you must
+You can make calls and receive incoming calls.
-add a PHONE record to your zone in the GNU Name System (using gnunet\-namestore).
+You need to setup an ego using gnunet\-identity first.
-gnunet\-conversation has an interactive help system via the /help command.
+For others to be able to call you, you must add a PHONE record to
+your zone in the GNU Name System (using gnunet\-namestore).
+gnunet\-conversation has an interactive help system via the /help
+command.
 .SH OPTIONS
 .B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
@@ -27,18 +26,37 @@ Specifies the NAME of the ego to use (for caller ID).
 Print short help on options.
 .B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
-Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
+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
+the conversation service.
-for most users.
+The default LINE is zero, which should be fine for most users.
 .B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending
-.SH "SEE ALSO"
+electronic mail to <gnunet\-developers@gnu.org>
+.SH SEE ALSO
 \fBgnunet\-identity\fP(1), \fBgnunet\-namestore\fP(1), \fBgnunet\-gns\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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-core.1 b/doc/man/gnunet-core.1
index 2ed3df880..dd2b566f9 100644
--- a/doc/man/gnunet-core.1
+++ b/doc/man/gnunet-core.1
@@ -1,17 +1,13 @@
-.TH gnunet\-core "1" "11 Apr 2014" "GNUnet"
+.TH GNUNET-CORE "1" "April 11, 2014" "GNUnet"
 .SH NAME
 gnunet\-core \- monitor CORE subsystem
 .SH SYNOPSIS
 .B gnunet\-core
 [\fIOPTIONS\fR]
 .SH DESCRIPTION
-.PP
 gnunet\-core is a tool to access various functions of GNUnet's core subsystem
 from the command\-line.  The only function right now is to monitor the status
 of peers known to the CORE service.
 .TP
 \fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR
 configuration file to use
@@ -31,11 +27,29 @@ print the version number
 .TP
 \fB\-V\fR, \fB\-\-verbose\fR
 be verbose
+.SH BUGS
-.SH NOTES
+Report bugs by using mantis <https://gnunet.org/bugs/> or by sending
+electronic mail to <gnunet\-developers@gnu.org>
+.SH SEE ALSO
-.SH "REPORTING BUGS"
-Report bugs by using mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
-.SH "SEE ALSO"
 \fBgnunet\-transport\fP(1)
+.PP
+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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-datastore.1 b/doc/man/gnunet-datastore.1
index 6bba7fb47..4cb536f51 100644
--- a/doc/man/gnunet-datastore.1
+++ b/doc/man/gnunet-datastore.1
@@ -1,18 +1,16 @@
-.TH gnunet\-datastore "1" "13 April 2017" "GNUnet"
+.TH GNUNET-DATASTORE "1" "April 13, 2017" "GNUnet"
 .SH NAME
 gnunet\-datastore \- dump or insert (restore) GNUnet datastore databases
 .SH SYNOPSIS
 .B gnunet\-datastore
 [\fIOPTIONS\fR]
 .SH DESCRIPTION
-.PP
+gnunet\-datastore can be used to backup and restore or merge GNUnet
+datastores.
-gnunet\-datastore can be used to backup and restore or merge GNUnet datastores.
+This is useful if a datastore is to be migrated between SQL databases,
-This is useful if a datastore is to be migrated between SQL databases, i.e.
+i.e.  from sqlite to postgres or vice versa.
-from sqlite to postgres or vice versa.  gnunet\-datastore will dump the
+gnunet\-datastore will dump the entire contents of the database or
-entire contents of the database or insert a dump file into the database.
+insert a dump file into the database.
 .TP
 \fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR
 configuration file to use
@@ -37,11 +35,29 @@ configure logging to write logs to FILENAME
 .TP
 \fB\-v\fR, \fB\-\-version\fR
 print the version number
+.SH BUGS
-.SH NOTES
+Report bugs by using mantis <https://gnunet.org/bugs/> or by sending
+electronic mail to <gnunet\-developers@gnu.org>
+.SH SEE ALSO
-.SH "REPORTING BUGS"
-Report bugs by using mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
-.SH "SEE ALSO"
 \fBgnunet\-publish\fP(1)
+.PP
+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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-directory.1 b/doc/man/gnunet-directory.1
index 9a44be244..109b2fc6c 100644
--- a/doc/man/gnunet-directory.1
+++ b/doc/man/gnunet-directory.1
@@ -1,7 +1,6 @@
-.TH gnunet-directory "1" "25 Feb 2012" "GNUnet"
+.TH GNUNET-DIRECTORY "1" "February 25, 2012" "GNUnet"
 .SH NAME
 gnunet\-directory \- display directories
 .SH SYNOPSIS
 .B gnunet\-directory
 [\fIOPTIONS\fR] (FILENAME)*
@@ -37,7 +36,7 @@ availability but does not produce useless duplicates (for example, it is a
 better idea to publish a collection of pictures or compressed sound files
 using a GNUnet directory instead of processing them with archivers such as
 tar or zip first).  Directories can contain arbitrary meta data for each file.
+.PP
 If a directory has missing blocks (for example, some blocks failed to download),
 GNUnet is typically able to retrieve information about other files in the
 directory.  Files in a GNUnet directory have no particular order; the GNUnet
@@ -45,18 +44,40 @@ code that generates a directory can reorder the entries in order to better
 fit the information about files into blocks of 32k.  Respecting 32k boundaries
 where possible makes it easier for gnunet\-directory (and other tools) to
 recover information from partially downloaded directory files.
+.PP
 At the moment, directories can be created by \fBgnunet\-fs\-gtk\fP
 and \fBgnunet\-publish\fP.  Just like ordinary files, a directory can be
 published in a namespace.
+.PP
 GNUnet directories use the (unregistered)
 mimetype \fBapplication/gnunet\-directory\fP.  They can show up among normal
 search results.  The directory file can be downloaded to disk
 by \fBgnunet\-download\fP(1) for later processing or be handled more directly
 by \fBgnunet\-fs\-gtk\fP(1).
-.SH "REPORTING BUGS"
+.SH BUGS
-Report bugs by using mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+Report bugs by using mantis <https://gnunet.org/bugs/> or by sending
-.SH "SEE ALSO"
+electronic mail to <gnunet\-developers@gnu.org>
-\fBgnunet\-fs\-gtk\fP(1), \fBgnunet\-publish\fP(1), \fBgnunet\-search\fP(1), \fBgnunet\-download\fP(1)
+.SH SEE ALSO
+\fBgnunet\-fs\-gtk\fP(1), \fBgnunet\-publish\fP(1),
+\fBgnunet\-search\fP(1), \fBgnunet\-download\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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-dns2gns.1 b/doc/man/gnunet-dns2gns.1
index e04901062..6ecad3c42 100644
--- a/doc/man/gnunet-dns2gns.1
+++ b/doc/man/gnunet-dns2gns.1
@@ -35,7 +35,26 @@ Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
 Print GNUnet version number.
 .SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <bug\-gnunet@gnu.org>
+Report bugs by using Mantis <https://gnunet.org/bugs/> 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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-download-manager.1 b/doc/man/gnunet-download-manager.1
index ec1f7538a..7cc6dbffb 100644
--- a/doc/man/gnunet-download-manager.1
+++ b/doc/man/gnunet-download-manager.1
@@ -1,30 +1,80 @@
-.TH GNUNET-DOWNLOAD-MANAGER 1 "15 Jan, 2011" "GNUnet"
+.TH GNUNET-DOWNLOAD-MANAGER 1 "October 26, 2018" "GNUnet"
 .SH NAME
 gnunet-download-manager \- manage downloads across sessions
 .SH SYNOPSIS
 .B gnunet\-download\-manager
 .RI [ options ]
 .br
 .SH DESCRIPTION
 \fBgnunet\-download\-manager\fP is a script that can be used to track
-download sessions.  It makes the process of resuming downloads after a
+download sessions.
-system reboot easier.  A typical use is to define an alias (depending
+It makes the process of resuming downloads after a system reboot
-on your shell) of the form
+easier.
+A typical use is to define an alias (depending on your shell) of the
+form:
+.TP
 $ alias gnunet\-download='gnunet\-download\-manager.scm download'
+.PP
-Other commands for the download manager include resume (resumes all
+The options for the download manager include:
-downloads), status (show status of pending downloads), killall (abort
+.TP
-all downloads), settings (for configuration) and help (print help text).
+.B download
+download
-gnunet\-download\-manager is a scheme script and will only work if Guile
+.TP
-is available.
+.B resume
+resumes all downloads
+.TP
+.B status
+show status of pending downloads
+.TP
+.B killall
+abort all downloads
+.TP
+.B settings
+for configuration
+.TP
+.B help
+print help text
+.PP
+gnunet\-download\-manager is a Scheme script and will only work if GNU
+Guile is available.
+.SH EXAMPLES
+(add-hook! *completed-download-hook* completed-download-notification-hook)
+.TP
+Add this to the configuration file to be notified of completed
+downloads.
+.SH FILES
+.TP
+~/.gnunet-download-manager.scm
+Configuration file.
 .SH BUGS
-Report bugs by using mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet-developers@gnu.org>
+Report bugs by using mantis <https://gnunet.org/bugs/> or by sending
+electronic mail to <gnunet-developers@gnu.org>.
+.PP
+Furthermore it is assumed that gnunet-download-manager is no longer
+working correctly with Guile 2.2 series or current GNUnet, bugfixes
+are welcome.
 .SH SEE ALSO
 gnunet\-download(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
+should give you access to the complete handbook,
+.IP
+.B 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).
+.SH HISTORY
+.SH AUTHORS
+gnunet\-download\-manager was contributed by Ludovic Courtes in 2004.
diff --git a/doc/man/gnunet-download.1 b/doc/man/gnunet-download.1
index 824c2414d..58e82e790 100644
--- a/doc/man/gnunet-download.1
+++ b/doc/man/gnunet-download.1
@@ -1,21 +1,17 @@
-.TH GNUNET-DOWNLOAD "1" "31 Jan 2016" "GNUnet"
+.TH GNUNET-DOWNLOAD "1" "January 31, 2016" "GNUnet"
 .SH NAME
 gnunet\-download \- a command line interface for downloading files from GNUnet
 .SH SYNOPSIS
 .B gnunet\-download
 [\fIOPTIONS\fR] \-\- GNUNET_URI
 .SH DESCRIPTION
-.PP
 Download files from GNUnet.
 .TP
 \fB\-a \fILEVEL\fR, \fB\-\-anonymity=LEVEL\fR
 set desired level of receiver anonymity.  Default is 1.
 .TP
 \fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR
 use config file (defaults: ~/.config/gnunet.conf)
 .TP
 \fB\-D, \fB\-\-delete\-incomplete\fR
 causes gnunet\-download to delete incomplete downloads when aborted with
@@ -24,20 +20,16 @@ download will not be deleted even with this option.  Without this option,
 terminating gnunet\-download with a signal will cause incomplete
 downloads to stay on disk.  If gnunet\-download runs to (normal) completion
 finishing the download, this option has no effect.
 .TP
 \fB\-h\fR, \fB\-\-help\fR
 print help page
 .TP
 \fB\-L \fILOGLEVEL\fR, \fB\-\-loglevel=LOGLEVEL\fR
 Change the loglevel.  Possible values for LOGLEVEL are
 ERROR, WARNING, INFO and DEBUG.
 .TP
 \fB\-n\fR, \fB\-\-no-network\fR
 Only search locally, do not forward requests to other peers.
 .TP
 \fB\-o \fIFILENAME\fR, \fB\-\-output=FILENAME\fR
 write the file to FILENAME.  Hint: when recursively downloading a directory,
@@ -45,7 +37,6 @@ append a '/' to the end of the FILENAME to create a directory of that name.
 If no FILENAME is specified, gnunet\-download constructs a temporary ID from
 the URI of the file.  The final filename is constructed based on meta\-data
 extracted using libextractor (if available).
 .TP
 \fB\-p \fIDOWNLOADS\fR, \fB\-\-parallelism=DOWNLOADS\fR
 set the maximum number of parallel downloads that is allowed.  More parallel
@@ -56,7 +47,6 @@ used to limit the number of files that are downloaded in parallel (\-r can
 be used to limit the number of blocks that are concurrently requested).
 As a result, the value only matters for recursive downloads.
 The default value is 32.
 .TP
 \fB\-r \fIREQUESTS\fR, \fB\-\-request-parallelism=REQUESTS\fR
 set the maximum number of parallel requests that is allowed.  If multiple
@@ -71,7 +61,6 @@ recursive downloads with many large files if memory and network
 bandwidth are not fully utilized and if the parallelism limit (\-p option)
 is not reached.  This option also only matters for recursive downloads.
 The default value is 4092.
 .TP
 \fB\-R\fR, \fB\-\-recursive\fR
 download directories recursively (and in parallel). Note that the URI
@@ -83,15 +72,12 @@ information will be stored in "DIRNAME/.gnd". However, it is also
 possible to specify "DIRNAME.gnd", in which case the files from the
 directory will end up in "DIRNAME/", while GNUnet's directory meta
 data will be in "DIRNAME.gnd".
 .TP
 \fB\-v\fR, \fB\-\-version\fR
 print the version number
 .TP
 \fB\-V\fR, \fB\-\-verbose\fR
 print progress information
 .SH NOTES
 The GNUNET_URI is typically obtained from
 gnunet\-search. gnunet\-fs\-gtk can also be used instead of
@@ -102,9 +88,7 @@ already present. GNUnet's file\-encoding will ensure file integrity,
 even if the existing file was not downloaded from GNUnet in the first
 place. Temporary information will be appended to the target file until
 the download is completed.
 .SH SETTING ANONYMITY LEVEL
 The \fB\-a\fR option can be used to specify additional anonymity
 constraints. If set to 0, GNUnet will try to download the file as fast
 as possible, including using non-anonymous methods.  If you set it to
@@ -121,14 +105,14 @@ anonymity level 0, the peers publishing the data might be sharing with
 a higher anonymity level, which in this case will determine
 performance.  Also, peers that cache content in the network always use
 anonymity level 1.
+.PP
 This option can be used to limit requests further than that. In
 particular, you can require GNUnet to receive certain amounts of
 traffic from other peers before sending your queries. This way, you
 can gain very high levels of anonymity \- at the expense of much more
 traffic and much higher latency. So set it only if you really believe
 you need it.
+.PP
 The definition of ANONYMITY\-RECEIVE is the following.  0 means no
 anonymity is required.  Otherwise a value of 'v' means that 1 out of v
 bytes of "anonymous" traffic can be from the local user, leaving 'v-1'
@@ -137,17 +121,40 @@ bytes of messages from foreign peers (using anonymous routing), it may
 originate n/(v-1) bytes of queries in the same time\-period. The
 time\-period is twice the average delay that GNUnet defers forwarded
 queries.
+.PP
 The default is 1 and this should be fine for most users.  Also notice
 that if you choose very large values, you may end up having no
 throughput at all, especially if many of your fellow GNUnet\-peers all
 do the same.
 .SH FILES
 .TP
 ~/.config/gnunet.conf
 GNUnet configuration file
-.SH "REPORTING BUGS"
+.SH BUGS
-Report bugs to <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+Report bugs to <https://gnunet.org/bugs/> or by sending electronic
-.SH "SEE ALSO"
+mail to <gnunet\-developers@gnu.org>
-\fBgnunet\-fs\-gtk\fP(1), \fBgnunet\-publish\fP(1), \fBgnunet\-search\fP(1), \fBgnunet.conf\fP(5), \fBgnunet\-service\-fs\fP(1)
+.SH SEE ALSO
+\fBgnunet\-fs\-gtk\fP(1), \fBgnunet\-publish\fP(1),
+\fBgnunet\-search\fP(1), \fBgnunet.conf\fP(5),
+\fBgnunet\-service\-fs\fP(1)
+.PP
+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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-ecc.1 b/doc/man/gnunet-ecc.1
index 22a3c5d44..e3db11eab 100644
--- a/doc/man/gnunet-ecc.1
+++ b/doc/man/gnunet-ecc.1
@@ -1,4 +1,4 @@
-.TH GNUNET\-ECC 1 "Jun 5, 2017" "GNUnet"
+.TH GNUNET\-ECC 1 "June 5, 2017" "GNUnet"
 .SH NAME
 gnunet\-ecc \- manipulate GNUnet ECC key files
@@ -49,4 +49,25 @@ Print GNUnet version number.
 .SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+Report bugs by using Mantis <https://gnunet.org/bugs/> 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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-fs.1 b/doc/man/gnunet-fs.1
index dfdaabbdb..8a9f0838c 100644
--- a/doc/man/gnunet-fs.1
+++ b/doc/man/gnunet-fs.1
@@ -1,19 +1,17 @@
-.TH gnunet\-fs "1" "2 Nov 2011" "GNUnet"
+.TH GNUNET\-FS "1" "November 2, 2011" "GNUnet"
 .SH NAME
 gnunet\-fs \- measure and control the fs subsystem
 .SH SYNOPSIS
 .B gnunet\-fs
 [\fIOPTIONS\fR]
 .SH DESCRIPTION
 .PP
 gnunet\-fs is a tool to access various functions of GNUnet's fs
-subsystem from the command\-line.  Most of these are not expected to
+subsystem from the command\-line.
-be useful for end-users.  gnunet\-fs can currently only be used to
+Most of these are not expected to be useful for end-users.
-obtain a list of indexed files.  Other functions should be added in
+gnunet\-fs can currently only be used to obtain a list of indexed
-the near future.
+files.
+Other functions should be added in the near future.
 .TP
 \fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR
 configuration file to use
@@ -21,20 +19,40 @@ configuration file to use
 \fB\-h\fR, \fB\-\-help\fR
 print help page
 .TP
-\fB\-i\fR, \fB\-\-list-indexed\fR print information about files that
+\fB\-i\fR, \fB\-\-list-indexed\fR
-are currently indexed by file-sharing
+print information about files that are currently indexed by
+file-sharing
 .TP
-\fB\-L \fILOGLEVEL\fR, \fB\-\-loglevel=LOGLEVEL\fR Change the
+\fB\-L \fILOGLEVEL\fR, \fB\-\-loglevel=LOGLEVEL\fR
-loglevel.  Possible values for LOGLEVEL are ERROR, WARNING, INFO and
+Change the loglevel.
-DEBUG.
+Possible values for LOGLEVEL are ERROR, WARNING, INFO and DEBUG.
 .TP
-\fB\-v\fR, \fB\-\-version\fR print the version number
+\fB\-v\fR, \fB\-\-version\fR
+print the version number
 .TP
-\fB\-V\fR, \fB\-\-verbose\fR be verbose
+\fB\-V\fR, \fB\-\-verbose\fR
+be verbose
 .SH BUGS
-Report bugs by using mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+Report bugs by using mantis <https://gnunet.org/bugs/> or by sending
+electronic mail to <gnunet\-developers@gnu.org>
 .SH SEE ALSO
 \fBgnunet\-publish\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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-gns-proxy.1 b/doc/man/gnunet-gns-proxy.1
index 96e9911a2..f99be5104 100644
--- a/doc/man/gnunet-gns-proxy.1
+++ b/doc/man/gnunet-gns-proxy.1
@@ -1,24 +1,19 @@
-.TH GNUNET\-GNS\-PROXY 1 "Oct 25, 2012" "GNUnet"
+.TH GNUNET-GNS-PROXY 1 "October 25, 2012" "GNUnet"
 .SH NAME
 gnunet\-gns\-proxy \- run a client side GNS SOCKS proxy
 .SH SYNOPSIS
 .B gnunet\-gns\-proxy
 .RI [ options ]
-.br
 .SH DESCRIPTION
 Most users will want to run this SOCKS proxy. It can be used in
 combination with browsers that support the SOCKS 4a protocol.
+.PP
 The proxy will perform SSL authentication of GNS names and rewrite GNS
 enabled HTML content. To assert the validity of GNS names a local root
 CA certificate has to be generated that is used by the proxy. Thus
 "gnunet-gns-proxy-setup-ca" should be executed before the first launch
 of this proxy or the \-\-authority switch is used to specify an
 appropriate CA certificate that is already trusted by the browser.
 .SH OPTIONS
 .B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
@@ -42,10 +37,29 @@ ERROR.
 .B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <bug\-gnunet@gnu.org>
+Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending
+electronic mail to <bug\-gnunet@gnu.org>
 .SH SEE ALSO
 gnunet\-gns(1)
+.PP
+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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-gns.1 b/doc/man/gnunet-gns.1
index 9e4482653..9f7a651a7 100644
--- a/doc/man/gnunet-gns.1
+++ b/doc/man/gnunet-gns.1
@@ -1,57 +1,67 @@
-.TH GNUNET\-GNS 1 "Mar 23, 2018" "GNUnet"
+.TH GNUNET\-GNS 1 "March 23, 2018" "GNUnet"
 .SH NAME
 gnunet\-gns \- Access to GNU Name System
 .SH SYNOPSIS
 .B gnunet\-gns
 .RI [ options ]
-.br
 .SH DESCRIPTION
 \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
+No unneeded output.
-information is displayed.  For example a lookup for an IP address will
+This is a quiet mode where only important information is displayed.
-only yield the IP address, no descriptive text.
+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
+Use LOGLEVEL for logging.
-ERROR.
+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.
+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,
+Resource Record Type (TYPE) to look for.
-AAAA, CNAME, NS, PKEY, PSEU, TLSA, SRV, SOA, MX, LEHO, VPN, REV, PTR,
+Supported TYPE's are: A, AAAA, CNAME, NS, PKEY, PSEU, TLSA, SRV, SOA,
-TXT
+MX, LEHO, VPN, REV, PTR, TXT.
 Defaults to "A".
 .B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
-.B
 .SH RETURN VALUE
 gnunet\-gns will return 0 on success, 1 on internal failures, 2 on
 launch failures, 4 if the given name is not configured to use GNS.
 .SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending
+electronic mail to <gnunet\-developers@gnu.org>
+.SH SEE ALSO
-.SH "SEE ALSO"
 \fBgnunet\-namestore\fP(1), \fBgnunet\-identity\fP(1)
+.PP
+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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-identity.1 b/doc/man/gnunet-identity.1
index 37cf85f45..8d009d07b 100644
--- a/doc/man/gnunet-identity.1
+++ b/doc/man/gnunet-identity.1
@@ -1,4 +1,4 @@
-.TH GNUNET-IDENTITY "1" "5 Sep 2013" "GNUnet"
+.TH GNUNET-IDENTITY "1" "September 5, 2013" "GNUnet"
 .SH NAME
 gnunet\-identity \- create, delete or list egos
 .SH SYNOPSIS
@@ -6,58 +6,75 @@ gnunet\-identity \- create, delete or list egos
 [options]
 .SH DESCRIPTION
 .PP
-gnunet\-identity is a tool for managing egos.  An ego is the persona
+gnunet\-identity is a tool for managing egos.
-that controls a namespace.  It is identical to a public\-private ECC
+An ego is the persona that controls a namespace.
-key pair.
+It is identical to a public\-private ECC key pair.
+.PP
 gnunet\-identity can be used to list all of the egos that were created
 locally, to create new egos, and to delete existing egos (the
 namespace will continue to exist, but it will be impossible to add
 additional data to it).
+.PP
 Creating a new ego requires using the \-C option together with an
-identifier (name) that is to be used for the new ego.  This identifier
+identifier (name) that is to be used for the new ego.
-is only used locally for this peer and not shared with other peers.
+This identifier is only used locally for this peer and not shared with
+other peers.
 .TP
-\fB\-C NAME\fR, \fB\-\-create=NAME\fR Creates a new ego with the given
+\fB\-C NAME\fR, \fB\-\-create=NAME\fR
-NAME.
+Creates a new ego with the given NAME.
+.TP
+\fB\-D NAME\fR, \fB\-\-delete=NAME\fR
+Delete the ego with the given NAME.
+.TP
+\fB\-e NAME\fR, \fB\-\-ego=NAME\fR
+Perform "set" operation with the respective ego.
+Needs to be used together with option \-s.
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help page.
 .TP
-\fB\-D NAME\fR, \fB\-\-delete=NAME\fR Delete the ego with the given
+\fB\-d\fR, \fB\-\-display\fR
+display all of our egos
+.TP
+\fB\-m\fR, \fB\-\-monitor\fR
+Run in monitor mode, listing all ouf our egos until CTRL-C is pressed.
+Each ego is listed together with a unique pointer value; if egos are
+renamed, that pointer value remains the same; if egos are deleted,
+they are listed one more time with a name of "<null>".
+.TP
+\fB\-s SUBSYSTEM\fR, \fB\-\-set=SUBSYSTEM\fR
+Perform "set" operation for the specified SUBSYSTEM with the
+respective ego.
+Needs to be used together with option \-e.
+After this, the given SUBSYSTEM will use the ego with the specified
 NAME.
+This will fail if NAME does not yet exist.
-.TP
-\fB\-e NAME\fR, \fB\-\-ego=NAME\fR Perform "set" operation with the
-respective ego.  Needs to be used together with option \-s.
-.TP
-\fB\-h\fR, \fB\-\-help\fR Print help page.
-.TP
-\fB\-d\fR, \fB\-\-display\fR display all of our egos
-.TP
-\fB\-m\fR, \fB\-\-monitor\fR run in monitor mode, listing all ouf our
-egos until CTRL-C is pressed. Each ego is listed together with a
-unique pointer value; if egos are renamed, that pointer value remains
-the same; if egos are deleted, they are listed one more time with a
-name of "<null>".
-.TP
-\fB\-s SUBSYSTEM\fR, \fB\-\-set=SUBSYSTEM\fR Perform "set" operation
-for the specified SUBSYSTEM with the respective ego.  Needs to be used
-together with option \-e.  After this, the given SUBSYSTEM will use
-the ego with the specified NAME.  This will fail if NAME does not yet
-exist.
 .SH FILES
 .TP
 ~/.local/share/gnunet/identity/egos
 Directory where the egos are stored (by default)
+.SH BUGS
-.SH "REPORTING BUGS"
+Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+electronic mail to <gnunet\-developers@gnu.org>
-.SH "SEE ALSO"
+.SH SEE ALSO
 \fBgnunet\-gns\fP(1),  \fBgnunet\-namestore\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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-namecache.1 b/doc/man/gnunet-namecache.1
index ffc315b32..528656218 100644
--- a/doc/man/gnunet-namecache.1
+++ b/doc/man/gnunet-namecache.1
@@ -1,4 +1,4 @@
-.TH GNUNET\-NAMECACHE 1 "Oct 16, 2013" "GNUnet"
+.TH GNUNET\-NAMECACHE 1 "October 16, 2013" "GNUnet"
 .SH NAME
 gnunet\-namecache \- inspect namecache
@@ -35,8 +35,26 @@ Specifies the public key of the zone to inspect (mandatory option)
 .SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending
+electronic mail to <gnunet\-developers@gnu.org>
+.SH SEE ALSO
-.SH "SEE ALSO"
 \fBgnunet\-gns\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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-namestore-fcfsd.1 b/doc/man/gnunet-namestore-fcfsd.1
index 88ab72071..3f22145e2 100644
--- a/doc/man/gnunet-namestore-fcfsd.1
+++ b/doc/man/gnunet-namestore-fcfsd.1
@@ -1,36 +1,31 @@
-.TH GNUNET\-NAMESTORE-FCFSD 1 "5 Sep 2013" "GNUnet"
+.TH GNUNET-NAMESTORE-FCFSD 1 "September 5, 2013" "GNUnet"
 .SH NAME
 gnunet\-namestore-fcfsd \- HTTP server for GNU Name System First-Come-First-Served name registration
 .SH SYNOPSIS
 .B gnunet\-namestore-fcfsd
 .RI [ options ]
-.br
 .SH DESCRIPTION
 Most users will not want to run an FCFS\-zone and thus will not need
 this program.
+.PP
 \fBgnunet\-gns-fcfsd\fP runs a web server where users can register
 names to be mapped to their GNS zone.  Names are made available on a
 First Come First Served basis (hence fcfs).  Registered names do not
 expire.  The HTTP server is run on the port that is specified in the
 configuration file in section "[fcfsd]" under the name "HTTPPORT".
+.PP
 It is possible to manage gnunet\-gns\-fcfsd using
 gnunet\-(service\-arm) by starting the daemon using "gnunet\-arm \-i
 fcfsd" or by setting "IMMEDIATE_START=YES" in the "fcfds" section of your
 configuration and the "-z ZONE" in as the "OPTION".
+.PP
 An FCFS\-zone is run at http://gnunet.org/fcfs/.  GNS users are
 encouraged to register their zone with the gnunet.org FCFS authority.
+.PP
 If you want to run your own FCFS registrar, you need to first create a
 pseudonym (using "gnunet\-identity \-C NAME"), and use it with the
 "-z" option.  After that, you can start the FCFSD service (possibly using
 gnunet\-arm).
 .SH OPTIONS
 .B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
@@ -48,9 +43,29 @@ Print GNUnet version number.
 .B
 .IP "\-z EGO, \-\-zone=EGO"
 Specifies for which EGO should FCFSD manage the zone.
 .SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <bug\-gnunet@gnu.org>
+Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending
+electronic mail to <bug\-gnunet@gnu.org>
 .SH SEE ALSO
 gnunet\-identity(1), gnunet\-gns(1), gnunet\-gns\-proxy(1)
+.PP
+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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-namestore.1 b/doc/man/gnunet-namestore.1
index 006c8593b..10577a0d9 100644
--- a/doc/man/gnunet-namestore.1
+++ b/doc/man/gnunet-namestore.1
@@ -1,4 +1,4 @@
-.TH GNUNET\-NAMESTORE 1 "Apr 15, 2014" "GNUnet"
+.TH GNUNET\-NAMESTORE 1 "April 15, 2014" "GNUnet"
 .SH NAME
 gnunet\-namestore \- manipulate GNU Name System (GNS) zone data
@@ -89,8 +89,26 @@ Specifies the name of the ego controlling the private key for the zone
 .SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending
+electronic mail to <gnunet\-developers@gnu.org>
+.SH SEE ALSO
-.SH "SEE ALSO"
 \fBgnunet\-gns\fP(1), \fBgnunet\-namestore\-gtk\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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-nat-auto.1 b/doc/man/gnunet-nat-auto.1
index 3a2631391..bc95972c4 100644
--- a/doc/man/gnunet-nat-auto.1
+++ b/doc/man/gnunet-nat-auto.1
@@ -1,71 +1,72 @@
-.TH GNUNET\-NAT\-AUTO 1 "6 Jan 2017" "GNUnet"
+.TH GNUNET-NAT-AUTO 1 "January 6, 2017" "GNUnet"
 .SH NAME
 gnunet\-nat\-auto \- autoconfigure and test NAT traversal
 .SH SYNOPSIS
 .B gnunet\-nat\-auto
 .RI [ options ]
-.br
 .SH DESCRIPTION
 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).
 .SH EXAMPLES
 .PP
 \fBAutomatic configuration:\fR
+.TP
-Probe and write result to configuration:
+# gnunet\-nat\-auto \-aw
+Probe and write result to configuration
-  # gnunet\-nat\-auto \-aw
+.PP
 \fBTest configuration:\fR
+.TP
-Test TCP configuration:
+# gnunet\-nat\-auto -t \-S transport-tcp
+Test TCP configuration
-  # gnunet\-nat\-auto -t \-S transport-tcp
+.TP
+# gnunet\-nat\-auto -t \-S transport-http
-Test HTTP configuration:
+Test HTTP configuration
+.TP
-  # gnunet\-nat\-auto -t \-S transport-http
+# gnunet\-nat\-auto -u \-S transport-udp
+Test UDP configuration
-Test UDP configuration:
-  # gnunet\-nat\-auto -u \-S transport-udp
 .SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending
+electronic mail to <gnunet\-developers@gnu.org>
 .SH SEE ALSO
 gnunet\-transport(1) gnunet\-nat(1)
+.PP
+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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-nat-server.1 b/doc/man/gnunet-nat-server.1
index 3d79d5bc5..1fdf1e265 100644
--- a/doc/man/gnunet-nat-server.1
+++ b/doc/man/gnunet-nat-server.1
@@ -1,23 +1,18 @@
-.TH GNUNET\-NAT\-SERVER 1 "25 Feb 2012" "GNUnet"
+.TH GNUNET-NAT-SERVER 1 "February 25, 2012" "GNUnet"
 .SH NAME
 gnunet\-nat\-server \- help GNUnet setup test network setup with NAT
 .SH SYNOPSIS
 .B gnunet\-nat\-server
 .RI [ options ]
 .RI PORT
-.br
 .SH DESCRIPTION
 Normal GNUnet end-users should not concern themselves with
 gnunet\-nat\-server.  In fact, distributions are encouraged to
 consider not shipping it at all.  Running gnunet\-nat\-server's is
 similar to running hostlist servers: it is a special service to the
 community with special requirements and no benefit to those running
 the service.
+.PP
 This program will listen on the specified PORT for incoming requests
 to test a peer's network connectivity.  Incoming requests can ask it
 to connect to a given IPv4 address (and port) using TCP or UDP and to
@@ -25,36 +20,53 @@ send a 2-byte test message using the specified address.  The program
 can also be asked to send a "fake" ICMP response message to a given
 IPv4 address (for autonomous NAT traversal \-\-\- see the description
 in the respective research paper).
+.PP
 The idea is that gnunet\-nat\-server will be run on some trusted hosts
 with unrestricted connectivity to allow GNUnet users to test their
 network configuration.  As written, the code allows any user on the
 Internet to cause the gnunet\-nat\-server to send 2-bytes of arbitrary
 data to any TCP or UDP port at any address.  We believe that this is
 generally harmless.
+.PP
 When running gnunet\-nat\-server, make sure to use a configuration
 that disables most NAT options but enables 'enable_nat_client' and
 sets 'internal_address' to the global IP address of your local host.
 Also, the gnunet\-helper\-nat\-client should be installed locally and
 run with root privileges (SUID), otherwise the gnunet\-nat\-server
 will not work properly.
+.PP
 Note that gnunet\-nat\-server could be run via gnunet\-arm but
 typically is not.  Also, the name of the host and port that
 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
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+Report bugs by using Mantis <https://gnunet.org/bugs/> 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.
+If the
+.B info
+and
+.B gnunet
+programs are properly installed at your site, the command
+.IP
+.B info gnunet
+.PP
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-nat.1 b/doc/man/gnunet-nat.1
index fe9d8af3e..cf48e1dc6 100644
--- a/doc/man/gnunet-nat.1
+++ b/doc/man/gnunet-nat.1
@@ -1,118 +1,109 @@
-.TH GNUNET\-NAT 1 "27 Nov 2016" "GNUnet"
+.TH GNUNET\-NAT 1 "October 26, 2018" "GNUnet"
 .SH NAME
 gnunet\-nat \- interact with the NAT service
 .SH SYNOPSIS
 .B gnunet\-nat
 .RI [ options ]
-.br
 .SH DESCRIPTION
+This tool allows testing various NAT traversal functions, as well as
-This tool allows testing various NAT traversal functions, as well
+attempting auto\-configuration.
-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
+Enable processing of STUN requests.
-the bind address and handle the packets if they are STUN packets. Will
+Will try to read UDP packets from the bind address and handle the
-only work with UDP.
+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
 .PP
 \fBBasic examples\fR
+.TP
+# gnunet-nat -i 0.0.0.0:8080 -u
 We are bound to "0.0.0.0:8080" on UDP and want to obtain all
-applicable IP addresses:
+applicable IP addresses.
+.TP
-  # gnunet-nat -i 0.0.0.0:8080 -u
+# gnunet-nat -i '[::0]':8080 -t
 We are bound to "::0" on port 8080 on TCP and want to obtain all
-applicable IP addresses:
+applicable IP addresses.
+.TP
-  # gnunet-nat -i '[::0]':8080 -t
+# gnunet-nat -i 127.0.0.1:8080 -u
 We are bound to "127.0.0.1:8080" on UDP and want to obtain all
 applicable IP addresses:
+.PP
-  # gnunet-nat -i 127.0.0.1:8080 -u
 \fBICMP-based NAT traversal:\fR
+.TP
+# gnunet-nat -Wt -i 192.168.178.12:8080
 Watch for connection reversal request (you must be bound to NAT range
 or to wildcard, 0.0.0.0), only works for IPv4:
+.TP
-  # gnunet-nat -Wt -i 192.168.178.12:8080
+# gnunet-nat -t -r 1.2.3.4:8080 -i 2.3.4.5:8080
 Initiate connection reversal request from peer at external IPv4
 address 1.2.3.4, while we are running ourselves at 2.3.4.5:8080 (must
 use IPv4 addresses):
+.TP
-  # gnunet-nat -t -r 1.2.3.4:8080 -i 2.3.4.5:8080
+# gnunet-nat -t -r 1.2.3.4:8080 -i 0.0.0.0:8080
 Initiate connection reversal request from peer at external IPv4
 address 1.2.3.4, and let the kernel fill in whatever IPv4 address we
 happen to have:
+.PP
-  # gnunet-nat -t -r 1.2.3.4:8080 -i 0.0.0.0:8080
 \fBManual hole punching:\fR
+.TP
+# gnunet-nat -t -p AUTO:8080
 Assume manually punched NAT, but determine external IP automatically:
+.PP
-  # gnunet-nat -t -p AUTO:8080
 \fBSTUN-based XXX:\fR
+.TP
-XXX:
+# gnunet-nat FIXME -s
+XXX
-  # gnunet-nat FIXME -s
 .SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending
+electronic mail to <gnunet\-developers@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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-peerinfo.1 b/doc/man/gnunet-peerinfo.1
index cfb34c36a..03246d968 100644
--- a/doc/man/gnunet-peerinfo.1
+++ b/doc/man/gnunet-peerinfo.1
@@ -1,23 +1,18 @@
-.TH GNUNET\-PEERINFO 1 "Mar 4, 2013" "GNUnet"
+.TH GNUNET-PEERINFO 1 "March 4, 2013" "GNUnet"
 .SH NAME
 gnunet\-peerinfo \- Display information about other peers.
 .SH SYNOPSIS
 .B gnunet\-peerinfo
 .RI [ options ]
-.br
 .SH DESCRIPTION
 .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
+.IP "\-g, \-\-get\-hello"
 Output HELLO uri(s)
 .B
 .IP "\-h, \-\-help"
@@ -35,7 +30,7 @@ Log messages to LOGFILE
 .IP "\-n, \-\-numeric"
 Disable resolution of IPs to hostnames
 .B
-.IP "\-p, \-\-put\-hello=HELLO
+.IP "\-p, \-\-put\-hello=HELLO"
 Add given HELLO uri to the database
 .B
 .IP "\-q, \-\-quiet"
@@ -48,10 +43,29 @@ order to consider this peer one of their friends in F2F mode).
 .B
 .IP "\-v, \-\-version"
 Print the version number
 .SH BUGS
-Report bugs by using mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+Report bugs by using mantis <https://gnunet.org/bugs/> or by sending
+electronic mail to <gnunet\-developers@gnu.org>
 .SH SEE ALSO
 gnunet.conf(5)
+.PP
+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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-publish.1 b/doc/man/gnunet-publish.1
index 28ee163e2..5bc2eec76 100644
--- a/doc/man/gnunet-publish.1
+++ b/doc/man/gnunet-publish.1
@@ -1,4 +1,4 @@
-.TH GNUNET-PUBLISH "1" "16 Nov 2015" "GNUnet"
+.TH GNUNET-PUBLISH "1" "November 16, 2015" "GNUnet"
 .SH NAME
 gnunet\-publish \- a command line interface for publishing new content into GNUnet
 .SH SYNOPSIS
@@ -7,315 +7,341 @@ gnunet\-publish \- a command line interface for publishing new content into GNUn
 .SH DESCRIPTION
 .PP
 In order to share files with other GNUnet users, the files must first
-be made available to GNUnet.  GNUnet does not automatically share all
+be made available to GNUnet.
-files from a certain directory (however, you can do this with the
+GNUnet does not automatically share all files from a certain directory
-gnunet\-auto\-share tool).  In fact, even files that are downloaded
+(however, you can do this with the gnunet\-auto\-share tool).
-are not automatically shared.
+In fact, even files that are downloaded are not automatically shared.
 .PP
 In order to start sharing files, the files must be added either using
-gnunet\-publish or a graphical interface such as gnunet\-fs\-gtk.  The
+gnunet\-publish or a graphical interface such as gnunet\-fs\-gtk.
-command line tool gnunet\-publish is more useful if many files are
+The command line tool gnunet\-publish is more useful if many files are
-supposed to be added.  gnunet\-publish can automatically publish
+supposed to be added.
-batches of files, recursively publish directories, create directories
+gnunet\-publish can automatically publish batches of files,
-that can be browsed within GNUnet and publish file lists in a
+recursively publish directories, create directories that can be
-namespace.  When run on a directory, gnunet\-publish will always
+browsed within GNUnet and publish file lists in a namespace.
-recursively publish all of the files in the directory.
+When run on a directory, gnunet\-publish will always recursively
+publish all of the files in the directory.
 .PP
 gnunet\-publish can automatically extract keywords from the files that
-are shared.  Users that want to download files from GNUnet use
+are shared.
-keywords to search for the appropriate content.  You can disable
+Users that want to download files from GNUnet use keywords to search
-keyword extraction with the \-D option.  You can manually add keywords
+for the appropriate content.
-using the \-k option. The keywords are case\-sensitive.
+You can disable keyword extraction with the \-D option.
+You can manually add keywords using the \-k option.
+The keywords are case\-sensitive.
 .PP
 In addition to searching for files by keyword, GNUnet allows
-organizing files into directories.  With directories, the user only
+organizing files into directories.
-needs to find the directory in order to be able to download any of the
+With directories, the user only needs to find the directory in order
-files listed in the directory.  Directories can contain pointers to
+to be able to download any of the files listed in the directory.
-other directories.
+Directories can contain pointers to other directories.
 .PP
 With gnunet\-publish, it is easy to create new directories
-simultaneously when adding the files.  Simply pass the name of a
+simultaneously when adding the files.
-directory instead of a file.
+Simply pass the name of a directory instead of a file.
 .PP
 Since keywords can be spammed (any user can add any content under any
-keyword), GNUnet supports namespaces.  A namespace is a subset of the
+keyword), GNUnet supports namespaces.
-searchspace into which only the holder of a certain pseudonym can add
+A namespace is a subset of the searchspace into which only the holder
-content.  Any GNUnet user can create any number of pseudonyms using
+of a certain pseudonym can add content.
-\fBgnunet\-pseudonym\fR. Pseudonyms are stored in the user's GNUnet
+Any GNUnet user can create any number of pseudonyms using
-directory. While pseudonyms are locally identified with an arbitrary
+\fBgnunet\-pseudonym\fR.  Pseudonyms are stored in the user's GNUnet
-string that the user selects when the pseudonym is created, the
+directory.
-namespace is globally known only under the hash of the public key of
+While pseudonyms are locally identified with an arbitrary string that
-the pseudonym. Since only the owner of the pseudonym can add content
+the user selects when the pseudonym is created, the namespace is
-to the namespace, it is impossible for other users to pollute the
+globally known only under the hash of the public key of the pseudonym.
-namespace. gnunet\-publish automatically publishes the top\-directory
+Since only the owner of the pseudonym can add content to the
-(or the only file if only one file is specified) into the namespace if
+namespace, it is impossible for other users to pollute the namespace.
-a pseudonym is specified.
+gnunet\-publish automatically publishes the top\-directory (or the
+only file if only one file is specified) into the namespace if a
+pseudonym is specified.
 .PP
 It is possible to update content in GNUnet if that content was placed
-and obtained from a particular namespace.  Updates are only possible
+and obtained from a particular namespace.
-for content in namespaces since this is the only way to assure that a
+Updates are only possible for content in namespaces since this is the
-malicious party can not supply counterfeited updates.  Note that an
+only way to assure that a malicious party can not supply counterfeited
-update with GNUnet does not make the old content unavailable, GNUnet
+updates.
-merely allows the publisher to point users to more recent
+Note that an update with GNUnet does not make the old content
-versions. You can use the \-N option to specify the future identifier
+unavailable, GNUnet merely allows the publisher to point users to more
-of an update.  When using this option, a GNUnet client that finds the
+recent versions.
-current (\-t) identifier will automatically begin a search for the
+You can use the \-N option to specify the future identifier of an
-update (\-N) identifier.  If you later publish an update under the
+update.
-(\-N) identifier, both results will be given to the user.
+When using this option, a GNUnet client that finds the current (\-t)
+identifier will automatically begin a search for the update (\-N)
+identifier.
+If you later publish an update under the (\-N) identifier, both
+results will be given to the user.
 .PP
 You can use automatic meta\-data extraction (based on libextractor) or
-the command\-line option \-m to specify meta-data.  For the \-m option
+the command\-line option \-m to specify meta-data.
-you need to use the form keyword\-type:value.  For example, use "\-m
+For the \-m option you need to use the form keyword\-type:value.
-os:Linux" to specify that the operating system is Linux.  Common
+For example, use "\-m os:Linux" to specify that the operating system
-meta\-data types are "author", "title" , "mimetype", "filename",
+is Linux.
-"language", "subject" and "keywords".  A full list can be obtained
+Common meta\-data types are "author", "title" , "mimetype",
-from the extract tool using the option \-\-list.  The meta\-data is
+"filename", "language", "subject" and "keywords".
-used to help users in searching for files on the network.  The
+A full list can be obtained from the extract tool using the option
-keywords are case\-sensitive.
+\-\-list.
+The meta\-data is used to help users in searching for files on the
+network.
+The keywords are case\-sensitive.
 .PP
-GNUnet supports two styles of publishing files on the
+GNUnet supports two styles of publishing files on the network.
-network. Publishing a file means that a copy of the file is made in
+Publishing a file means that a copy of the file is made in the local
-the local (!) database of the node.  Indexing a file means that an
+(!) database of the node.
-index is added to the local (!)  database with symbolic links to the
+Indexing a file means that an index is added to the local (!)
-file itself.  The links will use the SHA-512 hash of the entire file
+database with symbolic links to the file itself.
-as the filename.  Indexing is generally significantly more efficient
+The links will use the SHA-512 hash of the entire file as the
-and the default choice.  However, indexing only works if the indexed
+filename.
-file can be read (using the same absolute path) by gnunet-service-fs.
+Indexing is generally significantly more efficient and the default
+choice.
+However, indexing only works if the indexed file can be read (using
+the same absolute path) by gnunet-service-fs.
 If this is not the case, indexing will fail (and gnunet\-publish will
-automatically revert to publishing instead).  Regardless of which
+automatically revert to publishing instead).
-method is used to publish the file, the file will be slowly (depending
+Regardless of which method is used to publish the file, the file will
-on how often it is requested and on how much bandwidth is available)
+be slowly (depending on how often it is requested and on how much
-dispersed into the network.  If you publish or index a file and then
+bandwidth is available) dispersed into the network.
-leave the network, it will almost always NOT be available anymore.
+If you publish or index a file and then leave the network, it will
+almost always NOT be available anymore.
-\fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR Use alternate config
+.PP
-file (if this option is not specified, the default is
+\fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR
-~/.config/gnunet.conf).
+Use alternate config file (if this option is not specified, the
+default is ~/.config/gnunet.conf).
 .TP
-\fB\-D\fR, \fB\-\-disable\-extractor\fR Disable use of GNU
+\fB\-D\fR, \fB\-\-disable\-extractor\fR
-libextractor for finding additional keywords and metadata.
+Disable use of GNU libextractor for finding additional keywords and
+metadata.
 .TP
-\fB\-d\fR, \fB\-\-disable\-creation\-time\fR Disable use of creation
+\fB\-d\fR, \fB\-\-disable\-creation\-time\fR
-time timestamp in metadata.  Useful to make created directories
+Disable use of creation time timestamp in metadata.
-deterministic and to avoid leaking information about the time at which
+Useful to make created directories deterministic and to avoid leaking
-a file was made available.
+information about the time at which a file was made available.
 .TP
-\fB\-e\fR, \fB\-\-extract\fR Print the list of keywords that will be
+\fB\-e\fR, \fB\-\-extract\fR
-used for each file given the current options.  Do not perform any
+Print the list of keywords that will be used for each file given the
-indexing or publishing.
+current options.
+Do not perform any indexing or publishing.
 .TP
-\fB\-h\fR, \fB\-\-help\fR Print a brief help page with all the
+\fB\-h\fR, \fB\-\-help\fR
-options.
+Print a brief help page with all the options.
 .TP
-\fB\-k \fIKEYWORD\fR, \fB\-\-key=KEYWORD\fR additional key to index
+\fB\-k \fIKEYWORD\fR, \fB\-\-key=KEYWORD\fR
-the content with (to add multiple keys, specify multiple times). Each
+Additional key to index the content with (to add multiple keys,
-additional key is case\-sensitive. Can be specified multiple times.
+specify multiple times).
+Each additional key is case\-sensitive.
+Can be specified multiple times.
 The keyword is only applied to the top\-level file or directory.
 .TP
-\fB\-L \fILOGLEVEL\fR, \fB\-\-loglevel=\fILOGLEVEL\fR Change the
+\fB\-L \fILOGLEVEL\fR, \fB\-\-loglevel=\fILOGLEVEL\fR
-loglevel.  Possible values for LOGLEVEL are ERROR, WARNING, INFO and
+Change the loglevel.
-DEBUG.
+Possible values for LOGLEVEL are ERROR, WARNING, INFO and DEBUG.
 .TP
-\fB\-m \fITYPE:VALUE\fR, \fB\-\-meta=\fITYPE:VALUE\fR For the main
+\fB\-m \fITYPE:VALUE\fR, \fB\-\-meta=\fITYPE:VALUE\fR
-file (or directory), set the metadata of the given TYPE to the given
+For the main file (or directory), set the metadata of the given TYPE
-VALUE.  Note that this will not add the respective VALUE to the set of
+to the given VALUE.
+Note that this will not add the respective VALUE to the set of
 keywords under which the file can be found.
 .TP
-\fB\-n\fR, \fB\-\-noindex\fR Executive summary: You probably don't
+\fB\-n\fR, \fB\-\-noindex\fR
-need it.
+Executive summary: You probably don't need it.
+Do not index, full publishing.
-Do not index, full publishing.  Note that directories, information for
+Note that directories, information for keyword search, namespace
-keyword search, namespace search and indexing data are always
+search and indexing data are always published (even without this
-published (even without this option).  With this option, every block
+option).
-of the actual files is stored in encrypted form in the block database
+With this option, every block of the actual files is stored in
-of the local peer.  While this adds security if the local node is
+encrypted form in the block database of the local peer.
-compromised (the adversary snags your machine), it is significantly
+While this adds security if the local node is compromised (the
-less efficient compared to on\-demand encryption and is definitely not
+adversary snags your machine), it is significantly less efficient
-recommended for large files.
+compared to on\-demand encryption and is definitely not recommended
+for large files.
 .TP
-\fB\-N \fIID\fR, \fB\-\-next=\fIID\fR Specifies the next identifier of
+\fB\-N \fIID\fR, \fB\-\-next=\fIID\fR
-a future version of the file to be published under the same pseudonym.
+Specifies the next identifier of a future version of the file to be
-This option is only valid together with the \-P option.  This option
+published under the same pseudonym.
-can be used to specify what the identifier of an updated version will
+This option is only valid together with the \-P option.
-look like.  Note that specifying \-i and \-N without \-t is not
+This option can be used to specify what the identifier of an updated
-allowed.
+version will look like.
+Note that specifying \-i and \-N without \-t is not allowed.
 .TP
-\fB\-p \fIPRIORITY\fR, \fB\-\-prio=\fIPRIORITY\fR Executive summary:
+\fB\-p \fIPRIORITY\fR, \fB\-\-prio=\fIPRIORITY\fR
-You probably don't need it.
+Executive summary: You probably don't need it.
+Set the priority of the published content (default: 365).
-Set the priority of the published content (default: 365).  If the
+If the local database is full, GNUnet will discard the content with
-local database is full, GNUnet will discard the content with the
+the lowest ranking.
-lowest ranking.  Note that ranks change over time depending on
+Note that ranks change over time depending on popularity.
-popularity.  The default should be high enough to preserve the locally
+The default should be high enough to preserve the locally published
-published content in favor of content that migrates from other peers.
+content in favor of content that migrates from other peers.
 .TP
-\fB\-P \fINAME\fR, \fB\-\-pseudonym=\fINAME\fR For the top\-level
+\fB\-P \fINAME\fR, \fB\-\-pseudonym=\fINAME\fR
-directory or file, places the file into the namespace identified by
+For the top\-level directory or file, places the file into the
-the pseudonym NAME. NAME must be a valid pseudonym managed by
+namespace identified by the pseudonym NAME.
-gnunet\-identity.
+NAME must be a valid pseudonym managed by gnunet\-identity.
 .TP
-\fB\-r \fILEVEL\fR, \fB\-\-replication=\fILEVEL\fR Set the desired
+\fB\-r \fILEVEL\fR, \fB\-\-replication=\fILEVEL\fR
-replication level.  If CONTENT_PUSHING is set to YES, GNUnet will push
+Set the desired replication level.
-each block (for the file) LEVEL times to other peers before doing
+If CONTENT_PUSHING is set to YES, GNUnet will push each block (for the
-normal "random" replication of all content.  This option can be used
+file) LEVEL times to other peers before doing normal "random"
-to push some content out into the network harder. Note that pushing
+replication of all content.
-content LEVEL times into the network does not guarantee that there
+This option can be used to push some content out into the network
-will actually be LEVEL replicas.
+harder.
+Note that pushing content LEVEL times into the network does not
+guarantee that there will actually be LEVEL replicas.
 .TP
-\fB\-s\fR, \fB\-\-simulate-only\fR When this option is used,
+\fB\-s\fR, \fB\-\-simulate-only\fR
-gnunet\-publish will not actually publish the file but just simulate
+When this option is used, gnunet\-publish will not actually publish
-what would be done.  This can be used to compute the GNUnet URI for a
+the file but just simulate what would be done.
-file without actually sharing it.
+This can be used to compute the GNUnet URI for a file without actually
+sharing it.
 .TP
-\fB\-t \fIID\fR, \fB\-\-this=\fIID\fR Specifies the identifier under
+\fB\-t \fIID\fR, \fB\-\-this=\fIID\fR
-which the file is to be published under a pseudonym.  This option is
+Specifies the identifier under which the file is to be published under
-only valid together with the\ \-P option.
+a pseudonym.
+This option is only valid together with the\ \-P option.
 .TP
-\fB\-u \fIURI\fR, \fB\-\-uri=\fIURI\fR This option can be used to
+\fB\-u \fIURI\fR, \fB\-\-uri=\fIURI\fR
-specify the URI of a file instead of a filename (this is the only case
+This option can be used to specify the URI of a file instead of a
-where the otherwise mandatory filename argument must be omitted).
+filename (this is the only case where the otherwise mandatory filename
+argument must be omitted).
 Instead of publishing a file or directory and using the corresponding
 URI, gnunet\-publish will use this URI and perform the selected
-namespace or keyword operations.  This can be used to add additional
+namespace or keyword operations.
-keywords to a file that has already been shared or to add files to a
+This can be used to add additional keywords to a file that has already
-namespace for which the URI is known but the content is not locally
+been shared or to add files to a namespace for which the URI is known
-available.
+but the content is not locally available.
 .TP
-\fB\-v\fR, \fB\-\-version\fR Print the version number.
+\fB\-v\fR, \fB\-\-version\fR
+Print the version number.
 .TP
-\fB\-V\fR, \fB\-\-verbose\fR Be verbose.  Using this option causes
+\fB\-V\fR, \fB\-\-verbose\fR
-gnunet\-publish to print progress information and at the end the file
+Be verbose.
-identification that can be used to download the file from GNUnet.
+Using this option causes gnunet\-publish to print progress information
+and at the end the file identification that can be used to download
+the file from GNUnet.
 .SH SETTING ANONYMITY LEVEL
 The \fB\-a\fR option can be used to specify additional anonymity
-constraints. If set to 0, GNUnet will publish the file non-anonymously
+constraints.
-and in fact sign the advertisement for the file using your peer's
+If set to 0, GNUnet will publish the file non-anonymously and in fact
-private key.  This will allow other users to download the file as fast
+sign the advertisement for the file using your peer's private key.
-as possible, including using non-anonymous methods (DHT, direct
+This will allow other users to download the file as fast as possible,
-transfer).  If you set it to 1 (default), you use the standard
+including using non-anonymous methods (DHT, direct transfer).
-anonymous routing algorithm (which does not explicitly leak your
+If you set it to 1 (default), you use the standard anonymous routing
-identity).  However, a powerful adversary may still be able to perform
+algorithm (which does not explicitly leak your identity).
-traffic analysis (statistics) to over time infer data about your
+However, a powerful adversary may still be able to perform traffic
-identity.  You can gain better privacy by specifying a higher level of
+analysis (statistics) to over time infer data about your identity.
-anonymity, which increases the amount of cover traffic your own
+You can gain better privacy by specifying a higher level of anonymity,
-traffic will get, at the expense of performance.  Note that regardless
+which increases the amount of cover traffic your own traffic will get,
-of the anonymity level you choose, peers that cache content in the
+at the expense of performance.
-network always use anonymity level 1.
+Note that regardless of the anonymity level you choose, peers that
+cache content in the network always use anonymity level 1.
-The definition of the ANONYMITY LEVEL is the following.  0 means no
+.PP
-anonymity is required.  Otherwise a value of 'v' means that 1 out of v
+The definition of the ANONYMITY LEVEL is the following.
-bytes of "anonymous" traffic can be from the local user, leaving 'v-1'
+0 means no anonymity is required.
-bytes of cover traffic per byte on the wire.  Thus, if GNUnet routes n
+Otherwise a value of 'v' means that 1 out of v bytes of "anonymous"
-bytes of messages from foreign peers (using anonymous routing), it may
+traffic can be from the local user, leaving 'v-1' bytes of cover
-originate n/(v-1) bytes of data in the same time\-period. The
+traffic per byte on the wire.
-time\-period is twice the average delay that GNUnet defers forwarded
+Thus, if GNUnet routes n bytes of messages from foreign peers (using
-queries.
+anonymous routing), it may originate n/(v-1) bytes of data in the same
+time\-period.
-The default is 1 and this should be fine for most users.  Also notice
+The time\-period is twice the average delay that GNUnet defers
-that if you choose very large values, you may end up having no
+forwarded queries.
-throughput at all, especially if many of your fellow GNUnet\-peers all
+.PP
-do the same.
+The default is 1 and this should be fine for most users.
+Also notice that if you choose very large values, you may end up
+having no throughput at all, especially if many of your fellow
+GNUnet\-peers all do the same.
 .SH EXAMPLES
 .PP
 \fBBasic examples\fR
+.TP
-Index a file COPYING:
+gnunet\-publish COPYING
+Index a file COPYING
- # gnunet\-publish COPYING
+.TP
+gnunet\-publish \-n COPYING
-Publish a file COPYING:
+Publish a file COPYING
+.TP
- # gnunet\-publish \-n COPYING
+gnunet\-publish \-k gpl \-k test COPYING
+Index a file COPYING with the keywords \fBgpl\fR and \fBtest\fR
-Index a file COPYING with the keywords \fBgpl\fR and \fBtest\fR:
+.TP
+gnunet\-publish \-m "description:GNU License" \-k gpl \-k test \-m "mimetype:text/plain" COPYING
- # gnunet\-publish \-k gpl \-k test COPYING
 Index a file COPYING with description "GNU License", mime-type
-"text/plain" and keywords \fBgpl\fR and \fBtest\fR:
+"text/plain" and keywords \fBgpl\fR and \fBtest\fR
+.PP
- # gnunet\-publish \-m "description:GNU License" \-k gpl \-k test \-m
-   "mimetype:text/plain" COPYING
 \fBUsing directories\fR
+.TP
+mkdir gnu ; mv COPYING AUTHORS gnu/ ; gnunet\-publish \-k test \-k gnu \-D gnu/
 Index the files COPYING and AUTHORS with keyword \fBtest\fR and build
 a directory containing the two files.  Make the directory itself
 available under keyword \fBgnu\fR and disable keyword extraction using
-libextractor:
+libextractor
+.TP
- # mkdir gnu mv COPYING AUTHORS gnu/ gnunet\-publish \-k test \-k gnu
+gnunet\-publish \-n \-m "description:Kitten collection" \-k kittens kittendir/
- # \-D gnu/
 Neatly publish an image gallery in \fBkittendir/\fR and its subdirs
 with keyword \fBkittens\fR for the directory but no keywords for the
-individual files or subdirs (\-n).  Force description for all files:
+individual files or subdirs (\-n).
+Force description for all files.
- # gnunet\-publish \-n \-m "description:Kitten collection" \-k kittens
+.PP
-   kittendir/
 \fBSecure publishing with namespaces\fR
+.TP
+gnunet\-publish \-P RIAA-2 \-t gpl COPYING
 Publish file COPYING with pseudonym RIAA-2 (\-P) and with identifier
-\fBgpl\fR (\-t) and no updates:
+\fBgpl\fR (\-t) and no updates
+.TP
- # gnunet\-publish \-P RIAA-2 \-t gpl COPYING
+gnunet\-publish \-P RIAA-2 \-t MUSIC \-N VIDEOS /home/ogg
 Recursively index /home/ogg and build a matching directory
 structure. Publish the top\-level directory into the namespace under
 the pseudonym RIAA\-2 (\-P) under identifier 'MUSIC' (\-t) and promise
 to provide an update with identifier 'VIDEOS' (\-N):
+.TP
- # gnunet\-publish \-P RIAA-2 \-t MUSIC \-N VIDEOS /home/ogg
+gnunet\-publish \-nV /var/lib/mysql
 Recursively publish (\-n) /var/lib/mysql and build a matching
 directory structure, but disable the use of libextractor to extract
-keywords (\-n).  Print the file identifiers (\-V) that can be used to
+keywords (\-n).
-retrieve the files.  This will store a copy of the MySQL database in
+Print the file identifiers (\-V) that can be used to retrieve the
-GNUnet but without adding any keywords to search for it.  Thus only
+files.
-people that have been told the secret file identifiers printed with
+This will store a copy of the MySQL database in GNUnet but without
-the \-V option can retrieve the (secret?) files:
+adding any keywords to search for it.
+Thus only people that have been told the secret file identifiers
- # gnunet\-publish \-nV /var/lib/mysql
+printed with the \-V option can retrieve the (secret?) files:
+.TP
+gnunet\-publish \-P MPAA-1 \-t root \-N next noise.mp3
 Create a namespace entry 'root' in namespace MPAA-1 and announce that
 the next update will be called 'next':
+.TP
- # gnunet\-publish \-P MPAA-1 \-t root \-N next noise.mp3
+gnunet\-publish \-P MPAA-1 \-t next noise_updated.mp3
 Update the previous entry, do not allow any future updates:
- # gnunet\-publish \-P MPAA-1 \-t next noise_updated.mp3
 .SH FILES
 .TP
 ~/.config/gnunet.conf
 GNUnet configuration file
-.SH "REPORTING BUGS"
+.SH BUGS
-Report bugs to <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+Report bugs to <https://gnunet.org/bugs/> or by sending electronic
-.SH "SEE ALSO"
+mail to <gnunet\-developers@gnu.org>
-\fBgnunet\-auto\-share\fP(1), \fBgnunet\-fs\-gtk\fP(1), \fBgnunet\-search\fP(1), \fBgnunet\-download\fP(1), \fBgnunet.conf\fP(5), \fBextract\fP(1), \fBgnunet\-identity\fP(1)
+.SH SEE ALSO
+\fBgnunet\-auto\-share\fP(1)
+\fBgnunet\-fs\-gtk\fP(1)
+\fBgnunet\-search\fP(1)
+\fBgnunet\-download\fP(1)
+\fBgnunet.conf\fP(5)
+\fBextract\fP(1)
+\fBgnunet\-identity\fP(1)
+.PP
+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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-qr.1 b/doc/man/gnunet-qr.1
index f1baf85ac..b80f18bb3 100644
--- a/doc/man/gnunet-qr.1
+++ b/doc/man/gnunet-qr.1
@@ -1,17 +1,13 @@
-.TH GNUNET\-QR 1 "Sep 13, 2014" "GNUnet"
+.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"
@@ -28,6 +24,26 @@ Do not show preview windows.
 .B
 .IP "\-v, \-\-verbose"
 Be verbose.
 .SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+Report bugs by using Mantis <https://gnunet.org/bugs/> 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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-resolver.1 b/doc/man/gnunet-resolver.1
index 7e16932ac..56eef560d 100644
--- a/doc/man/gnunet-resolver.1
+++ b/doc/man/gnunet-resolver.1
@@ -1,16 +1,11 @@
-.TH GNUNET\-RESOLVER 1 "Jan 4, 2012" "GNUnet"
+.TH GNUNET-RESOLVER 1 "January 4, 2012" "GNUnet"
 .SH NAME
 gnunet\-resolver \- build-in GNUnet stub resolver
 .SH SYNOPSIS
 .B gnunet\-resolver
 .RI [ options ] [ hostname ]
-.br
 .SH DESCRIPTION
 \fBgnunet\-resolver\fP uses build-in GNUnet stub resolver.
 .SH OPTIONS
 .B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
@@ -31,6 +26,27 @@ Perform a reverse lookup.
 .B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+Report bugs by using Mantis <https://gnunet.org/bugs/> 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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-revocation.1 b/doc/man/gnunet-revocation.1
index b963b2dc0..1afda399c 100644
--- a/doc/man/gnunet-revocation.1
+++ b/doc/man/gnunet-revocation.1
@@ -1,4 +1,4 @@
-.TH GNUNET\-REVOCATION 1 "Mar 15, 2012" "GNUnet"
+.TH GNUNET\-REVOCATION 1 "March 15, 2012" "GNUnet"
 .SH NAME
 gnunet\-revocation \- revoke private keys (of egos) in GNUnet
@@ -68,4 +68,23 @@ Print GNUnet version number.
 .SH BUGS
 Report bugs by using Mantis <https://gnunet.org/bugs/> 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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-scalarproduct.1 b/doc/man/gnunet-scalarproduct.1
index 0159e1eb9..4ccb2a740 100644
--- a/doc/man/gnunet-scalarproduct.1
+++ b/doc/man/gnunet-scalarproduct.1
@@ -1,17 +1,13 @@
-.TH GNUNET\-VECTORPRODUCT 1 "8 Aug 2013" "GNUnet"
+.TH GNUNET-VECTORPRODUCT 1 "August 8, 2013" "GNUnet"
 .SH NAME
 gnunet\-vectorproduct \- compute a vectorproduct
 .SH SYNOPSIS
 .B gnunet\-vectorproduct
 .RI [ options ]
-.br
 .SH DESCRIPTION
 \fBgnunet-vectorproduct\fP enables you to compute a vectorproduct
 across two peers \fBAlice\fP and \fBBob\fP.
+.PP
 A client can issue one of two messages to its service:
 .TS
 tab (@);
@@ -23,17 +19,16 @@ T}
 Elements to support a peer in computing a vectorproduct (\fBBob\fP)
 T}
 .TE
 Both requests must share the same SID, which can be an arbitrary
 string identifying the session. SIDs should be unique, however it is
 sufficient to guarantee the uniqueness of the tupel element count and
 session ID.
+.PP
 \fBAlice\fP\'s client must supply the ASCII encoded peer ID of bob\'s
 service, it will internally be checked by the client for
 validity. Invalid values here result in the client or the service
 failing the session.
+.PP
 Elements are handed over as signed decimal integers, the element count
 supplied by \fBAlice\fP and \fBBob\fP must match. \fBAlice\fP can also
 supply a mask for these values to her service, which allows partial
@@ -42,11 +37,10 @@ masked by setting their the corresponding mask element to zero, any
 other value means the element will not be masked. \fBAlice\fP\'s
 client will also mask all 0-values to avoid information leakage to
 \fBBob\fP.
+.PP
 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"
@@ -78,10 +72,29 @@ Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
 .B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending
+electronic mail to <gnunet\-developers@gnu.org>
 .SH SEE ALSO
 gnunet\-peerinfo(1)
+.PP
+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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-scrypt.1 b/doc/man/gnunet-scrypt.1
index 147b18fbe..d156e17e8 100644
--- a/doc/man/gnunet-scrypt.1
+++ b/doc/man/gnunet-scrypt.1
@@ -1,17 +1,12 @@
-.TH GNUNET\-SCRYPT 1 "Sep 13, 2014" "GNUnet"
+.TH GNUNET-SCRYPT 1 "September 13, 2014" "GNUnet"
 .SH NAME
 gnunet\-scrypt \- Manipulate GNUnet proof of work files.
 .SH SYNOPSIS
 .B gnunet\-scrypt
 .RI [ options ]
-.br
 .SH DESCRIPTION
 \fBgnunet\-scrypt\fP is a command line tool to manipulate GNUnet proof
 of work files.
 .SH OPTIONS
 .B
 .IP "\-b BITS,  \-\-bits=BITS"
@@ -40,6 +35,27 @@ Time to wait between calculations.
 .B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+Report bugs by using Mantis <https://gnunet.org/bugs/> 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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-search.1 b/doc/man/gnunet-search.1
index 1e0973b63..79991e375 100644
--- a/doc/man/gnunet-search.1
+++ b/doc/man/gnunet-search.1
@@ -1,4 +1,4 @@
-.TH GNUNET-SEARCH "1" "25 Feb 2012" "0.9.6" "GNUnet"
+.TH GNUNET-SEARCH "1" "February 25, 2012" "0.9.6" "GNUnet"
 .SH NAME
 gnunet\-search \- a command line interface to search for content on GNUnet
 .SH SYNOPSIS
@@ -117,11 +117,11 @@ Searches for content matching both mandatory keywords "Das" and "Kapital".
 Search results are printed by gnunet\-search like this:
 .P
 .ad l
-        gnunet\-download \-o "COPYING" gnunet://fs/chk/HASH1.HASH2.SIZE
+        gnunet\-download \-o "COPYING" gnunet://fs/chk/HASH1.HASH2.SIZE
-                Description: The GNU General Public License
+                Description: The GNU General Public License
-                Mime-type: text/plain
+                Mime-type: text/plain
 .ad b
 The first line contains the command to run to download the file.  The
@@ -140,3 +140,22 @@ GNUnet configuration file; specifies the default value for the timeout
 Report bugs to <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
 .SH "SEE ALSO"
 \fBgnunet\-fs\-gtk\fP(1), \fBgnunet\-publish\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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-statistics.1 b/doc/man/gnunet-statistics.1
index 2aa889382..e61a8493c 100644
--- a/doc/man/gnunet-statistics.1
+++ b/doc/man/gnunet-statistics.1
@@ -1,21 +1,16 @@
-.TH GNUNET\-STATISTICS 1 "Jan 4, 2012" "GNUnet"
+.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 ]
-.br
 .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"
@@ -50,10 +45,29 @@ folder containing the data of all testbed nodes like \fBgnunet\-statistics -t /t
 .B
 .IP "\-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>
+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.
+If the
+.B info
+and
+.B gnunet
+programs are properly installed at your site, the command
+.IP
+.B info gnunet
+.PP
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-testbed-profiler.1 b/doc/man/gnunet-testbed-profiler.1
index bc7092e68..cac6e9af7 100644
--- a/doc/man/gnunet-testbed-profiler.1
+++ b/doc/man/gnunet-testbed-profiler.1
@@ -1,16 +1,12 @@
-.TH GNUNET\-TESTBED\-PROFILER 1 "Sep 13, 2014" "GNUnet"
+.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"
@@ -41,6 +37,25 @@ Create COUNT number of peers.
 .B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
 Report bugs by using Mantis <https://gnunet.org/bugs/> 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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-testing-run-service.1 b/doc/man/gnunet-testing-run-service.1
index a6a29d953..60c40bf7f 100644
--- a/doc/man/gnunet-testing-run-service.1
+++ b/doc/man/gnunet-testing-run-service.1
@@ -1,26 +1,21 @@
-.TH GNUNET\-TESTING\-RUN\-SERVICE 1 "Aug 25, 2013" "GNUnet"
+.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 ]
-.br
 .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"
@@ -31,6 +26,27 @@ Print short help on options.
 .B
 .IP "\-s SERVICE, \-\-service=SERVICE"
 Name of the service to run.
 .SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+Report bugs by using Mantis <https://gnunet.org/bugs/> 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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-testing.1 b/doc/man/gnunet-testing.1
index 82ea62e71..ff1af50ef 100644
--- a/doc/man/gnunet-testing.1
+++ b/doc/man/gnunet-testing.1
@@ -1,16 +1,13 @@
-.TH GNUNET\-TESTING 1 "Jan 4, 2012" "GNUnet"
+.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.
+\fBgnunet\-testing\fP is a command line tool to access the testing
+library.
 .SH OPTIONS
 .B
 .IP "\-C,  \-\-cfg"
@@ -42,6 +39,27 @@ Configuration template.
 .B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+Report bugs by using Mantis <https://gnunet.org/bugs/> 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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-timeout.1 b/doc/man/gnunet-timeout.1
index e413254f4..8adb85571 100644
--- a/doc/man/gnunet-timeout.1
+++ b/doc/man/gnunet-timeout.1
@@ -1,20 +1,36 @@
-.TH GNUNET\-TIMOUET 1 "Jun 5, 2018" "GNUnet"
+.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
-.br
 .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://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending
+electronic mail to <gnunet\-developers@gnu.org>
-.SH SEE
+.SH SEE ALSO
 timeout(1)
+.PP
+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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-transport-certificate-creation.1 b/doc/man/gnunet-transport-certificate-creation.1
index 89df87f4b..0e1e681f8 100644
--- a/doc/man/gnunet-transport-certificate-creation.1
+++ b/doc/man/gnunet-transport-certificate-creation.1
@@ -1,19 +1,35 @@
-.TH GNUNET\-TRANSPORT\-CERTIFICATE\-CREATION 1 "Jan 31, 2014" "GNUnet"
+.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
-.br
 .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://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+Report bugs by using Mantis <https://gnunet.org/bugs/> 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.
+If the
+.B info
+and
+.B gnunet
+programs are properly installed at your site, the command
+.IP
+.B info gnunet
+.PP
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-transport.1 b/doc/man/gnunet-transport.1
index 3a81c54fe..2aafbb9ab 100644
--- a/doc/man/gnunet-transport.1
+++ b/doc/man/gnunet-transport.1
@@ -1,20 +1,17 @@
-.TH gnunet\-transport "1" "17 Oct 2015" "GNUnet"
+.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
@@ -62,11 +59,26 @@ print the version number
 .TP
 \fB\-V\fR, \fB\-\-verbose\fR
 be verbose
-.SH NOTES
 .SH "REPORTING BUGS"
 Report bugs by using mantis <https://gnunet.org/bugs/> 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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-unindex.1 b/doc/man/gnunet-unindex.1
index cf095cc49..1c9d1a58c 100644
--- a/doc/man/gnunet-unindex.1
+++ b/doc/man/gnunet-unindex.1
@@ -1,4 +1,4 @@
-.TH GNUNET-UNINDEX "1" "6 Sep 2009" "GNUnet"
+.TH GNUNET-UNINDEX "1" "September 6, 2009" "GNUnet"
 .SH NAME
 gnunet\-unindex \- a command line interface for deleting indexed files from GNUnet
 .SH SYNOPSIS
@@ -17,7 +17,6 @@ print help page
 \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
 print the version number
@@ -38,3 +37,22 @@ GNUnet configuration file
 Report bugs to <https://gnunet.org/bugs/> 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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-uri.1 b/doc/man/gnunet-uri.1
index ac8ccf374..72105c4c8 100644
--- a/doc/man/gnunet-uri.1
+++ b/doc/man/gnunet-uri.1
@@ -1,20 +1,15 @@
-.TH GNUNET\-URI 1 "Jun 26, 2012" "GNUnet"
+.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
-.br
 .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"
@@ -28,7 +23,27 @@ Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
 .B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+Report bugs by using Mantis <https://gnunet.org/bugs/> 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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-vpn.1 b/doc/man/gnunet-vpn.1
index 6b1b11f7b..838624d98 100644
--- a/doc/man/gnunet-vpn.1
+++ b/doc/man/gnunet-vpn.1
@@ -1,29 +1,27 @@
-.TH GNUNET\-VPN 1 "25 Feb 2012" "GNUnet"
+.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.  There are two main types of tunnels.  Tunnels to an
+GNUnet network.
-exit node which routes the traffic to the global Internet, and tunnels
+There are two main types of tunnels.
-to a node that runs a service only within GNUnet.  Depending on the
+Tunnels to an exit node which routes the traffic to the global
-type of tunnel, gnunet\-vpn takes different options.  The "\-i" option
+Internet, and tunnels to a node that runs a service only within
-is required for tunnels to an exit node, whereas the "\-p" and "\-s"
+GNUnet.
-options in conjunction with either "\-u" or "\-t" are required for
+Depending on the type of tunnel, gnunet\-vpn takes different options.
-tunnels to services.  For exit tunnels, both UDP and TCP traffic will
+The "\-i" option is required for tunnels to an exit node, whereas the
-be redirected.  For service tunnels, either UDP ("\-u") or TCP ("\-t")
+"\-p" and "\-s" options in conjunction with either "\-u" or "\-t" are
-traffic will be redirected.
+required for tunnels to services.
+For exit tunnels, both UDP and TCP traffic will be redirected.
-The tool will display the IP address for this end of the tunnel.  The
+For service tunnels, either UDP ("\-u") or TCP ("\-t") traffic will
-address can be displayed as soon as it has been allocated, or only
+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"
@@ -36,45 +34,68 @@ Desired IP address on this end of the tunnel should be an IPv6 address.
 Use the configuration file FILENAME.
 .B
 .IP "\-d TIME, \-\-duration TIME"
-The mapping should be established for TIME.  The value given must be a
+The mapping should be established for TIME.
-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,
-Note that the quotes are required on the shell. Default is 5 minutes.
+for example "500 ms".
+Note that the quotes are required on the shell.
+Default is 5 minutes.
 .B
 .IP "\-h, \-\-help"
 Print short help on options.
 .B
 .IP "\-i IP, \-\-ip IP"
 Tunnel should be to an exit node and connect to the given IPv4 or IPv6
-IP address.  Note that you can specify an IPv6 address as the target
+IP address.
-here, even in combination with "\-4" (4to6) and similarly you can
+Note that you can specify an IPv6 address as the target here, even in
-specify an IPv4 address in combination with "\-6" (6to4).
+combination with "\-4" (4to6) and similarly you can specify an IPv4
+address in combination with "\-6" (6to4).
 .B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
-Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
+Use LOGLEVEL for logging.
+Valid values are DEBUG, INFO, WARNING and ERROR.
 .B
 .IP "\-p PEERID,  \-\-peer=PEERID"
-Name of the peer offering the service to connect to.  Cannot be used
+Name of the peer offering the service to connect to.
-in conjunction with "\-i", requires "\-s".
+Cannot be used in conjunction with "\-i", requires "\-s".
 .B
 .IP "\-s NAME,  \-\-service=NAME"
-Name of the service running on the target peer.  Cannot be used in
+Name of the service running on the target peer.
-conjunction with "\-i", requires "\-p".
+Cannot be used in conjunction with "\-i", requires "\-p".
 .B
 .IP "\-t, \-\-tcp"
-Service runs TCP.  Either "\-t" or "\-u" must be specified when using "\-s".
+Service runs TCP.
+Either "\-t" or "\-u" must be specified when using "\-s".
 .B
 .IP "\-u, \-\-udp"
-Service runs UDP.  Either "\-t" or "\-u" must be specified when using "\-s".
+Service runs UDP.
+Either "\-t" or "\-u" must be specified when using "\-s".
 .B
 .IP "\-V, \-\-verbose"
 Be verbose.
 .B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+Report bugs by using Mantis <https://gnunet.org/bugs/> 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
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet-zoneimport.1 b/doc/man/gnunet-zoneimport.1
index cf76b86ee..97d784136 100644
--- a/doc/man/gnunet-zoneimport.1
+++ b/doc/man/gnunet-zoneimport.1
@@ -1,12 +1,8 @@
-.TH GNUNET\-ZONEIMPORT 1 "Apr 23, 2018" "GNUnet"
+.TH GNUNET-ZONEIMPORT 1 "April 23, 2018" "GNUnet"
 .SH NAME
 gnunet\-zoneimport \- import DNS zone into GNS zone
 .SH SYNOPSIS
 .B gnunet\-zoneimport [IP]+
-.br
 .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
@@ -17,29 +13,28 @@ 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"
@@ -55,7 +50,6 @@ 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
@@ -64,18 +58,33 @@ 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
 Typical invocaton would be:
 $ gnunet\-zoneimport 1.2.3.4 < names.txt
 .SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet\-developers@gnu.org>
+Report bugs by using Mantis <https://gnunet.org/bugs/> 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.
+If the
+.B info
+and
+.B gnunet
+programs are properly installed at your site, the command
+.IP
+.B info gnunet
+.PP
+should give you access to the complete handbook,
+.IP
+.B 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).
diff --git a/doc/man/gnunet.conf.5 b/doc/man/gnunet.conf.5
index 3dd8c7b62..3c88305ba 100644
--- a/doc/man/gnunet.conf.5
+++ b/doc/man/gnunet.conf.5
@@ -1,11 +1,10 @@
-.TH GNUNET.CONF "5" "05 May 2018" "GNUnet"
+.\" -*- mode: nroff -*-
+.TH GNUNET.CONF "5" "October 26, 2018" "GNUnet"
 .SH NAME
 gnunet.conf \- GNUnet configuration file
 .SH SYNOPSIS
 ~/.config/gnunet.conf
 .SH DESCRIPTION
-.PP
 A GNUnet setup typically consists of a set of service processes run by a user
 "gnunet" and a set of user-interface processes run by a standard account.
 The default location for the configuration file for the services is
@@ -16,8 +15,7 @@ gnunet\-setup (part of the GNUnet GTK package) can be used to edit this
 configuration.  The parts of GNUnet that are run as a normal user may have
 config options too and they read from "$HOME/.config/gnunet.conf".
 The latter config file can skip any options for the services.
+.PP
-.TP
 The basic structure of the configuration file is the following.  The file is
 split into sections.  Every section begins with "[SECTIONNAME]" and contains
 a number of options of the form "OPTION=VALUE".
@@ -29,9 +27,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
-.PP
 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".
@@ -45,11 +41,8 @@ place of the absolute definition of "/tmp".
 So instead of "/tmp/foo" you would write "$GNUNET_TMP/foo".
 The usage of "$GNUNET_TMP/foo", will result in "$TMPDIR/gnunet/foo", or
 "$TMP/gnunet/foo" and finally, if "TMPDIR" is undefined, "/tmp/gnunet/foo".
 .PP
 The following options are generic and shared by all services:
 .IP HOSTNAME
    The hostname specifies the machine on which the service is running.
    This is usually "localhost".
@@ -92,12 +85,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.
-.B
 .SH ATS Options
 .IP UNSPECIFIED_QUOTA_IN
    quotes in KiB or MiB per seconds.  Or use the word "unlimited"
 .IP UNSPECIFIED_QUOTA_OUT
@@ -118,9 +106,7 @@ The following options are generic and shared by all services:
    quotes in KiB or MiB per seconds.  Or use the word "unlimited"
 .IP WLAN_QUOTA_OUT
    quotes in KiB or MiB per seconds.  Or use the word "unlimited"
 .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
@@ -139,13 +125,33 @@ to the actual external address for your usage.
    [arm]
    START_SYSTEM_SERVICES = YES
    START_USER_SERVICES = NO
 .SH FILES
 .TP
 ~/.config/gnunet.conf
 GNUnet configuration file
-.SH "REPORTING BUGS"
+.SH BUGS
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic
+Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending
-mail to <bug-gnunet@gnu.org>
+electronic mail to <bug-gnunet@gnu.org>
-.SH "SEE ALSO"
+.SH SEE ALSO
 \fBgnunet\-setup\fP(1), \fBgnunet\-arm\fP(1)
+.PP
+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
+should give you access to the complete handbook,
+.IP
+.B 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).