summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2016-01-10 07:56:31 (GMT)
committerBenjamin Peterson <benjamin@python.org>2016-01-10 07:56:31 (GMT)
commit4d927420b81aac3710b17aca1ff08f3cb281076e (patch)
tree025b1092d7a364fc5681cea1e7354a41e9541716 /Doc/library
parent3858a1c18c029f3c35a3e0a55de058b6efc06629 (diff)
parent6829dbbf3f286e0f789bfd0afe0555aaccc03012 (diff)
downloadcpython-4d927420b81aac3710b17aca1ff08f3cb281076e.zip
cpython-4d927420b81aac3710b17aca1ff08f3cb281076e.tar.gz
cpython-4d927420b81aac3710b17aca1ff08f3cb281076e.tar.bz2
merge 3.4 (#26066)
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/crypto.rst11
1 files changed, 0 insertions, 11 deletions
diff --git a/Doc/library/crypto.rst b/Doc/library/crypto.rst
index 8ad24c8..1eddfdc 100644
--- a/Doc/library/crypto.rst
+++ b/Doc/library/crypto.rst
@@ -16,14 +16,3 @@ Here's an overview:
hashlib.rst
hmac.rst
-
-.. index::
- pair: AES; algorithm
- single: cryptography
- single: Kuchling, Andrew
-
-Hardcore cypherpunks will probably find the cryptographic modules written by
-A.M. Kuchling of further interest; the package contains modules for various
-encryption algorithms, most notably AES. These modules are not distributed with
-Python but available separately. See the URL http://www.pycrypto.org/ for more
-information.