1 files changed, 17 insertions, 35 deletions
diff --git a/doc/man/gnunet-nat-auto.1 b/doc/man/gnunet-nat-auto.1
index ca50d76fc..bc95972c4 100644
--- a/doc/man/gnunet-nat-auto.1
+++ b/doc/man/gnunet-nat-auto.1
@@ -1,77 +1,59 @@
-.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>
 .SH SEE ALSO
 gnunet\-transport(1) gnunet\-nat(1)
+.PP
 The full documentation for
 .B gnunet
-is maintained as a Texinfo manual.  If the
+is maintained as a Texinfo manual.
+If the
 .B info
 and
 .B gnunet

diff --git a/doc/man/gnunet-nat-auto.1 b/doc/man/gnunet-nat-auto.1 index ca50d76fc..bc95972c4 100644 --- a/doc/man/gnunet-nat-auto.1 +++ b/doc/man/gnunet-nat-auto.1
@@ -1,77 +1,59 @@
1	.TH GNUNET\-NAT\-AUTO 1 "6 Jan 2017" "GNUnet"	1	.TH GNUNET-NAT-AUTO 1 "January 6, 2017" "GNUnet"
2
3	.SH NAME	2	.SH NAME
4	gnunet\-nat\-auto \- autoconfigure and test NAT traversal	3	gnunet\-nat\-auto \- autoconfigure and test NAT traversal
5
6	.SH SYNOPSIS	4	.SH SYNOPSIS
7	.B gnunet\-nat\-auto	5	.B gnunet\-nat\-auto
8	.RI [ options ]	6	.RI [ options ]
9	.br
10
11	.SH DESCRIPTION	7	.SH DESCRIPTION
12
13	This tool allows testing various NAT traversal functions, as well	8	This tool allows testing various NAT traversal functions, as well
14	as attempting auto\-configuration.	9	as attempting auto\-configuration.
15
16	.SH OPTIONS	10	.SH OPTIONS
17	.B	11	.B
18	.IP "\-a, \-\-auto"	12	.IP "\-a, \-\-auto"
19	Attempt auto\-configuration for NAT traversal.	13	Attempt auto\-configuration for NAT traversal.
20
21	.B	14	.B
22	.IP "\-c FILENAME, \-\-config=FILENAME"	15	.IP "\-c FILENAME, \-\-config=FILENAME"
23	Use the configuration file FILENAME.	16	Use the configuration file FILENAME.
24
25	.B	17	.B
26	.IP "\-S NAME, \-\-section=NAME"	18	.IP "\-S NAME, \-\-section=NAME"
27	Name of the configuration section with details about the configuration	19	Name of the configuration section with details about the configuration
28	to test. For example "transport-tcp".	20	to test. For example "transport-tcp".
29
30	.IP "\-t, \-\-tcp"	21	.IP "\-t, \-\-tcp"
31	Use TCP.	22	Use TCP.
32
33	.B	23	.B
34	.IP "\-u, \-\-udp"	24	.IP "\-u, \-\-udp"
35	Use UDP.	25	Use UDP.
36
37	.B	26	.B
38	.IP "\-w, \-\-write"	27	.IP "\-w, \-\-write"
39	Write configuration to configuration file, useful in combination with	28	Write configuration to configuration file, useful in combination with
40	autoconfiguration (\-a).	29	autoconfiguration (\-a).
41
42	.SH EXAMPLES	30	.SH EXAMPLES
43	.PP	31	.PP
44
45	\fBAutomatic configuration:\fR	32	\fBAutomatic configuration:\fR
46		33	.TP
47	Probe and write result to configuration:	34	# gnunet\-nat\-auto \-aw
48		35	Probe and write result to configuration
49	# gnunet\-nat\-auto \-aw	36	.PP
50
51
52	\fBTest configuration:\fR	37	\fBTest configuration:\fR
53		38	.TP
54	Test TCP configuration:	39	# gnunet\-nat\-auto -t \-S transport-tcp
55		40	Test TCP configuration
56	# gnunet\-nat\-auto -t \-S transport-tcp	41	.TP
57		42	# gnunet\-nat\-auto -t \-S transport-http
58	Test HTTP configuration:	43	Test HTTP configuration
59		44	.TP
60	# gnunet\-nat\-auto -t \-S transport-http	45	# gnunet\-nat\-auto -u \-S transport-udp
61		46	Test UDP configuration
62	Test UDP configuration:
63
64	# gnunet\-nat\-auto -u \-S transport-udp
65
66
67	.SH BUGS	47	.SH BUGS
68	Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending	48	Report bugs by using Mantis <https://gnunet.org/bugs/> or by sending
69	electronic mail to <gnunet\-developers@gnu.org>	49	electronic mail to <gnunet\-developers@gnu.org>
70	.SH SEE ALSO	50	.SH SEE ALSO
71	gnunet\-transport(1) gnunet\-nat(1)	51	gnunet\-transport(1) gnunet\-nat(1)
		52	.PP
72	The full documentation for	53	The full documentation for
73	.B gnunet	54	.B gnunet
74	is maintained as a Texinfo manual. If the	55	is maintained as a Texinfo manual.
		56	If the
75	.B info	57	.B info
76	and	58	and
77	.B gnunet	59	.B gnunet