summaryrefslogtreecommitdiffhomepage
path: root/sites/www
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2015-09-30 13:55:38 -0700
committerJeff Forcier <jeff@bitprophet.org>2015-09-30 13:55:38 -0700
commit0d2d811df4f1a91ab731a9b24367cb1b01e81c15 (patch)
treed4e44653ffb1dd04c86066f70d59a6722f3956e5 /sites/www
parent70924234bb70d15005e4ce18305fc610482acf1b (diff)
parent9c77538747881bb8cb3f6c7b220515cfd6943b92 (diff)
Merge branch '1.15' into 482-int
Diffstat (limited to 'sites/www')
-rw-r--r--sites/www/changelog.rst4
-rw-r--r--sites/www/index.rst8
2 files changed, 6 insertions, 6 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index bb93f885..6520dde4 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,10 @@
Changelog
=========
+* :bug:`402` Check to see if an SSH agent is actually present before trying to
+ forward it to the remote end. This replaces what was usually a useless
+ ``TypeError`` with a human-readable ``AuthenticationError``. Credit to Ken
+ Jordan for the fix and Yvan Marques for original report.
* :release:`1.15.2 <2014-12-19>`
* :release:`1.14.2 <2014-12-19>`
* :release:`1.13.3 <2014-12-19>`
diff --git a/sites/www/index.rst b/sites/www/index.rst
index 1b609709..8e7562af 100644
--- a/sites/www/index.rst
+++ b/sites/www/index.rst
@@ -26,11 +26,7 @@ Please see the sidebar to the left to begin.
.. rubric:: Footnotes
.. [#]
- SSH is defined in RFCs
- `4251 <http://www.rfc-editor.org/rfc/rfc4251.txt>`_,
- `4252 <http://www.rfc-editor.org/rfc/rfc4252.txt>`_,
- `4253 <http://www.rfc-editor.org/rfc/rfc4253.txt>`_, and
- `4254 <http://www.rfc-editor.org/rfc/rfc4254.txt>`_;
- the primary working implementation of the protocol is the `OpenSSH project
+ SSH is defined in :rfc:`4251`, :rfc:`4252`, :rfc:`4253` and :rfc:`4254`. The
+ primary working implementation of the protocol is the `OpenSSH project
<http://openssh.org>`_. Paramiko implements a large portion of the SSH
feature set, but there are occasional gaps.