[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

[benjamin.peterson]

http://hg.python.org/cpython/rev/f9651488f256
changeset:   70828:f9651488f256
parent:      70826:976915e35ccd
parent:      70827:505fb7045aad
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Jun 16 18:51:37 2011 -0500
summary:
  merge 3.2

files:
  Doc/whatsnew/3.2.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst
--- a/Doc/whatsnew/3.2.rst
+++ b/Doc/whatsnew/3.2.rst
@@ -385,7 +385,7 @@
 =====================================================
 
 This informational PEP clarifies how bytes/text issues are to be handled by the
-WGSI protocol.  The challenge is that string handling in Python 3 is most
+WSGI protocol.  The challenge is that string handling in Python 3 is most
 conveniently handled with the :class:`str` type even though the HTTP protocol
 is itself bytes oriented.
 

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