diff -r ec3ca1901776 Doc/distutils/apiref.rst --- a/Doc/distutils/apiref.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/distutils/apiref.rst Sun May 18 16:48:11 2014 -0700 @@ -1099,13 +1099,13 @@ during the build of Python), not the OS version of the current system. For universal binary builds on Mac OS X the architecture value reflects - the univeral binary status instead of the architecture of the current + the universal binary status instead of the architecture of the current processor. For 32-bit universal binaries the architecture is ``fat``, for 64-bit universal binaries the architecture is ``fat64``, and for 4-way universal binaries the architecture is ``universal``. Starting from Python 2.7 and Python 3.2 the architecture ``fat3`` is used for a 3-way universal build (ppc, i386, x86_64) and ``intel`` is used for - a univeral build with the i386 and x86_64 architectures + a universal build with the i386 and x86_64 architectures Examples of returned values on Mac OS X: diff -r ec3ca1901776 Doc/distutils/builtdist.rst --- a/Doc/distutils/builtdist.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/distutils/builtdist.rst Sun May 18 16:48:11 2014 -0700 @@ -355,7 +355,7 @@ would create a 64bit installation executable on your 32bit version of Windows. 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 +Python itself for the platform you are targeting - it is not possible from a 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 diff -r ec3ca1901776 Doc/howto/clinic.rst --- a/Doc/howto/clinic.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/howto/clinic.rst Sun May 18 16:48:11 2014 -0700 @@ -886,7 +886,7 @@ Advanced converters ------------------- -Remeber those format units you skipped for your first +Remember those format units you skipped for your first time because they were advanced? Here's how to handle those too. The trick is, all those format units take arguments--either @@ -1020,12 +1020,12 @@ the ``"as"`` should come before the return converter.) There's one additional complication when using return converters: how do you -indicate an error has occured? Normally, a function returns a valid (non-``NULL``) +indicate an error has occurred? Normally, a function returns a valid (non-``NULL``) pointer for success, and ``NULL`` for failure. But if you use an integer return converter, all integers are valid. How can Argument Clinic detect an error? Its solution: each return converter implicitly looks for a special value that indicates an error. If you return that value, and an error has been set (``PyErr_Occurred()`` returns a true -value), then the generated code will propogate the error. Otherwise it will +value), then the generated code will propagate the error. Otherwise it will encode the value you return like normal. Currently Argument Clinic supports only a few return converters:: @@ -1573,7 +1573,7 @@ ``line_prefix`` is a string that will be prepended to every line of Clinic's output; ``line_suffix`` is a string that will be appended to every line of Clinic's output. -Both of these suport two format strings: +Both of these support two format strings: ``{block comment start}`` Turns into the string ``/*``, the start-comment text sequence for C files. diff -r ec3ca1901776 Doc/howto/pyporting.rst --- a/Doc/howto/pyporting.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/howto/pyporting.rst Sun May 18 16:48:11 2014 -0700 @@ -60,7 +60,7 @@ `trove classifiers`_ to signify what versions of Python it **currently** supports. At minimum you should specify the major version(s), e.g. ``Programming Language :: Python :: 2`` if your project currently only supports -Python 2. It is preferrable that you be as specific as possible by listing every +Python 2. It is preferable that you be as specific as possible by listing every major/minor version of Python that you support, e.g. if your project supports Python 2.6 and 2.7, then you want the classifiers of:: diff -r ec3ca1901776 Doc/howto/regex.rst --- a/Doc/howto/regex.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/howto/regex.rst Sun May 18 16:48:11 2014 -0700 @@ -852,7 +852,7 @@ problem. Both of them use a common syntax for regular expression extensions, so we'll look at that first. -Perl 5 is well-known for its powerful additions to standard regular expressions. +Perl 5 is well known for its powerful additions to standard regular expressions. For these new features the Perl developers couldn't choose new single-keystroke metacharacters or new special sequences beginning with ``\`` without making Perl's regular expressions confusingly different from standard REs. If they chose ``&`` as a diff -r ec3ca1901776 Doc/howto/sockets.rst --- a/Doc/howto/sockets.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/howto/sockets.rst Sun May 18 16:48:11 2014 -0700 @@ -232,7 +232,7 @@ following message. You'll need to put that aside and hold onto it, until it's needed. -Prefixing the message with it's length (say, as 5 numeric characters) gets more +Prefixing the message with its length (say, as 5 numeric characters) gets more complex, because (believe it or not), you may not get all 5 characters in one ``recv``. In playing around, you'll get away with it; but in high network loads, your code will very quickly break unless you use two ``recv`` loops - the first diff -r ec3ca1901776 Doc/library/argparse.rst --- a/Doc/library/argparse.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/library/argparse.rst Sun May 18 16:48:11 2014 -0700 @@ -1873,7 +1873,7 @@ Arguments that are read from a file (see the *fromfile_prefix_chars* keyword argument to the :class:`ArgumentParser` constructor) are read one - argument per line. :meth:`convert_arg_line_to_args` can be overriden for + argument per line. :meth:`convert_arg_line_to_args` can be overridden for fancier reading. This method takes a single argument *arg_line* which is a string read from diff -r ec3ca1901776 Doc/library/cmd.rst --- a/Doc/library/cmd.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/library/cmd.rst Sun May 18 16:48:11 2014 -0700 @@ -252,7 +252,7 @@ 'Move turtle to an absolute position with changing orientation. GOTO 100 200' goto(*parse(arg)) def do_home(self, arg): - 'Return turtle to the home postion: HOME' + 'Return turtle to the home position: HOME' home() def do_circle(self, arg): 'Draw circle with given radius an options extent and steps: CIRCLE 50' diff -r ec3ca1901776 Doc/library/collections.abc.rst --- a/Doc/library/collections.abc.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/library/collections.abc.rst Sun May 18 16:48:11 2014 -0700 @@ -179,7 +179,7 @@ (3) The :class:`Set` mixin provides a :meth:`_hash` method to compute a hash value for the set; however, :meth:`__hash__` is not defined because not all sets - are hashable or immutable. To add set hashabilty using mixins, + are hashable or immutable. To add set hashability using mixins, inherit from both :meth:`Set` and :meth:`Hashable`, then define ``__hash__ = Set._hash``. diff -r ec3ca1901776 Doc/library/collections.rst --- a/Doc/library/collections.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/library/collections.rst Sun May 18 16:48:11 2014 -0700 @@ -986,7 +986,7 @@ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Since an ordered dictionary remembers its insertion order, it can be used -in conjuction with sorting to make a sorted dictionary:: +in conjunction with sorting to make a sorted dictionary:: >>> # regular unsorted dictionary >>> d = {'banana': 3, 'apple':4, 'pear': 1, 'orange': 2} diff -r ec3ca1901776 Doc/library/configparser.rst --- a/Doc/library/configparser.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/library/configparser.rst Sun May 18 16:48:11 2014 -0700 @@ -388,7 +388,7 @@ * All sections include ``DEFAULTSECT`` values as well which means that ``.clear()`` on a section may not leave the section visibly empty. This is because default values cannot be deleted from the section (because technically - they are not there). If they are overriden in the section, deleting causes + they are not there). If they are overridden in the section, deleting causes the default value to be visible again. Trying to delete a default value causes a ``KeyError``. @@ -669,7 +669,7 @@ More advanced customization may be achieved by overriding default values of these parser attributes. The defaults are defined on the classes, so they -may be overriden by subclasses or by attribute assignment. +may be overridden by subclasses or by attribute assignment. .. attribute:: BOOLEAN_STATES diff -r ec3ca1901776 Doc/library/copyreg.rst --- a/Doc/library/copyreg.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/library/copyreg.rst Sun May 18 16:48:11 2014 -0700 @@ -9,7 +9,7 @@ module: pickle module: copy -The :mod:`copyreg` module offers a way to define fuctions used while pickling +The :mod:`copyreg` module offers a way to define functions used while pickling specific objects. The :mod:`pickle` and :mod:`copy` modules use those functions when pickling/copying those objects. The module provides configuration information about object constructors which are not classes. diff -r ec3ca1901776 Doc/library/http.server.rst --- a/Doc/library/http.server.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/library/http.server.rst Sun May 18 16:48:11 2014 -0700 @@ -220,7 +220,7 @@ .. method:: send_response_only(code, message=None) - Sends the reponse header only, used for the purposes when ``100 + Sends the response header only, used for the purposes when ``100 Continue`` response is sent by the server to the client. The headers not buffered and sent directly the output stream.If the *message* is not specified, the HTTP message corresponding the response *code* is sent. diff -r ec3ca1901776 Doc/library/ipaddress.rst --- a/Doc/library/ipaddress.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/library/ipaddress.rst Sun May 18 16:48:11 2014 -0700 @@ -103,7 +103,7 @@ 1. A string in decimal-dot notation, consisting of four decimal integers in the inclusive range 0-255, separated by dots (e.g. ``192.168.0.1``). Each integer represents an octet (byte) in the address. Leading zeroes are - tolerated only for values less then 8 (as there is no ambiguity + tolerated only for values less than 8 (as there is no ambiguity between the decimal and octal interpretations of such strings). 2. An integer that fits into 32 bits. 3. An integer packed into a :class:`bytes` object of length 4 (most diff -r ec3ca1901776 Doc/library/logging.handlers.rst --- a/Doc/library/logging.handlers.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/library/logging.handlers.rst Sun May 18 16:48:11 2014 -0700 @@ -435,7 +435,7 @@ .. method:: createSocket() Tries to create a socket; on failure, uses an exponential back-off - algorithm. On intial failure, the handler will drop the message it was + algorithm. On initial failure, the handler will drop the message it was trying to send. When subsequent messages are handled by the same instance, it will not try connecting until some time has passed. The default parameters are such that the initial delay is one second, and if diff -r ec3ca1901776 Doc/library/plistlib.rst --- a/Doc/library/plistlib.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/library/plistlib.rst Sun May 18 16:48:11 2014 -0700 @@ -129,7 +129,7 @@ and binary) file object. Returns the unpacked root object (which usually is a dictionary). - This function calls :func:`load` to do the actual work, the the documentation + This function calls :func:`load` to do the actual work, see the documentation of :func:`that function ` for an explanation of the keyword arguments. .. note:: diff -r ec3ca1901776 Doc/library/resource.rst --- a/Doc/library/resource.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/library/resource.rst Sun May 18 16:48:11 2014 -0700 @@ -45,7 +45,7 @@ .. data:: RLIM_INFINITY - Constant used to represent the the limit for an unlimited resource. + Constant used to represent the limit for an unlimited resource. .. function:: getrlimit(resource) diff -r ec3ca1901776 Doc/library/select.rst --- a/Doc/library/select.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/library/select.rst Sun May 18 16:48:11 2014 -0700 @@ -210,7 +210,7 @@ .. warning:: Registering a file descriptor that's already registered is not an - error, but the result is undefined. The appropiate action is to + error, but the result is undefined. The appropriate action is to unregister or modify it first. This is an important difference compared with :c:func:`poll`. diff -r ec3ca1901776 Doc/library/shutil.rst --- a/Doc/library/shutil.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/library/shutil.rst Sun May 18 16:48:11 2014 -0700 @@ -341,7 +341,7 @@ On Windows, the current directory is always prepended to the *path* whether or not you use the default or provide your own, which is the behavior the - command shell uses when finding executables. Additionaly, when finding the + command shell uses when finding executables. Additionally, when finding the *cmd* in the *path*, the ``PATHEXT`` environment variable is checked. For example, if you call ``shutil.which("python")``, :func:`which` will search ``PATHEXT`` to know that it should look for ``python.exe`` within the *path* diff -r ec3ca1901776 Doc/library/site.rst --- a/Doc/library/site.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/library/site.rst Sun May 18 16:48:11 2014 -0700 @@ -184,7 +184,7 @@ unless the Python interpreter was started with the :option:`-S` flag. .. versionchanged:: 3.3 - This function used to be called unconditionnally. + This function used to be called unconditionally. .. function:: addsitedir(sitedir, known_paths=None) diff -r ec3ca1901776 Doc/library/socket.rst --- a/Doc/library/socket.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/library/socket.rst Sun May 18 16:48:11 2014 -0700 @@ -1444,7 +1444,7 @@ can use the :meth:`socket.send`, and the :meth:`socket.recv` operations (and their counterparts) on the socket object as usual. -This example might require special priviledge:: +This example might require special privileges:: import socket import struct diff -r ec3ca1901776 Doc/library/ssl.rst --- a/Doc/library/ssl.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/library/ssl.rst Sun May 18 16:48:11 2014 -0700 @@ -1021,7 +1021,7 @@ :data:`CERT_NONE`. At least one of *cafile* or *capath* must be specified. This method can also load certification revocation lists (CRLs) in PEM or - or DER format. In order to make use of CRLs, :attr:`SSLContext.verify_flags` + DER format. In order to make use of CRLs, :attr:`SSLContext.verify_flags` must be configured properly. The *cafile* string, if present, is the path to a file of concatenated @@ -1693,7 +1693,7 @@ Verifying certificates '''''''''''''''''''''' -When calling the the :class:`SSLContext` constructor directly, +When calling the :class:`SSLContext` constructor directly, :const:`CERT_NONE` is the default. Since it does not authenticate the other peer, it can be insecure, especially in client mode where most of time you would like to ensure the authenticity of the server you're talking to. diff -r ec3ca1901776 Doc/library/threading.rst --- a/Doc/library/threading.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/library/threading.rst Sun May 18 16:48:11 2014 -0700 @@ -630,7 +630,7 @@ cv.wait() Therefore, the same rules apply as with :meth:`wait`: The lock must be - held when called and is re-aquired on return. The predicate is evaluated + held when called and is re-acquired on return. The predicate is evaluated with the lock held. .. versionadded:: 3.2 diff -r ec3ca1901776 Doc/library/tkinter.ttk.rst --- a/Doc/library/tkinter.ttk.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/library/tkinter.ttk.rst Sun May 18 16:48:11 2014 -0700 @@ -1167,7 +1167,7 @@ Each widget in :mod:`ttk` is assigned a style, which specifies the set of elements making up the widget and how they are arranged, along with dynamic and default settings for element options. By default the style name is the -same as the widget's class name, but it may be overriden by the widget's style +same as the widget's class name, but it may be overridden by the widget's style option. If you don't know the class name of a widget, use the method :meth:`Misc.winfo_class` (somewidget.winfo_class()). diff -r ec3ca1901776 Doc/library/tracemalloc.rst --- a/Doc/library/tracemalloc.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/library/tracemalloc.rst Sun May 18 16:48:11 2014 -0700 @@ -350,7 +350,7 @@ the *nframe* parameter of the :func:`start` function to store more frames. The :mod:`tracemalloc` module must be tracing memory allocations to take a - snapshot, see the the :func:`start` function. + snapshot, see the :func:`start` function. See also the :func:`get_object_traceback` function. diff -r ec3ca1901776 Doc/library/turtle.rst --- a/Doc/library/turtle.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/library/turtle.rst Sun May 18 16:48:11 2014 -0700 @@ -1809,7 +1809,7 @@ Pop up a dialog window for input of a number. title is the title of the dialog window, prompt is a text mostly describing what numerical information - to input. default: default value, minval: minimum value for imput, + to input. default: default value, minval: minimum value for input, maxval: maximum value for input The number input must be in the range minval .. maxval if these are given. If not, a hint is issued and the dialog remains open for @@ -2397,7 +2397,7 @@ Accordingly the latter has got an alias: :meth:`Screen.onkeyrelease`. - The method :meth:`Screen.mainloop` has been added. So when working only - with Screen and Turtle objects one must not additonally import + with Screen and Turtle objects one must not additionally import :func:`mainloop` anymore. - Two input methods has been added :meth:`Screen.textinput` and diff -r ec3ca1901776 Doc/library/urllib.request.rst --- a/Doc/library/urllib.request.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/library/urllib.request.rst Sun May 18 16:48:11 2014 -0700 @@ -67,7 +67,7 @@ :class:`http.client.HTTPResponse` object which has the following :ref:`httpresponse-objects` methods. - For ftp, file, and data urls and requests explicity handled by legacy + For ftp, file, and data urls and requests explicitly handled by legacy :class:`URLopener` and :class:`FancyURLopener` classes, this function returns a :class:`urllib.response.addinfourl` object which can work as :term:`context manager` and has methods such as @@ -1067,7 +1067,7 @@ the various ways in which a (X)HTML or a XML document could have specified its encoding information. -As the python.org website uses *utf-8* encoding as specified in it's meta tag, we +As the python.org website uses *utf-8* encoding as specified in its meta tag, we will use the same for decoding the bytes object. :: >>> with urllib.request.urlopen('http://www.python.org/') as f: diff -r ec3ca1901776 Doc/library/weakref.rst --- a/Doc/library/weakref.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/library/weakref.rst Sun May 18 16:48:11 2014 -0700 @@ -566,8 +566,8 @@ .. note:: - If you create a finalizer object in a daemonic thread just as the - the program exits then there is the possibility that the finalizer + If you create a finalizer object in a daemonic thread just as the program + exits then there is the possibility that the finalizer does not get called at exit. However, in a daemonic thread :func:`atexit.register`, ``try: ... finally: ...`` and ``with: ...`` do not guarantee that cleanup occurs either. diff -r ec3ca1901776 Doc/library/webbrowser.rst --- a/Doc/library/webbrowser.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/library/webbrowser.rst Sun May 18 16:48:11 2014 -0700 @@ -20,7 +20,7 @@ the user exits the browser. If the environment variable :envvar:`BROWSER` exists, it is interpreted as the -:data:`os.pathsep`-separated list of browsers to try ahead of the the platform +:data:`os.pathsep`-separated list of browsers to try ahead of the platform defaults. When the value of a list part contains the string ``%s``, then it is interpreted as a literal browser command line to be used with the argument URL substituted for ``%s``; if the part does not contain ``%s``, it is simply diff -r ec3ca1901776 Doc/library/xml.dom.rst --- a/Doc/library/xml.dom.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/library/xml.dom.rst Sun May 18 16:48:11 2014 -0700 @@ -412,7 +412,7 @@ .. method:: NodeList.item(i) Return the *i*'th item from the sequence, if there is one, or ``None``. The - index *i* is not allowed to be less then zero or greater than or equal to the + index *i* is not allowed to be less than zero or greater than or equal to the length of the sequence. diff -r ec3ca1901776 Doc/whatsnew/2.1.rst --- a/Doc/whatsnew/2.1.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/whatsnew/2.1.rst Sun May 18 16:48:11 2014 -0700 @@ -219,7 +219,7 @@ .. seealso:: - :pep:`207` - Rich Comparisions + :pep:`207` - Rich Comparisons Written by Guido van Rossum, heavily based on earlier work by David Ascher, and implemented by Guido van Rossum. diff -r ec3ca1901776 Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst Sun May 18 21:40:20 2014 +0100 +++ b/Doc/whatsnew/3.3.rst Sun May 18 16:48:11 2014 -0700 @@ -1579,7 +1579,7 @@ avoid race conditions in multi-threaded programs. * The :mod:`os` module has a new :func:`~os.sendfile` function which provides - an efficent "zero-copy" way for copying data from one file (or socket) + an efficient "zero-copy" way for copying data from one file (or socket) descriptor to another. The phrase "zero-copy" refers to the fact that all of the copying of data between the two descriptors is done entirely by the kernel, with no copying of data into userspace buffers. :func:`~os.sendfile` @@ -1908,7 +1908,7 @@ :meth:`~socketserver.BaseServer.service_actions` that is called by the :meth:`~socketserver.BaseServer.serve_forever` method in the service loop. :class:`~socketserver.ForkingMixIn` now uses this to clean up zombie -child proceses. (Contributed by Justin Warkentin in :issue:`11109`.) +child processes. (Contributed by Justin Warkentin in :issue:`11109`.) sqlite3 @@ -2360,7 +2360,7 @@ bytecode file, make sure to call :func:`importlib.invalidate_caches` to clear out the cache for the finders to notice the new file. -* :exc:`ImportError` now uses the full name of the module that was attemped to +* :exc:`ImportError` now uses the full name of the module that was attempted to be imported. Doctests that check ImportErrors' message will need to be updated to use the full name of the module instead of just the tail of the name.