[GNUnet-SVN] [gnunet] branch master updated (5c7d3e6b3 -> 9ffade313)

[gnunet]

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

ng0 pushed a change to branch master
in repository gnunet.

    from 5c7d3e6b3 fix accidental slipup w configure.ac
     new 293b8ea9c man: ats: fixes.
     new 173f529ff man: fix and adjust zoneimport
     new d89900c55 man: fix and adjust vpn
     new 9ffade313 man: fix and adjust uri

The 4 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-ats.1        | 138 +++++++++++++++++++++++---------------------
 doc/man/gnunet-uri.1        |  87 +++++++++++++++-------------
 doc/man/gnunet-vpn.1        | 126 +++++++++++++++++++++-------------------
 doc/man/gnunet-zoneimport.1 | 117 ++++++++++++++++++++-----------------
 4 files changed, 253 insertions(+), 215 deletions(-)

diff --git a/doc/man/gnunet-ats.1 b/doc/man/gnunet-ats.1
index 6ead870d4..1e7b7731c 100644
--- a/doc/man/gnunet-ats.1
+++ b/doc/man/gnunet-ats.1
@@ -21,82 +21,90 @@
 .\"
 .\" SPDX-License-Identifier: GPL3.0-or-later OR FDL1.3-or-later
 .\"
-.TH GNUNET\-ATS 1 "October 16, 2015" "GNUnet"
-.SH NAME
-gnunet\-ats \- display information about transport resource allocation
-.SH SYNOPSIS
-.B gnunet\-ats
-.RI [-a\ |\ --aa]
-.RI [-c\ FILENAME\ |\ --config=FILENAME]
-.RI [-C\ |\ --connect=PEERID]
-.RI [-h\ |\ --help]
-.RI [-i\ |\ --id=PEERID]
-.RI [-k\ |\ --value=VALUE]
-.RI [-L\ LOGLEVEL\ |\ --loglevel=LOGLEVEL]
-.RI [-m\ |\ --monitor]
-.RI [-n\ |\ --numeric]
-.RI [-k\ |\ --preference=E]
-.RI [-q\ |\ --quotas]
-.RI [-t\ |\ --type=VALUE]
-.RI [-u\ |\ --used]
-.RI [-V\ |\ --verbose]
-.RI [-v\ |\ --version]
-.SH DESCRIPTION
-\fBgnunet\-ats\fP can be used to display information about the GNUnet's 
transport selection mechanism.
+.Dd October 16, 2015
+.Dt GNUNET-ATS 1
+.Os
+.Sh NAME
+.Nm gnunet-ats
+.Nd
+display information about transport resource allocation
+.Sh SYNOPSIS
+.Nm
+.Op Fl a | \-all
+.Op Fl C Ar PEERID | Fl \-connect= Ns Ar PEERID
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
+.Op Fl h | \-help
+.Op Fl i Ar PEERID | Fl \-id= Ns Ar PEERID
+.Op Fl k Ar VALUE | Fl \-value= Ns Ar VALUE
+.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+.Op Fl m | \-monitor
+.Op Fl n | \-numeric
+.Op Fl p Ar PREFERENCE | Fl \-preference= Ns Ar PREFERENCE
+.Op Fl q | \-quotas
+.Op Fl t Ar TYPE | Fl \-type= Ns Ar TYPE
+.Op Fl u | \-used
+.Op Fl V | \-verbose
+.Op Fl v | \-version
+.Sh DESCRIPTION
+.Nm
+can be used to display information about the GNUnet's transport selection 
mechanism.
 It shows information about the addresses and the assigned input and output 
bandwidth.
-.SH OPTIONS
-.IP "\-a\ |\ \-\-aa"
+.Sh OPTIONS
+.Bl -tag -width Ds
+.It Fl a | \-all
 List all addresses currently known to ats.
-.IP "\-c FILENAME\ |\ \-\-config=FILENAME"
-Use the configuration file FILENAME.
-.IP "\-C\ |\ -\-connect=PEERID"
+.It Fl C Ar PEERID | Fl \-connect= Ns Ar PEERID
 Ask ATS to suggest an address for PEERID to transport to establish a 
