28 files changed, 0 insertions, 205 deletions

diff --git a/doc/man/gnunet-bcd.1 b/doc/man/gnunet-bcd.1
index 02b4397de..9b37a097b 100644
--- a/doc/man/gnunet-bcd.1
+++ b/doc/man/gnunet-bcd.1
@@ -13,19 +13,14 @@ installed.  If it does not work for you, try installing the full
 TeXLive distribution first, for example using the package\-manager
 apt: "apt-get install texlive-full".
 .SH OPTIONS
-.B
 .IP "\-p PORT, \-\-port=PORT"
 Run the HTTP server on port PORT.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-cadet.1 b/doc/man/gnunet-cadet.1
index 8404f085c..44d7fffca 100644
--- a/doc/man/gnunet-cadet.1
+++ b/doc/man/gnunet-cadet.1
@@ -21,42 +21,30 @@ For one\-to\-many communication \fBgnunet\-social\fP may be better
 suited, however.
 
 .SH SPECIFIC OPTIONS
-.B
 .IP "\-C CONNECTION_ID,  \-\-connection=CONNECTION_ID"
 Provide information about a particular connection.
-.B
 .IP "\-d,  \-\-dump"
 Dump debug information to STDERR.
-.B
 .IP "\-e,  \-\-echo"
 Activate echo mode.
-.B
 .IP "\-o SHARED_SECRET,  \-\-open-port=SHARED_SECRET"
 Listen for connections using a shared secret among sender and recipient.
-.B
 .IP "\-p PEER_ID,  \-\-peer=PEER_ID"
 Provide information about a patricular peer.
-.B
 .IP "\-P,  \-\-peers"
 Provide information about all peers.
-.B
 .IP "\-T,  \-\-tunnels"
 Provide information about all tunnels.
 
 .SH STANDARD OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-l LOGFILE, \-\-logfile=LOGFILE"
 Configure logging to write logs to LOGFILE.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 
diff --git a/doc/man/gnunet-config.1 b/doc/man/gnunet-config.1
index f1443283f..98d7fd0d9 100644
--- a/doc/man/gnunet-config.1
+++ b/doc/man/gnunet-config.1
@@ -7,38 +7,28 @@ gnunet\-config \- manipulate GNUnet configuration files
 .SH DESCRIPTION
 \fBgnunet\-config\fP can be used to read or modify GNUnet configuration files.
 .SH OPTIONS
-.B
 .IP "\-f, \-\-filename"
 When accessing a specific option using \-s and \-o, perform expansions as if the
 value represents a filename.
-.B
 .IP "\-s SECTION, \-\-section=SECTION"
 Which configuration section should be accessed or edited. Required option.
-.B
 .IP "\-S, \-\-list\-sections"
 List available configuration sections for use with \-\-section.
-.B
 .IP "\-W, \-\-rewrite"
 Consider differences to defaults only.
-.B
 .IP "\-o OPTION, \-\-option=OPTION"
 Which configuration option should be accessed or edited.  Required to set a value.
 If not given, all values of a given section will be printed in the
 format "OPTION = VALUE".
-.B
 .IP "\-V VALUE, \-\-value VALUE"
 Configuration value to store in the given section under the given option.
 Must only be given together with \-s and \-o options.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-conversation-test.1 b/doc/man/gnunet-conversation-test.1
index 5c08d3dab..477da5042 100644
--- a/doc/man/gnunet-conversation-test.1
+++ b/doc/man/gnunet-conversation-test.1
@@ -17,17 +17,13 @@ known to your computer).
 You can use gnunet\-conversation\-test without having a peer running
 on your computer.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.
 Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-conversation.1 b/doc/man/gnunet-conversation.1
index 5925871da..3815b3887 100644
--- a/doc/man/gnunet-conversation.1
+++ b/doc/man/gnunet-conversation.1
@@ -15,25 +15,19 @@ your zone in the GNU Name System (using gnunet\-namestore).
 gnunet\-conversation has an interactive help system via the /help
 command.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-e NAME,  \-\-ego=NAME"
 Specifies the NAME of the ego to use (for caller ID).
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.
 Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-p LINE,  \-\-phone=LINE"
 Optional argument that can be used to specify the phone LINE to be used with
 the conversation service.
 The default LINE is zero, which should be fine for most users.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-dns2gns.1 b/doc/man/gnunet-dns2gns.1
