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/contributing.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/contributing.rst')
| -rw-r--r-- | docs/contributing.rst | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/docs/contributing.rst b/docs/contributing.rst index 184ba214..74b854bd 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -41,7 +41,7 @@ follow the directions on the :doc:`security page </security>`. Code ---- -When in doubt, refer to `PEP 8`_ for Python code. +When in doubt, refer to :pep:`8` for Python code. Every code file must start with the boilerplate notice of the Apache License. Additionally, every Python code file must contain @@ -287,7 +287,6 @@ The HTML documentation index can now be found at .. _`GitHub`: https://github.com/pyca/cryptography .. _`our mailing list`: https://mail.python.org/mailman/listinfo/cryptography-dev -.. _`PEP 8`: http://www.peps.io/8/ .. _`syntax`: http://sphinx-doc.org/domains.html#info-field-lists .. _`pytest`: https://pypi.python.org/pypi/pytest .. _`tox`: https://pypi.python.org/pypi/tox |