diff options
| author | Georg Brandl <georg@python.org> | 2013-10-06 16:26:43 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2013-10-06 16:26:43 (GMT) |
| commit | 7cc439a8774ddc200ff87d290976f7f0ea470b42 (patch) | |
| tree | daf4dc32d559df5eb14ac2179f99055eb3d64805 /Doc/library/hashlib.rst | |
| parent | 99b1a12f2f565f0bdc959ec42268e7ef823819be (diff) | |
| parent | 6e94a3098e0e69a433e92c3a9e9270a54d820fec (diff) | |
| download | cpython-7cc439a8774ddc200ff87d290976f7f0ea470b42.zip cpython-7cc439a8774ddc200ff87d290976f7f0ea470b42.tar.gz cpython-7cc439a8774ddc200ff87d290976f7f0ea470b42.tar.bz2 | |
merge with 3.3
Diffstat (limited to 'Doc/library/hashlib.rst')
| -rw-r--r-- | Doc/library/hashlib.rst | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst index 0ebb5f6..d5531c4 100644 --- a/Doc/library/hashlib.rst +++ b/Doc/library/hashlib.rst @@ -23,12 +23,14 @@ algorithm (defined in Internet :rfc:`1321`). The terms "secure hash" and digests. The modern term is secure hash. .. note:: - If you want the adler32 or crc32 hash functions they are available in + + If you want the adler32 or crc32 hash functions, they are available in the :mod:`zlib` module. .. warning:: - Some algorithms have known hash collision weaknesses, see the FAQ at the end. + Some algorithms have known hash collision weaknesses, refer to the "See + also" section at the end. There is one constructor method named for each type of :dfn:`hash`. All return a hash object with the same simple interface. For example: use :func:`sha1` to |