index 552df25b6..d5c945e5a 100644
--- a/doc/man/gnunet-dns2gns.1
+++ b/doc/man/gnunet-dns2gns.1
@@ -18,19 +18,14 @@ to DNS.  This DNS proxy is useful for enabling non-personalized
 GNS\-resolution to an entire network or to offer GNS\-resolution to DNS users.
 
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-d IP,  \-\-dns=IP"
 IP address of a recursive DNS resolver that should be used for non-GADS hostnames.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 
diff --git a/doc/man/gnunet-ecc.1 b/doc/man/gnunet-ecc.1
index aedc0bc49..2aa7743b2 100644
--- a/doc/man/gnunet-ecc.1
+++ b/doc/man/gnunet-ecc.1
@@ -17,33 +17,25 @@ take a while.  If the option \-p is given, the corresponding public
 key will be printed to the console.
 
 .SH OPTIONS
-.B
 .IP "\-g COUNT, \-\-generate-keys=COUNT"
 Create COUNT public-private key pairs and write them to FILENAME.
 Used for creating a file for testing.
-.B
 .IP "\-p, \-\-print-public-key"
 Print the corresponding public key to stdout.  This is the value used
 for PKEY records in GNS.
-.B
 .IP "\-P, \-\-print-private-key"
 Print the corresponding private key to stdout.  This is the value used
 for PKEY records in GNS.
-.B
 .IP "\-x, \-\-print-hex"
 Print the corresponding public key to stdout in HEX format.  Useful
 for comparing to Ed25519 keys in X.509 tools.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and
 ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 
diff --git a/doc/man/gnunet-gns-proxy.1 b/doc/man/gnunet-gns-proxy.1
index 6c12e2c09..603c5a28c 100644
--- a/doc/man/gnunet-gns-proxy.1
+++ b/doc/man/gnunet-gns-proxy.1
@@ -15,26 +15,20 @@ CA certificate has to be generated that is used by the proxy. Thus
 of this proxy or the \-\-authority switch is used to specify an
 appropriate CA certificate that is already trusted by the browser.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-a AUTHORITY,  \-\-authority=AUTHORITY"
 Path to a PEM CA file that contains the certificate and private key of
 the CA to use to assert the validity of GNS names. The default port is
 specified in the configuration file for the gns service under
 "[gns-proxy]" PROXY_CACERT.
-.B
 .IP "\-p PORT,  \-\-port=PORT"
 The port this proxy should listen on. Default is 7777.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and
 ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-gns.1 b/doc/man/gnunet-gns.1
index 597297629..750c72d95 100644
--- a/doc/man/gnunet-gns.1
+++ b/doc/man/gnunet-gns.1
@@ -8,33 +8,26 @@ gnunet\-gns \- Access to GNU Name System
 \fBgnunet\-gns\fP can be used to lookup and process GNU Name Service
 names.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-r, \-\-raw"
 No unneeded output.
 This is a quiet mode where only important information is displayed.
 For example a lookup for an IP address will only yield the IP address,
 no descriptive text.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.
 Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-u NAME, \-\-lookup=NAME"
 Name to lookup.
 Resolve the specified name using the GNU Name System.
-.B
 .IP "\-t TYPE, \-\-type=TYPE"
 Resource Record Type (TYPE) to look for.
 Supported TYPE's are: A, AAAA, CNAME, NS, PKEY, PSEU, TLSA, SRV, SOA,
 MX, LEHO, VPN, REV, PTR, TXT.
 Defaults to "A".
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH RETURN VALUE
diff --git a/doc/man/gnunet-namecache.1 b/doc/man/gnunet-namecache.1
index 78acb017b..06946e387 100644
--- a/doc/man/gnunet-namecache.1
+++ b/doc/man/gnunet-namecache.1
@@ -13,23 +13,17 @@ gnunet\-namecache \- inspect namecache
 namecache.
 
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and
 ERROR.
