merge with 3.2

0109e3cd · Sandro Tosi · 19b1d507 · 83c48822 · 0109e3cd
Commit 0109e3cd authored Feb 28, 2012 by Sandro Tosi
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/Doc/library/operator.rst
+++ b/Doc/library/operator.rst
@@ -340,7 +340,7 @@ Python syntax and the functions in the :mod:`operator` module.
 +-----------------------+-------------------------+---------------------------------------+
 | Containment Test      | ``obj in seq``          | ``contains(seq, obj)``                |
 +-----------------------+-------------------------+---------------------------------------+
-| Division              | ``a / b``               | ``div(a, b)``                         |
+| Division              | ``a / b``               | ``truediv(a, b)``                     |
 +-----------------------+-------------------------+---------------------------------------+
 | Division              | ``a // b``              | ``floordiv(a, b)``                    |
 +-----------------------+-------------------------+---------------------------------------+