Index: Doc/extending/windows.rst =================================================================== --- Doc/extending/windows.rst (revision 64789) +++ Doc/extending/windows.rst (working copy) @@ -23,7 +23,7 @@ This chapter mentions a number of filenames that include an encoded Python version number. These filenames are represented with the version number shown - as ``XY``; in practive, ``'X'`` will be the major version number and ``'Y'`` + as ``XY``; in practice, ``'X'`` will be the major version number and ``'Y'`` will be the minor version number of the Python release you're working with. For example, if you are using Python 2.2.1, ``XY`` will actually be ``22``. Index: Doc/using/windows.rst =================================================================== --- Doc/using/windows.rst (revision 64789) +++ Doc/using/windows.rst (working copy) @@ -188,7 +188,7 @@ startup. You can also make all ``.py`` scripts execute with :program:`pythonw.exe`, -setting this through the usual facilites, for example (might require +setting this through the usual facilities, for example (might require administrative rights): #. Launch a command prompt. @@ -217,7 +217,7 @@ The `PyWin32 `_ module by Mark Hammond is a collection of modules for advanced Windows-specific support. This includes -utilites for: +utilities for: * `Component Object Model `_ (COM) * Win32 API calls Index: Doc/c-api/conversion.rst =================================================================== --- Doc/c-api/conversion.rst (revision 64789) +++ Doc/c-api/conversion.rst (working copy) @@ -89,15 +89,15 @@ .. cfunction:: char * PyOS_stricmp(char *s1, char *s2) - Case insensitive comparsion of strings. The functions works almost - identical to :cfunc:`strcmp` except that it ignores the case. + Case insensitive comparison of strings. The function works almost + identically to :cfunc:`strcmp` except that it ignores the case. .. versionadded:: 2.6 .. cfunction:: char * PyOS_strnicmp(char *s1, char *s2, Py_ssize_t size) - Case insensitive comparsion of strings. The functions works almost - identical to :cfunc:`strncmp` except that it ignores the case. + Case insensitive comparison of strings. The function works almost + identically to :cfunc:`strncmp` except that it ignores the case. .. versionadded:: 2.6 Index: Doc/whatsnew/2.6.rst =================================================================== --- Doc/whatsnew/2.6.rst (revision 64789) +++ Doc/whatsnew/2.6.rst (working copy) @@ -529,7 +529,7 @@ .. XXX I think this still needs help :mod:`multiprocessing` makes it easy to distribute work over multiple processes. -Its API is similiar to that of :mod:`threading`. For example:: +Its API is similar to that of :mod:`threading`. For example:: from multiprocessing import Process Index: Doc/tutorial/stdlib2.rst =================================================================== --- Doc/tutorial/stdlib2.rst (revision 64789) +++ Doc/tutorial/stdlib2.rst (working copy) @@ -286,7 +286,7 @@ performance trade-offs. The :mod:`array` module provides an :class:`array()` object that is like a list -that stores only homogenous data and stores it more compactly. The following +that stores only homogeneous data and stores it more compactly. The following example shows an array of numbers stored as two byte unsigned binary numbers (typecode ``"H"``) rather than the usual 16 bytes per entry for regular lists of python int objects:: Index: Doc/library/string.rst =================================================================== --- Doc/library/string.rst (revision 64789) +++ Doc/library/string.rst (working copy) @@ -293,7 +293,7 @@ "noses " -Which is subsitituted into the string, yielding:: +Which is substituted into the string, yielding:: "A man with two noses " Index: Doc/library/urllib2.rst =================================================================== --- Doc/library/urllib2.rst (revision 64789) +++ Doc/library/urllib2.rst (working copy) @@ -916,7 +916,7 @@ obtain the HTTP proxy's URL. This example replaces the default :class:`ProxyHandler` with one that uses -programatically-supplied proxy URLs, and adds proxy authorization support with +programmatically-supplied proxy URLs, and adds proxy authorization support with :class:`ProxyBasicAuthHandler`. :: proxy_handler = urllib2.ProxyHandler({'http': 'http://www.example.com:3128/'}) Index: Doc/library/turtle.rst =================================================================== --- Doc/library/turtle.rst (revision 64789) +++ Doc/library/turtle.rst (working copy) @@ -1275,7 +1275,7 @@ ... left(10) ... >>> for _ in range(8): - ... left(45); fd(2) # a regular octogon + ... left(45); fd(2) # a regular octagon Animation control @@ -1286,7 +1286,7 @@ :param delay: positive integer Set or return the drawing *delay* in milliseconds. (This is approximately - the time interval between two consecutived canvas updates.) The longer the + the time interval between two consecutive canvas updates.) The longer the drawing delay, the slower the animation. Optional argument: Index: Doc/library/ftplib.rst =================================================================== --- Doc/library/ftplib.rst (revision 64789) +++ Doc/library/ftplib.rst (working copy) @@ -316,7 +316,7 @@ Send a ``QUIT`` command to the server and close the connection. This is the "polite" way to close a connection, but it may raise an exception of the server - reponds with an error to the ``QUIT`` command. This implies a call to the + responds with an error to the ``QUIT`` command. This implies a call to the :meth:`close` method which renders the :class:`FTP` instance useless for subsequent calls (see below). Index: Doc/library/select.rst =================================================================== --- Doc/library/select.rst (revision 64789) +++ Doc/library/select.rst (working copy) @@ -338,7 +338,7 @@ +---------------------------+---------------------------------------------+ | :const:`KQ_EV_DISABLE` | Disablesevent | +---------------------------+---------------------------------------------+ - | :const:`KQ_EV_ONESHOT` | Removes event after first occurence | + | :const:`KQ_EV_ONESHOT` | Removes event after first occurrence | +---------------------------+---------------------------------------------+ | :const:`KQ_EV_CLEAR` | Reset the state after an event is retrieved | +---------------------------+---------------------------------------------+ @@ -373,7 +373,7 @@ +============================+============================================+ | :const:`KQ_NOTE_DELETE` | *unlink()* was called | +----------------------------+--------------------------------------------+ - | :const:`KQ_NOTE_WRITE` | a write occured | + | :const:`KQ_NOTE_WRITE` | a write occurred | +----------------------------+--------------------------------------------+ | :const:`KQ_NOTE_EXTEND` | the file was extended | +----------------------------+--------------------------------------------+ Index: Doc/library/multiprocessing.rst =================================================================== --- Doc/library/multiprocessing.rst (revision 64789) +++ Doc/library/multiprocessing.rst (working copy) @@ -160,7 +160,7 @@ The ``'d'`` and ``'i'`` arguments used when creating ``num`` and ``arr`` are typecodes of the kind used by the :mod:`array` module: ``'d'`` indicates a - double precision float and ``'i'`` inidicates a signed integer. These shared + double precision float and ``'i'`` indicates a signed integer. These shared objects will be process and thread safe. For more flexibility in using shared memory one can use the @@ -784,7 +784,7 @@ A bounded semaphore object: a clone of :class:`threading.BoundedSemaphore`. - (On Mac OSX this is indistiguishable from :class:`Semaphore` because + (On Mac OSX this is indistinguishable from :class:`Semaphore` because ``sem_getvalue()`` is not implemented on that platform). .. class:: Condition([lock]) @@ -893,8 +893,8 @@ .. note:: - Although it is posible to store a pointer in shared memory remember that this - will refer to a location in the address space of a specific process. + Although it is possible to store a pointer in shared memory remember that + this will refer to a location in the address space of a specific process. However, the pointer is quite likely to be invalid in the context of a second process and trying to dereference the pointer from the second process may cause a crash. @@ -1776,7 +1776,7 @@ handler which sends output to :data:`sys.stderr` using format ``'[%(levelname)s/%(processName)s] %(message)s'``. (The logger allows use of the non-standard ``'%(processName)s'`` format.) Message sent to this logger - will not by default propogate to the root logger. + will not by default propagate to the root logger. Note that on Windows child processes will only inherit the level of the parent process's logger -- any other customization of the logger will not be Index: Doc/library/xmlrpclib.rst =================================================================== --- Doc/library/xmlrpclib.rst (revision 64789) +++ Doc/library/xmlrpclib.rst (working copy) @@ -379,7 +379,7 @@ try: proxy.add(2, 5) except xmlrpclib.Fault, err: - print "A fault occured" + print "A fault occurred" print "Fault code: %d" % err.faultCode print "Fault string: %s" % err.faultString @@ -426,7 +426,7 @@ try: proxy.some_method() except xmlrpclib.ProtocolError, err: - print "A protocol error occured" + print "A protocol error occurred" print "URL: %s" % err.url print "HTTP/HTTPS headers: %s" % err.headers print "Error code: %d" % err.errcode Index: Doc/library/__future__.rst =================================================================== --- Doc/library/__future__.rst (revision 64789) +++ Doc/library/__future__.rst (working copy) @@ -16,7 +16,7 @@ * To document when incompatible changes were introduced, and when they will be --- or were --- made mandatory. This is a form of executable documentation, and - can be inspected programatically via importing :mod:`__future__` and examining + can be inspected programmatically via importing :mod:`__future__` and examining its contents. Each statement in :file:`__future__.py` is of the form:: Index: Doc/library/wsgiref.rst =================================================================== --- Doc/library/wsgiref.rst (revision 64789) +++ Doc/library/wsgiref.rst (working copy) @@ -415,7 +415,7 @@ from wsgiref.validate import validator from wsgiref.simple_server import make_server - # Our callable object which is intentionally not compilant to the + # Our callable object which is intentionally not compliant to the # standard, so the validator is going to break def simple_app(environ, start_response): status = '200 OK' # HTTP Status Index: Doc/library/stdtypes.rst =================================================================== --- Doc/library/stdtypes.rst (revision 64789) +++ Doc/library/stdtypes.rst (working copy) @@ -1543,7 +1543,7 @@ .. method:: isdisjoint(other) Return True if the set has no elements in common with *other*. Sets are - disjoint if and only if their interesection is the empty set. + disjoint if and only if their intersection is the empty set. .. versionadded:: 2.6 Index: Doc/library/imputil.rst =================================================================== --- Doc/library/imputil.rst (revision 64789) +++ Doc/library/imputil.rst (working copy) @@ -108,7 +108,7 @@ This code is intended to be read, not executed. However, it does work -- all you need to do to enable it is "import knee". -(The name is a pun on the klunkier predecessor of this module, "ni".) +(The name is a pun on the clunkier predecessor of this module, "ni".) :: Index: Doc/library/operator.rst =================================================================== --- Doc/library/operator.rst (revision 64789) +++ Doc/library/operator.rst (working copy) @@ -630,7 +630,7 @@ +-----------------------+-------------------------+---------------------------------+ | Right Shift | ``a >> b`` | ``rshift(a, b)`` | +-----------------------+-------------------------+---------------------------------+ -| Sequence Repitition | ``seq * i`` | ``repeat(seq, i)`` | +| Sequence Repetition | ``seq * i`` | ``repeat(seq, i)`` | +-----------------------+-------------------------+---------------------------------+ | Slice Assignment | ``seq[i:j] = values`` | ``setslice(seq, i, j, values)`` | +-----------------------+-------------------------+---------------------------------+ Index: Doc/library/tix.rst =================================================================== --- Doc/library/tix.rst (revision 64789) +++ Doc/library/tix.rst (working copy) @@ -310,7 +310,7 @@ .. \ulink{FileEntry}{http://tix.sourceforge.net/dist/current/demos/samples/FileEnt.tcl} -Hierachical ListBox +Hierarchical ListBox ^^^^^^^^^^^^^^^^^^^ Index: Doc/library/functions.rst =================================================================== --- Doc/library/functions.rst (revision 64789) +++ Doc/library/functions.rst (working copy) @@ -1389,7 +1389,7 @@ or use in modern Python programming. They have been kept here to maintain backwards compatibility with programs written for older versions of Python. -Python programmers, trainers, students and bookwriters should feel free to +Python programmers, trainers, students and book writers should feel free to bypass these functions without concerns about missing something important. Index: Doc/library/macosa.rst =================================================================== --- Doc/library/macosa.rst (revision 64789) +++ Doc/library/macosa.rst (working copy) @@ -6,10 +6,10 @@ ********************* This chapter describes the current implementation of the Open Scripting -Architecure (OSA, also commonly referred to as AppleScript) for Python, allowing -you to control scriptable applications from your Python program, and with a -fairly pythonic interface. Development on this set of modules has stopped, and a -replacement is expected for Python 2.5. +Architecture (OSA, also commonly referred to as AppleScript) for Python, +allowing you to control scriptable applications from your Python program, +and with a fairly pythonic interface. Development on this set of modules has +stopped, and a replacement is expected for Python 2.5. For a description of the various components of AppleScript and OSA, and to get an understanding of the architecture and terminology, you should read Apple's