Skip to content

Commit

Permalink
Merge branch 'master' of github.com:paramiko/paramiko
Browse files Browse the repository at this point in the history
  • Loading branch information
bitprophet committed Apr 19, 2018
2 parents d6f7d20 + bac196c commit 16d0d3a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion sites/www/installing-1.x.rst
Original file line number Diff line number Diff line change
Expand Up @@ -118,4 +118,4 @@ First, see the main install doc's notes: :ref:`gssapi` - everything there is
required for Paramiko 1.x as well.

Additionally, users of Paramiko 1.x, on all platforms, need a final dependency:
`pyasn1 <https://pypi.python.org/pypi/pyasn1>`_ ``0.1.7`` or better.
`pyasn1 <https://pypi.org/project/pyasn1/>`_ ``0.1.7`` or better.
2 changes: 1 addition & 1 deletion sites/www/installing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ due to their infrequent utility & non-platform-agnostic requirements):

* It hopefully goes without saying but **all platforms** need **a working
installation of GSS-API itself**, e.g. Heimdal.
* **Unix** needs `python-gssapi <https://pypi.python.org/pypi/python-gssapi/>`_
* **Unix** needs `python-gssapi <https://pypi.org/project/python-gssapi/>`_
``0.6.1`` or better.

.. note:: This library appears to only function on Python 2.7 and up.
Expand Down

0 comments on commit 16d0d3a

Please sign in to comment.