From: Ondřej Surý <ondrej@sury.org>
Date: Thu, 16 Sep 2021 11:03:35 +0000 (+0200)
Subject: Add CHANGES and release note for [GL #2882] (removal)
X-Git-Tag: v9.17.19~31^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c6e5a4bbc37a38c4a607eadffa5f1368c69e9f4e;p=thirdparty%2Fbind9.git

Add CHANGES and release note for [GL #2882] (removal)
---

diff --git a/CHANGES b/CHANGES
index fa06d6c91df..6734103c293 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,5 @@
-5719.	[func]		The "masterfile-format" format "map" has been marked
-			as deprecated.  The "map" format will be permanently
-			removed in a future release. [GL #2882]
+5719.	[func]		The "masterfile-format" format "map" has been removed.
+			[GL #2882]
 
 5718.	[bug]		Changing the sig signing type, by specifing
 			sig-signing-type, failed as the configuration was
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 081dc00deb2..91d666e96ce 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -32,6 +32,11 @@ Removed Features
 - Native PKCS#11 support has been removed; BIND 9 now uses OpenSSL engine_pkcs11 from the
   OpenSC project. :gl:`#2691`
 
+- The ``masterfile-format`` format ``map`` has removed.  If you are using the
+  ``map`` format, you are advised to convert the zones to ``raw`` format with
+  ``named-compilezone`` and change the configuration prior to BIND 9
+  upgrade. :gl:`#2882`
+
 Feature Changes
 ~~~~~~~~~~~~~~~
 
@@ -47,9 +52,6 @@ Feature Changes
   9.16.0 but no error was reported, although sending UDP messages
   (such as notifies) would fail. :gl:`#2888`
 
-- The ``masterfile-format`` format ``map`` has been marked as deprecated and
-  will be removed in a future release. :gl:`#2882`
-
 Bug Fixes
 ~~~~~~~~~