summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2009-09-16 01:33:31 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2009-09-16 01:33:31 (GMT)
commitf4b4623a309fe2548e7b2987674b4e68f5b8f0e1 (patch)
tree36da4e26ccb55415cef92582018e98701db4b9a1 /Doc
parent1e112baf6aedad75af6b91987bbd1731a5fb3e1f (diff)
downloadcpython-f4b4623a309fe2548e7b2987674b4e68f5b8f0e1.zip
cpython-f4b4623a309fe2548e7b2987674b4e68f5b8f0e1.tar.gz
cpython-f4b4623a309fe2548e7b2987674b4e68f5b8f0e1.tar.bz2
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 ........
Diffstat (limited to 'Doc')
-rw-r--r--Doc/reference/simple_stmts.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/reference/simple_stmts.rst b/Doc/reference/simple_stmts.rst
index 2a34b69..4a9b8ad 100644
--- a/Doc/reference/simple_stmts.rst
+++ b/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::