summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-06-16 18:51:37 -0500
committerBenjamin Peterson <benjamin@python.org>2011-06-16 18:51:37 -0500
commit12aebabd99b2419eaea336b27701107a92fce19d (patch)
treebe25cbd1fdb37199c5cbc98f8cc00fcaa227ee3a
parent364cbb8ca4b9d7c564bf09e0d14dd9f0f77778d6 (diff)
parentb4cfa3ad6391d570d068a142052d6bc0f2602890 (diff)
downloadcpython-git-12aebabd99b2419eaea336b27701107a92fce19d.tar.gz
merge 3.2
-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 358e5bec41..a20bda6777 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.