-.B
 .IP "\-n NAME, \-\-name=NAME"
 Name (label) of the record to display (mandatory option)
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
-.B
 .IP "\-z PKEY, \-\-zone=PKEY"
 Specifies the public key of the zone to inspect (mandatory option)
 
diff --git a/doc/man/gnunet-namestore-fcfsd.1 b/doc/man/gnunet-namestore-fcfsd.1
index a6c9d2b32..c1eca224f 100644
--- a/doc/man/gnunet-namestore-fcfsd.1
+++ b/doc/man/gnunet-namestore-fcfsd.1
@@ -27,20 +27,15 @@ pseudonym (using "gnunet\-identity \-C NAME"), and use it with the
 "-z" option.  After that, you can start the FCFSD service (possibly using
 gnunet\-arm).
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and
 ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
-.B
 .IP "\-z EGO, \-\-zone=EGO"
 Specifies for which EGO should FCFSD manage the zone.
 .SH BUGS
diff --git a/doc/man/gnunet-namestore.1 b/doc/man/gnunet-namestore.1
index 7517a4f5e..6a824cc47 100644
--- a/doc/man/gnunet-namestore.1
+++ b/doc/man/gnunet-namestore.1
@@ -12,13 +12,10 @@ gnunet\-namestore \- manipulate GNU Name System (GNS) zone data
 \fBgnunet\-namestore\fP can be used to manipulate records in a GNS zone.
 
 .SH OPTIONS
-.B
 .IP "\-a, \-\-add"
 Desired operation is adding a record
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-d, \-\-delete"
 Desired operation is deleting records under the given name that match
 the specified type (\-t) and value (\-V).  If type or value are not
@@ -26,41 +23,31 @@ specified, it means that all types (or values) should be assumed to
 match (and possibly multiple or all values under the given label will
 be deleted).  Specifying a label (\-n) is mandatory.  Note that
 matching by expiration time or flags is (currently) not supported.
-.B
 .IP "\-D, \-\-display"
 Desired operation is listing of matching records
-.B
 .IP "\-e TIME, \-\-expiration=TIME"
 Specifies expiration time of record to add; format is relative time,
 i.e "1 h" or "7 d 30 m".  Supported units are "ms", "s", "min" or
 "minutes", "h" (hours), "d" (days) and "a" (years).
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-i NICKNAME, \-\-nick=NICKNAME"
 Set the desired NICKNAME for the zone. The nickname will be included
 in all (public) records and used as the suggested name for this zone.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and
 ERROR.
-.B
 .IP "\-m, \-\-monitor"
 Monitor changes to the zone on an ongoing basis (in contrast to \-D,
 which merely displays the current records)
-.B
 .IP "\-n NAME, \-\-name=NAME"
 Label or name of the record to add/delete/display
-.B
 .IP "\-p, \-\-public"
 Create a record that is public (shared with other users that know the
 label)
-.B
 .IP "\-r PKEY, \-\-reverse=PKEY"
 Determine our GNS name for the given public key (reverse lookup of the
 PKEY) in the given zone.
-.B
 .IP "\-R RECORDLINE, \-\-replace=RECORDLINE"
 Sets record set to values given in RECORDLINE.  This option can be specified multiple
 times to provide multiple records for the record set.  Existing records under the
@@ -69,29 +56,23 @@ same label will be deleted. The format for the RECORDLINE is
 be given explicitly, seconds is always implied), TYPE is the
 DNS/GNS record type, FLAGS is "(N)ORMAL", "(S)HADOW" or "(P)UBLIC".  The VALUE
 follows the usual human-readable value format(s) of DNS/GNS.
-.B
 .IP "\-s, \-\-shadow"
 Create a record that is a shadow record.  Shadow records are only used
 once all other records of the same type under the same label have
 expired.
