[Python-checkins] r82423 - in python/branches/release31-maint: Doc/library/2to3.rst

[benjamin.peterson]

Author: benjamin.peterson
Date: Thu Jul  1 19:51:42 2010
New Revision: 82423

Log:
Merged revisions 82422 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82422 | benjamin.peterson | 2010-07-01 12:49:01 -0500 (Thu, 01 Jul 2010) | 9 lines
  
  Merged revisions 82420 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r82420 | benjamin.peterson | 2010-07-01 12:45:52 -0500 (Thu, 01 Jul 2010) | 1 line
    
    fix fixer name
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/library/2to3.rst

Modified: python/branches/release31-maint/Doc/library/2to3.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/2to3.rst	(original)
+++ python/branches/release31-maint/Doc/library/2to3.rst	Thu Jul  1 19:51:42 2010
@@ -276,7 +276,7 @@
 
    Converts the :keyword:`print` statement to the :func:`print` function.
 
-.. 2to3fixer:: raises
+.. 2to3fixer:: raise
 
    Converts ``raise E, V`` to ``raise E(V)``, and ``raise E, V, T`` to ``raise
    E(V).with_traceback(T)``.  If ``E`` is a tuple, the translation will be