[GNUnet-SVN] [gnunet] branch master updated (9ffade313 -> 6ec659c53)

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a change to branch master
in repository gnunet.

    from 9ffade313 man: fix and adjust uri
     new 2732a27b7 man: uri
     new 2bcf3d08a man: unindex
     new c26a1a7ee man: transport
     new 48c611bba man: gnunet-transport-certificate-creation.1
     new dff83c5a8 man: timeout
     new 04fa73ecf man: testing
     new 7de800bc5 man: testing-run-service
     new 64750c8e1 man: testing
     new 6ec659c53 man: tbp

The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 doc/man/gnunet-testbed-profiler.1               | 101 ++++++++++-------
 doc/man/gnunet-testing-run-service.1            |  90 ++++++++-------
 doc/man/gnunet-testing.1                        |  98 +++++++++-------
 doc/man/gnunet-timeout.1                        |  72 ++++++------
 doc/man/gnunet-transport-certificate-creation.1 |  69 ++++++------
 doc/man/gnunet-transport.1                      | 142 +++++++++++++-----------
 doc/man/gnunet-unindex.1                        | 108 ++++++++++--------
 doc/man/gnunet-uri.1                            |   2 +-
 8 files changed, 372 insertions(+), 310 deletions(-)

diff --git a/doc/man/gnunet-testbed-profiler.1 
b/doc/man/gnunet-testbed-profiler.1
index 7faacaee4..fe9d713b3 100644
--- a/doc/man/gnunet-testbed-profiler.1
+++ b/doc/man/gnunet-testbed-profiler.1
@@ -1,52 +1,67 @@
-.TH GNUNET\-TESTBED\-PROFILER 1 "September 13, 2014" "GNUnet"
-.SH NAME
-gnunet\-testbed\-profiler \- Profiling driver for the testbed.
-.SH SYNOPSIS
-.B gnunet\-testbed\-profiler
-.RI [ options ]
-.br
-.SH DESCRIPTION
-\fBgnunet\-testbed\-profiler\fP is a command line profiling driver for the 
testbed.
-.SH OPTIONS
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+.Dd September 13, 2014
+.Dt GNUNET-TESTBED-PROFILER 1
+.Os
+.Sh NAME
+.Nm gnunet-testbed-profiler
+.Nd
+profiling driver for the testbed
+.Sh SYNOPSIS
+.Nm
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
+.Op Fl e Ar COUNT | Fl \-num-errors= Ns Ar COUNT
+.Op Fl H Ar FILENAME |  Fl \-hosts= Ns Ar FILENAME
+.Op Fl h | \-help
+.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+.Op Fl l Ar LOGFILE |  Fl \-logfile= Ns Ar LOGFILE
+.Op Fl n | \-non-interactive
+.Op Fl p Ar COUNT | Fl \-num-peers= Ns Ar COUNT
+.Op Fl v | \-version
+.Sh DESCRIPTION
+.Nm
+is a command line profiling driver for the testbed.
+.Sh OPTIONS
+.Bl -tag -width Ds
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.IP "\-e COUNT,  \-\-num\-errors=COUNT"
+.It Fl e Ar COUNT | Fl \-num-errors= Ns Ar COUNT
 Tolerate COUNT number of continious timeout failures.
-.IP "\-H FILENAME,  \-\-hosts=FILENAME"
+.It Fl H Ar FILENAME |  Fl \-hosts= Ns Ar FILENAME
 Name of the file with the login information for the testbed.
-.IP "\-h, \-\-help"
+.It Fl h | \-help
 Print short help on options.
-.IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
-Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.IP "\-l LOGFILE, \-\-logfile=LOGFILE"
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+Use LOGLEVEL for logging.
+Valid values are DEBUG, INFO, WARNING and ERROR.
+.It Fl l Ar LOGFILE |  Fl \-logfile= Ns Ar LOGFILE
 Configure logging to write logs to LOGFILE.
-.IP "\-n, \-\-non\-interactive"
-Run profiler in non-interactive mode where upon testbed setup the
-profiler does not wait for a keystroke but continues to run until a
-termination signal is received.
-.IP "\-p COUNT, \-\-num\-peers=COUNT"
+.It Fl n | \-non-interactive
+Run profiler in non-interactive mode where upon testbed setup the profiler 
does not wait for a keystroke but continues to run until a termination signal 
is received.
+.It Fl p Ar COUNT | Fl \-num-peers= Ns Ar COUNT
 Create COUNT number of peers.
