- re-documented localzone tags in example.conf.

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

diff --git a/doc/Changelog b/doc/Changelog
index 903f3ab6726cd3651414f22b2f1fbbcfe1555e35..62e639ddbbe306c8efa0d8f8e5f95dbf72c08903 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -6,6 +6,7 @@
        - tag for release 1.5.9rc1.
        - Fix (for 1.5.10): Fix unbound-anchor.exe file location defaults to
          Program Files with (x86) appended.
+       - re-documented localzone tags in example.conf.
 
 31 May 2016: Wouter
        - Fix windows service to be created run with limited rights, as a

diff --git a/doc/example.conf.in b/doc/example.conf.in
index 2edfcd10ea08e3975dce94b7afb907cdcea22e2f..179008f45d9ed72c1c8ccae11f4f359a1110c93b 100644 (file)
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -484,6 +484,10 @@ server:
        # plain value in bytes or you can append k, m or G. default is "1Mb".
        # neg-cache-size: 1m
 
+       # define a number of tags here, you can use them to tag localzones.
+       # repeat the define-tag statement to add additional tags.
+       # define-tag: "tag1 tag2 tag3"
+
        # By default, for a number of zones a small default 'nothing here'
        # reply is built-in.  Query traffic is thus blocked.  If you
        # wish to serve such zone you can unblock them by uncommenting one
@@ -576,6 +580,9 @@ server:
        # you need to do the reverse notation yourself.
        # local-data-ptr: "192.0.2.3 www.example.com"
 
+       # tag a localzone with a list of tag names (in "" with spaces between)
+       # local-zone-tag: "example.com" "tag2 tag3"
+
        # service clients over SSL (on the TCP sockets), with plain DNS inside
        # the SSL stream.  Give the certificate to use and private key.
        # default is "" (disabled).  requires restart to take effect.