summaryrefslogtreecommitdiffhomepage
path: root/sites/www/installing.rst
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-09-08 11:26:59 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-09-08 11:26:59 -0700
commit7ab97439c5a90f9ab55f489719229a6cdcf85310 (patch)
treef556256a346670431ab87e357ba8ed22ebe17b66 /sites/www/installing.rst
parent49ae00822c910f62462fd881b1161bb8178b637d (diff)
parenta0f854d17fc59f0279d4d2b07d3fd810dfb1894e (diff)
Merge branch 'master' into 373-int
Conflicts: paramiko/channel.py
Diffstat (limited to 'sites/www/installing.rst')
-rw-r--r--sites/www/installing.rst4
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: