oxford comma

benjaminp · benjaminp · commit 0ccff4d3e10a · 2014-05-26T15:41:26.000-07:00
diff --git 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)