-.B
 .IP "\-t TYPE, \-\-type=TYPE"
 Type of the record to add/delete/display (i.e. "A", "AAAA", "NS",
 "PKEY", "MX" etc.)
-.B
 .IP "\-u URI, \-\-uri=URI"
 Add PKEY record from gnunet://gns/-URI to our zone; the record type is
 always PKEY, if no expiration is given FOREVER is used
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
-.B
 .IP "\-V VALUE, \-\-value=VALUE"
 Value to store or remove from the GNS zone.  Specific format depends
 on the record type.  A records expect a dotted decimal IPv4 address,
 AAAA records an IPv6 address, PKEY a public key in GNUnet's printable
 format, and CNAME and NS records should be a domain name.
-.B
 .IP "\-z EGO, \-\-zone=EGO"
 Specifies the name of the ego controlling the private key for the zone
 (mandatory option)
diff --git a/doc/man/gnunet-nat-auto.1 b/doc/man/gnunet-nat-auto.1
index 8514a5c99..efd4b5df1 100644
--- a/doc/man/gnunet-nat-auto.1
+++ b/doc/man/gnunet-nat-auto.1
@@ -8,22 +8,17 @@ gnunet\-nat\-auto \- autoconfigure and test NAT traversal
 This tool allows testing various NAT traversal functions, as well
 as attempting auto\-configuration.
 .SH OPTIONS
-.B
 .IP "\-a,  \-\-auto"
 Attempt auto\-configuration for NAT traversal.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-S NAME,  \-\-section=NAME"
 Name of the configuration section with details about the configuration
 to test. For example "transport-tcp".
 .IP "\-t,  \-\-tcp"
 Use TCP.
-.B
 .IP "\-u,  \-\-udp"
 Use UDP.
-.B
 .IP "\-w,  \-\-write"
 Write configuration to configuration file, useful in combination with
 autoconfiguration (\-a).
diff --git a/doc/man/gnunet-nat-server.1 b/doc/man/gnunet-nat-server.1
index f31e69b26..8cb995f7c 100644
--- a/doc/man/gnunet-nat-server.1
+++ b/doc/man/gnunet-nat-server.1
@@ -41,7 +41,6 @@ gnunet\-nat\-server is run on should be specified in the NATSERVER
 option in the [setup] section of the configuration file of hosts that
 are supposed to autoconfigure with this server.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
 .SH BUGS
diff --git a/doc/man/gnunet-nat.1 b/doc/man/gnunet-nat.1
index 4a6a56e97..fe9272ea5 100644
--- a/doc/man/gnunet-nat.1
+++ b/doc/man/gnunet-nat.1
@@ -8,38 +8,28 @@ gnunet\-nat \- interact with the NAT service
 This tool allows testing various NAT traversal functions, as well as
 attempting auto\-configuration.
 .SH OPTIONS
-.B
 .IP "\-b ADDRESS,  \-\-bind=ADDRESS"
 Assume that the service is (locally) bound to ADDRESS.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-e ADDRESS,  \-\-external=ADDRESS"
 Assume that ADDRESS is the globally visible address of the peer.
-.B
 .IP "\-i ADDRESS,  \-\-in=ADDRESS"
 Assuming we are listening at ADDRESS for connection reversal requests.
-.B
 .IP "\-r ADDRESS,  \-\-remote=ADDRESS"
 Ask the peer at ADDRESS for connection reversal, using the local
 address for the target address of the reversal.
-.B
 .IP "\-S NAME,  \-\-section=NAME"
 Name of section in configuration file to use for additional options.
-.B
 .IP "\-s,  \-\-stun"
 Enable processing of STUN requests.
 Will try to read UDP packets from the bind address and handle the
 packets if they are STUN packets.
 Will only work with UDP.
-.B
 .IP "\-t,  \-\-tcp"
 Use TCP.
-.B
 .IP "\-u,  \-\-udp"
 Use UDP.
-.B
 .IP "\-W,  \-\-watch"
 Watch for connection reversal requests.
 .SH EXAMPLES
