merge 3.1

diff --cc Doc/c-api/module.rst
index 1a64947454bb040f12d715b4bb83a9283af3251c,12816c9fd8c7a3e4c3374858ac1665b509a6485f..ffd68e308489ae1d4bd1db09682c0cb844663a4f
--- 1/Doc/c-api/module.rst
--- 2/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.