aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-09-19 20:51:43 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-09-19 20:51:43 -0500
commit3d971a6b95000f7575d4508c0bc1eee93138e8f6 (patch)
tree520fb4df1c3ec2ea90b1d753a605e0134c21840b /docs
parent298d25ad89362f77eb1bb70de8fa6e756b38d628 (diff)
parent5a5d26c4f8ba388ad1316723737deed3e3170911 (diff)
downloadcryptography-3d971a6b95000f7575d4508c0bc1eee93138e8f6.tar.gz
cryptography-3d971a6b95000f7575d4508c0bc1eee93138e8f6.tar.bz2
cryptography-3d971a6b95000f7575d4508c0bc1eee93138e8f6.zip
Merge pull request #2356 from alex/doc-pypy
Fixes #2353 -- document that we need PyPy 2.6+
Diffstat (limited to 'docs')
-rw-r--r--docs/installation.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/installation.rst b/docs/installation.rst
index 277e021b..1caeb1f7 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -10,7 +10,7 @@ You can install ``cryptography`` with ``pip``:
Supported platforms
-------------------
-Currently we test ``cryptography`` on Python 2.6, 2.7, 3.3, 3.4 and PyPy
+Currently we test ``cryptography`` on Python 2.6, 2.7, 3.3, 3.4 and PyPy 2.6+
on these operating systems.
* x86-64 CentOS 7.x, 6.4 and CentOS 5.x