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

[benjamin.peterson]

https://hg.python.org/cpython/rev/bacb540ab6ba
changeset:   98303:bacb540ab6ba
branch:      3.5
parent:      98299:ef3b833b98c2
parent:      98302:30da62ea4d7c
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Sep 27 01:23:35 2015 -0700
summary:
  merge 3.4

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


diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst
--- a/Doc/library/hashlib.rst
+++ b/Doc/library/hashlib.rst
@@ -176,8 +176,8 @@
    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

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