- Fix #1170: document that 'inform' local-zone uses local-data.

git-svn-id: file:///svn/unbound/trunk@3944 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 3e0c388bc611befc06750f94a13f670ba5d03add..81ecca31fcecc90949019802719ee1d09a73dcab 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+5 December 2016: Wouter
+       - Fix #1170: document that 'inform' local-zone uses local-data.
+
  1 December 2016: Ralph
        - hyphen as minus fix, by Andreas Schulze
 

diff --git a/doc/example.conf.in b/doc/example.conf.in
index 7255bdb655baf0e969467565a6c498fdbd426871..a8d61d3a26a930accde047fc6d77b314e4b5c9a2 100644 (file)
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -595,7 +595,7 @@ server:
        # o redirect serves the zone data for any subdomain in the zone.
        # o nodefault can be used to normally resolve AS112 zones.
        # o typetransparent resolves normally for other types and other names
-       # o inform resolves normally, but logs client IP address
+       # o inform acts like transparent, but logs client IP address
        # o inform_deny drops queries and logs client IP address
        # o always_transparent, always_refuse, always_nxdomain, resolve in
        #   that way but ignore local data for that name.

diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index 71a86966048951326d969917156a015ecfdd292a..755558acc8d23ae7c2288d3e6e6c4f64a68d3844 100644 (file)
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -1001,11 +1001,11 @@ queries for www.example.com and www.foo.example.com are redirected, so
 that users with web browsers cannot access sites with suffix example.com.
 .TP 10
 \h'5'\fIinform\fR 
-The query is answered normally.  The client IP address (@portnumber)
-is printed to the logfile.  The log message is: timestamp, unbound-pid,
-info: zonename inform IP@port queryname type class.  This option can be
-used for normal resolution, but machines looking up infected names are
-logged, eg. to run antivirus on them.
+The query is answered normally, same as transparent.  The client IP
+address (@portnumber) is printed to the logfile.  The log message is:
+timestamp, unbound-pid, info: zonename inform IP@port queryname type
+class.  This option can be used for normal resolution, but machines
+looking up infected names are logged, eg. to run antivirus on them.
 .TP 10
 \h'5'\fIinform_deny\fR 
 The query is dropped, like 'deny', and logged, like 'inform'.  Ie. find