[Python-checkins] cpython (merge 3.4 -> default): merge 3.4 (#21174)

[benjamin.peterson]

http://hg.python.org/cpython/rev/c48164710ed5
changeset:   90168:c48164710ed5
parent:      90165:34ace7eb67e9
parent:      90167:33528b9520e6
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Apr 07 19:35:36 2014 -0400
summary:
  merge 3.4 (#21174)

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


diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst
--- a/Doc/library/exceptions.rst
+++ b/Doc/library/exceptions.rst
@@ -161,7 +161,7 @@
 
 .. exception:: GeneratorExit
 
-   Raise when a :term:`generator`\'s :meth:`close` method is called.  It
+   Raised when a :term:`generator`\'s :meth:`close` method is called.  It
    directly inherits from :exc:`BaseException` instead of :exc:`Exception` since
    it is technically not an error.
 

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