-.IP "\-v, \-\-version"
+.It Fl v | \-version
 Print GNUnet version number.
-.SH BUGS
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending 
electronic mail to <address@hidden>
-.SH "SEE ALSO"
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B gnunet
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
+.El
+.Sh SEE ALSO
+The full documentation for gnunet is maintained as a Texinfo manual.
+If the
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.Pp
 should give you access to the complete handbook,
-.IP
-.B info gnunet-c-tutorial
-.PP
+.Pp
+.Dl info gnunet-c-tutorial
+.Pp
 will give you access to a tutorial for developers.
-.PP
-Depending on your installation, this information is also
-available in
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.sp
+Depending on your installation, this information is also available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt address@hidden .
diff --git a/doc/man/gnunet-testing-run-service.1 
b/doc/man/gnunet-testing-run-service.1
index 29e6258de..903810c7f 100644
--- a/doc/man/gnunet-testing-run-service.1
+++ b/doc/man/gnunet-testing-run-service.1
@@ -1,49 +1,53 @@
-.TH GNUNET-TESTING-RUN-SERVICE 1 "August 25, 2013" "GNUnet"
-.SH NAME
-gnunet\-testing\-run\-service \- Command line tool to start a service for 
testing.
-.SH SYNOPSIS
-.B gnunet\-testing\-run\-service
-.RI [ options ]
-.SH DESCRIPTION
-\fBgnunet\-testing\-run\-service\fP is a command line tool to start a
-service for testing. It starts a peer, running only the service
-specified on the command line, outputs the path to the temporary
-configuration file to stdout.
-.PP
-The peer will run until this program is killed, or stdin is
-closed. When reading the character 'r' from stdin, the running service
-is restarted with the same configuration.
-.PP
-This executable is intended to be used by gnunet-java, in order to
-reliably start and stop services for test cases.
-.SH OPTIONS
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+.Dd August 25, 2013
+.Dt GNUNET-TESTING-RUN-SERVICE 1
+.Os
+.Sh NAME
+.Nm gnunet-testing-run-service
+.Nd
+command line tool to start a service for testing
+.Sh SYNOPSIS
+.Nm
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
+.Op Fl h | \-help
+.Op Fl s Ar SERVICE | Fl \-service= Ns Ar SERVICE
+.Sh DESCRIPTION
+.Nm
+is a command line tool to start a service for testing.
+It starts a peer, running only the service specified on the command line, 
outputs the path to the temporary configuration file to stdout.
+.Pp
+The peer will run until this program is killed, or stdin is closed.
+When reading the character 'r' from stdin, the running service is restarted 
with the same configuration.
+.Pp
+This executable is intended to be used by gnunet-java, in order to reliably 
start and stop services for test cases.
+.Bl -tag -width Ds
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Name of the template configuration file to use (optional).
-.IP "\-h, \-\-help"
+.It Fl h | \-help
 Print short help on options.
-.IP "\-s SERVICE, \-\-service=SERVICE"
+.It Fl s Ar SERVICE | Fl \-service= Ns Ar SERVICE
 Name of the service to run.
-.SH BUGS
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
-electronic mail to <address@hidden>
-.SH SEE ALSO
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.
+.El
+.Sh SEE ALSO
+The full documentation for gnunet is maintained as a Texinfo manual.
 If the
-.B info
-and
-.B gnunet
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.Pp
 should give you access to the complete handbook,
-.IP
-.B info gnunet-c-tutorial
-.PP
+.Pp
+.Dl info gnunet-c-tutorial
+.Pp
 will give you access to a tutorial for developers.
