diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-02-03 21:59:29 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-02-03 21:59:29 -0600 |
| commit | e4acd5d922bd66dfa4f27782c0913550085a6929 (patch) | |
| tree | 8922ec5e4e3f150883a89cf54c00264c1fd5be46 /docs/installation.rst | |
| parent | e035ba978bf81c9dc17c33d7a8c6d61082ac4292 (diff) | |
| parent | ba5fcd97baf193259a156caa5b5cbc107ee46794 (diff) | |
| download | cryptography-e4acd5d922bd66dfa4f27782c0913550085a6929.tar.gz cryptography-e4acd5d922bd66dfa4f27782c0913550085a6929.tar.bz2 cryptography-e4acd5d922bd66dfa4f27782c0913550085a6929.zip | |
Merge branch 'master' into urandom-engine
* master: (66 commits)
Chanloge + versionadded
Added an example usage
Typo fix
Added to toctree
Rename and document
Linkify the things we have that others don't
add HKDF to changelog
Strings have quote marks at both ends.
HKDF example.
Properly mark all test cases as dependant on HMAC.
Remove language about the separate stages of HKDF until we expose multiple stages of HKDF.
Don't forget InvalidKey.
Fix typo
Import exception classes instead of the exceptions module.
Lose the bit about passwords.
https a bunch of links.
Pseudorandom is a word.
Backtick the entire equation.
Clarify salt language and link to the paper in addition to the RFC.
Don't expose extract and expand on this class yet because we don't know how best to expose verify functionality, continue testing the stages using the private methods.
...
Conflicts:
docs/hazmat/backends/openssl.rst
Diffstat (limited to 'docs/installation.rst')
| -rw-r--r-- | docs/installation.rst | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/docs/installation.rst b/docs/installation.rst index 2206107e..7e7348e2 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -1,5 +1,5 @@ -Installing -========== +Installation +============ You can install ``cryptography`` with ``pip``: @@ -7,10 +7,9 @@ You can install ``cryptography`` with ``pip``: $ pip install cryptography -Installation Notes -================== On Windows ---------- + If you're on Windows you'll need to make sure you have OpenSSL installed. There are `pre-compiled binaries`_ available. If your installation is in an unusual location set the ``LIB`` and ``INCLUDE`` environment variables |