aboutsummaryrefslogtreecommitdiffstats
path: root/docs/installation.rst
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-10-01 21:10:26 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-10-01 21:10:59 -0500
commitda74298444b38c71fd7c78f7c00f15521807a623 (patch)
treeb9ff0f45e445f7025851b181141c07915fbf8149 /docs/installation.rst
parenta94f97ee8b32d35fc7ed02849a807fab58147dc5 (diff)
downloadcryptography-da74298444b38c71fd7c78f7c00f15521807a623.tar.gz
cryptography-da74298444b38c71fd7c78f7c00f15521807a623.tar.bz2
cryptography-da74298444b38c71fd7c78f7c00f15521807a623.zip
update our docs for the testing matrix to be accurate
Diffstat (limited to 'docs/installation.rst')
-rw-r--r--docs/installation.rst16
1 files changed, 8 insertions, 8 deletions
diff --git a/docs/installation.rst b/docs/installation.rst
index 2f978852..c9cd6dba 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -15,24 +15,24 @@ Currently we test ``cryptography`` on Python 2.6, 2.7, 3.3, 3.4, 3.5, and PyPy
* x86-64 CentOS 7.x, 6.4 and CentOS 5.x
* x86-64 FreeBSD 10
-* OS X 10.10 Yosemite, 10.9 Mavericks, 10.8 Mountain Lion, and 10.7 Lion
-* x86-64 Ubuntu 12.04 LTS
-* x86-64 Debian Wheezy (7.x) and Jessie (8.x)
-* 32-bit Python on 64-bit Windows Server 2008
-* 64-bit Python on 64-bit Windows Server 2012
+* OS X 10.11 El Capitan, 10.10 Yosemite, 10.9 Mavericks, 10.8 Mountain Lion,
+ and 10.7 Lion
+* x86-64 Ubuntu 12.04 LTS and Ubuntu 14.04 LTS
+* x86-64 Debian Wheezy (7.x), Jessie (8.x), and Debian Sid (unstable)
+* 32-bit and 64-bit Python on 64-bit Windows Server 2012
We test compiling with ``clang`` as well as ``gcc`` and use the following
OpenSSL releases:
* ``OpenSSL 0.9.8e-fips-rhel5`` (``RHEL/CentOS 5``)
* ``OpenSSL 0.9.8k``
-* ``OpenSSL 0.9.8za``
+* ``OpenSSL 0.9.8-latest`` (The most recent 0.9.8 release)
* ``OpenSSL 1.0.0-fips`` (``RHEL/CentOS 6.4``)
* ``OpenSSL 1.0.1``
* ``OpenSSL 1.0.1e-fips`` (``RHEL/CentOS 7``)
* ``OpenSSL 1.0.1j-freebsd``
-* ``OpenSSL 1.0.1-latest`` (The most recent 1.0.1 release)
-* ``OpenSSL 1.0.2``
+* ``OpenSSL 1.0.1f``
+* ``OpenSSL 1.0.2-latest``
On Windows
----------