[Python-checkins] cpython (merge 3.5 -> default): merge 3.5 (#26066)

[benjamin.peterson]

https://hg.python.org/cpython/rev/8ee02ec9b634
changeset:   99828:8ee02ec9b634
parent:      99823:60d4c3a29201
parent:      99827:cc9ffb4829e7
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Jan 09 23:56:40 2016 -0800
summary:
  merge 3.5 (#26066)

files:
  Doc/library/crypto.rst |  11 -----------
  1 files changed, 0 insertions(+), 11 deletions(-)


diff --git a/Doc/library/crypto.rst b/Doc/library/crypto.rst
--- a/Doc/library/crypto.rst
+++ b/Doc/library/crypto.rst
@@ -16,14 +16,3 @@
 
    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.

-- 
Repository URL: https://hg.python.org/cpython