6 files changed, 60 insertions, 43 deletions
diff --git a/sites/docs/conf.py b/sites/docs/conf.py
index 5674fed1..eb895804 100644
--- a/sites/docs/conf.py
+++ b/sites/docs/conf.py
@@ -1,16 +1,17 @@
 # Obtain shared config values
 import os, sys
-sys.path.append(os.path.abspath('..'))
-sys.path.append(os.path.abspath('../..'))
+
+sys.path.append(os.path.abspath(".."))
+sys.path.append(os.path.abspath("../.."))
 from shared_conf import *
 
 # Enable autodoc, intersphinx
-extensions.extend(['sphinx.ext.autodoc'])
+extensions.extend(["sphinx.ext.autodoc"])
 
 # Autodoc settings
-autodoc_default_flags = ['members', 'special-members']
+autodoc_default_flags = ["members", "special-members"]
 
 # Sister-site links to WWW
-html_theme_options['extra_nav_links'] = {
-    "Main website": 'http://www.paramiko.org',
+html_theme_options["extra_nav_links"] = {
+    "Main website": "http://www.paramiko.org"
 }
diff --git a/sites/shared_conf.py b/sites/shared_conf.py
index 99fab315..f4806cf1 100644
--- a/sites/shared_conf.py
+++ b/sites/shared_conf.py
@@ -5,36 +5,29 @@ import alabaster
 
 # Alabaster theme + mini-extension
 html_theme_path = [alabaster.get_path()]
-extensions = ['alabaster', 'sphinx.ext.intersphinx']
+extensions = ["alabaster", "sphinx.ext.intersphinx"]
 # Paths relative to invoking conf.py - not this shared file
-html_theme = 'alabaster'
+html_theme = "alabaster"
 html_theme_options = {
-    'description': "A Python implementation of SSHv2.",
-    'github_user': 'paramiko',
-    'github_repo': 'paramiko',
-    'analytics_id': 'UA-18486793-2',
-    'travis_button': True,
+    "description": "A Python implementation of SSHv2.",
+    "github_user": "paramiko",
+    "github_repo": "paramiko",
+    "analytics_id": "UA-18486793-2",
+    "travis_button": True,
 }
 html_sidebars = {
-    '**': [
-        'about.html',
-        'navigation.html',
-        'searchbox.html',
-        'donate.html',
-    ]
+    "**": ["about.html", "navigation.html", "searchbox.html", "donate.html"]
 }
 
 # Everything intersphinx's to Python
-intersphinx_mapping = {
-    'python': ('http://docs.python.org/2.6', None),
-}
+intersphinx_mapping = {"python": ("https://docs.python.org/2.7/", None)}
 
 # Regular settings
-project = 'Paramiko'
+project = "Paramiko"
 year = datetime.now().year
-copyright = '%d Jeff Forcier' % year
-master_doc = 'index'
-templates_path = ['_templates']
-exclude_trees = ['_build']
-source_suffix = '.rst'
-default_role = 'obj'
+copyright = "{} Jeff Forcier".format(year)
+master_doc = "index"
+templates_path = ["_templates"]
+exclude_trees = ["_build"]
+source_suffix = ".rst"
+default_role = "obj"
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 66ad53de..b6343c87 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,7 @@
 Changelog
 =========
 
+* :release:`2.4.1 <2018-03-12>`
 * :release:`2.3.2 <2018-03-12>`
 * :release:`2.2.3 <2018-03-12>`
 * :release:`2.1.5 <2018-03-12>`
@@ -16,10 +17,32 @@ Changelog
 * :bug:`1039` Ed25519 auth key decryption raised an unexpected exception when
   given a unicode password string (typical in python 3). Report by Theodor van
   Nahl and fix by Pierce Lopez.
+* :release:`2.4.0 <2017-11-14>`
+* :feature:`-` Add a new ``passphrase`` kwarg to `SSHClient.connect
+  <paramiko.client.SSHClient.connect>` so users may disambiguate key-decryption
+  passphrases from password-auth passwords. (This is a backwards compatible
+  change; ``password`` will still pull double duty as a passphrase when
+  ``passphrase`` is not given.)
+* :support:`-` Update ``tearDown`` of client test suite to avoid hangs due to
+  eternally blocking ``accept()`` calls on the internal server thread (which
+  can occur when test code raises an exception before actually connecting to
+  the server.)
 * :bug:`1108 (1.17+)` Rename a private method keyword argument (which was named
   ``async``) so that we're compatible with the upcoming Python 3.7 release
   (where ``async`` is a new keyword.) Thanks to ``@vEpiphyte`` for the report.
+* :support:`1100` Updated the test suite & related docs/metadata/config to be
+  compatible with pytest instead of using the old, custom, crufty
+  unittest-based ``test.py``.
+  
+  This includes marking known-slow tests (mostly the SFTP ones) so they can be
+  filtered out by ``inv test``'s default behavior; as well as other minor
+  tweaks to test collection and/or display (for example, GSSAPI tests are
+  collected, but skipped, instead of not even being collected by default as in
+  ``test.py``.)
 * :support:`- backported` Include LICENSE file in wheel archives.
+* :support:`1070` Drop Python 2.6 and Python 3.3 support; now only 2.7 and 3.4+
+  are supported. If you're unable to upgrade from 2.6 or 3.3, please stick to
+  the Paramiko 2.3.x (or below) release lines.
 * :release:`2.3.1 <2017-09-22>`
 * :bug:`1071` Certificate support broke the no-certificate case for Ed25519
   keys (symptom is an ``AttributeError`` about ``public_blob``.) This went
diff --git a/sites/www/conf.py b/sites/www/conf.py
index c7ba0a86..00944871 100644
--- a/sites/www/conf.py
+++ b/sites/www/conf.py
@@ -3,22 +3,22 @@ import sys
 import os
 from os.path import abspath, join, dirname
 
-sys.path.append(abspath(join(dirname(__file__), '..')))
+sys.path.append(abspath(join(dirname(__file__), "..")))
 from shared_conf import *
 
 # Releases changelog extension
-extensions.append('releases')
+extensions.append("releases")
 releases_release_uri = "https://github.com/paramiko/paramiko/tree/%s"
 releases_issue_uri = "https://github.com/paramiko/paramiko/issues/%s"
 
 # Default is 'local' building, but reference the public docs site when building
 # under RTD.
-target = join(dirname(__file__), '..', 'docs', '_build')
-if os.environ.get('READTHEDOCS') == 'True':
-    target = 'http://docs.paramiko.org/en/latest/'
-intersphinx_mapping['docs'] = (target, None)
+target = join(dirname(__file__), "..", "docs", "_build")
+if os.environ.get("READTHEDOCS") == "True":
+    target = "http://docs.paramiko.org/en/latest/"
+intersphinx_mapping["docs"] = (target, None)
 
 # Sister-site links to API docs
-html_theme_options['extra_nav_links'] = {
-    "API Docs": 'http://docs.paramiko.org',
+html_theme_options["extra_nav_links"] = {
+    "API Docs": "http://docs.paramiko.org"
 }
diff --git a/sites/www/index.rst b/sites/www/index.rst
index f0a5db8a..26961f24 100644
--- a/sites/www/index.rst
+++ b/sites/www/index.rst
@@ -1,11 +1,11 @@
 Welcome to Paramiko!
 ====================
 
-Paramiko is a Python (2.6+, 3.3+) implementation of the SSHv2 protocol [#]_,
+Paramiko is a Python (2.7, 3.4+) implementation of the SSHv2 protocol [#]_,
 providing both client and server functionality. While it leverages a Python C
-extension for low level cryptography
-(`Cryptography <https://cryptography.io>`_), Paramiko itself is a pure Python
-interface around SSH networking concepts.
+extension for low level cryptography (`Cryptography
+<https://cryptography.io>`_), Paramiko itself is a pure Python interface around
+SSH networking concepts.
 
 This website covers project information for Paramiko such as the changelog,
 contribution guidelines, development roadmap, news/blog, and so forth. Detailed
diff --git a/sites/www/installing.rst b/sites/www/installing.rst
index f335a9e7..e6db2dca 100644
--- a/sites/www/installing.rst
+++ b/sites/www/installing.rst
@@ -19,8 +19,8 @@ via `pip <http://pip-installer.org>`_::
 
     $ pip install paramiko
 
-We currently support **Python 2.6, 2.7, 3.3+, and PyPy**. Users on Python 2.5
-or older (or 3.2 or older) are urged to upgrade.
+We currently support **Python 2.7, 3.4+, and PyPy**. Users on Python 2.6 or
+older (or 3.3 or older) are urged to upgrade.
 
 Paramiko has only one direct hard dependency: the Cryptography library. See
 :ref:`cryptography`.