summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorThomas Wouters <thomas@python.org>2000-07-16 12:04:32 (GMT)
committerThomas Wouters <thomas@python.org>2000-07-16 12:04:32 (GMT)
commit7e47402264cf87b9bbb61fc9ff610af08add7c7b (patch)
tree8103f0f2df8ca09de0b8cfd9d38b4982c6993f16 /Include
parentc533e4a01207f74b9c4f9a7414631a3c7b711595 (diff)
downloadcpython-7e47402264cf87b9bbb61fc9ff610af08add7c7b.zip
cpython-7e47402264cf87b9bbb61fc9ff610af08add7c7b.tar.gz
cpython-7e47402264cf87b9bbb61fc9ff610af08add7c7b.tar.bz2
Spelling fixes supplied by Rob W. W. Hooft. All these are fixes in either
comments, docstrings or error messages. I fixed two minor things in test_winreg.py ("didn't" -> "Didn't" and "Didnt" -> "Didn't"). There is a minor style issue involved: Guido seems to have preferred English grammar (behaviour, honour) in a couple places. This patch changes that to American, which is the more prominent style in the source. I prefer English myself, so if English is preferred, I'd be happy to supply a patch myself ;)
Diffstat (limited to 'Include')
-rw-r--r--Include/abstract.h2
-rw-r--r--Include/cStringIO.h2
-rw-r--r--Include/cobject.h4
-rw-r--r--Include/longintrepr.h2
-rw-r--r--Include/modsupport.h2
-rw-r--r--Include/object.h6
-rw-r--r--Include/unicodeobject.h4
7 files changed, 11 insertions, 11 deletions
diff --git a/Include/abstract.h b/Include/abstract.h
index 890ffcd..b765c4b 100644
--- a/Include/abstract.h
+++ b/Include/abstract.h
@@ -695,7 +695,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/
DL_IMPORT(PyObject *) PySequence_Concat(PyObject *o1, PyObject *o2);
/*
- Return the concatination of o1 and o2 on success, and NULL on
+ Return the concatenation of o1 and o2 on success, and NULL on
failure. This is the equivalent of the Python
expression: o1+o2.
diff --git a/Include/cStringIO.h b/Include/cStringIO.h
index cc62c90..fac5f05 100644
--- a/Include/cStringIO.h
+++ b/Include/cStringIO.h
@@ -71,7 +71,7 @@
*/
-/* Basic fuctions to manipulate cStringIO objects from C */
+/* Basic functions to manipulate cStringIO objects from C */
static struct PycStringIO_CAPI {
diff --git a/Include/cobject.h b/Include/cobject.h
index 15850d9..e7b75f5 100644
--- a/Include/cobject.h
+++ b/Include/cobject.h
@@ -28,7 +28,7 @@ extern DL_IMPORT(PyTypeObject) PyCObject_Type;
#define PyCObject_Check(op) ((op)->ob_type == &PyCObject_Type)
/* Create a PyCObject from a pointer to a C object and an optional
- destrutor function. If the second argument is non-null, then it
+ destructor function. If the second argument is non-null, then it
will be called with the first argument if and when the PyCObject is
destroyed.
@@ -38,7 +38,7 @@ PyCObject_FromVoidPtr(void *cobj, void (*destruct)(void*));
/* Create a PyCObject from a pointer to a C object, a description object,
- and an optional destrutor function. If the third argument is non-null,
+ and an optional destructor function. If the third argument is non-null,
then it will be called with the first and second arguments if and when
the PyCObject is destroyed.
*/
diff --git a/Include/longintrepr.h b/Include/longintrepr.h
index fed01ed..1e78d05 100644
--- a/Include/longintrepr.h
+++ b/Include/longintrepr.h
@@ -44,7 +44,7 @@ typedef BASE_TWODIGITS_TYPE stwodigits; /* signed variant of twodigits */
In a normalized number, ob_digit[abs(ob_size)-1] (the most significant
digit) is never zero. Also, in all cases, for all valid i,
0 <= ob_digit[i] <= MASK.
- The allocation fuction takes care of allocating extra memory
+ The allocation function takes care of allocating extra memory
so that ob_digit[0] ... ob_digit[abs(ob_size)-1] are actually available. */
struct _longobject {
diff --git a/Include/modsupport.h b/Include/modsupport.h
index c50d769..c55b46b 100644
--- a/Include/modsupport.h
+++ b/Include/modsupport.h
@@ -44,7 +44,7 @@ extern DL_IMPORT(PyObject *) Py_VaBuildValue(char *, va_list);
#define PYTHON_API_STRING "1009"
/* The API version is maintained (independently from the Python version)
so we can detect mismatches between the interpreter and dynamically
- loaded modules. These are diagnosticised by an error message but
+ loaded modules. These are diagnosed by an error message but
the module is still loaded (because the mismatch can only be tested
after loading the module). The error message is intended to
explain the core dump a few seconds later.
diff --git a/Include/object.h b/Include/object.h
index 8c61e56..72a5282 100644
--- a/Include/object.h
+++ b/Include/object.h
@@ -51,7 +51,7 @@ and the type pointer. The actual memory allocated for an object
contains other data that can only be accessed after casting the pointer
to a pointer to a longer structure type. This longer type must start
with the reference count and type fields; the macro PyObject_HEAD should be
-used for this (to accomodate for future changes). The implementation
+used for this (to accommodate for future changes). The implementation
of a particular object type can cast the object pointer to the proper
type and back.
@@ -326,7 +326,7 @@ The macros Py_INCREF(op) and Py_DECREF(op) are used to increment or decrement
reference counts. Py_DECREF calls the object's deallocator function; for
objects that don't contain references to other objects or heap memory
this can be the standard function free(). Both macros can be used
-whereever a void expression is allowed. The argument shouldn't be a
+wherever a void expression is allowed. The argument shouldn't be a
NIL pointer. The macro _Py_NewReference(op) is used only to initialize
reference counts to 1; it is defined here for convenience.
@@ -518,7 +518,7 @@ times.
redefinition for better locality and less overhead.
Objects that want to be recursion safe need to use
- the macroes
+ the macro's
Py_TRASHCAN_SAFE_BEGIN(name)
and
Py_TRASHCAN_SAFE_END(name)
diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h
index 38f787b..41fffc0 100644
--- a/Include/unicodeobject.h
+++ b/Include/unicodeobject.h
@@ -493,7 +493,7 @@ extern DL_IMPORT(PyObject*) PyUnicode_AsUTF16String(
Note that Py_UNICODE data is being interpreted as UTF-16 reduced to
UCS-2. This trick makes it possible to add full UTF-16 capabilities
- at a later point without comprimising the APIs.
+ at a later point without compromising the APIs.
*/
@@ -815,7 +815,7 @@ extern DL_IMPORT(int) PyUnicode_Compare(
PyObject *right /* Right string */
);
-/* Apply a argument tuple or dictionar to a format string and return
+/* Apply a argument tuple or dictionary to a format string and return
the resulting Unicode string. */
extern DL_IMPORT(PyObject *) PyUnicode_Format(