Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Doc/c-api/bytearray.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ Direct API functions
Return a new bytearray object from any object, *o*, that implements the
:ref:`buffer protocol <bufferobjects>`.

.. XXX expand about the buffer protocol, at least somewhere


.. c:function:: PyObject* PyByteArray_FromStringAndSize(const char *string, Py_ssize_t len)

Expand Down
2 changes: 1 addition & 1 deletion Doc/c-api/bytes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Bytes Objects
-------------

These functions raise :exc:`TypeError` when expecting a bytes parameter and are
These functions raise :exc:`TypeError` when expecting a bytes parameter and
called with a non-bytes parameter.

.. index:: object: bytes
Expand Down
2 changes: 1 addition & 1 deletion Doc/c-api/call.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ This convention is not only used by *tp_call*:
:c:member:`~PyTypeObject.tp_new` and :c:member:`~PyTypeObject.tp_init`
also pass arguments this way.

To call an object, use :c:func:`PyObject_Call` or other
To call an object, use :c:func:`PyObject_Call` or another
:ref:`call API <capi-call>`.


Expand Down
6 changes: 3 additions & 3 deletions Doc/c-api/exceptions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ For convenience, some of these functions will always return a

.. c:function:: void PyErr_SyntaxLocation(const char *filename, int lineno)

Like :c:func:`PyErr_SyntaxLocationEx`, but the col_offset parameter is
Like :c:func:`PyErr_SyntaxLocationEx`, but the *col_offset* parameter is
omitted.


Expand Down Expand Up @@ -333,7 +333,7 @@ an error value).

Issue a warning message with explicit control over all warning attributes. This
is a straightforward wrapper around the Python function
:func:`warnings.warn_explicit`, see there for more information. The *module*
:func:`warnings.warn_explicit`; see there for more information. The *module*
and *registry* arguments may be set to ``NULL`` to get the default effect
described there.

Expand Down Expand Up @@ -441,7 +441,7 @@ Querying the error indicator
error indicator.


.. c:function:: void PyErr_NormalizeException(PyObject**exc, PyObject**val, PyObject**tb)
.. c:function:: void PyErr_NormalizeException(PyObject **exc, PyObject **val, PyObject **tb)

Under certain circumstances, the values returned by :c:func:`PyErr_Fetch` below
can be "unnormalized", meaning that ``*exc`` is a class object but ``*val`` is
Expand Down
8 changes: 4 additions & 4 deletions Doc/c-api/init_config.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ There are two kinds of configuration:

* The :ref:`Python Configuration <init-python-config>` can be used to build a
customized Python which behaves as the regular Python. For example,
environments variables and command line arguments are used to configure
environment variables and command line arguments are used to configure
Python.

* The :ref:`Isolated Configuration <init-isolated-conf>` can be used to embed
Python into an application. It isolates Python from the system. For example,
environments variables are ignored, the LC_CTYPE locale is left unchanged and
environment variables are ignored, the LC_CTYPE locale is left unchanged and
no signal handler is registered.

The :c:func:`Py_RunMain` function can be used to write a customized Python
Expand Down Expand Up @@ -1287,7 +1287,7 @@ Isolated Configuration
isolate Python from the system. For example, to embed Python into an
application.

This configuration ignores global configuration variables, environments
This configuration ignores global configuration variables, environment
variables, command line arguments (:c:member:`PyConfig.argv` is not parsed)
and user site directory. The C standard streams (ex: ``stdout``) and the
LC_CTYPE locale are left unchanged. Signal handlers are not installed.
Expand Down Expand Up @@ -1432,7 +1432,7 @@ Multi-Phase Initialization Private Provisional API
==================================================

This section is a private provisional API introducing multi-phase
initialization, the core feature of the :pep:`432`:
initialization, the core feature of :pep:`432`:

* "Core" initialization phase, "bare minimum Python":

Expand Down