summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-04-08 14:44:50 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-04-08 14:44:50 (GMT)
commitbc91330efb96fc66dc02f2b75f1dc6ad2f6523e3 (patch)
treeac3f0aef39f7abfcb0f141d8df3e6db2431fb996
parent4dd25256e25b2f03d0140e53f0813d482e3b07b5 (diff)
parentf0f7844f38ff692aa6add3af9cf9395544654cbc (diff)
downloadcpython-bc91330efb96fc66dc02f2b75f1dc6ad2f6523e3.zip
cpython-bc91330efb96fc66dc02f2b75f1dc6ad2f6523e3.tar.gz
cpython-bc91330efb96fc66dc02f2b75f1dc6ad2f6523e3.tar.bz2
merge 3.4
-rw-r--r--Doc/c-api/typeobj.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/Doc/c-api/typeobj.rst b/Doc/c-api/typeobj.rst
index efd8574..666de64 100644
--- a/Doc/c-api/typeobj.rst
+++ b/Doc/c-api/typeobj.rst
@@ -1199,7 +1199,8 @@ Sequence Object Structures
This function is used by :c:func:`PySequence_Repeat` and has the same
signature. It is also used by the ``*`` operator, after trying numeric
- multiplication via the :c:member:`~PyTypeObject.tp_as_number.nb_mul` slot.
+ multiplication via the :c:member:`~PyTypeObject.tp_as_number.nb_multiply`
+ slot.
.. c:member:: ssizeargfunc PySequenceMethods.sq_item