[Python-checkins] cpython (merge 3.1 -> 3.2): merge 3.1

Sat Apr 30 20:14:12 CEST 2011

http://hg.python.org/cpython/rev/6e9aedf6ef24
changeset: 69714:6e9aedf6ef24
branch: 3.2
parent: 69708:2caf82aee7a4
parent: 69713:b3e7ffe6d727
user: Benjamin Peterson <benjamin at python.org>
date: Sat Apr 30 13:15:18 2011 -0500
summary:
 merge 3.1
files:
 Doc/c-api/module.rst | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Doc/c-api/module.rst b/Doc/c-api/module.rst
--- a/Doc/c-api/module.rst
+++ b/Doc/c-api/module.rst
@@ -205,7 +205,7 @@
 .. c:function:: int PyModule_AddIntMacro(PyObject *module, macro)
 
 Add an int constant to *module*. The name and the value are taken from
- *macro*. For example ``PyModule_AddConstant(module, AF_INET)`` adds the int
+ *macro*. For example ``PyModule_AddIntMacro(module, AF_INET)`` adds the int
 constant *AF_INET* with the value of *AF_INET* to *module*.
 Return ``-1`` on error, ``0`` on success.
 
-- 
Repository URL: http://hg.python.org/cpython
