Merge branch 'master' into 1.1

diff --git a/THANKS b/THANKS
index 0e7e692..f7e45bb 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -31,6 +31,7 @@ We would like to thank the following people for their contributions to tinc:
 * Matias Carrasco
 * Max Rijevski
 * Menno Smits
+* Mesar Hameed
 * Michael Tokarev
 * Miles Nordin
 * Nick Hibma

diff --git a/doc/tinc.conf.5.in b/doc/tinc.conf.5.in
index 40b013b..861ff68 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
-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.

diff --git a/doc/tinc.texi b/doc/tinc.texi
index fb1cd38..40a297a 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}>