[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

[benjamin.peterson]

http://hg.python.org/cpython/rev/6e792720efe9
changeset:   90855:6e792720efe9
parent:      90851:37166903007e
parent:      90854:2777ee24c189
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon May 26 15:42:44 2014 -0700
summary:
  merge 3.4

files:
  Doc/library/hashlib.rst |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


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

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