summaryrefslogtreecommitdiff
path: root/sites
diff options
context:
space:
mode:
Diffstat (limited to 'sites')
-rw-r--r--sites/www/changelog.rst9
-rw-r--r--sites/www/conf.py14
2 files changed, 18 insertions, 5 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 9d8ab3a1..0b2022ca 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,15 @@
Changelog
=========
+- :release:`3.1.0 <2023-03-10>`
+- :feature:`2013` (solving :issue:`2009`, plus others) Add an explicit
+ ``channel_timeout`` keyword argument to `paramiko.client.SSHClient.connect`,
+ allowing users to configure the previously-hardcoded default value of 3600
+ seconds. Thanks to ``@VakarisZ`` and ``@ilija-lazoroski`` for the report and
+ patch, with credit to Mike Salvatore for patch review.
+- :feature:`2173` Accept single tabs as field separators (in addition to
+ single spaces) in `<paramiko.hostkeys.HostKeyEntry.from_line>` for parity
+ with OpenSSH's KnownHosts parser. Patched by Alex Chavkin.
- :support:`2178 backported` Apply ``codespell`` to the codebase, which found a
lot of very old minor spelling mistakes in docstrings. Also modernize many
instances of ``*largs`` vs ``*args`` and ``**kwarg`` vs ``**kwargs``. Patch
diff --git a/sites/www/conf.py b/sites/www/conf.py
index 00944871..179f0b7f 100644
--- a/sites/www/conf.py
+++ b/sites/www/conf.py
@@ -1,22 +1,26 @@
# Obtain shared config values
-import sys
+from pathlib import Path
import os
-from os.path import abspath, join, dirname
+import sys
-sys.path.append(abspath(join(dirname(__file__), "..")))
+updir = Path(__file__).parent.parent.resolve()
+sys.path.append(str(updir))
from shared_conf import *
# Releases changelog extension
extensions.append("releases")
releases_release_uri = "https://github.com/paramiko/paramiko/tree/%s"
releases_issue_uri = "https://github.com/paramiko/paramiko/issues/%s"
+releases_development_branch = "main"
+# Don't show unreleased_X.x sections up top for 1.x or 2.x anymore
+releases_supported_versions = [3]
# Default is 'local' building, but reference the public docs site when building
# under RTD.
-target = join(dirname(__file__), "..", "docs", "_build")
+target = updir / "docs" / "_build"
if os.environ.get("READTHEDOCS") == "True":
target = "http://docs.paramiko.org/en/latest/"
-intersphinx_mapping["docs"] = (target, None)
+intersphinx_mapping["docs"] = (str(target), None)
# Sister-site links to API docs
html_theme_options["extra_nav_links"] = {