From: Wouter Wijngaards Date: Wed, 19 Oct 2016 07:15:41 +0000 (+0000) Subject: - Fix #1130: whitespace in example.conf.in more consistent. X-Git-Tag: release-1.6.0rc1~63 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4621d209ca779e4eccef3f23016251eb7d674cd6;p=thirdparty%2Funbound.git - Fix #1130: whitespace in example.conf.in more consistent. git-svn-id: file:///svn/unbound/trunk@3894 be551aaa-1e26-0410-a405-d3ace91eadb9 --- diff --git a/doc/Changelog b/doc/Changelog index bafc194f8..c47d19c60 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +19 October 2016: Wouter + - Fix #1130: whitespace in example.conf.in more consistent. + 18 October 2016: Wouter - Patch that resolves CNAMEs entered in local-data conf statements that point to data on the internet, from Jinmei Tatuya (Infoblox). diff --git a/doc/example.conf.in b/doc/example.conf.in index 3761270af..2892e041d 100644 --- a/doc/example.conf.in +++ b/doc/example.conf.in @@ -52,7 +52,7 @@ server: # outgoing-interface: 192.0.2.153 # outgoing-interface: 2001:DB8::5 # outgoing-interface: 2001:DB8::6 - + # Specify a netblock to use remainder 64 bits as random bits for # upstream queries. Uses freebind option (Linux). # outgoing-interface: 2001:DB8::/64 @@ -171,7 +171,7 @@ server: # the maximum number of hosts that are cached (roundtrip, EDNS, lame). # infra-cache-numhosts: 10000 - + # define a number of tags here, use with local-zone, access-control. # repeat the define-tag statement to add additional tags. # define-tag: "tag1 tag2 tag3" @@ -331,7 +331,7 @@ server: # Harden against queries that fall under dnssec-signed nxdomain names. # harden-below-nxdomain: no - # Harden the referral path by performing additional queries for + # Harden the referral path by performing additional queries for # infrastructure data. Validates the replies (if possible). # Default off, because the lookups burden the server. Experimental # implementation of draft-wijngaards-dnsext-resolver-side-mitigation. @@ -346,7 +346,7 @@ server: # privacy. Only sent minimum required labels of the QNAME and set QTYPE # to NS when possible. # qname-minimisation: no - + # QNAME minimisation in strict mode. Do not fall-back to sending full # QNAME to potentially broken nameservers. A lot of domains will not be # resolvable when this option in enabled. @@ -734,7 +734,7 @@ remote-control: # and local-data options. Options from matching views will override global # options. Global options will be used if no matching view is found. # With view-first yes, it will try to answer using the global local-zone and -# local-data elements if there is no view specific match. +# local-data elements if there is no view specific match. # view: # name: "viewname" # local-zone: "example.com" redirect