merge 3.5

2015-09-27 01:23:40 -07:00 · 2015-09-27 01:23:40 -07:00 · feb8b62847
parent 2352a2f31d 16b5708471
commit feb8b62847
1 changed files with 2 additions and 2 deletions
--- 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