diff --git a/doc/man/gnunet-peerinfo.1 b/doc/man/gnunet-peerinfo.1
index bd37fa635..88094fa10 100644
--- a/doc/man/gnunet-peerinfo.1
+++ b/doc/man/gnunet-peerinfo.1
@@ -8,39 +8,28 @@ gnunet\-peerinfo \- Display information about other peers.
 .PP
 \fBgnunet\-peerinfo\fP display the known addresses and trust of known peers.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME, \-\-config=FILENAME"
 Load config file (default: ~/.config/gnunet.conf)
-.B
 .IP "\-g, \-\-get\-hello"
 Output HELLO uri(s)
-.B
 .IP "\-h, \-\-help"
 Print help page
-.B
 .IP "\-i, \-\-info"
 List all known peers (and their addresses)
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Set the loglevel
-.B
 .IP "\-l LOGFILE, \-\-logfile=LOGFILE"
 Log messages to LOGFILE
-.B
 .IP "\-n, \-\-numeric"
 Disable resolution of IPs to hostnames
-.B
 .IP "\-p, \-\-put\-hello=HELLO"
 Add given HELLO uri to the database
-.B
 .IP "\-q, \-\-quiet"
 Do not print anything but the peer identities
-.B
 .IP "\-s, \-\-self"
 Print only our own identity (together with "\-q", this is the exact
 line that other peers would have to put in to their friends file in
 order to consider this peer one of their friends in F2F mode).
-.B
 .IP "\-v, \-\-version"
 Print the version number
 .SH BUGS
diff --git a/doc/man/gnunet-qr.1 b/doc/man/gnunet-qr.1
index 0145a3523..2303c15e0 100644
--- a/doc/man/gnunet-qr.1
+++ b/doc/man/gnunet-qr.1
@@ -9,19 +9,14 @@ gnunet\-qr \- Scan a QR code using a video device and import.
 \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"
 Use the configuration file FILENAME.
-.B
 .IP "\-d DEVICE,  \-\-device=DEVICE"
 Use device DEVICE.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-s,  \-\-silent"
 Do not show preview windows.
-.B
 .IP "\-v, \-\-verbose"
 Be verbose.
 .SH BUGS
diff --git a/doc/man/gnunet-resolver.1 b/doc/man/gnunet-resolver.1
index 66f1ba9a8..494131d01 100644
--- a/doc/man/gnunet-resolver.1
+++ b/doc/man/gnunet-resolver.1
@@ -7,23 +7,17 @@ gnunet\-resolver \- build-in GNUnet stub resolver
 .SH DESCRIPTION
 \fBgnunet\-resolver\fP uses build-in GNUnet stub resolver.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and
 ERROR.
-.B
 .IP "\-l LOGFILE, \-\-logfile=LOGFILE"
 Configure logging to write logs to LOGFILE.
-.B
 .IP "\-r, \-\-reverse"
 Perform a reverse lookup.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-revocation.1 b/doc/man/gnunet-revocation.1
index f21f82612..6fae373e7 100644
--- a/doc/man/gnunet-revocation.1
+++ b/doc/man/gnunet-revocation.1
@@ -28,19 +28,15 @@ expensive.  Depending on your CPU, the calculation can take days or
 weeks.
 
 .SH OPTIONS
-.B
 .IP "\-t KEY, \-\-test=KEY"
 Check if the given KEY (ASCII\-encoded public key required) has been
 revoked.
-.B
 .IP "\-R NAME, \-\-revoke=NAME"
 Calculate or perform revocation for the ego with the given NAME.
-.B
 .IP "\-p, \-\-perform"
 Actually perform the revocation as soon as possible (do not just
 generate a revocation certificate, use it).  Must be supplied to
 actually perform the revocation.
-.B
 .IP "\-f NAME, \-\-filename=NAME"
 Use NAME as the name of the file that is to contain the revocation
 certificate.  Intermediate computation results will be stored here, as
@@ -51,17 +47,13 @@ be performed instantly.  If the given file contains anything (a valid
 certificate, with or without the completed proof-of-work) there is no
 need to supply the "\-R" option or to still have the private key of
 the ego to perform the revocation.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and
 ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 
