SF patch #838938: Typos in the docs (Extending/Embedding + Python/C API)
(Contributed by Florent Rougon.)
diff --git a/Doc/api/abstract.tex b/Doc/api/abstract.tex
index c5aee66..1acbef9 100644
--- a/Doc/api/abstract.tex
+++ b/Doc/api/abstract.tex
@@ -267,7 +267,7 @@
\begin{cfuncdesc}{PyObject*}{PyObject_CallMethod}{PyObject *o,
char *method, char *format,
\moreargs}
- Call the method named \var{m} of object \var{o} with a variable
+ Call the method named \var{method} of object \var{o} with a variable
number of C arguments. The C arguments are described by a
\cfunction{Py_BuildValue()} format string. The format may be \NULL,
indicating that no arguments are provided. Returns the result of the
diff --git a/Doc/api/exceptions.tex b/Doc/api/exceptions.tex
index 8cd0fe4..f98b644 100644
--- a/Doc/api/exceptions.tex
+++ b/Doc/api/exceptions.tex
@@ -331,9 +331,8 @@
example, when an exception occurs in an \method{__del__()} method.
The function is called with a single argument \var{obj} that
- identifies where the context in which the unraisable exception
- occurred. The repr of \var{obj} will be printed in the warning
- message.
+ identifies the context in which the unraisable exception occurred.
+ The repr of \var{obj} will be printed in the warning message.
\end{cfuncdesc}
\section{Standard Exceptions \label{standardExceptions}}
diff --git a/Doc/api/newtypes.tex b/Doc/api/newtypes.tex
index f1fe4d6..adfd2ba 100644
--- a/Doc/api/newtypes.tex
+++ b/Doc/api/newtypes.tex
@@ -166,7 +166,7 @@
This is a macro which expands to the declarations of the fields of
the \ctype{PyObject} type; it is used when declaring new types which
represent objects without a varying length. The specific fields it
- expands to depends on the definition of
+ expands to depend on the definition of
\csimplemacro{Py_TRACE_REFS}. By default, that macro is not
defined, and \csimplemacro{PyObject_HEAD} expands to:
\begin{verbatim}
@@ -397,7 +397,7 @@
This should be done before any instances of the type are created.
\cfunction{PyType_Ready()} checks if \member{ob_type} is \NULL, and
if so, initializes it: in Python 2.2, it is set to
- \code{\&PyType_Type}; in Python 2.2.1 and later it will be
+ \code{\&PyType_Type}; in Python 2.2.1 and later it is
initialized to the \member{ob_type} field of the base class.
\cfunction{PyType_Ready()} will not change this field if it is
non-zero.
@@ -704,7 +704,7 @@
\end{cmemberdesc}
\begin{cmemberdesc}{PyTypeObject}{PyBufferProcs*}{tp_as_buffer}
- Pointer to an additional structure contains fields relevant only to
+ Pointer to an additional structure that contains fields relevant only to
objects which implement the buffer interface. These fields are
documented in ``Buffer Object Structures'' (section
\ref{buffer-structs}).
diff --git a/Doc/ext/newtypes.tex b/Doc/ext/newtypes.tex
index 743cb5a..c296adb 100644
--- a/Doc/ext/newtypes.tex
+++ b/Doc/ext/newtypes.tex
@@ -537,7 +537,7 @@
Noddy_methods, /* tp_methods */
\end{verbatim}
-Note that used the \constant{METH_NOARGS} flag to indicate that the
+Note that we used the \constant{METH_NOARGS} flag to indicate that the
method is passed no arguments.
Finally, we'll make our type usable as a base class. We've written
@@ -683,7 +683,7 @@
\end{verbatim}
In this example, we create a list that contains itself. When we delete
-it, it still has a reference from itself. It's reference count doesn't
+it, it still has a reference from itself. Its reference count doesn't
drop to zero. Fortunately, Python's cyclic-garbage collector will
eventually figure out that the list is garbage and free it.