--- gvpe/doc/gvpe.conf.5	2005/01/10 19:21:06	1.3
+++ gvpe/doc/gvpe.conf.5	2005/03/03 07:24:57	1.6
@@ -129,13 +129,12 @@
 .\" ========================================================================
 .\"
 .IX Title "GVPE.CONF 5"
-.TH GVPE.CONF 5 "2004-12-04" "1.7" "GNU Virtual Private Ethernet"
+.TH GVPE.CONF 5 "2005-03-01" "1.7" "GNU Virtual Private Ethernet"
 .SH "NAME"
 gvpe.conf \- configuration file for the GNU VPE daemon
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
-.Vb 4
-\&   enable-udp = yes
+.Vb 3
 \&   udp-port = 407
 \&   mtu = 1492
 \&   ifname = vpn0
@@ -422,12 +421,14 @@
 is only 38 bytes, as opposed to \s-1UDP\s0's 58 (or \s-1TCP\s0's 60+).
 .IP "enable-udp = yes|true|on | no|false|off" 4
 .IX Item "enable-udp = yes|true|on | no|false|off"
-Enable the UDPv4 transport using the \f(CW\*(C`udp\-port\*(C'\fR port (default: \f(CW\*(C`yes\*(C'\fR,
-but this will change!). This is a good general choice since \s-1UDP\s0 tunnels
-well through many firewalls.
-.Sp
-\&\s-1NOTE:\s0 Please specify \f(CW\*(C`enable\-udp = yes\*(C'\fR even though it is the default, as
-some future version will have all protocols disabled by default.
+Enable the UDPv4 transport using the \f(CW\*(C`udp\-port\*(C'\fR port (default: \f(CW\*(C`no\*(C'\fR,
+unless no other protocol is enabled for a node, in which case this
+protocol is enabled automatically). This is a good general choice since
+\&\s-1UDP\s0 tunnels well through many firewalls.
+.Sp
+\&\s-1NOTE:\s0 Please specify \f(CW\*(C`enable\-udp = yes\*(C'\fR if you want t use it even though
+it might get switched on automatically, as some future version might
+default to another default protocol.
 .IP "enable-tcp = yes|true|on | no|false|off" 4
 .IX Item "enable-tcp = yes|true|on | no|false|off"
 Enable the TCPv4 transport using the \f(CW\*(C`tcp\-port\*(C'\fR port
@@ -482,20 +483,20 @@
 .SH "CONFIG DIRECTORY LAYOUT"
 .IX Header "CONFIG DIRECTORY LAYOUT"
 The default (or recommended) directory layout for the config directory is:
-.IP "gvpe.conf" 4
-.IX Item "gvpe.conf"
+.IP "\(bu" 4
+.IX Xref "gvpe.conf"
 The config file.
-.IP "if-up" 4
-.IX Item "if-up"
+.IP "\(bu" 4
+.IX Xref "if-up"
 The if-up script
-.IP "node\-up, node-down" 4
-.IX Item "node-up, node-down"
+.IP "," 4
+.IX Xref "node-up node-down"
 If used the node up or node-down scripts.
-.IP "hostkey" 4
-.IX Item "hostkey"
+.IP "\(bu" 4
+.IX Xref "hostkey"
 The private key (taken from \f(CW\*(C`hostkeys/nodename\*(C'\fR) of the current host.
-.IP "pubkey/nodename" 4
-.IX Item "pubkey/nodename"
+.IP "\(bu" 4
+.IX Xref "pubkey nodename"
 The public keys of the other nodes, one file per node.
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"