diff --git a/doc/man/gnunet-scalarproduct.1 b/doc/man/gnunet-scalarproduct.1
index 1c8938daf..34d5e4ef0 100644
--- a/doc/man/gnunet-scalarproduct.1
+++ b/doc/man/gnunet-scalarproduct.1
@@ -42,34 +42,26 @@ The protocol by definition relies on \fBAlice\fP and \fBBob\fP being
 benign, thus \fBBob\fP can arbitrarily falsify his information. Both
 peers collaborate to achieve a correct result.
 .SH OPTIONS
-.B
 .IP "\-e ELEMENTS, \-\-elements=ELEMENTS"
 The element-vector the vectorproduct should be computed over in signed
 decimal form, eg: \"42,1,-3,3,7\". Zero value elements will be automatically masked.
-.B
 .IP "\-m MASK, \-\-mask=MASK"
 Elements in the vector can be masked. There must be at least two
 elements left in the vector to compute a vectorproduct. Non-Zero
 values indicate an element is not maskes.
-.B
 .IP "\-k KEY, \-\-key=KEY"
 The session key, a shared string of arbitrary length from which the
 SID will be generated
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-p PEERID, \-\-peer=PEERID"
 The remote peer\'s ASCII-armored gnunet-peer ID as output by
 gnunet-peerinfo. If this option is not given, the peer will take the
 \fBBob\fP\'s role.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-scrypt.1 b/doc/man/gnunet-scrypt.1
index 79da8a263..545af37e9 100644
--- a/doc/man/gnunet-scrypt.1
+++ b/doc/man/gnunet-scrypt.1
@@ -7,31 +7,22 @@ gnunet\-scrypt \- Manipulate GNUnet proof of work files.
 .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"
 Number of bits to require for the proof of work.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-k FILE, \-\-keyfile=FILE"
 File with private key, otherwise default is used.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-l LOGFILE, \-\-logfile=LOGFILE"
 Configure logging to write logs to LOGFILE.
-.B
 .IP "\-o FILE, \-\-outfile=FILE"
 File with proof of work, otherwise default is used.
-.B
 .IP "\-t TIME, \-\-timeout=TIME"
 Time to wait between calculations.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-statistics.1 b/doc/man/gnunet-statistics.1
index e61a8493c..9b5d52ccc 100644
--- a/doc/man/gnunet-statistics.1
+++ b/doc/man/gnunet-statistics.1
@@ -12,37 +12,28 @@ various aspect of GNUnet's operation.  This tool only works if the
 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"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-n NAME,  \-\-name=NAME"
 Each statistic has a name that is unique with in its subsystem.  With
 this option, the output can be restricted to statistics that have a
 particular name.
-.B
 .IP "\-p,  \-\-persistent"
 When setting a value, make the value persistent.  If the value used to
 be persistent and this flag is not given, it will be marked as
 non\-persistent.
-.B
 .IP "\-s SUBSYSTEM,  \-\-subsystem=SUBSYSTEM"
 Statistics are kept for various subsystems.  With this option, the
 output can be restricted to a particular subsystem only.
-.B
 .IP "\-S SEPARATOR,  \-\-csv-separator=SEPARATOR"
 Specify a separator for generating csv-output.
-.B
 .IP "\-t TESTBED_PATH,  \-\-subsystem=TESTBED_PATH"
 When running testbed, you can get statistics of all peers with specefying the
 folder containing the data of all testbed nodes like \fBgnunet\-statistics -t /tmp/testbedARtmQv\fP.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-testbed-profiler.1 b/doc/man/gnunet-testbed-profiler.1
index b1dde99dd..7faacaee4 100644
--- a/doc/man/gnunet-testbed-profiler.1
+++ b/doc/man/gnunet-testbed-profiler.1
@@ -8,33 +8,24 @@ gnunet\-testbed\-profiler \- Profiling driver for the testbed.
 .SH DESCRIPTION
 \fBgnunet\-testbed\-profiler\fP is a command line profiling driver for the testbed.
 .SH OPTIONS
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-e COUNT,  \-\-num\-errors=COUNT"
 Tolerate COUNT number of continious timeout failures.