-.PP
-Depending on your installation, this information is also
-available in
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.sp
+Depending on your installation, this information is also available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt address@hidden .
diff --git a/doc/man/gnunet-testing.1 b/doc/man/gnunet-testing.1
index 8c5a1f208..182da613d 100644
--- a/doc/man/gnunet-testing.1
+++ b/doc/man/gnunet-testing.1
@@ -1,55 +1,69 @@
-.TH GNUNET\-TESTING 1 "January 4, 2012" "GNUnet"
-.SH NAME
-gnunet\-testing \- Command line tool to access the testing library.
-.SH SYNOPSIS
-.B gnunet\-testing
-.RI [ options ]
-.br
-.SH DESCRIPTION
-\fBgnunet\-testing\fP is a command line tool to access the testing
-library.
-.SH OPTIONS
-.IP "\-C,  \-\-cfg"
+.Dd January 4, 2012
+.Dt GNUNET-TESTING 1
+.Os
+.Sh NAME
+.Nm gnunet-testing
+.Nd
+command line tool to access the testing library
+.Sh SYNOPSIS
+.Nm
+.Op Fl C | \-cfg
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
+.Op Fl H | \-hostkeys
+.Op Fl h | \-help
+.Op Fl k | \-key
+.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+.Op Fl l Ar LOGFILE | Fl \-logfile= Ns Ar LOFILE
+.Op Fl n | \-number
+.Op Fl t | \-template
+.Op Fl v | \-version
+.Sh DESCRIPTION
+.Nm
+is a command line tool to access the testing library.
+.Sh OPTIONS
+.Bl -tag -width Ds
+.It Fl C | \-cfg
 Create unique configuration files.
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.IP "\-H, \-\-hostkeys"
+.It Fl H | \-hostkeys
 Host key file.
-.IP "\-h, \-\-help"
+.It Fl h | \-help
 Print short help on options.
-.IP "\-k, \-\-key"
+.It Fl k | \-key
 Create hostkey files from pre-computed hostkey list.
-.IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.IP "\-l LOGFILE, \-\-logfile=LOGFILE"
+.It Fl l Ar LOGFILE | Fl \-logfile= Ns Ar LOFILE
 Configure logging to write logs to LOGFILE.
-.IP "\-n, \-\-number"
+.It Fl n | \-number
 Number of unique configuration files or hostkeys to create.
-.IP "\-t, \-\-template"
+.It Fl t | \-template
 Configuration template.
-.IP "\-v, \-\-version"
+.It Fl v | \-version
 Print GNUnet version number.
-.SH BUGS
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
-electronic mail to <address@hidden>
-.SH SEE ALSO
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.
+.El
+.Sh SEE ALSO
+The full documentation for gnunet is maintained as a Texinfo manual.
 If the
-.B info
-and
-.B gnunet
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.Pp
 should give you access to the complete handbook,
-.IP
-.B info gnunet-c-tutorial
-.PP
+.Pp
+.Dl info gnunet-c-tutorial
+.Pp
 will give you access to a tutorial for developers.
-.PP
-Depending on your installation, this information is also
-available in
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.sp
+Depending on your installation, this information is also available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt address@hidden .
diff --git a/doc/man/gnunet-timeout.1 b/doc/man/gnunet-timeout.1
index 653f211cd..15abfe351 100644
--- a/doc/man/gnunet-timeout.1
+++ b/doc/man/gnunet-timeout.1
@@ -1,36 +1,42 @@
-.TH GNUNET-TIMOUET 1 "June 5, 2018" "GNUnet"
-.SH NAME
-gnunet\-timeout \- run process with timeout
-.SH SYNOPSIS
-.B gnunet\-timeout
-.RI TIMEOUT PROGRAM ARGS
-.SH DESCRIPTION
-\fBgnunet\-timeout\fP can be used to run another process with a
-timeout.  Provided as the standard "timout" utility may not be
-available on all platforms.
-.SH BUGS
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
-electronic mail to <address@hidden>
-.SH SEE ALSO
-timeout(1)
-.PP
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.
+.Dd June 5, 2018
+.Dt GNUNET-TIMEOUT 1
+.Os
+.Sh NAME
+.Nm gnunet-timeout
+.Nd
+run process with timeout
+.Sh SYNOPSIS
+.Nm
+.Ao Ar duration Ac
+.Ao Ar command Ac
+.Ao args ... Ac
+.Sh DESCRIPTION
+.Nm
+can be used to run another process with a timeout.
+It is provided because the standard "timout" utility may not be available on 
all platforms.
+.Sh SEE ALSO
+.Xr timeout 1
+.sp
+The full documentation for gnunet is maintained as a Texinfo manual.
 If the
