Changeset 391 for python/trunk/Doc/c-api/concrete.rst

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Doc/c-api/concrete.rst (modified) (3 diffs)

python/trunk/Doc/c-api/concrete.rst

@@ -12 +12 @@
 object from a Python program and you are not sure that it has the right type,
 you must perform a type check first; for example, to check that an object is a
-dictionary, use :cfunc:`PyDict_Check`.  The chapter is structured like the
+dictionary, use :c:func:`PyDict_Check`.  The chapter is structured like the
 "family tree" of Python object types.
 
@@ -101 +101 @@
    slice.rst
    weakref.rst
+   capsule.rst
    cobject.rst
    cell.rst
@@ -106 +107 @@
    datetime.rst
    set.rst
+   code.rst