-.B
 .IP "\-H FILENAME,  \-\-hosts=FILENAME"
 Name of the file with the login information for the testbed.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-l LOGFILE, \-\-logfile=LOGFILE"
 Configure logging to write logs to LOGFILE.
-.B
 .IP "\-n, \-\-non\-interactive"
 Run profiler in non-interactive mode where upon testbed setup the
 profiler does not wait for a keystroke but continues to run until a
 termination signal is received.
-.B
 .IP "\-p COUNT, \-\-num\-peers=COUNT"
 Create COUNT number of peers.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-testing-run-service.1 b/doc/man/gnunet-testing-run-service.1
index 43fdb8ecf..29e6258de 100644
--- a/doc/man/gnunet-testing-run-service.1
+++ b/doc/man/gnunet-testing-run-service.1
@@ -17,13 +17,10 @@ is restarted with the same configuration.
 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"
 Name of the template configuration file to use (optional).
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-s SERVICE, \-\-service=SERVICE"
 Name of the service to run.
 .SH BUGS
diff --git a/doc/man/gnunet-testing.1 b/doc/man/gnunet-testing.1
index 357d0df44..8c5a1f208 100644
--- a/doc/man/gnunet-testing.1
+++ b/doc/man/gnunet-testing.1
@@ -9,34 +9,24 @@ gnunet\-testing \- 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"
 Create unique configuration files.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-H, \-\-hostkeys"
 Host key file.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-k, \-\-key"
 Create hostkey files from pre-computed hostkey list.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-l LOGFILE, \-\-logfile=LOGFILE"
 Configure logging to write logs to LOGFILE.
-.B
 .IP "\-n, \-\-number"
 Number of unique configuration files or hostkeys to create.
-.B
 .IP "\-t, \-\-template"
 Configuration template.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-unindex.1 b/doc/man/gnunet-unindex.1
index 6aee4f62e..580bdb4c2 100644
--- a/doc/man/gnunet-unindex.1
+++ b/doc/man/gnunet-unindex.1
@@ -28,7 +28,6 @@ You can only unindex files that you indexed and that you still have
 available locally in full.  You should use gnunet\-unindex on files
 that you indexed (not inserted) and that you are going to delete or
 move locally.
-.TP
 .SH FILES
 .TP
 ~/.config/gnunet.conf
diff --git a/doc/man/gnunet-uri.1 b/doc/man/gnunet-uri.1
index 2fe1a05d2..5121fc5c8 100644
--- a/doc/man/gnunet-uri.1
+++ b/doc/man/gnunet-uri.1
@@ -11,16 +11,12 @@ 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"
 Use the configuration file FILENAME.
-.B
 .IP "\-h, \-\-help"
 Print short help on options.
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS
diff --git a/doc/man/gnunet-vpn.1 b/doc/man/gnunet-vpn.1
index ddb53a7bd..76ce52cb4 100644
--- a/doc/man/gnunet-vpn.1
+++ b/doc/man/gnunet-vpn.1
@@ -23,56 +23,43 @@ 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"
 Desired IP address on this end of the tunnel should be an IPv4 address.
-.B
 .IP "\-6, \-\-ipv6"
 Desired IP address on this end of the tunnel should be an IPv6 address.
-.B
 .IP "\-c FILENAME,  \-\-config=FILENAME"
 Use the configuration file FILENAME.
-.B
 .IP "\-d TIME, \-\-duration 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".
 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 here, even in
 combination with "\-4" (4to6) and similarly you can specify an IPv4
 address in combination with "\-6" (6to4).
-.B
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 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 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 conjunction with "\-i", requires "\-p".
-.B
 .IP "\-t, \-\-tcp"
 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".
-.B
 .IP "\-V, \-\-verbose"
 Be verbose.
-.B
 .IP "\-v, \-\-version"
 Print GNUnet version number.
 .SH BUGS