From: Ralph Dolmans Date: Thu, 25 Aug 2016 08:40:42 +0000 (+0000) Subject: Clarify local-zone-override entry in unbound.conf.5 X-Git-Tag: release-1.5.10~29 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=536cf2364d981609adab4bd35d2352d357fa074d;p=thirdparty%2Funbound.git Clarify local-zone-override entry in unbound.conf.5 git-svn-id: file:///svn/unbound/trunk@3836 be551aaa-1e26-0410-a405-d3ace91eadb9 --- diff --git a/doc/Changelog b/doc/Changelog index c041b39ba..445fef7a9 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,4 +1,7 @@ 25 August 2016: Ralph + - Clarify local-zone-override entry in unbound.conf.5 + +25 August 2016: Wouter - 64bit build option for makedist windows compile, -w64. 24 August 2016: Ralph diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in index 7e9a85bdb..e80f187e3 100644 --- a/doc/unbound.conf.5.in +++ b/doc/unbound.conf.5.in @@ -1121,8 +1121,9 @@ used access-control element has a matching tag. Tags must be defined in tags. .TP 5 .B local\-zone\-override: \fI -Override the localzone type for queries from addresses matching netblock. -Overrides types configured in both tagged and untagged localzones, and +Override the localzone type for queries from addresses matching netblock. +Use this localzone type, regardless the type configured for the local-zone +(both tagged and untagged) and regardless the type configured using access\-control\-tag\-action. .TP 5 .B ratelimit: \fI