summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-03-13 19:03:58 (GMT)
committerGeorg Brandl <georg@python.org>2009-03-13 19:03:58 (GMT)
commite83a4adba77d1055c564fbcc87695e259e672f5b (patch)
tree20a1be6cb2d89b5cdb854e46539098bc41b73f29 /Doc
parentefa7c138b603915e7064055ea8d7718d96d30cbc (diff)
downloadcpython-e83a4adba77d1055c564fbcc87695e259e672f5b.zip
cpython-e83a4adba77d1055c564fbcc87695e259e672f5b.tar.gz
cpython-e83a4adba77d1055c564fbcc87695e259e672f5b.tar.bz2
#5486: typos.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/c-api/init.rst2
-rw-r--r--Doc/distutils/packageindex.rst4
-rw-r--r--Doc/library/2to3.rst8
-rw-r--r--Doc/library/exceptions.rst2
-rw-r--r--Doc/library/turtle.rst6
5 files changed, 11 insertions, 11 deletions
diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst
index ec6207b..14292cb 100644
--- a/Doc/c-api/init.rst
+++ b/Doc/c-api/init.rst
@@ -835,7 +835,7 @@ interpreter lock and can perform any Python API calls.
it returns -1 without setting any exception.
This function can be called on any thread, be it a Python thread or
- some other system thread. If it is a Python thread, it doesen't matter if
+ some other system thread. If it is a Python thread, it doesn't matter if
it holds the global interpreter lock or not.
.. versionadded:: 2.7
diff --git a/Doc/distutils/packageindex.rst b/Doc/distutils/packageindex.rst
index c4cbf88..1498394 100644
--- a/Doc/distutils/packageindex.rst
+++ b/Doc/distutils/packageindex.rst
@@ -98,7 +98,7 @@ repository to work with::
python setup.py register -r http://example.com/pypi
-The name of the section that describes the repository may also be used
-for conveniency::
+For convenience, the name of the section that describes the repository
+may also be used::
python setup.py register -r other
diff --git a/Doc/library/2to3.rst b/Doc/library/2to3.rst
index 03cfbbe..7011f92 100644
--- a/Doc/library/2to3.rst
+++ b/Doc/library/2to3.rst
@@ -99,7 +99,7 @@ differentiate between the print statement with parentheses (such as ``print
Fixers
------
-Each step of tranforming code is encapsulated in a fixer. The command ``2to3
+Each step of transforming code is encapsulated in a fixer. The command ``2to3
-l`` lists them. As :ref:`documented above <2to3-using>`, each can be turned on
and off individually. They are described here in more detail.
@@ -167,11 +167,11 @@ and off individually. They are described here in more detail.
.. 2to3fixer:: idioms
- This optional fixer preforms several transformations that make Python code
- more idiomatic. Type comparisions like ``type(x) is SomeClass`` and
+ This optional fixer performs several transformations that make Python code
+ more idiomatic. Type comparisons like ``type(x) is SomeClass`` and
``type(x) == SomeClass`` are converted to ``isinstance(x, SomeClass)``.
``while 1`` becomes ``while True``. This fixer also tries to make use of
- :func:`sorted` in appropiate places. For example, this block ::
+ :func:`sorted` in appropriate places. For example, this block ::
L = list(some_iterable)
L.sort()
diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst
index 9673dab..a50ffbf 100644
--- a/Doc/library/exceptions.rst
+++ b/Doc/library/exceptions.rst
@@ -52,7 +52,7 @@ The following exceptions are only used as base classes for other exceptions.
The base class for all built-in exceptions. It is not meant to be directly
inherited by user-defined classes (for that use :exc:`Exception`). If
:func:`str` or :func:`unicode` is called on an instance of this class, the
- representation of the argument(s) to the instance are returned or the emptry
+ representation of the argument(s) to the instance are returned or the empty
string when there were no arguments. All arguments are stored in :attr:`args`
as a tuple.
diff --git a/Doc/library/turtle.rst b/Doc/library/turtle.rst
index fd84597..9707420 100644
--- a/Doc/library/turtle.rst
+++ b/Doc/library/turtle.rst
@@ -61,7 +61,7 @@ The object-oriented interface uses essentially two+two classes:
The procedural interface provides functions which are derived from the methods
of the classes :class:`Screen` and :class:`Turtle`. They have the same names as
-the corresponding methods. A screen object is automativally created whenever a
+the corresponding methods. A screen object is automatically created whenever a
function derived from a Screen method is called. An (unnamed) turtle object is
automatically created whenever any of the functions derived from a Turtle method
is called.
@@ -1608,7 +1608,7 @@ The public classes of the module :mod:`turtle`
=========== ===========
"polygon" a polygon-tuple, i.e. a tuple of pairs of coordinates
"image" an image (in this form only used internally!)
- "compound" ``None`` (a compund shape has to be constructed using the
+ "compound" ``None`` (a compound shape has to be constructed using the
:meth:`addcomponent` method)
=========== ===========
@@ -1830,7 +1830,7 @@ There is a set of demo scripts in the turtledemo directory located in the
It contains:
-- a set of 15 demo scripts demonstrating differet features of the new module
+- a set of 15 demo scripts demonstrating different features of the new module
:mod:`turtle`
- a demo viewer :file:`turtleDemo.py` which can be used to view the sourcecode
of the scripts and run them at the same time. 14 of the examples can be