From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 30 Apr 2011 18:15:18 +0000 (-0500)
Subject: merge 3.1
X-Git-Tag: v3.2.1b1~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f97aed1a2506539ca612bad9435b1f92b811857d;p=python

merge 3.1
---

f97aed1a2506539ca612bad9435b1f92b811857d
diff --cc Doc/c-api/module.rst
index 1a64947454,12816c9fd8..ffd68e3084
--- a/Doc/c-api/module.rst
+++ b/Doc/c-api/module.rst
@@@ -202,10 -189,10 +202,10 @@@ These functions are usually used in th
     null-terminated.  Return ``-1`` on error, ``0`` on success.
  
  
 -.. cfunction:: int PyModule_AddIntMacro(PyObject *module, macro)
 +.. 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.