diff options
author | Martin Panter <vadmium+py@gmail.com> | 2016-07-28 01:30:58 (GMT) |
---|---|---|
committer | Martin Panter <vadmium+py@gmail.com> | 2016-07-28 01:30:58 (GMT) |
commit | 8bde9111157e0eb994159c1506b1cec86298f810 (patch) | |
tree | 27d5ea90712d9eee3e678804ef581bac50ff9ba2 /Doc | |
parent | 4b53359090b7b3cfad128e40083f563f7c1900e4 (diff) | |
parent | eb9957065acaafbf3d8ebee4770ecb13ea0c07c0 (diff) | |
download | cpython-8bde9111157e0eb994159c1506b1cec86298f810.zip cpython-8bde9111157e0eb994159c1506b1cec86298f810.tar.gz cpython-8bde9111157e0eb994159c1506b1cec86298f810.tar.bz2 |
Issue #27626: Merge spelling fixes from 3.5
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/howto/clinic.rst | 2 | ||||
-rw-r--r-- | Doc/howto/sockets.rst | 2 | ||||
-rw-r--r-- | Doc/library/configparser.rst | 2 | ||||
-rw-r--r-- | Doc/library/importlib.rst | 2 | ||||
-rw-r--r-- | Doc/library/os.rst | 2 | ||||
-rw-r--r-- | Doc/library/socket.rst | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/Doc/howto/clinic.rst b/Doc/howto/clinic.rst index 7f275a4..82eae01 100644 --- a/Doc/howto/clinic.rst +++ b/Doc/howto/clinic.rst @@ -1583,7 +1583,7 @@ called ``preserve``:: preserve -This tells Clinic that the current contents of the output should be kept, unmodifed. +This tells Clinic that the current contents of the output should be kept, unmodified. This is used internally by Clinic when dumping output into ``file`` files; wrapping it in a Clinic block lets Clinic use its existing checksum functionality to ensure the file was not modified by hand before it gets overwritten. diff --git a/Doc/howto/sockets.rst b/Doc/howto/sockets.rst index 04394d4..bc71d85 100644 --- a/Doc/howto/sockets.rst +++ b/Doc/howto/sockets.rst @@ -106,7 +106,7 @@ mainloop of the web server:: There's actually 3 general ways in which this loop could work - dispatching a thread to handle ``clientsocket``, create a new process to handle ``clientsocket``, or restructure this app to use non-blocking sockets, and -mulitplex between our "server" socket and any active ``clientsocket``\ s using +multiplex between our "server" socket and any active ``clientsocket``\ s using ``select``. More about that later. The important thing to understand now is this: this is *all* a "server" socket does. It doesn't send any data. It doesn't receive any data. It just produces "client" sockets. Each ``clientsocket`` is diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst index eeae96a..a9a5f5a 100644 --- a/Doc/library/configparser.rst +++ b/Doc/library/configparser.rst @@ -66,7 +66,7 @@ The structure of INI files is described `in the following section <#supported-ini-file-structure>`_. Essentially, the file consists of sections, each of which contains keys with values. :mod:`configparser` classes can read and write such files. Let's start by -creating the above configuration file programatically. +creating the above configuration file programmatically. .. doctest:: diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst index c1c3b12..24b8104 100644 --- a/Doc/library/importlib.rst +++ b/Doc/library/importlib.rst @@ -633,7 +633,7 @@ ABC hierarchy:: .. method:: path_stats(path) Optional abstract method which returns a :class:`dict` containing - metadata about the specifed path. Supported dictionary keys are: + metadata about the specified path. Supported dictionary keys are: - ``'mtime'`` (mandatory): an integer or floating-point number representing the modification time of the source code; diff --git a/Doc/library/os.rst b/Doc/library/os.rst index eae7249..9456733 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -1938,7 +1938,7 @@ features: On Unix, *path* can be of type :class:`str` or :class:`bytes` (use :func:`~os.fsencode` and :func:`~os.fsdecode` to encode and decode :class:`bytes` paths). On Windows, *path* must be of type :class:`str`. - On both sytems, the type of the :attr:`~os.DirEntry.name` and + On both systems, the type of the :attr:`~os.DirEntry.name` and :attr:`~os.DirEntry.path` attributes of each :class:`os.DirEntry` will be of the same type as *path*. diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst index c63c73a..d0a3c5e 100644 --- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -1226,7 +1226,7 @@ to sockets. much data, if any, was successfully sent. .. versionchanged:: 3.5 - The socket timeout is no more reset each time data is sent successfuly. + The socket timeout is no more reset each time data is sent successfully. The socket timeout is now the maximum total duration to send all data. .. versionchanged:: 3.5 |