From ebe83bed9c46f4da28ee29f24ff1718a2d07c9fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Wed, 12 May 2021 09:09:43 +0200
Subject: [PATCH 1/4] Tweak and reword recent CHANGES entries

---
 CHANGES | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 048bec16e1..372c422c7e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,11 +1,12 @@
-5631.	[bug]		Update ZONEMD to match RFC 8976. [GL #2658]
+5631.	[protocol]	Update the implementation of the ZONEMD RR type to match
+			RFC 8976. [GL #2658]
 
-5630.	[func]		Treat DNSSEC responses with NSEC3 iterations greater
-			than 150 as insecure. [GL #2445]
+5630.	[func]		Treat DNSSEC responses containing NSEC3 records with
+			iteration counts greater than 150 as insecure.
+			[GL #2445]
 
-5629.	[func]		Reduce the supported maximum number of iterations
-			that can be configured in an NSEC3 zone to 150.
-			[GL #2642]
+5629.	[func]		Reduce the maximum supported number of NSEC3 iterations
+			that can be configured for a zone to 150. [GL #2642]
 
 	--- 9.11.31 released ---
 

From 3736bc9604ba945fcf5bfdd2500daa631f1e67f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Wed, 12 May 2021 09:09:43 +0200
Subject: [PATCH 2/4] Tweak and reword release notes

---
 doc/arm/notes-9.11.32.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/arm/notes-9.11.32.xml b/doc/arm/notes-9.11.32.xml
index 00a6941073..a588656579 100644
--- a/doc/arm/notes-9.11.32.xml
+++ b/doc/arm/notes-9.11.32.xml
@@ -55,14 +55,14 @@
     <itemizedlist>
       <listitem>
         <para>
-          Reduce the supported maximum number of iterations that can be
-          configured in an NSEC3 zones to 150. [GL #2642]
+          The maximum supported number of NSEC3 iterations that can be
+          configured for a zone has been reduced to 150. [GL #2642]
         </para>
       </listitem>
       <listitem>
         <para>
-	  Treat DNSSEC responses with NSEC3 iterations greater than 150 as
-	  insecure. [GL #2445]
+          DNSSEC responses containing NSEC3 records with iteration counts
+          greater than 150 are now treated as insecure. [GL #2445]
         </para>
       </listitem>
     </itemizedlist>
@@ -72,7 +72,8 @@
     <itemizedlist>
       <listitem>
         <para>
-          Update ZONEMD to match RFC 8976. [GL #2658]
+          The implementation of the ZONEMD RR type has been updated to match RFC
+          8976. [GL #2658]
         </para>
       </listitem>
     </itemizedlist>

From f722b35c6e372486a95410e29f53e9ceeef8368a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Wed, 12 May 2021 09:09:43 +0200
Subject: [PATCH 3/4] Reorder release notes

---
 doc/arm/notes-9.11.32.xml | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/doc/arm/notes-9.11.32.xml b/doc/arm/notes-9.11.32.xml
index a588656579..0bccea854b 100644
--- a/doc/arm/notes-9.11.32.xml
+++ b/doc/arm/notes-9.11.32.xml
@@ -53,23 +53,18 @@
 
   <section xml:id="relnotes-9.11.32-changes"><info><title>Feature Changes</title></info>
     <itemizedlist>
-      <listitem>
-        <para>
-          The maximum supported number of NSEC3 iterations that can be
-          configured for a zone has been reduced to 150. [GL #2642]
-        </para>
-      </listitem>
       <listitem>
         <para>
           DNSSEC responses containing NSEC3 records with iteration counts
           greater than 150 are now treated as insecure. [GL #2445]
         </para>
       </listitem>
-    </itemizedlist>
-  </section>
-
-  <section xml:id="relnotes-9.11.32-bugs"><info><title>Bug Fixes</title></info>
-    <itemizedlist>
+      <listitem>
+        <para>
+          The maximum supported number of NSEC3 iterations that can be
+          configured for a zone has been reduced to 150. [GL #2642]
+        </para>
+      </listitem>
       <listitem>
         <para>
           The implementation of the ZONEMD RR type has been updated to match RFC
@@ -79,4 +74,14 @@
     </itemizedlist>
   </section>
 
+  <section xml:id="relnotes-9.11.32-bugs"><info><title>Bug Fixes</title></info>
+    <itemizedlist>
+      <listitem>
+        <para>
+          None.
+        </para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
 </section>

From c7dd6b4b2e6546b0b04350d2e1dcfa90609d6567 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Wed, 12 May 2021 09:09:43 +0200
Subject: [PATCH 4/4] Prepare release notes for BIND 9.11.32

---
 doc/arm/notes-9.11.32.xml | 50 ---------------------------------------
 1 file changed, 50 deletions(-)

diff --git a/doc/arm/notes-9.11.32.xml b/doc/arm/notes-9.11.32.xml
index 0bccea854b..06b8fefecc 100644
--- a/doc/arm/notes-9.11.32.xml
+++ b/doc/arm/notes-9.11.32.xml
@@ -11,46 +11,6 @@
 
 <section xml:id="relnotes-9.11.32"><info><title>Notes for BIND 9.11.32</title></info>
 
-  <section xml:id="relnotes-9.11.32-security"><info><title>Security Fixes</title></info>
-    <itemizedlist>
-      <listitem>
-        <para>
-          None.
-        </para>
-      </listitem>
-    </itemizedlist>
-  </section>
-
-  <section xml:id="relnotes-9.11.32-known"><info><title>Known Issues</title></info>
-    <itemizedlist>
-      <listitem>
-        <para>
-          None.
-        </para>
-      </listitem>
-    </itemizedlist>
-  </section>
-
-  <section xml:id="relnotes-9.11.32-new"><info><title>New Features</title></info>
-    <itemizedlist>
-      <listitem>
-        <para>
-          None.
-        </para>
-      </listitem>
-    </itemizedlist>
-  </section>
-
-  <section xml:id="relnotes-9.11.32-removed"><info><title>Removed Features</title></info>
-    <itemizedlist>
-      <listitem>
-        <para>
-          None.
-        </para>
-      </listitem>
-    </itemizedlist>
-  </section>
-
   <section xml:id="relnotes-9.11.32-changes"><info><title>Feature Changes</title></info>
     <itemizedlist>
       <listitem>
@@ -74,14 +34,4 @@
     </itemizedlist>
   </section>
 
-  <section xml:id="relnotes-9.11.32-bugs"><info><title>Bug Fixes</title></info>
-    <itemizedlist>
-      <listitem>
-        <para>
-          None.
-        </para>
-      </listitem>
-    </itemizedlist>
-  </section>
-
 </section>