[Python-checkins] cpython (merge 3.5 -> default): Merge for issue #26760

[brett.cannon]

https://hg.python.org/cpython/rev/5c18598382e9
changeset:   100990:5c18598382e9
parent:      100988:92388bdba01c
parent:      100989:ba6f4f0fe9ea
user:        Brett Cannon <brett at python.org>
date:        Fri Apr 15 12:44:09 2016 -0700
summary:
  Merge for issue #26760

files:
  Doc/c-api/veryhigh.rst |  8 +++++++-
  1 files changed, 7 insertions(+), 1 deletions(-)


diff --git a/Doc/c-api/veryhigh.rst b/Doc/c-api/veryhigh.rst
--- a/Doc/c-api/veryhigh.rst
+++ b/Doc/c-api/veryhigh.rst
@@ -307,10 +307,16 @@
    cells.
 
 
+.. c:type:: PyFrameObject
+
+   The C structure of the objects used to describe frame objects. The
+   fields of this type are subject to change at any time.
+
+
 .. c:function:: PyObject* PyEval_EvalFrame(PyFrameObject *f)
 
    Evaluate an execution frame.  This is a simplified interface to
-   PyEval_EvalFrameEx, for backward compatibility.
+   :c:func:`PyEval_EvalFrameEx`, for backward compatibility.
 
 
 .. c:function:: PyObject* PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)

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