summaryrefslogtreecommitdiffstats
path: root/Doc/tutorial
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2012-01-11 19:56:22 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2012-01-11 19:56:22 (GMT)
commit982c91e4c9bbf8b8b62cda779d31beac2350fa58 (patch)
treec31543784d929f2419945d7d16aa228733bf2078 /Doc/tutorial
parent7a825ba3c655bbfb0a4dc4794e0f9f15b1dfd179 (diff)
parentea868d32a1ca25a96a1dc17ca1c11db0bf37e413 (diff)
downloadcpython-982c91e4c9bbf8b8b62cda779d31beac2350fa58.zip
cpython-982c91e4c9bbf8b8b62cda779d31beac2350fa58.tar.gz
cpython-982c91e4c9bbf8b8b62cda779d31beac2350fa58.tar.bz2
Merge with 3.2
Diffstat (limited to 'Doc/tutorial')
-rw-r--r--Doc/tutorial/classes.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst
index 4926280..33171cd 100644
--- a/Doc/tutorial/classes.rst
+++ b/Doc/tutorial/classes.rst
@@ -458,8 +458,8 @@ argument::
self.add(x)
Methods may reference global names in the same way as ordinary functions. The
-global scope associated with a method is the module containing the class
-definition. (The class itself is never used as a global scope.) While one
+global scope associated with a method is the module containing its
+definition. (A class is never used as a global scope.) While one
rarely encounters a good reason for using global data in a method, there are
many legitimate uses of the global scope: for one thing, functions and modules
imported into the global scope can be used by methods, as well as functions and