- Fix #502: explain that do-ip6 disable does not stop AAAA lookups,

  but it stops the use of the ipv6 transport layer for DNS traffic.

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

diff --git a/doc/Changelog b/doc/Changelog
index 9bda05fbc72a3f443681c68767df99e486cd5c4f..856e20490f1ce050f585e0a0ceb328f9e653d0a8 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+11 April 2014: Wouter
+       - Fix #502: explain that do-ip6 disable does not stop AAAA lookups,
+         but it stops the use of the ipv6 transport layer for DNS traffic.
+
 10 April 2014: Wouter
        - iana portlist updated.
        - Patch from Hannes Frederic Sowa for Linux 3.15 fragmentation

diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index 1b9502a4fbc00a5487128f05f1201c78db41434d..aae24e2d2388da6ad3de37db8f089d107a5aae4c 100644 (file)
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -310,7 +310,9 @@ Enable or disable whether ip4 queries are answered or issued. Default is yes.
 .B do\-ip6: \fI<yes or no>
 Enable or disable whether ip6 queries are answered or issued. Default is yes.
 If disabled, queries are not answered on IPv6, and queries are not sent on
-IPv6 to the internet nameservers.
+IPv6 to the internet nameservers.  With this option you can disable the
+ipv6 transport for sending DNS traffic, it does not impact the contents of
+the DNS traffic, which may have ip4 and ip6 addresses in it.
 .TP
 .B do\-udp: \fI<yes or no>
 Enable or disable whether UDP queries are answered or issued. Default is yes.