merge 3.2

3563b18c · Benjamin Peterson · 52e2cc86 · 1c92cfea · 3563b18c
Commit 3563b18c authored Dec 19, 2011 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

Doc/library/operator.rst Doc/library/operator.rst +5 -5

No files found.
--- a/Doc/library/operator.rst
+++ b/Doc/library/operator.rst
@@ -12,11 +12,11 @@
   from operator import itemgetter, iadd
-The :mod:`operator` module exports a set of functions implemented in C
+The :mod:`operator` module exports a set of functions corresponding to the
-corresponding to the intrinsic operators of Python.  For example,
+intrinsic operators of Python.  For example, ``operator.add(x, y)`` is
-``operator.add(x, y)`` is equivalent to the expression ``x+y``.  The function
+equivalent to the expression ``x+y``.  The function names are those used for
-names are those used for special class methods; variants without leading and
+special class methods; variants without leading and trailing ``__`` are also
-trailing ``__`` are also provided for convenience.
+provided for convenience.
 The functions fall into categories that perform object comparisons, logical
 operations, mathematical operations and sequence operations.