-.B info
-and
-.B gnunet
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.Pp
 should give you access to the complete handbook,
-.IP
-.B info gnunet-c-tutorial
-.PP
+.Pp
+.Dl info gnunet-c-tutorial
+.Pp
 will give you access to a tutorial for developers.
-.PP
-Depending on your installation, this information is also
-available in
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.sp
+Depending on your installation, this information is also available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt address@hidden .
diff --git a/doc/man/gnunet-transport-certificate-creation.1 
b/doc/man/gnunet-transport-certificate-creation.1
index 9dc572acf..e896363e4 100644
--- a/doc/man/gnunet-transport-certificate-creation.1
+++ b/doc/man/gnunet-transport-certificate-creation.1
@@ -1,35 +1,40 @@
-.TH GNUNET\-TRANSPORT-CERTIFICATE-CREATION 1 "January 31, 2014" "GNUnet"
-.SH NAME
-gnunet\-transport\-certificate\-creation \- create certificate for HTTPS 
transport
-.SH SYNOPSIS
-.B gnunet\-transport\-certificate\-creation
-.I privatekey certificate
-.SH DESCRIPTION
-\fBgnunet\-transport\-certificate\-creation\fP uses openssl to generate a RSA
-private key and then a self-signed certificate for HTTPS transport.
-.SH BUGS
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
-electronic mail to <address@hidden>
-.SH SEE ALSO
-gnunet\-transport(1)
-.PP
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.
+.Dd January 31, 2014
+.Dt GNUNET-TRANSPORT-CERTIFICATE-CREATION 1
+.Os
+.Sh NAME
+.Nm gnunet-transport-certificate-creation
+.Nd
+create certificate for HTTPS transport
+.Sh SYNOPSIS
+.Nm
+.Op privatekey
+.Op certificate
+.Sh DESCRIPTION
+.Nm
+uses openssl to generate a RSA private key and then a self-signed certificate 
for HTTPS transport.
+.Sh SEE ALSO
+.Xr gnunet-transport 1
+.sp
+The full documentation for gnunet is maintained as a Texinfo manual.
 If the
-.B info
-and
-.B gnunet
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.Pp
 should give you access to the complete handbook,
-.IP
-.B info gnunet-c-tutorial
-.PP
+.Pp
+.Dl info gnunet-c-tutorial
+.Pp
 will give you access to a tutorial for developers.
-.PP
-Depending on your installation, this information is also
-available in
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.sp
+Depending on your installation, this information is also available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt address@hidden .
diff --git a/doc/man/gnunet-transport.1 b/doc/man/gnunet-transport.1
index eef762174..f5ed47ad1 100644
--- a/doc/man/gnunet-transport.1
+++ b/doc/man/gnunet-transport.1
@@ -1,84 +1,92 @@
-.TH GNUNET\-TRANSPORT "1" "October 17, 2015" "GNUnet"
-.SH NAME
-gnunet\-transport \- measure and control the transport subsystem
-.SH SYNOPSIS
-.B gnunet\-transport
-[\fIOPTIONS\fR]
-.SH DESCRIPTION
-.PP
-gnunet\-transport is a tool to access various functions of GNUnet's
-transport subsystem from the command\-line.  Most of these are not
-expected to be useful for end-users.  gnunet\-transport can be used to
-evaluate the performance of the transports, force a peer to connect to
-another peer (if possible).  Other functions should be added in the
-near future.
-.TP
-\fB\-b\fR, \fB\-\-benchmark\fR
-measure how fast we are receiving data (from all connections).  On
-exit, the data rate will be reported.  Runs until aborted with CTRL-C.
-.TP
-\fB\-D\fR, \fB\-\-disconnect\fR
-force disconnection from a peer (used in conjunction with \-p).
-Note that you can use the gnunet\-ats command\-line tool to suggest connects.
-.TP
-\fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR
+.Dd October 17, 2015
+.Dt GNUNET-TRANSPORT 1
+.Os
+.Sh NAME
+.Nm gnunet-transport
+.Nd
+measure and control the transport subsystem
+.Sh SYNOPSIS
+.Nm
+.Op Fl b | \-benchmark
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
+.Op Fl D | \-disconnect
+.Op Fl e | \-events
+.Op Fl h | \-help
+.Op Fl i | \-information
+.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+.Op Fl l Ar LOGFILE | Fl \-logfile= Ns Ar LOGFILE
+.Op Fl m | \-monitor
+.Op Fl p Ar PEER | Fl \-peer= Ns Ar PEER
+.Op Fl P | \-plugins
+.Op Fl s | \-send
+.Op Fl v | \-version
+.Op Fl V | \-verbose
+.Sh DESCRIPTION
+.Nm
+is a tool to access various functions of GNUnet's transport subsystem from the 
command-line.
+Most of these are not expected to be useful for end-users.
+gnunet-transport can be used to evaluate the performance of the transports, 
force a peer to connect to another peer (if possible).
+Other functions should be added in the near future.
+.Bl -tag -width Ds
+.It Fl b | \-benchmark
+measure how fast we are receiving data (from all connections).
+On exit, the data rate will be reported.
+Runs until aborted with CTRL-C.
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 configuration file to use
-.TP
-\fB\-e \fB\-\-events\fR
+.It Fl D | \-disconnect
+force disconnection from a peer (used in conjunction with \-p).
+Note that you can use the gnunet-ats command-line tool to suggest connects.
+.It Fl e | \-events
 provide information about all connect and disconnect events (continuously)
