oxford comma

0ccff4d3 · Benjamin Peterson · 1a2cf9ab · 0ccff4d3
Commit 0ccff4d3 authored May 26, 2014 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Doc/library/hashlib.rst Doc/library/hashlib.rst +3 -3

No files found.
--- 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)