Patch #33: ResolverConfiguration documentation fixes from Scott Kitte…

…rman.
trusteddomainproject · Apr 29, 2015 · b177428 · b177428
1 parent 8ebcc5e
commit b177428
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/contrib/docs/chroot b/contrib/docs/chroot
@@ -32,13 +32,13 @@ is really present.
 setting up resolving
 ====================
 The next point is only required if opendkim is compiled with the optional code
-option "USE_UNBOUND" and you activated "UnboundConfigFile" in opendkim.conf.
+option "USE_UNBOUND" and you activated "ResolverConfiguration" in opendkim.conf.
 Then you must place the unbound configuration file inside /path/to/chroot. If
 your unbound.conf includes other files such dnssec keys, these file must also
 be placed inside /path/to/chroot.
 
   opendkim.conf:
-  UnboundConfigFile	/inside_chroot/unbound.conf
+  ResolverConfiguration	/inside_chroot/unbound.conf
 
 setup entropie
 ==============

diff --git a/opendkim/opendkim.conf.sample b/opendkim/opendkim.conf.sample
@@ -731,15 +731,6 @@ Syslog			Yes
 
 # UMask			022
 
-##  UnboundConfigFile filename
-##  	default (none)
-##
-##  Specifies a configuration file to be passed to the Unbound library that
-##  performs DNS queries applying the DNSSEC protocol.  See the Unbound
-##  documentation at http://unbound.net for the expected content of this file.
-##  The results of using this and the TrustAnchorFile setting at the same
-## time are undefined.
-
 # UnboundConfigFile	/var/named/unbound.conf
 
 ##  Userid userid