summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-09-27 08:23:40 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-09-27 08:23:40 (GMT)
commitfeb8b6284712cdbf28f8f41ee6386b0a54ec13f4 (patch)
tree41ab1974787133a0241c6225d05d3fa5b7bcc2db /Doc/library
parent2352a2f31d3530661c38f6f3e846d5636b2dfbf2 (diff)
parent16b570847130b150d116f303174309333a2cbdc7 (diff)
downloadcpython-feb8b6284712cdbf28f8f41ee6386b0a54ec13f4.zip
cpython-feb8b6284712cdbf28f8f41ee6386b0a54ec13f4.tar.gz
cpython-feb8b6284712cdbf28f8f41ee6386b0a54ec13f4.tar.bz2
merge 3.5
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/hashlib.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst
index e0a877a..8492422 100644
--- a/Doc/library/hashlib.rst
+++ b/Doc/library/hashlib.rst
@@ -176,8 +176,8 @@ A hash object has the following methods:
compute the digests of data sharing a common initial substring.
-Key Derivation Function
------------------------
+Key derivation
+--------------
Key derivation and key stretching algorithms are designed for secure password
hashing. Naive algorithms such as ``sha1(password)`` are not resistant against