[Python-checkins] r85264 - in python/branches/release27-maint: Doc/distutils/builtdist.rst Doc/faq/design.rst Doc/faq/programming.rst Doc/glossary.rst Doc/howto/descriptor.rst Doc/howto/sockets.rst Doc/library/2to3.rst Doc/library/bisect.rst Doc/library/importlib.rst Doc/library/logging.rst Doc/library/multiprocessing.rst Doc/library/os.rst Doc/library/profile.rst Doc/library/readline.rst Doc/library/telnetlib.rst Doc/library/turtle.rst Doc/library/unittest.rst Doc/reference/expressions.rst
georg.brandl
python-checkins at python.org
Wed Oct 6 11:32:48 CEST 2010
Author: georg.brandl
Date: Wed Oct 6 11:32:48 2010
New Revision: 85264
Log:
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.
........
Modified:
python/branches/release27-maint/ (props changed)
python/branches/release27-maint/Doc/distutils/builtdist.rst
python/branches/release27-maint/Doc/faq/design.rst
python/branches/release27-maint/Doc/faq/programming.rst
python/branches/release27-maint/Doc/glossary.rst
python/branches/release27-maint/Doc/howto/descriptor.rst
python/branches/release27-maint/Doc/howto/sockets.rst
python/branches/release27-maint/Doc/library/2to3.rst
python/branches/release27-maint/Doc/library/bisect.rst
python/branches/release27-maint/Doc/library/importlib.rst
python/branches/release27-maint/Doc/library/logging.rst
python/branches/release27-maint/Doc/library/multiprocessing.rst
python/branches/release27-maint/Doc/library/os.rst
python/branches/release27-maint/Doc/library/profile.rst
python/branches/release27-maint/Doc/library/readline.rst
python/branches/release27-maint/Doc/library/telnetlib.rst
python/branches/release27-maint/Doc/library/turtle.rst
python/branches/release27-maint/Doc/library/unittest.rst
python/branches/release27-maint/Doc/reference/expressions.rst
Modified: python/branches/release27-maint/Doc/distutils/builtdist.rst
==============================================================================
--- python/branches/release27-maint/Doc/distutils/builtdist.rst (original)
+++ python/branches/release27-maint/Doc/distutils/builtdist.rst Wed Oct 6 11:32:48 2010
@@ -358,7 +358,7 @@
To cross-compile, you must download the Python source code and cross-compile
Python itself for the platform you are targetting - it is not possible from a
-binary installtion of Python (as the .lib etc file for other platforms are
+binary installation of Python (as the .lib etc file for other platforms are
not included.) In practice, this means the user of a 32 bit operating
system will need to use Visual Studio 2008 to open the
:file:`PCBuild/PCbuild.sln` solution in the Python source tree and build the
Modified: python/branches/release27-maint/Doc/faq/design.rst
==============================================================================
--- python/branches/release27-maint/Doc/faq/design.rst (original)
+++ python/branches/release27-maint/Doc/faq/design.rst Wed Oct 6 11:32:48 2010
@@ -28,7 +28,7 @@
If you're used to reading and writing code that uses one style, you will feel at
least slightly uneasy when reading (or being required to write) another style.
-Many coding styles place begin/end brackets on a line by themself. This makes
+Many coding styles place begin/end brackets on a line by themselves. This makes
programs considerably longer and wastes valuable screen space, making it harder
to get a good overview of a program. Ideally, a function should fit on one
screen (say, 20-30 lines). 20 lines of Python can do a lot more work than 20
Modified: python/branches/release27-maint/Doc/faq/programming.rst
==============================================================================
--- python/branches/release27-maint/Doc/faq/programming.rst (original)
+++ python/branches/release27-maint/Doc/faq/programming.rst Wed Oct 6 11:32:48 2010
@@ -944,7 +944,7 @@
-------------------------------------------------------------------------------------
Starting with Python 2.2, you can use ``S.rstrip("\r\n")`` to remove all
-occurences of any line terminator from the end of the string ``S`` without
+occurrences of any line terminator from the end of the string ``S`` without
removing other trailing whitespace. If the string ``S`` represents more than
one line, with several empty lines at the end, the line terminators for all the
blank lines will be removed::
Modified: python/branches/release27-maint/Doc/glossary.rst
==============================================================================
--- python/branches/release27-maint/Doc/glossary.rst (original)
+++ python/branches/release27-maint/Doc/glossary.rst Wed Oct 6 11:32:48 2010
@@ -19,7 +19,7 @@
2to3
A tool that tries to convert Python 2.x code to Python 3.x code by
- handling most of the incompatibilites which can be detected by parsing the
+ handling most of the incompatibilities which can be detected by parsing the
source and traversing the parse tree.
2to3 is available in the standard library as :mod:`lib2to3`; a standalone
Modified: python/branches/release27-maint/Doc/howto/descriptor.rst
==============================================================================
--- python/branches/release27-maint/Doc/howto/descriptor.rst (original)
+++ python/branches/release27-maint/Doc/howto/descriptor.rst Wed Oct 6 11:32:48 2010
@@ -296,7 +296,7 @@
<bound method D.f of <__main__.D object at 0x00B18C90>>
The output suggests that bound and unbound methods are two different types.
-While they could have been implemented that way, the actual C implemention of
+While they could have been implemented that way, the actual C implementation of
:ctype:`PyMethod_Type` in
`Objects/classobject.c <http://svn.python.org/view/python/trunk/Objects/classobject.c?view=markup>`_
is a single object with two different representations depending on whether the
Modified: python/branches/release27-maint/Doc/howto/sockets.rst
==============================================================================
--- python/branches/release27-maint/Doc/howto/sockets.rst (original)
+++ python/branches/release27-maint/Doc/howto/sockets.rst Wed Oct 6 11:32:48 2010
@@ -314,7 +314,7 @@
Non-blocking Sockets
====================
-If you've understood the preceeding, you already know most of what you need to
+If you've understood the preceding, you already know most of what you need to
know about the mechanics of using sockets. You'll still use the same calls, in
much the same ways. It's just that, if you do it right, your app will be almost
inside-out.
Modified: python/branches/release27-maint/Doc/library/2to3.rst
==============================================================================
--- python/branches/release27-maint/Doc/library/2to3.rst (original)
+++ python/branches/release27-maint/Doc/library/2to3.rst Wed Oct 6 11:32:48 2010
@@ -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.
Modified: python/branches/release27-maint/Doc/library/bisect.rst
==============================================================================
--- python/branches/release27-maint/Doc/library/bisect.rst (original)
+++ python/branches/release27-maint/Doc/library/bisect.rst Wed Oct 6 11:32:48 2010
@@ -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
Modified: python/branches/release27-maint/Doc/library/importlib.rst
==============================================================================
--- python/branches/release27-maint/Doc/library/importlib.rst (original)
+++ python/branches/release27-maint/Doc/library/importlib.rst Wed Oct 6 11:32:48 2010
@@ -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.
Modified: python/branches/release27-maint/Doc/library/logging.rst
==============================================================================
--- python/branches/release27-maint/Doc/library/logging.rst (original)
+++ python/branches/release27-maint/Doc/library/logging.rst Wed Oct 6 11:32:48 2010
@@ -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
Modified: python/branches/release27-maint/Doc/library/multiprocessing.rst
==============================================================================
--- python/branches/release27-maint/Doc/library/multiprocessing.rst (original)
+++ python/branches/release27-maint/Doc/library/multiprocessing.rst Wed Oct 6 11:32:48 2010
@@ -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:
Modified: python/branches/release27-maint/Doc/library/os.rst
==============================================================================
--- python/branches/release27-maint/Doc/library/os.rst (original)
+++ python/branches/release27-maint/Doc/library/os.rst Wed Oct 6 11:32:48 2010
@@ -337,7 +337,7 @@
Set the current process's real, effective, and saved user ids.
- Availibility: Unix.
+ Availability: Unix.
.. versionadded:: 2.7
Modified: python/branches/release27-maint/Doc/library/profile.rst
==============================================================================
--- python/branches/release27-maint/Doc/library/profile.rst (original)
+++ python/branches/release27-maint/Doc/library/profile.rst Wed Oct 6 11:32:48 2010
@@ -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)
Modified: python/branches/release27-maint/Doc/library/readline.rst
==============================================================================
--- python/branches/release27-maint/Doc/library/readline.rst (original)
+++ python/branches/release27-maint/Doc/library/readline.rst Wed Oct 6 11:32:48 2010
@@ -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.
Modified: python/branches/release27-maint/Doc/library/telnetlib.rst
==============================================================================
--- python/branches/release27-maint/Doc/library/telnetlib.rst (original)
+++ python/branches/release27-maint/Doc/library/telnetlib.rst Wed Oct 6 11:32:48 2010
@@ -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)
Modified: python/branches/release27-maint/Doc/library/turtle.rst
==============================================================================
--- python/branches/release27-maint/Doc/library/turtle.rst (original)
+++ python/branches/release27-maint/Doc/library/turtle.rst Wed Oct 6 11:32:48 2010
@@ -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
Modified: python/branches/release27-maint/Doc/library/unittest.rst
==============================================================================
--- python/branches/release27-maint/Doc/library/unittest.rst (original)
+++ python/branches/release27-maint/Doc/library/unittest.rst Wed Oct 6 11:32:48 2010
@@ -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
Modified: python/branches/release27-maint/Doc/reference/expressions.rst
==============================================================================
--- python/branches/release27-maint/Doc/reference/expressions.rst (original)
+++ python/branches/release27-maint/Doc/reference/expressions.rst Wed Oct 6 11:32:48 2010
@@ -417,7 +417,7 @@
multiple times, they have more than one entry point and their execution can be
suspended. The only difference is that a generator function cannot control
where should the execution continue after it yields; the control is always
-transfered to the generator's caller.
+transferred to the generator's caller.
.. index:: object: generator
More information about the Python-checkins
mailing list