connection.
-Note that you can use the gnunet\-transport command\-line tool to force 
disconnects.
-.IP "\-h\ |\ -\-help"
+Note that you can use the gnunet-transport commandline tool to force 
disconnects.
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
+Use the configuration file FILENAME.
+.It Fl h | \-help
 Print short help on options.
-.IP "\-i\ |\ -\-id=PEERID"
-Print information for a specific peer identity only
-.IP "\-k\ |\ -\-value=VALUE"
-Value to set for when changing preference values
-.IP "\-L LOGLEVEL\ |\ -\-loglevel=LOGLEVEL"
+.It Fl i Ar PEERID | Fl \-id= Ns Ar PEERID
+Print information for a specific peer identity only.
+.It Fl k Ar VALUE | Fl \-value= Ns Ar VALUE
+Value to set for when changing preference values.
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
 Use LOGLEVEL for logging.
 Valid values are DEBUG, INFO, WARNING and ERROR.
-.IP "\-m\ |\ -\-monitor"
-Monitor changes to the bandwidth assignments continuously
-.IP "\-n\ |\ -\-numeric"
-Do not resolve IP addresses to hostnames
-.IP "\-k\ |\ -\-preference=E"
+.It Fl m | \-monitor
+Monitor changes to the bandwidth assignments continuously.
+.It Fl n | \-numeric
+Do not resolve IP addresses to hostnames.
+.It Fl p Ar PREFERENCE | Fl \-preference= Ns Ar PREFERENCE
 Set preference values, -i, -k and -t required.
-.IP "\-q\ |\ -\-quotas"
+.It Fl q | \-quotas
 Print quotas for all network types
-.IP "\-t\ |\ -\-type=VALUE"
+.It Fl t Ar TYPE | Fl \-type= Ns Ar TYPE
 Preference type to change: latency | bandwidth
-.IP "\-u\ |\ -\-used"
+.It Fl u | \-used
 Print addresses actively used only
-.IP "\-V\ |\ -\-verbose"
+.It Fl V | \-verbose
 Print verbose output (include ATS address properties)
-.IP "\-v\ |\ -\-version"
+.It v | \-version
 Print GNUnet version number.
-.SH SEE ALSO
-gnunet\-transport(1)
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B gnunet
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
+.El
+.Sh SEE ALSO
+.Xr gnunet-transport 1
+.sp
+The full documentation for gnunet is maintained as a Texinfo manual.
+If the
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.Pp
 should give you access to the complete handbook,
-.IP
-.B info gnunet-c-tutorial
-.PP
+.Pp
+.Dl info gnunet-c-tutorial
+.Pp
 will give you access to a tutorial for developers.
-.PP
-Depending on your installation, this information is also
-available in
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
-.SH BUGS
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending 
electronic mail to <address@hidden>.
+.Pp
+Depending on your installation, this information is also available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt address@hidden .
diff --git a/doc/man/gnunet-uri.1 b/doc/man/gnunet-uri.1
index 5121fc5c8..1dc8caf86 100644
--- a/doc/man/gnunet-uri.1
+++ b/doc/man/gnunet-uri.1
@@ -1,45 +1,54 @@
-.TH GNUNET-URI 1 "June 26, 2012" "GNUnet"
-.SH NAME
-gnunet\-uri \- invoke default handler for GNUnet URIs
-.SH SYNOPSIS
-.B gnunet\-uri
-.RI URI
-.SH DESCRIPTION
-\fBgnunet\-uri\fP can be used to invoke the correct tool to handle a
-GNUnet URI.  GNUnet URIs have the format "gnunet://SUBSYSTEM/DETAILS"
-and thus the specific tool to handle the URI depends on the subsystem.
-gnunet\-uri will determine the correct tool (by looking for SUBSYSTEM
-in the configuration section "uri") and invoke it.
-.SH OPTIONS
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+.Dd June 26, 2012
+.Dt GNUNET-URI 1
+.Os
+.Sh NAME
+.Nm gnunet-uri
+.Nd
+invoke default handler for GNUnet URIs
+.Sh SYNOPSIS
+.Nm
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
+.Op Fl h | \-help
+.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+.Op Fl v | \-version
+.Op URI
+.Sh DESCRIPTION
+.Nm
+can be used to invoke the correct tool to handle a GNUnet URI.
+GNUnet URIs have the format "gnunet://SUBSYSTEM/DETAILS" and thus the specific 
tool to handle the URI depends on the subsystem.
+gnunet-uri will determine the correct tool (by looking for SUBSYSTEM in the 
configuration section "uri") and invoke it.
+.Bl -tag -width Ds
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.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 "\-v, \-\-version"
+.It Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+Use LOGLEVEL for logging.
+Valid values are DEBUG, INFO, WARNING and ERROR.
+.It Fl v | \-version
 Print GNUnet version number.
