- Fix #4240: Fix whitespace cleanup in example.conf.

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

diff --git a/doc/Changelog b/doc/Changelog
index 6e09400b32b72ea5feb2f32bc63610e658b16b94..7a07b999ae5958a941c86d605c84b36fcdd1fb31 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+21 March 2019: Wouter
+       - Fix #4240: Fix whitespace cleanup in example.conf.
+
 19 March 2019: Wouter
        - add type CAA to libpyunbound (accessing libunbound from python).
 

diff --git a/doc/example.conf.in b/doc/example.conf.in
index d09e5a79362e91e76c8f045ccacd6ef38b6d8ce9..c78156fe11819c6c138b64e9e28bc7c49bceec96 100644 (file)
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -492,7 +492,7 @@ server:
 
        # trust anchor signaling sends a RFC8145 key tag query after priming.
        # trust-anchor-signaling: yes
-       
+
        # Root key trust anchor sentinel (draft-ietf-dnsop-kskroll-sentinel)
        # root-key-sentinel: yes
 
@@ -721,7 +721,7 @@ server:
 
        # cipher setting for TLSv1.2
        # tls-ciphers: "DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256"
-       # cipher setting for TLSv1.3 
+       # cipher setting for TLSv1.3
        # tls-ciphersuites: "TLS_AES_128_GCM_SHA256:TLS_AES_128_CCM_8_SHA256:TLS_AES_128_CCM_SHA256:TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256"
 
        # Add the secret file for TLS Session Ticket.
@@ -793,7 +793,7 @@ server:
        # fast-server-permil: 0
        # the number of servers that will be used in the fast server selection.
        # fast-server-num: 3
-       
+
        # Specific options for ipsecmod. unbound needs to be configured with
        # --enable-ipsecmod for these to take effect.
        #
@@ -912,24 +912,24 @@ remote-control:
 # notifies.
 # auth-zone:
 #      name: "."
-#      master: 199.9.14.201         # b.root-servers.net       
-#      master: 192.33.4.12          # c.root-servers.net       
-#      master: 199.7.91.13          # d.root-servers.net       
-#      master: 192.5.5.241          # f.root-servers.net       
-#      master: 192.112.36.4         # g.root-servers.net       
-#      master: 193.0.14.129         # k.root-servers.net       
-#      master: 192.0.47.132         # xfr.cjr.dns.icann.org    
-#      master: 192.0.32.132         # xfr.lax.dns.icann.org    
-#      master: 2001:500:200::b      # b.root-servers.net       
-#      master: 2001:500:2::c        # c.root-servers.net       
-#      master: 2001:500:2d::d       # d.root-servers.net       
-#      master: 2001:500:2f::f       # f.root-servers.net       
-#      master: 2001:500:12::d0d     # g.root-servers.net       
-#      master: 2001:7fd::1          # k.root-servers.net       
-#      master: 2620:0:2830:202::132 # xfr.cjr.dns.icann.org    
-#      master: 2620:0:2d0:202::132  # xfr.lax.dns.icann.org    
-#      fallback-enabled: yes   
-#      for-downstream: no      
+#      master: 199.9.14.201         # b.root-servers.net
+#      master: 192.33.4.12          # c.root-servers.net
+#      master: 199.7.91.13          # d.root-servers.net
+#      master: 192.5.5.241          # f.root-servers.net
+#      master: 192.112.36.4         # g.root-servers.net
+#      master: 193.0.14.129         # k.root-servers.net
+#      master: 192.0.47.132         # xfr.cjr.dns.icann.org
+#      master: 192.0.32.132         # xfr.lax.dns.icann.org
+#      master: 2001:500:200::b      # b.root-servers.net
+#      master: 2001:500:2::c        # c.root-servers.net
+#      master: 2001:500:2d::d       # d.root-servers.net
+#      master: 2001:500:2f::f       # f.root-servers.net
+#      master: 2001:500:12::d0d     # g.root-servers.net
+#      master: 2001:7fd::1          # k.root-servers.net
+#      master: 2620:0:2830:202::132 # xfr.cjr.dns.icann.org
+#      master: 2620:0:2d0:202::132  # xfr.lax.dns.icann.org
+#      fallback-enabled: yes
+#      for-downstream: no
 #      for-upstream: yes
 # auth-zone:
 #      name: "example.org"