summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-06-16 23:51:24 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-06-16 23:51:24 (GMT)
commitb4cfa3ad6391d570d068a142052d6bc0f2602890 (patch)
tree064cb49ad5278bc6a855d4b00da1b4849da3738e
parenta08eb73b4a0419b810f6f101f0f36b45ed4f70b9 (diff)
parenta63d45c825386267fd64a423997f9efd4cf1f5a8 (diff)
downloadcpython-b4cfa3ad6391d570d068a142052d6bc0f2602890.zip
cpython-b4cfa3ad6391d570d068a142052d6bc0f2602890.tar.gz
cpython-b4cfa3ad6391d570d068a142052d6bc0f2602890.tar.bz2
merge heads
-rw-r--r--Doc/whatsnew/3.2.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst
index d411d85..32f97d6 100644
--- a/Doc/whatsnew/3.2.rst
+++ b/Doc/whatsnew/3.2.rst
@@ -385,7 +385,7 @@ PEP 3333: Python Web Server Gateway Interface v1.0.1
=====================================================
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.