-.TP
-\fB\-h\fR, \fB\-\-help\fR
+.It Fl h | \-help
 print help page
-.TP
-\fB\-i\fR, \fB\-\-information\fR
+.It Fl i | \-information
 print information about our current connections (once)
-.TP
-\fB\-L \fILOGLEVEL\fR, \fB\-\-loglevel=LOGLEVEL\fR
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
 Change the loglevel.  Possible values for LOGLEVEL are ERROR, WARNING, INFO 
and DEBUG.
-.TP
-\fB\-l \fILOGFILE\fR, \fB\-\-logfile=LOGFILE\fR
+.It Fl l Ar LOGFILE | Fl \-logfile= Ns Ar LOGFILE
 configure logging to write logs to LOGFILE
-.TP
-\fB\-m\fR, \fB\-\-monitor\fR
+.It Fl m | \-monitor
 print information about our current connections (continuously)
-.TP
-\fB\-p \fIPEER\fR, \fB\-\-peer=PEER\fR
+.It Fl p Ar PEER | Fl \-peer= Ns Ar PEER
 the peer identity to connect to or monitor
-.TP
-\fB\-P, \fB\-\-plugins\fR
+.It Fl P | \-plugins
 monitor session state of transport plugins
-.TP
-\fB\-s\fR, \fB\-\-send\fR
+.It Fl s | \-send
 transmit (dummy) traffic as quickly as possible to the peer specified
 with the \-p option.  The rate will still be limited by the quota(s)
 determined by the peers (ATS subsystem).  Will run until CTRL\-C is
 pressed or until the connection to the other peer is disrupted.
-.TP
-\fB\-v\fR, \fB\-\-version\fR
+.It Fl v | \-version
 print the version number
-.TP
-\fB\-V\fR, \fB\-\-verbose\fR
+.It Fl V | \-verbose
 be verbose
-.SH "REPORTING BUGS"
-Report bugs by using mantis <https://bugs.gnunet.org/> or by sending 
electronic mail to <address@hidden>
-.SH "SEE ALSO"
-\fBgnunet\-arm\fP(1), \fBgnunet\-ats\fP(1)
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B gnunet
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
+.El
+.Sh SEE ALSO
+.Xr gnunet-arm 1 ,
+.Xr gnunet-ats 1
+.sp
+The full documentation for gnunet is maintained as a Texinfo manual.
+If the
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.Pp
 should give you access to the complete handbook,
-.IP
-.B info gnunet-c-tutorial
-.PP
+.Pp
+.Dl info gnunet-c-tutorial
+.Pp
 will give you access to a tutorial for developers.
