[Python-checkins] cpython (merge 3.4 -> 3.5): Merge 3.4

[zach.ware]

https://hg.python.org/cpython/rev/938fe6ce92a7
changeset:   96871:938fe6ce92a7
branch:      3.5
parent:      96868:74b1a0001dc8
parent:      96870:ed6ec65f50d2
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Tue Jul 07 00:00:43 2015 -0500
summary:
  Merge 3.4

files:
  Doc/c-api/structures.rst |  7 ++++---
  1 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Doc/c-api/structures.rst b/Doc/c-api/structures.rst
--- a/Doc/c-api/structures.rst
+++ b/Doc/c-api/structures.rst
@@ -60,7 +60,7 @@
 
 .. c:macro:: Py_TYPE(o)
 
-   This macro is used to access the `ob_type` member of a Python object.
+   This macro is used to access the :attr:`ob_type` member of a Python object.
    It expands to::
 
       (((PyObject*)(o))->ob_type)
@@ -68,7 +68,8 @@
 
 .. c:macro:: Py_REFCNT(o)
 
-   This macro is used to access the `ob_refcnt` member of a Python object.
+   This macro is used to access the :attr:`ob_refcnt` member of a Python
+   object.
    It expands to::
 
       (((PyObject*)(o))->ob_refcnt)
@@ -76,7 +77,7 @@
 
 .. c:macro:: Py_SIZE(o)
 
-   This macro is used to access the `ob_size` member of a Python object.
+   This macro is used to access the :attr:`ob_size` member of a Python object.
    It expands to::
 
       (((PyVarObject*)(o))->ob_size)

-- 
Repository URL: https://hg.python.org/cpython