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 c5aee66750a60a0f28b337c34ded8d16f4de2731..1acbef9e7c622a766c4cfa3e158ace72821c8555 100644 (file)
--- a/Doc/api/abstract.tex
+++ b/Doc/api/abstract.tex
@@ -267,7 +267,7 @@ determination.
 \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 8cd0fe4ffb8c993c1720b8df935482cb41672c97..f98b644896c219157fc97243f4fe69ce6aeeeeb1 100644 (file)
--- a/Doc/api/exceptions.tex
+++ b/Doc/api/exceptions.tex
@@ -331,9 +331,8 @@ for each thread.
   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 f1fe4d6788bde8c80e4c5b5759b6fdd79a8a76a7..adfd2ba69b1c82208ec0006e81c982a2cfec6629 100644 (file)
--- a/Doc/api/newtypes.tex
+++ b/Doc/api/newtypes.tex
@@ -166,7 +166,7 @@ These macros are used in the definition of \ctype{PyObject} and
   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 @@ Foo_Type.ob_type = &PyType_Type;
   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 @@ PyMappingMethods *tp_as_mapping;
 \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 743cb5a128c71a2ed49acbe67410615a05b1e72d..c296adbe8121517c1eb8a94c964d237095018b10 100644 (file)
--- a/Doc/ext/newtypes.tex
+++ b/Doc/ext/newtypes.tex
@@ -537,7 +537,7 @@ and assign them to the \member{tp_methods} slot:
     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 @@ when objects are involved in cycles.  For example, consider:
 \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.