[Python-checkins] cpython (merge 3.3 -> default): merge 3.3 (closes #16687)

[benjamin.peterson]

http://hg.python.org/cpython/rev/95cb2f09ac50
changeset:   80965:95cb2f09ac50
parent:      80960:faaac6ceffff
parent:      80964:ccafaabe1a7f
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Dec 20 20:25:00 2012 -0600
summary:
  merge 3.3 (closes #16687)

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


diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst
--- a/Doc/library/hashlib.rst
+++ b/Doc/library/hashlib.rst
@@ -40,12 +40,12 @@
 
 .. note::
 
-   For better multithreading performance, the Python GIL is released for
+   For better multithreading performance, the Python :term:`GIL` is released for
    strings of more than 2047 bytes at object creation or on update.
 
 .. note::
 
-   Feeding string objects is to :meth:`update` is not supported, as hashes work
+   Feeding string objects into :meth:`update` is not supported, as hashes work
    on bytes, not on characters.
 
 .. index:: single: OpenSSL; (use in module hashlib)

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