--- gvpe/doc/gvpe.conf.5.pod	2010/09/10 21:13:52	1.25
+++ gvpe/doc/gvpe.conf.5.pod	2011/03/06 19:40:27	1.28
@@ -30,19 +30,50 @@
 after any directives. Whitespace is allowed around the C<=> sign or after
 values, but not within the variable names or values themselves.
 
-The only exception to the above is the "on" directive that can prefix any
-C<name = value> setting and will only "execute" it on the named node, or
-(if the nodename starts with "!") on all nodes except the named one.
+All settings are applied "in order", that is, later settings of the same
+variable overwrite earlier ones.
+
+The only exceptions to the above are the "on" and "include" directives:
+
+=over 4
+
+=item on nodename ...
 
-For example, set the MTU to C<1450> everywhere, loglevel to C<noise> on
-branch1, and connect to C<ondemand> everywhere but on branch2:
+=item on !nodename ...
+
+You can prefix any configuration directive with C<on> and a nodename. GVPE
+will will only "execute" it on the named node, or (if the nodename starts
+with C<!>) on all nodes except the named one.
+
+Example: set the MTU to C<1450> everywhere, C<loglevel> to C<noise> on
+C<branch1>, and C<connect> to C<ondemand> everywhere but on branch2.
 
    mtu = 1450
    on branch1 loglevel = noise
    on !branch2 connect = ondemand
 
-All settings are applied "in order", that is, later settings of the same
-variable overwrite earlier ones.
+=item include relative-or-absolute-path
+
+Reads the specified file (the path must not contain whitespace or C<=>
+characters) and evaluate all config directives in it as if they were
+spelled out in place of the C<include> directive.
+
+The path is a printf format string, that is, you must escape any C<%>
+by doubling it, and you can have a single C<%s> inside, which will be
+replaced by the current nodename.
+
+Relative paths are interpreted relative to the GVPE config directory.
+
+Example: include the file F<local.conf> in the config directory on every
+node.
+
+   include local.conf
+
+Example: include a file F<conf/>nodenameF<.conf>
+
+   include conf/%s.conf
+
+=back
 
 =head1 ANATOMY OF A CONFIG FILE
 
@@ -79,6 +110,15 @@
 The port where the C<dns-forw-host> is to be contacted (default: C<53>,
 which is fine in most cases).
 
+=item dns-case-preserving = yes|true|on | no|false|off
+
+Sets whether the DNS transport forwarding server preserves case (DNS
+servers have to, but some access systems are even more broken than others)
+(default: true).
+
+Normally, when the forwarding server changes the case of domain names then
+GVPE will automatically set this to false.
+
 =item dns-max-outstanding = integer-number-of-requests
 
 The maximum number of outstanding DNS transport requests
@@ -426,9 +466,12 @@
 
 =item compress = yes|true|on | no|false|off
 
-Wether to compress data packets sent to this node (default: C<yes>).
-Compression is really cheap even on slow computers and has no size
-overhead at all, so enabling this is often a good idea.
+For the current node, this specified whether it will accept compressed
+packets, and for all other nodes, this specifies whether to try to
+compress data packets sent to this node (default: C<yes>). Compression is
+really cheap even on slow computers, has no size overhead at all and will
+only be used when the other side supports compression, so enabling this is
+often a good idea.
 
 =item connect = ondemand | never | always | disabled
 
@@ -529,13 +572,7 @@
 
 See gvpe.protocol(7) for a description of the UDP transport protocol.
 
-Enable the UDPv4 transport using the C<udp-port> port (default: C<no>,
-unless no other protocol is enabled for a node, in which case this
-protocol is enabled automatically).
-
-NOTE: Please specify C<enable-udp = yes> if you want to use it even though
-it might get switched on automatically, as some future version might
-default to another default protocol.
+Enable the UDPv4 transport using the C<udp-port> port (default: C<no>).
 
 =item hostname = hostname | ip    [can not be defaulted]
 
@@ -564,7 +601,7 @@
 
 =item inherit-tos = yes|true|on | no|false|off
 
-Wether to inherit the TOS settings of packets sent to the tunnel when
+Whether to inherit the TOS settings of packets sent to the tunnel when
 sending packets to this node (default: C<yes>). If set to C<yes> then
 outgoing tunnel packets will have the same TOS setting as the packets sent
 to the tunnel device, which is usually what you want.