merge with 3.4

birkenfeld · birkenfeld · commit 4ae7839e19f7 · 2014-10-06T14:15:13.000+02:00
diff --git a/Doc/c-api/type.rst b/Doc/c-api/type.rst
@@ -44,6 +44,7 @@ Type Objects
 
    .. versionadded:: 3.2
 
+
 .. c:function:: void PyType_Modified(PyTypeObject *type)
 
    Invalidate the internal lookup cache for the type and all of its
@@ -67,6 +68,11 @@ Type Objects
 
    Return true if *a* is a subtype of *b*.
 
+   This function only checks for actual subtypes, which means that
+   :meth:`~type.__subclasscheck__` is not called on *b*.  Call
+   :c:func:`PyObject_IsSubclass` to do the same check that :func:`issubclass`
+   would do.
+
 
 .. c:function:: PyObject* PyType_GenericAlloc(PyTypeObject *type, Py_ssize_t nitems)
 