-.SH BUGS
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending
-electronic mail to <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-vpn.1 b/doc/man/gnunet-vpn.1
index 76ce52cb4..e0fd2b78c 100644
--- a/doc/man/gnunet-vpn.1
+++ b/doc/man/gnunet-vpn.1
@@ -1,88 +1,98 @@
-.TH GNUNET\-VPN 1 "February 25, 2012" "GNUnet"
-.SH NAME
-gnunet\-vpn \- manually setup a GNUnet VPN tunnel
-.SH SYNOPSIS
-.B gnunet\-vpn
-.RI [ options ]
-.br
-.SH DESCRIPTION
-\fBgnunet\-vpn\fP can be used to manually setup a VPN tunnel via the
-GNUnet network.
+.Dd February 25, 2012
+.Dt GNUNET-VPN 1
+.Sh NAME
+.Nm gnunet-vpn
+.Nd
+manually setup a GNUnet VPN tunnel
+.Sh SYNOPSIS
+.Nm
+.Op Fl 4 | \-ipv4
+.Op Fl 6 | \-ipv6
+.Op Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
+.Op Fl d Ar TIME | Fl \-duration Ar TIME
+.Op Fl h | \-help
+.Op Fl i Ar IP | Fl \-ip Ar IP
+.Op Fl L Ar LOGLEVEL | Fl \-loglevel= Ns Ar LOGLEVEL
+.Op Fl p Ar PEERID | Fl \-peer= Ns Ar PEERID
+.Op Fl s Ar NAME | Fl \-service= Ns Ar NAME
+.Op Fl t | \-tcp
+.Op Fl u | \-udp
+.Op Fl V | \-verbose
+.Op Fl v | \-version
+.Sh DESCRIPTION
+.Nm
+can be used to manually setup a VPN tunnel via the GNUnet network.
 There are two main types of tunnels.
-Tunnels to an exit node which routes the traffic to the global
-Internet, and tunnels to a node that runs a service only within
-GNUnet.
+Tunnels to an exit node which routes the traffic to the global Internet, and 
tunnels to a node that runs a service only within GNUnet.
 Depending on the type of tunnel, gnunet\-vpn takes different options.
-The "\-i" option is required for tunnels to an exit node, whereas the
-"\-p" and "\-s" options in conjunction with either "\-u" or "\-t" are
-required for tunnels to services.
+The "\-i" option is required for tunnels to an exit node, whereas the "\-p" 
and "\-s" options in conjunction with either "\-u" or "\-t" are required for 
tunnels to services.
 For exit tunnels, both UDP and TCP traffic will be redirected.
-For service tunnels, either UDP ("\-u") or TCP ("\-t") traffic will
-be redirected.
+For service tunnels, either UDP ("\-u") or TCP ("\-t") traffic will be 
redirected.
 The tool will display the IP address for this end of the tunnel.
-The address can be displayed as soon as it has been allocated, or only
-after ("\-a") the tunnel has been created.
-.SH OPTIONS
-.IP "\-4, \-\-ipv4"
+The address can be displayed as soon as it has been allocated, or only after 
("\-a") the tunnel has been created.
+.Bl -tag -width Ds
+.It Fl 4 | \-ipv4
 Desired IP address on this end of the tunnel should be an IPv4 address.
-.IP "\-6, \-\-ipv6"
+.It Fl 6 | \-ipv6
 Desired IP address on this end of the tunnel should be an IPv6 address.
-.IP "\-c FILENAME,  \-\-config=FILENAME"
+.It Fl c Ar FILENAME | Fl \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.IP "\-d TIME, \-\-duration TIME"
+.It Fl d Ar TIME | Fl \-duration Ar TIME
 The mapping should be established for TIME.
