diff --git a/bin/tests/system/shutdown/tests_shutdown.py b/bin/tests/system/shutdown/tests_shutdown.py
index 2e2bee6c47..5ca19ba160 100755
--- a/bin/tests/system/shutdown/tests_shutdown.py
+++ b/bin/tests/system/shutdown/tests_shutdown.py
@@ -162,7 +162,7 @@ def wait_for_proc_termination(proc, max_timeout=10):
 # In both methods named should exit gracefully.
 @pytest.mark.parametrize(
     "kill_method",
-    [pytest.param("rndc", marks=pytest.mark.xfail(reason="GL#4060")), "sigtem"],
+    [pytest.param("rndc", marks=pytest.mark.xfail(reason="GL#4060")), "sigterm"],
 )
 def test_named_shutdown(named_port, control_port, kill_method):
     # pylint: disable-msg=too-many-locals
diff --git a/doc/arm/logging-categories.inc.rst b/doc/arm/logging-categories.inc.rst
index 82160c78f0..c80c17fe7f 100644
--- a/doc/arm/logging-categories.inc.rst
+++ b/doc/arm/logging-categories.inc.rst
@@ -62,10 +62,10 @@
 
     The query log entry first reports a client object identifier in @0x<hexadecimal-number> format. Next, it reports the client's IP address and port number, and the query name, class, and type. Next, it reports whether the Recursion Desired flag was set (+ if set, - if not set), whether the query was signed (S), whether EDNS was in use along with the EDNS version number (E(#)), whether TCP was used (T), whether DO (DNSSEC Ok) was set (D), whether CD (Checking Disabled) was set (C), whether a valid DNS Server COOKIE was received (V), and whether a DNS COOKIE option without a valid Server COOKIE was present (K). After this, the destination address the query was sent to is reported. Finally, if any CLIENT-SUBNET option was present in the client query, it is included in square brackets in the format [ECS address/source/scope].
 
-    ``client 127.0.0.1#62536 (www.example.com):``
-    ``query: www.example.com IN AAAA +SE``
-    ``client ::1#62537 (www.example.net):``
-    ``query: www.example.net IN AAAA -SE``
+    .. code-block:: none
+
+       client @0x7f91b8005490 127.0.0.1#62536 (www.example.com): query: www.example.com IN AAAA +E(0)K (127.0.0.1)
+       client @0x7f91b4007400 ::1#62537 (www.example.net): query: www.example.net IN AAAA +E(0)K (::1)
 
     The first part of this log message, showing the client address/port number and query name, is repeated in all subsequent log messages related to the same query.
 
diff --git a/doc/arm/notes.rst b/doc/arm/notes.rst
index 13991e02ca..a9abcb85b0 100644
--- a/doc/arm/notes.rst
+++ b/doc/arm/notes.rst
@@ -38,7 +38,7 @@ information about each release, and source code.
 
 .. include:: ../notes/notes-known-issues.rst
 
-.. include:: ../notes/notes-current.rst
+.. include:: ../notes/notes-9.19.15.rst
 .. include:: ../notes/notes-9.19.14.rst
 .. include:: ../notes/notes-9.19.13.rst
 .. include:: ../notes/notes-9.19.12.rst
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-9.19.15.rst
similarity index 56%
rename from doc/notes/notes-current.rst
rename to doc/notes/notes-9.19.15.rst
index eb7a7777a0..2495673405 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-9.19.15.rst
@@ -12,34 +12,23 @@
 Notes for BIND 9.19.15
 ----------------------
 
-Security Fixes
-~~~~~~~~~~~~~~
-
-- None.
-
-New Features
-~~~~~~~~~~~~
-
-- None.
-
-Removed Features
-~~~~~~~~~~~~~~~~
-
-- None.
-
 Feature Changes
 ~~~~~~~~~~~~~~~
 
-- Use NS records for relaxed QNAME-minimization mode.  This reduces the
-  number of queries ``named`` makes when resolving, as it allows the
-  non-existence of NS RRsets at non-referral nodes to be cached in
-  addition to the normally cached referrals. :gl:`#3325`
+- The ``relaxed`` QNAME minimization mode now uses NS records. This
+  reduces the number of queries :iscman:`named` makes when resolving, as
+  it allows the non-existence of NS RRsets at non-referral nodes to be
+  cached in addition to the normally cached referrals. :gl:`#3325`
 
 Bug Fixes
 ~~~~~~~~~
 
-- Restored the abilty to read HMAC-MD5 K file pairs (K*.+157+*.{key,private})
-  that was accidentally lost. :gl:`#4154`
+- The ability to read HMAC-MD5 key files, which was accidentally lost in
+  BIND 9.19.6 and BIND 9.18.8, has been restored. :gl:`#3668`
+  :gl:`#4154`
+
+- Several minor stability issues with the catalog zone implementation
+  have been fixed. :gl:`#4132` :gl:`#4136` :gl:`#4171`
 
 Known Issues
 ~~~~~~~~~~~~