Merged revisions 84945 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r84945 | georg.brandl | 2010-09-21 16:48:28 +0200 (Di, 21 Sep 2010) | 1 line
#9911: doc copyedits.
........
diff --git a/Doc/library/2to3.rst b/Doc/library/2to3.rst
index f3be8fa..de31251 100644
--- a/Doc/library/2to3.rst
+++ b/Doc/library/2to3.rst
@@ -89,7 +89,7 @@
Since some print statements can be parsed as function calls or statements, 2to3
cannot always read files containing the print function. When 2to3 detects the
presence of the ``from __future__ import print_function`` compiler directive, it
-modifies its internal grammar to interpert :func:`print` as a function. This
+modifies its internal grammar to interpret :func:`print` as a function. This
change can also be enabled manually with the :option:`-p` flag. Use
:option:`-p` to run fixers on code that already has had its print statements
converted.
diff --git a/Doc/library/bisect.rst b/Doc/library/bisect.rst
index 2bee02f..c566216 100644
--- a/Doc/library/bisect.rst
+++ b/Doc/library/bisect.rst
@@ -127,7 +127,7 @@
Unlike the :func:`sorted` function, it does not make sense for the :func:`bisect`
functions to have *key* or *reversed* arguments because that would lead to an
-inefficent design (successive calls to bisect functions would not "remember"
+inefficient design (successive calls to bisect functions would not "remember"
all of the previous key lookups).
Instead, it is better to search a list of precomputed keys to find the index
diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
index 375c2ae..c4307b5 100644
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -23,5 +23,5 @@
specified in relative terms, then the *package* argument must be
specified to the package which is to act as the anchor for resolving the
package name (e.g. ``import_module('..mod', 'pkg.subpkg')`` will import
- ``pkg.mod``). The specified module will be inserted into
+ ``pkg.mod``). The specified module will be inserted into
:data:`sys.modules` and returned.
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
index 4acd1d4..d451567 100644
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -2744,7 +2744,7 @@
.. attribute:: exc_info
Exception tuple (à la `sys.exc_info`) or `None` if no exception
- information is availble.
+ information is available.
.. attribute:: func
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index 27b8703..d7acfbb 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -376,7 +376,7 @@
Otherwise a daemonic process would leave its children orphaned if it gets
terminated when its parent process exits. Additionally, these are **not**
Unix daemons or services, they are normal processes that will be
- terminated (and not joined) if non-dameonic processes have exited.
+ terminated (and not joined) if non-daemonic processes have exited.
In addition to the :class:`Threading.Thread` API, :class:`Process` objects
also support the following attributes and methods:
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index c9747e3..b920d4e 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -337,7 +337,7 @@
Set the current process's real, effective, and saved user ids.
- Availibility: Unix.
+ Availability: Unix.
.. versionadded:: 2.7
diff --git a/Doc/library/profile.rst b/Doc/library/profile.rst
index a69a0da..1e2350f 100644
--- a/Doc/library/profile.rst
+++ b/Doc/library/profile.rst
@@ -620,7 +620,7 @@
integers, you can also invoke the class constructor with a second argument
specifying the real duration of one unit of time. For example, if
:func:`your_integer_time_func` returns times measured in thousands of seconds,
- you would constuct the :class:`Profile` instance as follows::
+ you would construct the :class:`Profile` instance as follows::
pr = profile.Profile(your_integer_time_func, 0.001)
diff --git a/Doc/library/readline.rst b/Doc/library/readline.rst
index c58fd26..9a7e940 100644
--- a/Doc/library/readline.rst
+++ b/Doc/library/readline.rst
@@ -20,7 +20,7 @@
the ``libedit`` library instead of GNU readline.
The configuration file for ``libedit`` is different from that
- of GNU readline. If you programmaticly load configuration strings
+ of GNU readline. If you programmatically load configuration strings
you can check for the text "libedit" in :const:`readline.__doc__`
to differentiate between GNU readline and libedit.
diff --git a/Doc/library/telnetlib.rst b/Doc/library/telnetlib.rst
index b1528bd..925eccc 100644
--- a/Doc/library/telnetlib.rst
+++ b/Doc/library/telnetlib.rst
@@ -198,8 +198,8 @@
received so far (may be the empty string if a timeout happened).
If a regular expression ends with a greedy match (such as ``.*``) or if more
- than one expression can match the same input, the results are indeterministic,
- and may depend on the I/O timing.
+ than one expression can match the same input, the results are
+ non-deterministic, and may depend on the I/O timing.
.. method:: Telnet.set_option_negotiation_callback(callback)
diff --git a/Doc/library/turtle.rst b/Doc/library/turtle.rst
index 07d1669..55905fe 100644
--- a/Doc/library/turtle.rst
+++ b/Doc/library/turtle.rst
@@ -1835,7 +1835,7 @@
.. function:: setup(width=_CFG["width"], height=_CFG["height"], startx=_CFG["leftright"], starty=_CFG["topbottom"])
Set the size and position of the main window. Default values of arguments
- are stored in the configuration dicionary and can be changed via a
+ are stored in the configuration dictionary and can be changed via a
:file:`turtle.cfg` file.
:param width: if an integer, a size in pixels, if a float, a fraction of the
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 0ef2e03..6fc49eb 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -634,7 +634,7 @@
.. function:: skipUnless(condition, reason)
- Skip the decoratored test unless *condition* is true.
+ Skip the decorated test unless *condition* is true.
.. function:: expectedFailure
@@ -1523,8 +1523,8 @@
.. attribute:: expectedFailures
- A list contaning 2-tuples of :class:`TestCase` instances and strings
- holding formatted tracebacks. Each tuple represents a expected failures
+ A list containing 2-tuples of :class:`TestCase` instances and strings
+ holding formatted tracebacks. Each tuple represents an expected failure
of the test case.
.. attribute:: unexpectedSuccesses