more 2.2.1 prep

diff --git a/README.md b/README.md
index 6395a9b0115e046f61a3eee0d473684692512c2b..d18eca35ff83825d225d17ac0a7eb1c2a055993a 100644 (file)
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ to facilitate the testing of DNS software.
 
 ## ABOUT THIS RELEASE
 
-This is dnspython 2.2.0.
+This is dnspython 2.2.1
 Please read
 [What's New](https://dnspython.readthedocs.io/en/stable/whatsnew.html) for
 information about the changes in this release.
@@ -72,8 +72,10 @@ Note that you can install any combination of the above, e.g.:
 
 ### Notices
 
-Python 2.x support ended with the release of 1.16.0.  dnspython 2.0.0 and
-later only support Python 3.6 and later.
+Python 2.x support ended with the release of 1.16.0.  Dnspython 2.0.0 through
+2.2.x support Python 3.6 and later.  As of dnspython 2.3.0, the minimum
+supported Python version will be 3.7.  We plan to align future support with the
+lifetime of the Python 3 versions.
 
 Documentation has moved to
 [dnspython.readthedocs.io](https://dnspython.readthedocs.io).

diff --git a/SECURITY.md b/SECURITY.md
index 8212d8390b9da27e6a7a710a5afb470ab3a51578..7467d40a207b92c2bf8dd1751eccfb5c067818cc 100644 (file)
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -6,10 +6,14 @@ The following versions would get a security update release if necessary.
 
 | Version  | Supported          |
 | -------- | ------------------ |
-| 2.0.x    | :white_check_mark: |
+| 2.2.x    | :white_check_mark: |
 | 1.16.x   | :white_check_mark: |
 | < 1.16.0 | :x:                |
 
+For older version 2 releases, the normal security upgrade path would
+be to upgrade to the latest version 2 release.  Selective backports to
+older 2.x versions may be considered on a case-by-case basis.
+
 ## Reporting a Vulnerability
 
 Send email to security@dnspython.org.  For confidentiality, use the following public key:

diff --git a/doc/whatsnew.rst b/doc/whatsnew.rst
index 7337db44c6f52c8e43419c6e0d76dbc883cc29ff..f35beb2a47c1ed6cf23b471ce33b411bed14ddcb 100644 (file)
--- a/doc/whatsnew.rst
+++ b/doc/whatsnew.rst
@@ -11,7 +11,7 @@ This release has no new features, but fixes the following issues:
 * dns.zone.from_text failed if relativize was False and an origin was
   specified in the parameters.
 
-* A number of types permitted an empty "rest of the rdata"
+* A number of types permitted an empty "rest of the rdata".
 
 * L32, L64, LP, and NID were missing from dns/rdtypes/ANY/__init__.py
 
@@ -22,7 +22,7 @@ This release has no new features, but fixes the following issues:
 * The type definition for a number of asynchronous query routines was
   missing the default of None for the backend parameter.
 
-* dns/tsigkeyring.py didn't import dns.tsig
+* dns/tsigkeyring.py didn't import dns.tsig.
 
 * A number of rdata types that have a "rest of the line" behavior for
   the last field of the rdata erroneously permitted an empty string.