summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-07-31 22:50:01 +0300
committerEzio Melotti <ezio.melotti@gmail.com>2011-07-31 22:50:01 +0300
commite906c13da45eb320b11eaa59404e24ab44f69ce5 (patch)
tree162b24e1597f62fd7b16432fb45e3a63b74658cd
parent9e2e99097cee234a3be025b968fb7ffff0f05f3e (diff)
parent222e61e44454611f2b037a2a596eb60c5b7fb695 (diff)
downloadcpython-git-e906c13da45eb320b11eaa59404e24ab44f69ce5.tar.gz
Merge typo fix.
-rw-r--r--Doc/howto/descriptor.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/howto/descriptor.rst b/Doc/howto/descriptor.rst
index 81bb8ca534..1616f67e12 100644
--- a/Doc/howto/descriptor.rst
+++ b/Doc/howto/descriptor.rst
@@ -42,7 +42,7 @@ classes (a class is new style if it inherits from :class:`object` or
Descriptors are a powerful, general purpose protocol. They are the mechanism
behind properties, methods, static methods, class methods, and :func:`super()`.
-They are used used throughout Python itself to implement the new style classes
+They are used throughout Python itself to implement the new style classes
introduced in version 2.2. Descriptors simplify the underlying C-code and offer
a flexible set of new tools for everyday Python programs.