Apply release note tweaks lost during rebase

diff --git a/doc/arm/notes.rst b/doc/arm/notes.rst
index 90b27a7711f74db17d97111c73e8d90d97e10e7a..34e58f66a6f7827e9e72fbca95f249443620a30c 100644 (file)
--- a/doc/arm/notes.rst
+++ b/doc/arm/notes.rst
@@ -28,29 +28,12 @@ Release Notes
 Introduction
 ------------
 
-BIND 9.15 is an unstable development release of BIND. This document
+BIND 9.17 is an unstable development release of BIND. This document
 summarizes new features and functional changes that have been introduced
 on this branch. With each development release leading up to the stable
-BIND 9.16 release, this document will be updated with additional
-features added and bugs fixed.
-
-.. _relnotes_versions:
-
-Note on Version Numbering
--------------------------
-
-Until BIND 9.12, new feature development releases were tagged as "alpha"
-and "beta", leading up to the first stable release for a given
-development branch, which always ended in ".0". More recently, BIND
-adopted the "odd-unstable/even-stable" release numbering convention.
-There will be no "alpha" or "beta" releases in the 9.15 branch, only
-increasing version numbers. So, for example, what would previously have
-been called 9.15.0a1, 9.15.0a2, 9.15.0b1, and so on, will instead be
-called 9.15.0, 9.15.1, 9.15.2, etc.
-
-The first stable release from this development branch will be renamed as
-9.16.0. Thereafter, maintenance releases will continue on the 9.16
-branch, while unstable feature development proceeds in 9.17.
+BIND 9.18 release, this document will be updated with additional
+features added and bugs fixed. Please see the file CHANGES for a more
+detailed list of changes and bug fixes.
 
 .. _relnotes_platforms:
 
@@ -59,18 +42,19 @@ Supported Platforms
 
 To build on UNIX-like systems, BIND requires support for POSIX.1c
 threads (IEEE Std 1003.1c-1995), the Advanced Sockets API for IPv6
-(:rfc:`3542`), and standard atomic operations provided by the C compiler.
+(:rfc:`3542`), and standard atomic operations provided by the C
+compiler.
 
-The OpenSSL cryptography library must be available for the target
-platform. A PKCS#11 provider can be used instead for Public Key
-cryptography (i.e., DNSSEC signing and validation), but OpenSSL is still
-required for general cryptography operations such as hashing and random
-number generation.
+The libuv asynchronous I/O library and the OpenSSL cryptography library
+must be available for the target platform. A PKCS#11 provider can be
+used instead of OpenSSL for Public Key cryptography (i.e., DNSSEC
+signing and validation), but OpenSSL is still required for general
+cryptography operations such as hashing and random number generation.
 
 More information can be found in the ``PLATFORMS.md`` file that is
 included in the source distribution of BIND 9. If your compiler and
 system libraries provide the above features, BIND 9 should compile and
-run. If that isn't the case, the BIND development team will generally
+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.
 
@@ -80,7 +64,7 @@ Download
 --------
 
 The latest versions of BIND 9 software can always be found at
-http://www.isc.org/downloads/. There you will find additional
+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.
 
@@ -93,7 +77,7 @@ for Microsoft Windows operating systems.
 License
 -------
 
-BIND is open source software licenced under the terms of the Mozilla
+BIND 9 is open source software licensed under the terms of the Mozilla
 Public License, version 2.0 (see the ``LICENSE`` file for the full
 text).
 
@@ -106,22 +90,20 @@ modifications, without redistributing it, nor anyone redistributing BIND
 without changes.
 
 Those wishing to discuss license compliance may contact ISC at
-https://www.isc.org/mission/contact/.
+https://www.isc.org/contact/.
 
 .. _end_of_life:
 
 End of Life
 -----------
 
-BIND 9.15 is an unstable development branch. When its development is
-complete, it will be renamed to BIND 9.16, which will be a stable
-branch.
-
-The end of life date for BIND 9.16 has not yet been determined. 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://www.isc.org/downloads/software-support-policy/ for
-details of ISC's software support policy.
+BIND 9.17 is an unstable development branch. When its development is
+complete, it will be renamed to BIND 9.18, which will be a stable
+branch. The end of life date for BIND 9.18 has not yet been determined.
+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 for details of
+ISC's software support policy.
 
 .. _relnotes_thanks:
 
@@ -129,6 +111,3 @@ Thank You
 ---------
 
 Thank you to everyone who assisted us in making this release possible.
-If you would like to contribute to ISC to assist us in continuing to
-make quality open source software, please visit our donations page at
-http://www.isc.org/donate/.