-The value given must be a number followed by a space and a time unit,
-for example "500 ms".
+The value given must be a number followed by a space and a time unit, for 
example "500 ms".
 Note that the quotes are required on the shell.
 Default is 5 minutes.
-.IP "\-h, \-\-help"
+.It Fl h | \-help
 Print short help on options.
-.IP "\-i IP, \-\-ip IP"
+.It Fl i Ar IP | Fl \-ip Ar IP
 Tunnel should be to an exit node and connect to the given IPv4 or IPv6
 IP address.
 Note that you can specify an IPv6 address as the target here, even in
 combination with "\-4" (4to6) and similarly you can specify an IPv4
 address in combination with "\-6" (6to4).
-.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 "\-p PEERID,  \-\-peer=PEERID"
+.It Fl p Ar PEERID | Fl \-peer= Ns Ar PEERID
 Name of the peer offering the service to connect to.
 Cannot be used in conjunction with "\-i", requires "\-s".
-.IP "\-s NAME,  \-\-service=NAME"
+.It Fl s Ar NAME | Fl \-service= Ns Ar NAME
 Name of the service running on the target peer.
 Cannot be used in conjunction with "\-i", requires "\-p".
-.IP "\-t, \-\-tcp"
+.It Fl t | \-tcp
 Service runs TCP.
 Either "\-t" or "\-u" must be specified when using "\-s".
-.IP "\-u, \-\-udp"
+.It Fl u | \-udp
 Service runs UDP.
 Either "\-t" or "\-u" must be specified when using "\-s".
-.IP "\-V, \-\-verbose"
+.It Fl V | \-verbose
 Be verbose.
-.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
-gnunet\-setup(1)
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B gnunet
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
+.El
+.Sh SEE ALSO
+.Xr gnunet-setup 1
+.sp
+The full documentation for gnunet is maintained as a Texinfo manual.
+If the
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.Pp
 should give you access to the complete handbook,
-.IP
-.B info gnunet-c-tutorial
-.PP
+.Pp
+.Dl info gnunet-c-tutorial
+.Pp
 will give you access to a tutorial for developers.
-.PP
-Depending on your installation, this information is also
-available in
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
+.sp
+Depending on your installation, this information is also available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt address@hidden .
diff --git a/doc/man/gnunet-zoneimport.1 b/doc/man/gnunet-zoneimport.1
index b825a99e8..e99b235b8 100644
--- a/doc/man/gnunet-zoneimport.1
+++ b/doc/man/gnunet-zoneimport.1
@@ -1,5 +1,5 @@
 .\" This file is part of GNUnet.
-.\" Copyright (C) 2018,2019 GNUnet e.V.
+.\" Copyright (C) 2018, 2019 GNUnet e.V.
 .\"
 .\" Permission is granted to copy, distribute and/or modify this document
 .\" under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -21,75 +21,86 @@
 .\"
 .\" SPDX-License-Identifier: GPL3.0-or-later OR FDL1.3-or-later
 .\"
-.TH GNUNET-ZONEIMPORT 1 "April 23, 2018" "GNUnet"
-.SH NAME
-gnunet\-zoneimport \- import DNS zone into GNS zone
-.SH SYNOPSIS
-.B gnunet\-zoneimport
-.RI [-c\ FILENAME\ |\ --config=FILENAME]
-.RI [-h\ |\ --help]
-.RI [-m\ RELATIVETIME\ |\ --minimum-expiration=RELATIVETIME]
-.RI [-s\ MAPSIZE\ |\ --size=MAPSIZE]
-[IP]+
-.SH DESCRIPTION
-\fBgnunet\-zoneimport\fP reads a list of domain names (FQDN) from stdin and 
issues DNS queries for each of the domain names given.
+.Dd April 23, 2018
+.Dt GNUNET-ZONEIMPORT 1
+.Os
+.Sh NAME
+.Nm gnunet-zoneimport
+.Nd
+import DNS zone into GNS zone
+.Sh SYNOPSIS
+.Nm
+.Op Fl c Ar FILENAME | \-config= Ns Ar FILENAME
+.Op Fl h | \-help
+.Op Fl m Ar RELATIVETIME | Fl \-minimum-expiration= Ns Ar RELATIVETIME
+.Op Fl s Ar MAPSIZE | Fl \-size= Ns Ar MAPSIZE
+.Op Ar \IP
+.Sh DESCRIPTION
+.Nm
+reads a list of domain names (FQDN) from stdin and issues DNS queries for each 
of the domain names given.
 It then checks if a local ego with a name matching the domain exists.
 Specifically, if the domain name is "example.fr", it will check if an ego "fr" 
