aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Reid <dreid@dreid.org>2014-04-15 19:56:52 -0400
committerDavid Reid <dreid@dreid.org>2014-04-15 19:56:52 -0400
commit2473d11a45a9c1d4fc04cbeb2f1173c8f2185a80 (patch)
tree171526d46b5850ad89d37670bfb43b015d27c5a8
parent1eab656b3fd5537630500a0d6d35fbb157b4c95c (diff)
parentc354a2bf44bb023845f476f5aae48f3198e57220 (diff)
downloadcryptography-2473d11a45a9c1d4fc04cbeb2f1173c8f2185a80.tar.gz
cryptography-2473d11a45a9c1d4fc04cbeb2f1173c8f2185a80.tar.bz2
cryptography-2473d11a45a9c1d4fc04cbeb2f1173c8f2185a80.zip
Merge pull request #926 from reaperhulk/update-supported-platforms
Update supported platforms
-rw-r--r--docs/installation.rst7
1 files changed, 4 insertions, 3 deletions
diff --git a/docs/installation.rst b/docs/installation.rst
index ac4c13cd..a0dd5f22 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -15,9 +15,10 @@ these operating systems.
* x86-64 CentOS 6.4 and CentOS 5
* x86-64 FreeBSD 9.2 and FreeBSD 10
-* OS X 10.9 and OS X 10.8
+* OS X 10.9 Mavericks, 10.8 Mountain Lion, and 10.7 Lion
* x86-64 Ubuntu 12.04 LTS
* 32-bit Python on 64-bit Windows Server 2008
+* 64-bit Python on 64-bit Windows Server 2012
On Windows
----------
@@ -30,8 +31,8 @@ to include the corresponding locations. For example:
.. code-block:: console
C:\> \path\to\vcvarsall.bat x86_amd64
- C:\> set LIB=C:\OpenSSL-1.0.1f-64bit\lib;%LIB%
- C:\> set INCLUDE=C:\OpenSSL-1.0.1f-64bit\include;%INCLUDE%
+ C:\> set LIB=C:\OpenSSL-1.0.1g-64bit\lib;%LIB%
+ C:\> set INCLUDE=C:\OpenSSL-1.0.1g-64bit\include;%INCLUDE%
C:\> pip install cryptography
Building cryptography on Linux