From ad0d0b4d9c30883e580c67a8414502308da81e4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Mon, 11 Jan 2021 15:20:36 +0100
Subject: [PATCH 1/3] Tweak and reword recent CHANGES entries

---
 CHANGES | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index b3766c4164..9bb92f29b7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,12 +2,12 @@
 			enabling support for libmaxminddb was not working
 			correctly. This has been fixed. [GL #2366]
 
-5557.	[bug]		Prevent rbtdb instances being destroyed by multiple
-			threads at the same time. [GL #2355]
+5557.	[bug]		Prevent RBTDB instances from being destroyed by multiple
+			threads at the same time. [GL #2317]
 
-5548.	[bug]		When BIND 9 was compiled with --disable-threads and
-			--with-epoll, it was possible to trigger an assertion
-			failure due to a double lock. [GL !4454]
+5548.	[bug]		named exited with an assertion failure upon startup when
+			compiled with --disable-threads and --with-epoll.
+			[GL !4454]
 
 5547.	[bug]		BIND 9 failed to build with --disable-threads and
 			--with-geoip2. [GL #2324]

From f62cc34cd9c72de2e07b078c341a5e63f77a24b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Mon, 11 Jan 2021 15:20:36 +0100
Subject: [PATCH 2/3] Tweak and reword release notes

---
 doc/arm/notes-9.11.27.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/arm/notes-9.11.27.xml b/doc/arm/notes-9.11.27.xml
index 8a38dddcc6..264192715c 100644
--- a/doc/arm/notes-9.11.27.xml
+++ b/doc/arm/notes-9.11.27.xml
@@ -65,8 +65,10 @@
     <itemizedlist>
       <listitem>
         <para>
-          Prevent rbtdb instances being destroyed by multiple threads at the same
-          time. This can trigger assertion failures. [GL #2355]
+          Multiple threads could attempt to destroy a single RBTDB instance at
+          the same time, resulting in an unpredictable but low-probability
+          assertion failure in <filename>free_rbtdb()</filename>. This has been
+          fixed. [GL #2317]
         </para>
       </listitem>
     </itemizedlist>

From 545c4fe44e982e1e2d578b7482a14f410ef5fdf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Mon, 11 Jan 2021 15:20:36 +0100
Subject: [PATCH 3/3] Prepare release notes for BIND 9.11.27

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

diff --git a/doc/arm/notes-9.11.27.xml b/doc/arm/notes-9.11.27.xml
index 264192715c..79a08cd830 100644
--- a/doc/arm/notes-9.11.27.xml
+++ b/doc/arm/notes-9.11.27.xml
@@ -11,56 +11,6 @@
 
 <section xml:id="relnotes-9.11.27"><info><title>Notes for BIND 9.11.27</title></info>
 
-  <section xml:id="relnotes-9.11.27-security"><info><title>Security Fixes</title></info>
-    <itemizedlist>
-      <listitem>
-        <para>
-          None.
-        </para>
-      </listitem>
-    </itemizedlist>
-  </section>
-
-  <section xml:id="relnotes-9.11.27-known"><info><title>Known Issues</title></info>
-    <itemizedlist>
-      <listitem>
-        <para>
-          None.
-        </para>
-      </listitem>
-    </itemizedlist>
-  </section>
-
-  <section xml:id="relnotes-9.11.27-new"><info><title>New Features</title></info>
-    <itemizedlist>
-      <listitem>
-        <para>
-          None.
-        </para>
-      </listitem>
-    </itemizedlist>
-  </section>
-
-  <section xml:id="relnotes-9.11.27-removed"><info><title>Removed Features</title></info>
-    <itemizedlist>
-      <listitem>
-        <para>
-          None.
-        </para>
-      </listitem>
-    </itemizedlist>
-  </section>
-
-  <section xml:id="relnotes-9.11.27-changes"><info><title>Feature Changes</title></info>
-    <itemizedlist>
-      <listitem>
-        <para>
-          None.
-        </para>
-      </listitem>
-    </itemizedlist>
-  </section>
-
   <section xml:id="relnotes-9.11.27-bugs"><info><title>Bug Fixes</title></info>
     <itemizedlist>
       <listitem>