Merge branch 'master' into 1.1

[meshlink] / doc / tinc.conf.5.in

diff --git a/doc/tinc.conf.5.in b/doc/tinc.conf.5.in
index 40b013b607e2c2e3f4667e71afab93d1f51eb7eb..861ff680c364a6f78e69c74df9f045ea39e85c63 100644 (file)
--- a/doc/tinc.conf.5.in
+++ b/doc/tinc.conf.5.in
@@ -355,7 +355,7 @@ a lookup if your DNS server is not responding.
 
 .Pp
 This does not affect resolving hostnames to IP addresses from the
 
 .Pp
 This does not affect resolving hostnames to IP addresses from the

-host configuration files.
+host configuration files, but whether hostnames should be resolved while logging.

 
 .It Va IffOneQueue Li = yes | no Po no Pc Bq experimental
 (Linux only) Set IFF_ONE_QUEUE flag on TUN/TAP devices.
 
 .It Va IffOneQueue Li = yes | no Po no Pc Bq experimental
 (Linux only) Set IFF_ONE_QUEUE flag on TUN/TAP devices.