From a91270b6bd50bd5301280d4e6b41f0f4d1c5da58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0pa=C4=8Dek?= <pspacek@isc.org>
Date: Thu, 7 Mar 2024 10:38:43 +0100
Subject: [PATCH] Prepare release notes for BIND 9.18.25

---
 doc/arm/notes.rst                             |  1 +
 .../{notes-current.rst => notes-9.18.25.rst}  | 41 +++++--------------
 2 files changed, 11 insertions(+), 31 deletions(-)
 rename doc/notes/{notes-current.rst => notes-9.18.25.rst} (88%)

diff --git a/doc/arm/notes.rst b/doc/arm/notes.rst
index a4a9754866..48921f9588 100644
--- a/doc/arm/notes.rst
+++ b/doc/arm/notes.rst
@@ -35,6 +35,7 @@ information about each release, and source code.
 
 .. include:: ../notes/notes-known-issues.rst
 
+.. include:: ../notes/notes-9.18.25.rst
 .. include:: ../notes/notes-9.18.24.rst
 .. include:: ../notes/notes-9.18.23.rst
 .. include:: ../notes/notes-9.18.22.rst
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-9.18.25.rst
similarity index 88%
rename from doc/notes/notes-current.rst
rename to doc/notes/notes-9.18.25.rst
index f9a7315aaf..0781387e46 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-9.18.25.rst
@@ -12,46 +12,25 @@
 Notes for BIND 9.18.25
 ----------------------
 
-Security Fixes
-~~~~~~~~~~~~~~
-
-- None.
-
-New Features
-~~~~~~~~~~~~
-
-- None.
-
-Removed Features
-~~~~~~~~~~~~~~~~
-
-- None.
-
-Feature Changes
-~~~~~~~~~~~~~~~
-
-- None.
-
 Bug Fixes
 ~~~~~~~~~
 
+- A regression in cache-cleaning code enabled memory use to grow
+  significantly more quickly than before, until the configured
+  :any:`max-cache-size` limit was reached. This has been fixed.
+  :gl:`#4596`
+
+- Using :option:`rndc flush` inadvertently caused cache cleaning to
+  become less effective. This could ultimately lead to the configured
+  :any:`max-cache-size` limit being exceeded and has now been fixed.
+  :gl:`#4621`
+
 - A use-after-free assertion might get triggered when the overmem cache
   cleaning triggers. :gl:`#4595`
 
   ISC would like to thank to Jinmei Tatuya from Infoblox for bringing
   this issue to our attention.
 
-- A regression in cache-cleaning code enabled memory use to grow
-  significantly more quickly than before, until the configured
-  :any:`max-cache-size` limit was reached. This has been fixed.
-  :gl:`#4596`
-
-
-- Using :option:`rndc flush` inadvertently caused cache cleaning to
-  become less effective. This could ultimately lead to the configured
-  :any:`max-cache-size` limit being exceeded and has now been fixed.
-  :gl:`#4621`
-
 Known Issues
 ~~~~~~~~~~~~