Merged revisions 74815 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r74815 | ezio.melotti | 2009-09-16 04:18:27 +0300 (Wed, 16 Sep 2009) | 1 line

  #6910 - for->or typo
........

Doc/reference/simple_stmts.rst

@@ -796,7 +796,7 @@ modules which were imported and used within the module).
 
 The :keyword:`from` form with ``*`` may only occur in a module scope.  The wild
 card form of import --- ``import *`` --- is only allowed at the module level.
-Attempting to use it in class for function definitions will raise a
+Attempting to use it in class or function definitions will raise a
 :exc:`SyntaxError`.
 
 .. index::