merge 3.4

0024fbb5 · Benjamin Peterson · c12318a7 · 0d81d80f · 0024fbb5
Commit 0024fbb5 authored May 26, 2014 by Benjamin Peterson
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Doc/library/hashlib.rst Doc/library/hashlib.rst +3 -3

No files found.
--- a/Doc/library/hashlib.rst
+++ b/Doc/library/hashlib.rst
@@ -180,9 +180,9 @@ Key Derivation Function
 -----------------------
 Key derivation and key stretching algorithms are designed for secure password
-hashing. Naive algorithms such as ``sha1(password)`` are not resistant
+hashing. Naive algorithms such as ``sha1(password)`` are not resistant against
-against brute-force attacks. A good password hashing function must be tunable,
+brute-force attacks. A good password hashing function must be tunable, slow, and
-slow and include a salt.
+include a `salt <https://en.wikipedia.org/wiki/Salt_%28cryptography%29>`_.
 .. function:: pbkdf2_hmac(name, password, salt, rounds, dklen=None)