aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2019-11-12 02:37:58 +0100
committerAlex Gaynor <alex.gaynor@gmail.com>2019-11-11 20:37:58 -0500
commitb5decbac5fdfe0c2f552475a38839e9b38968809 (patch)
tree43ca2b0c37b92148d7ece39232ade4bb25b778a4 /docs
parent2e86983a77d02a38ef0485ebe7ab05c1c98a7685 (diff)
downloadcryptography-b5decbac5fdfe0c2f552475a38839e9b38968809.tar.gz
cryptography-b5decbac5fdfe0c2f552475a38839e9b38968809.tar.bz2
cryptography-b5decbac5fdfe0c2f552475a38839e9b38968809.zip
Windows Installation: fix link to binaries (#5061)
* Windows Installation: fix link to binaries While https://github.com/pyca/infra/tree/master/windows/openssl points a trusted source (which would be preferable), pyca/infra currently does not provide any Windows binaries for download. Linking to the official OpenSSL wiki seems to be a reasonable compromise. * fix whitespace
Diffstat (limited to 'docs')
-rw-r--r--docs/installation.rst13
1 files changed, 6 insertions, 7 deletions
diff --git a/docs/installation.rst b/docs/installation.rst
index fc3fa894..a5881bd9 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -47,12 +47,11 @@ just run
$ pip install cryptography
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
-own `infrastructure`_. Be sure to download the proper
-version for your architecture and Python (2010 works for Python 2.7, 3.3,
-and 3.4 while 2015 is required for 3.5 and above). 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:
+You can compile OpenSSL yourself as well or use `a binary distribution`_.
+Be sure to download the proper version for your architecture and Python
+(VC2010 works for Python 2.7, 3.3, and 3.4 while VC2015 is required for 3.5 and above).
+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:
.. code-block:: console
@@ -280,7 +279,7 @@ local `wheel cache`_.
.. _`Homebrew`: https://brew.sh
.. _`MacPorts`: https://www.macports.org
-.. _`infrastructure`: https://github.com/pyca/infra/tree/master/windows/openssl
+.. _`a binary distribution`: https://wiki.openssl.org/index.php/Binaries
.. _virtualenv: https://virtualenv.pypa.io/en/latest/
.. _openssl.org: https://www.openssl.org/source/
.. _`wheel cache`: https://pip.pypa.io/en/stable/reference/pip_install/#caching