From 59da803e86245011ab3ba67d337493a4a4971724 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 Jul 2022 06:32:55 +0200
Subject: [PATCH 1/3] Prepare release notes for BIND 9.16.31

---
 doc/arm/notes.rst                             |  2 +-
 .../{notes-current.rst => notes-9.16.31.rst}  | 25 -------------------
 2 files changed, 1 insertion(+), 26 deletions(-)
 rename doc/notes/{notes-current.rst => notes-9.16.31.rst} (80%)

diff --git a/doc/arm/notes.rst b/doc/arm/notes.rst
index 06413a2466..5b424b0e70 100644
--- a/doc/arm/notes.rst
+++ b/doc/arm/notes.rst
@@ -44,7 +44,7 @@ https://www.isc.org/download/. There you will find additional
 information about each release, source code, and pre-compiled versions
 for Microsoft Windows operating systems.
 
-.. include:: ../notes/notes-current.rst
+.. include:: ../notes/notes-9.16.31.rst
 .. include:: ../notes/notes-9.16.30.rst
 .. include:: ../notes/notes-9.16.29.rst
 .. include:: ../notes/notes-9.16.28.rst
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-9.16.31.rst
similarity index 80%
rename from doc/notes/notes-current.rst
rename to doc/notes/notes-9.16.31.rst
index fb43114671..fcad63d0ef 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-9.16.31.rst
@@ -12,31 +12,6 @@
 Notes for BIND 9.16.31
 ----------------------
 
-Security Fixes
-~~~~~~~~~~~~~~
-
-- None.
-
-Known Issues
-~~~~~~~~~~~~
-
-- None.
-
-New Features
-~~~~~~~~~~~~
-
-- None.
-
-Removed Features
-~~~~~~~~~~~~~~~~
-
-- None.
-
-Feature Changes
-~~~~~~~~~~~~~~~
-
-- None.
-
 Bug Fixes
 ~~~~~~~~~
 

From 5cbf8d3c18c6eedfbcb7ea7f52424aaac45c5848 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 Jul 2022 06:32:55 +0200
Subject: [PATCH 2/3] Tweak and reword release notes

---
 doc/notes/notes-9.16.31.rst | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/notes/notes-9.16.31.rst b/doc/notes/notes-9.16.31.rst
index fcad63d0ef..30a13e553a 100644
--- a/doc/notes/notes-9.16.31.rst
+++ b/doc/notes/notes-9.16.31.rst
@@ -15,9 +15,10 @@ Notes for BIND 9.16.31
 Bug Fixes
 ~~~~~~~~~
 
-- Fix the assertion failure caused by TCP connection closing between the
-  connect (or accept) and the read from the socket. :gl:`#3400`
+- An assertion failure caused by a TCP connection closing between a
+  connect (or accept) and a read from a socket has been fixed.
+  :gl:`#3400`
 
-- ``named`` could crash during a very rare situation that could arise when
-  validating a query which had timed out at that same exact moment. This has
-  been fixed. :gl:`#3398`
+- :iscman:`named` could crash during a very rare situation that could
+  arise when validating a query which had timed out at that exact
+  moment. This has been fixed. :gl:`#3398`

From a2bd0075bb51040416ae573f2eba80bb5a955d78 Mon Sep 17 00:00:00 2001
From: Tinderbox User <tbox@isc.org>
Date: Mon, 11 Jul 2022 04:49:15 +0000
Subject: [PATCH 3/3] prep 9.16.31

---
 CHANGES | 2 ++
 version | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 3edcfcdd89..6869b2cc18 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+	--- 9.16.31 released ---
+
 5917.	[bug]		Update ifconfig.sh script as is miscomputed interface
 			identifiers when destroying interfaces. [GL #3061]
 
diff --git a/version b/version
index 82c32ba40b..19eee9e6b9 100644
--- a/version
+++ b/version
@@ -8,4 +8,4 @@ MINORVER=16
 PATCHVER=31
 RELEASETYPE=
 RELEASEVER=
-EXTENSIONS=-dev
+EXTENSIONS=