[Python-checkins] cpython (3.4): oxford comma

[benjamin.peterson]

http://hg.python.org/cpython/rev/c9aabb32026b
changeset:   90853:c9aabb32026b
branch:      3.4
parent:      90850:f7075eb04b75
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon May 26 15:41:26 2014 -0700
summary:
  oxford comma

files:
  Doc/library/hashlib.rst |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst
--- a/Doc/library/hashlib.rst
+++ b/Doc/library/hashlib.rst
@@ -180,9 +180,9 @@
 -----------------------
 
 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)

-- 
Repository URL: http://hg.python.org/cpython