From: Matthijs Mekking <matthijs@isc.org>
Date: Tue, 8 Dec 2020 14:19:21 +0000 (+0100)
Subject: Add notes for [#1086]
X-Git-Tag: v9.17.10~31^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d96350f4f23be4a76419357f6fe2c168716dd51;p=thirdparty%2Fbind9.git

Add notes for [#1086]

Mention the configuration cleanup.
---

diff --git a/CHANGES b/CHANGES
index aac6b48b55a..7652c6860b5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
-5563.	[cleanup]	Clean up the number of clause flags [GL #1086].
+5563.	[cleanup]	Changed several obsolete configuration options to
+			ancient, making them into fatal errors. Also cleaned
+			up the number of clause flags in the configuration
+			parser. [GL #1086]
 
 5562.	[placeholder]
 
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index eec08c3a79c..95a441124dc 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -29,7 +29,17 @@ New Features
 Removed Features
 ~~~~~~~~~~~~~~~~
 
-- None.
+- A number of non-working configuration options that had been marked
+  as obsolete in previous releases have now been removed completely.
+  Using any of the following options is now considered a configuration
+  failure:
+  ``acache-cleaning-interval``, ``acache-enable``, ``additional-from-auth``,
+  ``additional-from-cache``, ``allow-v6-synthesis``, ``cleaning-interval``,
+  ``dnssec-enable``, ``dnssec-lookaside``, ``filter-aaaa``,
+  ``filter-aaaa-on-v4``, ``filter-aaaa-on-v6``, ``geoip-use-ecs``, ``lwres``,
+  ``max-acache-size``, ``nosit-udp-size``, ``queryport-pool-ports``,
+  ``queryport-pool-updateinterval``, ``request-sit``, ``sit-secret``,
+  ``support-ixfr``, ``use-queryport-pool``, ``use-ixfr``. [GL #1086]
 
 Feature Changes
 ~~~~~~~~~~~~~~~