-.PP
-Depending on your installation, this information is also
-available in
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.sp
+Depending on your installation, this information is also available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt address@hidden .
diff --git a/doc/man/gnunet-unindex.1 b/doc/man/gnunet-unindex.1
index 580bdb4c2..e953ce23a 100644
--- a/doc/man/gnunet-unindex.1
+++ b/doc/man/gnunet-unindex.1
@@ -1,57 +1,67 @@
-.TH GNUNET-UNINDEX "1" "September 6, 2009" "GNUnet"
-.SH NAME
-gnunet\-unindex \- a command line interface for deleting indexed files from 
GNUnet
-.SH SYNOPSIS
-.B gnunet\-unindex
-[\fIOPTIONS\fR] FILENAME
-.SH DESCRIPTION
-.PP
-gnunet\-unindex is used for deleting indexed files from GNUnet.
-.TP
-\fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR
-use config file (defaults: ~/.config/gnunet.conf)
-.TP
-\fB\-h\fR, \fB\-\-help\fR
+.Dd September 6, 2009
+.Dt GNUNET-UNINDEX 1
+.Sh NAME
+.Nm gnunet-unindex
+.Nd
+a command line interface for deleting indexed files from GNUnet
+.Sh SYNOPSIS
+.Nm
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
+.Op Fl h | \-help
+.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+.Op Fl v | \-version
+.Op Fl V | \-verbose
+FILENAME
+.Sh DESCRIPTION
+.Nm
+is used for deleting indexed files from GNUnet.
+.Bl -tag -width Ds
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
+Use config file FILENAME as config (default: ~/.config/gnunet.conf).
+.It Fl h | \-help
 print help page
-.TP
-\fB\-L \fILOGLEVEL\fR, \fB\-\-loglevel=LOGLEVEL\fR
-Change the loglevel.  Possible values for LOGLEVEL are NOTHING,
-ERROR, WARNING, INFO and DEBUG.
-.TP
-\fB\-v\fR, \fB\-\-version\fR
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+Change the loglevel.
+Possible values for LOGLEVEL are NOTHING, ERROR, WARNING, INFO and DEBUG.
+.It Fl v | \-version
 print the version number
-.TP
-\fB\-V\fR, \fB\-\-verbose\fR
+.It Fl V | \-verbose
 be verbose
-.SH NOTES
-You can only unindex files that you indexed and that you still have
-available locally in full.  You should use gnunet\-unindex on files
-that you indexed (not inserted) and that you are going to delete or
-move locally.
-.SH FILES
+.El
+.Sh NOTES
+You can only unindex files that you indexed and that you still have available 
locally in full.
+You should use gnunet-unindex on files that you indexed (not inserted) and 
that you are going to delete or move locally.
+.Sh FILES
 .TP
 ~/.config/gnunet.conf
 GNUnet configuration file
-.SH "REPORTING BUGS"
-Report bugs to <https://bugs.gnunet.org/> or by sending electronic mail to 
<address@hidden>
-.SH "SEE ALSO"
-\fBgnunet\-fs\-gtk\fP(1), \fBgnunet\-publish\fP(1), \fBgnunet\-search\fP(1), 
\fBgnunet\-download\fP(1), \fBgnunet.conf\fP(5)
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B gnunet
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
+.Sh SEE ALSO
+.Xr gnunet-fs-gtk 1 ,
+.Xr gnunet-publish 1 ,
+.Xr gnunet-search 1 ,
+.Xr gnunet-download 1 ,
+.Xr gnunet.conf 5
+.sp
+The full documentation for gnunet is maintained as a Texinfo manual.
+If the
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.Pp
 should give you access to the complete handbook,
-.IP
-.B info gnunet-c-tutorial
-.PP
+.Pp
+.Dl info gnunet-c-tutorial
+.Pp
 will give you access to a tutorial for developers.
-.PP
-Depending on your installation, this information is also
-available in
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.sp
+Depending on your installation, this information is also available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt address@hidden .
diff --git a/doc/man/gnunet-uri.1 b/doc/man/gnunet-uri.1
index 1dc8caf86..bb525ef7f 100644
--- a/doc/man/gnunet-uri.1
+++ b/doc/man/gnunet-uri.1
@@ -11,7 +11,7 @@ invoke default handler for GNUnet URIs
 .Op Fl h | \-help
 .Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
 .Op Fl v | \-version
-.Op URI
+URI
 .Sh DESCRIPTION
 .Nm
 can be used to invoke the correct tool to handle a GNUnet URI.

-- 
To stop receiving notification emails like this one, please contact
address@hidden