From: R David Murray <rdmurray@bitdance.com>
Date: Wed, 26 Feb 2014 18:07:21 +0000 (-0500)
Subject: whatsnew: expand pbkdf2_hmac entry slightly.
X-Git-Tag: v3.4.1rc1~233^2~181
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9251d59523f64fa789c5ec4e68290644fbde1021;p=thirdparty%2FPython%2Fcpython.git

whatsnew: expand pbkdf2_hmac entry slightly.
---

diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
index f9e5b2a59359..997afc49d315 100644
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -757,8 +757,10 @@ dictionaries containing the collections statistics since interpreter startup.
 hashlib
 -------
 
-New :func:`hashlib.pbkdf2_hmac` function.  (Contributed by Christian Heimes in
-:issue:`18582`)
+A new :func:`hashlib.pbkdf2_hmac` function provides
+the `PKCS#5 password-based key derivation function 2
+<http://en.wikipedia.org/wiki/PBKDF2>`_.  (Contributed by Christian
+Heimes in :issue:`18582`)
 
 The :attr:`~hashlib.hash.name` attribute of :mod:`hashlib` hash objects is now
 a formally supported interface.  It has always existed in CPython's