From: Benjamin Peterson Date: Mon, 26 May 2014 22:41:26 +0000 (-0700) Subject: oxford comma X-Git-Tag: v3.4.2rc1~498 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ccff4d3e10af0d1c7ddba8e1b60526578c6718a;p=python oxford comma --- diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst index d27902e3c2..661338e0e1 100644 --- 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 -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. .. function:: pbkdf2_hmac(name, password, salt, rounds, dklen=None)