diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2014-09-08 15:01:18 -0700 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2014-09-08 15:03:12 -0700 |
commit | 68f7dbea29bb700caf5885ffe8af6bc7bd5ad92b (patch) | |
tree | 3fbee6b5c76ca2a38cb3abf527f6643a3cd6957c /sites/www/installing.rst | |
parent | 021160d8db62b8873f7deda3f7d89750941d2704 (diff) | |
parent | 88d932f2bbab907879639122969fb1f763258d29 (diff) |
Merge branch 'master' into 362-int
Conflicts:
tests/test_client.py
Diffstat (limited to 'sites/www/installing.rst')
-rw-r--r-- | sites/www/installing.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sites/www/installing.rst b/sites/www/installing.rst index a28ce6cd..052825c4 100644 --- a/sites/www/installing.rst +++ b/sites/www/installing.rst @@ -16,7 +16,7 @@ via `pip <http://pip-installer.org>`_:: Users who want the bleeding edge can install the development version via ``pip install paramiko==dev``. -We currently support **Python 2.6, 2.7 and 3.3** (Python **3.2** should also +We currently support **Python 2.6, 2.7 and 3.3+** (Python **3.2** should also work but has a less-strong compatibility guarantee from us.) Users on Python 2.5 or older are urged to upgrade. @@ -32,7 +32,7 @@ Release lines Users desiring stability may wish to pin themselves to a specific release line once they first start using Paramiko; to assist in this, we guarantee bugfixes -for at least the last 2-3 releases including the latest stable one. This currently means Paramiko **1.11** through **1.13**. +for the last 2-3 releases including the latest stable one. If you're unsure which version to install, we have suggestions: |