Merge branch 'master' into 1.1

[meshlink] / doc / tinc.texi

diff --git a/doc/tinc.texi b/doc/tinc.texi
index fb1cd381f2f4cb0ad7fa48caaf5a483b40c172c5..40a297a3e9531034224d746232c5e2ea39eda1e9 100644 (file)
--- a/doc/tinc.texi
+++ b/doc/tinc.texi
@@ -982,7 +982,7 @@ tinc's efficiency, even stopping the daemon for a few seconds everytime
 it does a lookup if your DNS server is not responding.
 
 This does not affect resolving hostnames to IP addresses from the
-configuration file.
+configuration file, but whether hostnames should be resolved while logging.
 
 @cindex Interface
 @item Interface = <@var{interface}>