aboutsummaryrefslogtreecommitdiffstats
path: root/docs/installation.rst
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-10-11 12:09:27 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-10-11 12:09:27 -0500
commit937aa47a99d488687febe25b813b350b5f492b4a (patch)
tree2ccba4cca35b9159c1f29e4e66d604d1707ba6b6 /docs/installation.rst
parent450d9797a2320f85aff317e5cab39cc2339eabec (diff)
downloadcryptography-937aa47a99d488687febe25b813b350b5f492b4a.tar.gz
cryptography-937aa47a99d488687febe25b813b350b5f492b4a.tar.bz2
cryptography-937aa47a99d488687febe25b813b350b5f492b4a.zip
update docs to point at newer, fancier openssl builder
Diffstat (limited to 'docs/installation.rst')
-rw-r--r--docs/installation.rst7
1 files changed, 4 insertions, 3 deletions
diff --git a/docs/installation.rst b/docs/installation.rst
index 5d629e9f..7c4b91e9 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -46,7 +46,9 @@ dependencies are included. Just run
If you prefer to compile it yourself you'll need to have OpenSSL installed.
You can compile OpenSSL yourself as well or use the binaries we build for our
-release infrastructure (`32-bit`_ and `64-bit`_). Wherever you place your copy
+release infrastructure (`openssl-release`_). Be sure to download the proper
+version for your architecture and Python (2010 works for Python 2.6, 2.7, 3.3,
+and 3.4 while 2015 is required for 3.5). Wherever you place your copy
of OpenSSL you'll need to set the ``LIB`` and ``INCLUDE`` environment variables
to include the proper locations. For example:
@@ -250,8 +252,7 @@ information, consult `Greg Wilson's blog post`_ on the subject.
.. _`Homebrew`: http://brew.sh
.. _`MacPorts`: https://www.macports.org
-.. _`32-bit`: https://jenkins.cryptography.io/job/openssl-win32-release/
-.. _`64-bit`: https://jenkins.cryptography.io/job/openssl-win64-release/
+.. _`openssl-release`: https://jenkins.cryptography.io/job/openssl-release/
.. _`bug in conda`: https://github.com/conda/conda-recipes/issues/110
.. _`Greg Wilson's blog post`: http://software-carpentry.org/blog/2014/04/mr-biczo-was-right.html
.. _virtualenv: https://virtualenv.pypa.io/en/latest/