diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-04 21:12:10 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-04 21:12:10 -0700 |
| commit | 89ce40612a1e88e894901c0a86a17c0e55043689 (patch) | |
| tree | e36e43b031da8d3c7727f03552aa494a1f7faada /docs | |
| parent | ce916866892230ac6e2e793e4b1a59eb5424a0ff (diff) | |
| parent | 07877f48d4e04e456b708b8e8bdf9e8feff79837 (diff) | |
| download | cryptography-89ce40612a1e88e894901c0a86a17c0e55043689.tar.gz cryptography-89ce40612a1e88e894901c0a86a17c0e55043689.tar.bz2 cryptography-89ce40612a1e88e894901c0a86a17c0e55043689.zip | |
Merge branch 'master' into bind-dsa
Conflicts:
cryptography/bindings/openssl/api.py
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/community.rst | 4 | ||||
| -rw-r--r-- | docs/contributing.rst | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/community.rst b/docs/community.rst index 809ffd12..86ba5055 100644 --- a/docs/community.rst +++ b/docs/community.rst @@ -10,6 +10,6 @@ You can find ``cryptography`` all over the web: * IRC: ``#cryptography-dev`` on ``irc.freenode.net`` .. _`Mailing list`: https://mail.python.org/mailman/listinfo/cryptography-dev -.. _`Source code`: https://github.com/alex/cryptography -.. _`Issue tracker`: https://github.com/alex/cryptography/issues +.. _`Source code`: https://github.com/pyca/cryptography +.. _`Issue tracker`: https://github.com/pyca/cryptography/issues .. _`Documentation`: https://cryptography.readthedocs.org/ diff --git a/docs/contributing.rst b/docs/contributing.rst index 9dd14c23..8f6a178e 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -141,7 +141,7 @@ Use `tox`_ to build the documentation. For example: The HTML documentation index can now be found at ``docs/_build/html/index.html`` -.. _`GitHub`: https://github.com/alex/cryptography +.. _`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 |