exists, while for a domain "example.com.fr" it will look for an ego called 
"com.fr").
 If so, it will convert the DNS records into GNS records (in particular 
converting NS records and glue records to GNS2DNS records) and add them to the 
namestore under the label ("example" in the examples above).
-.PP
-The arguments given to gnunet\-zoneimport is a list of IP addresses of DNS 
servers to query.
-.PP
-gnunet\-zoneimport will usually never terminate: it will check when DNS 
records expire, and re-issue requests when the old DNS records have expired so 
that GNS always has the latest data.
-.PP
-gnunet\-zoneimport will issue many DNS queries in parallel, but is 
rate-limited in various ways, so most DNS servers should easily handle the load.
-gnunet\-zoneimport will perform a limited number of retries if queries fail.
-.PP
-gnunet\-zoneimport operates incrementally.
+.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.
+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
-.IP "\-c FILENAME\ | \-\-config=FILENAME"
+.Bl -tag -width Ds
+.It Fl c Ar FILENAME | \-config= Ns Ar FILENAME
 Use the configuration file FILENAME.
-.IP "\-h\ | \-\-help"
+.It Fl h | \-help
 Print short help on options.
-.IP "\-m RELATIVETIME\ | \-\-minimum-expiration=RELATIVETIME"
+.It Fl m Ar RELATIVETIME | Fl \-minimum-expiration= Ns Ar RELATIVETIME
 Ensure that imported DNS records never have an expiration time that is less 
than RELATIVETIME into the future.
 RELATIVETIME is a time given like "1 week" or "1 h".
 If DNS returns records with a shorter lifetime, gnunet\-zoneimport will simply 
bump the lifetime to the specified value (relative to the time of the import).
 Default is zero.
-.IP "\-s MAPSIZE\ | \-\-size=MAPSIZE"
+.It Fl s Ar MAPSIZE | Fl \-size= Ns Ar MAPSIZE
 Specifies the size (in number of entries) to use for the main hash map.
 The value provided should be at least twice the number of domain names that 
will be given to the tool.
 This option is required for very large zones where the number of records 
encountered is too large for the automatic growth mechanism to work (that one 
is limited to at most 16 MB allocations for security reasons).
 Do not worry about this unless you are importing millions of domain names from 
a zone.
-.SH EXAMPLES
-.TP
+.It Ar \IP
+IP Is the list of IPs given.
+.El
+.Sh EXAMPLES
 Typical invocaton would be:
-$ gnunet\-zoneimport 1.2.3.4 < names.txt
-.SH SEE ALSO
-gnunet\-gns(1), gnunet\-namestore(1)
-.PP
-The full documentation for
-.B gnunet
-is maintained as a Texinfo manual.
+.Pp
+.Dl $ gnunet\-zoneimport 1.2.3.4 < names.txt
+.Sh SEE ALSO
+.Xr gnunet-gns 1 ,
+.Xr gnunet-namestore 1
+.sp
+The full documentation for gnunet is maintained as a Texinfo manual.
 If the
-.B info
-and
-.B gnunet
-programs are properly installed at your site, the command
-.IP
-.B info gnunet
-.PP
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.Pp
 should give you access to the complete handbook,
-.IP
-.B info gnunet-c-tutorial
-.PP
+.Pp
+.Dl info gnunet-c-tutorial
+.Pp
 will give you access to a tutorial for developers.
-.PP
+.sp
 Depending on your installation, this information is also available in
-\fBgnunet\fP(7) and \fBgnunet-c-tutorial\fP(7).
-.SH BUGS
-Report bugs by using Mantis <https://bugs.gnunet.org/> or by sending 
electronic mail to <address@hidden>.
+.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 .

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