1 files changed, 28 insertions, 22 deletions

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.
-
-.TP
+.PP
 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"
-Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending electronic
-mail to <bug-gnunet@gnu.org>
-.SH "SEE ALSO"
+.SH BUGS
+Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending
+electronic mail to <bug-gnunet@gnu.org>
+.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).