Changelog note for #519 and example.conf edit

- Merge #519: Support for selective enabling tcp-upstream for
  stub/forward zones.
- For #519: note stub-tcp-upstream and forward-tcp-upstream in
  the example configuration file.

diff --git a/doc/Changelog b/doc/Changelog
index 8a420d77045f46155378b214cf22da217c00fb52..15b0db32cedab5f6bba6dff69f3aa9cd7252e623 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,10 @@
        - Add test tool readzone to .gitignore.
        - Merge #521: Update mini_event.c.
        - Merge #523: fix: free() call more than once with the same pointer.
+       - Merge #519: Support for selective enabling tcp-upstream for
+         stub/forward zones.
+       - For #519: note stub-tcp-upstream and forward-tcp-upstream in
+         the example configuration file.
 
 5 August 2021: Wouter
        - Tag for 1.13.2rc1 release.

diff --git a/doc/example.conf.in b/doc/example.conf.in
index e13c3ad241b849b6f8137cb946a364ba387068b0..a7287ec5e7d713d56919866851e72971d502359d 100644 (file)
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -987,6 +987,7 @@ remote-control:
 #      stub-addr: 192.0.2.68
 #      stub-prime: no
 #      stub-first: no
+#      stub-tcp-upstream: no
 #      stub-tls-upstream: no
 #      stub-no-cache: no
 # stub-zone:
@@ -1004,6 +1005,7 @@ remote-control:
 #      forward-addr: 192.0.2.68
 #      forward-addr: 192.0.2.73@5355  # forward to port 5355.
 #      forward-first: no
+#      forward-tcp-upstream: no
 #      forward-tls-upstream: no
 #      forward-no-cache: no
 # forward-zone: