diff --git a/CHANGES b/CHANGES
index fc005b8a55..4bfa275e5f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,6 @@
-5376. [bug] Fix DNS ineffective rebinding protection when BIND 9
- is configured as a forwarding DNS server. [GL #1574]
- (Thanks to Tobias Klein)
+5376. [bug] Fix ineffective DNS rebinding protection when BIND is
+ configured as a forwarding DNS server. Thanks to Tobias
+ Klein. [GL #1574]
5358. [bug] Inline master zones whose master files were touched
but otherwise unchanged and were subsequently reloaded
@@ -8,7 +8,8 @@
5357. [bug] Newly added RRSIG records with expiry times before
the previous earliest expiry times might not be
- re-signed in time. The was a side effect of 5315.
+ re-signed in time. This was a side effect of 5315.
+ [GL !3137]
--- 9.14.11 released ---
diff --git a/doc/arm/Makefile.in b/doc/arm/Makefile.in
index e3e63bd5bb..c1ba4721d5 100644
--- a/doc/arm/Makefile.in
+++ b/doc/arm/Makefile.in
@@ -21,6 +21,7 @@ PDFOBJS = Bv9ARM.pdf notes.pdf
NOTESXML = notes-download.xml notes-eol.xml notes-intro.xml notes-license.xml \
notes-numbering.xml notes-platforms.xml notes-thankyou.xml \
+ notes-9.14.12.xml \
notes-9.14.11.xml \
notes-9.14.10.xml \
notes-9.14.9.xml \
diff --git a/doc/arm/notes-9.14.12.xml b/doc/arm/notes-9.14.12.xml
index 68130aa4ad..94fc82e69b 100644
--- a/doc/arm/notes-9.14.12.xml
+++ b/doc/arm/notes-9.14.12.xml
@@ -15,9 +15,9 @@
- DNS rebinding protection was ineffective when BIND 9 is configured as
- a forwarding DNS server. Found and responsibly reported by Tobias
- Klein. [GL #1574]
+ DNS rebinding protection was ineffective when BIND 9 is configured as
+ a forwarding DNS server. Found and responsibly reported by Tobias
+ Klein. [GL #1574]
@@ -27,8 +27,8 @@
- Fixed re-signing issues with inline zones which resulted in
- records being re-signed late or not at all.
+ Fixed re-signing issues with inline zones which resulted in
+ records being re-signed late or not at all.
diff --git a/doc/arm/notes-eol.xml b/doc/arm/notes-eol.xml
index 09f81f6e32..a80967207d 100644
--- a/doc/arm/notes-eol.xml
+++ b/doc/arm/notes-eol.xml
@@ -11,8 +11,9 @@
End of Life
- The end of life date for BIND 9.14 has not yet been determined.
- For those needing long term support, the current Extended Support
+ BIND 9.16 has replaced 9.14 as the current stable version.
+ This BIND release is the last one in the BIND 9.14 release train.
+ For those needing long-term support, the current Extended Support
Version (ESV) is BIND 9.11, which will be supported until at
least December 2021. See
https://kb.isc.org/docs/aa-00896
diff --git a/doc/arm/notes-platforms.xml b/doc/arm/notes-platforms.xml
index c4d31d57cb..67eb673fe9 100644
--- a/doc/arm/notes-platforms.xml
+++ b/doc/arm/notes-platforms.xml
@@ -15,7 +15,7 @@
cleanup, and some very old code has been removed that supported
obsolete operating systems and operating systems for which ISC is
no longer able to perform quality assurance testing. Specifically,
- workarounds for UnixWare, BSD/OS, AIX, Tru64, SunOS, TruCluster
+ workarounds for UnixWare, BSD/OS, AIX, Tru64, SunOS, TruCluster,
and IRIX have been removed.
@@ -28,7 +28,7 @@
More information can be found in the PLATFORM.md
file that is included in the source distribution of BIND 9. If your
platform compiler and system libraries provide the above features,
- BIND 9 should compile and run. If that isn't the case, the BIND
+ BIND 9 should compile and run. If that is not the case, the BIND
development team will generally accept patches that add support
for systems that are still supported by their respective vendors.
diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index 1ec0436857..465fe4439b 100644
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -24,6 +24,7 @@
+