From: Ezio Melotti <none@none>
Date: Mon, 18 Apr 2011 07:14:13 +0000 (+0300)
Subject: #11865: Merge with 3.1.
X-Git-Tag: v3.2.1b1~108
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=74c0031066c365563cd0b4e5ad8da3687ed60656;p=thirdparty%2FPython%2Fcpython.git

#11865: Merge with 3.1.
---

74c0031066c365563cd0b4e5ad8da3687ed60656
diff --cc Doc/c-api/init.rst
index 623bd7cea350,12abf1e9e6b8..535bf12364a0
--- a/Doc/c-api/init.rst
+++ b/Doc/c-api/init.rst
@@@ -908,7 -892,7 +908,7 @@@ a worker thread and the actual call tha
  main thread where it has possession of the global interpreter lock and can
  perform any Python API calls.
  
- .. c:function:: void Py_AddPendingCall( int (*func)(void *, void *arg) )
 -.. cfunction:: void Py_AddPendingCall(int (*func)(void *), void *arg)
++.. c:function:: void Py_AddPendingCall(int (*func)(void *), void *arg)
  
     .. index:: single: Py_AddPendingCall()