diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2016-04-17 05:32:47 (GMT) |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2016-04-17 05:32:47 (GMT) |
commit | 6a7b3a77b4b2be0badd24ee5f0fdbaa2e0e79c3d (patch) | |
tree | 69e2dda76d29c6ac33906e0ad2e1359c5bc8e0e4 /Doc | |
parent | 50dd1f7dd68ed2f526adfebd5caa342e26da4517 (diff) | |
download | cpython-6a7b3a77b4b2be0badd24ee5f0fdbaa2e0e79c3d.zip cpython-6a7b3a77b4b2be0badd24ee5f0fdbaa2e0e79c3d.tar.gz cpython-6a7b3a77b4b2be0badd24ee5f0fdbaa2e0e79c3d.tar.bz2 |
Issue #26778: Fixed "a/an/and" typos in code comment and documentation.
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/c-api/set.rst | 6 | ||||
-rw-r--r-- | Doc/c-api/unicode.rst | 4 | ||||
-rw-r--r-- | Doc/distutils/apiref.rst | 2 | ||||
-rw-r--r-- | Doc/library/asyncio-eventloop.rst | 2 | ||||
-rw-r--r-- | Doc/library/ctypes.rst | 4 | ||||
-rw-r--r-- | Doc/library/idle.rst | 2 | ||||
-rw-r--r-- | Doc/library/shutil.rst | 2 | ||||
-rw-r--r-- | Doc/library/tarfile.rst | 2 | ||||
-rw-r--r-- | Doc/library/tkinter.tix.rst | 2 | ||||
-rw-r--r-- | Doc/tutorial/datastructures.rst | 2 | ||||
-rw-r--r-- | Doc/whatsnew/2.2.rst | 2 | ||||
-rw-r--r-- | Doc/whatsnew/3.4.rst | 2 |
12 files changed, 16 insertions, 16 deletions
diff --git a/Doc/c-api/set.rst b/Doc/c-api/set.rst index 7f4d534..8de0394 100644 --- a/Doc/c-api/set.rst +++ b/Doc/c-api/set.rst @@ -128,7 +128,7 @@ or :class:`frozenset` or instances of their subtypes. of brand new frozensets before they are exposed to other code). Return 0 on success or -1 on failure. Raise a :exc:`TypeError` if the *key* is unhashable. Raise a :exc:`MemoryError` if there is no room to grow. Raise a - :exc:`SystemError` if *set* is an not an instance of :class:`set` or its + :exc:`SystemError` if *set* is not an instance of :class:`set` or its subtype. @@ -142,7 +142,7 @@ subtypes but not for instances of :class:`frozenset` or its subtypes. error is encountered. Does not raise :exc:`KeyError` for missing keys. Raise a :exc:`TypeError` if the *key* is unhashable. Unlike the Python :meth:`~set.discard` method, this function does not automatically convert unhashable sets into - temporary frozensets. Raise :exc:`PyExc_SystemError` if *set* is an not an + temporary frozensets. Raise :exc:`PyExc_SystemError` if *set* is not an instance of :class:`set` or its subtype. @@ -150,7 +150,7 @@ subtypes but not for instances of :class:`frozenset` or its subtypes. Return a new reference to an arbitrary object in the *set*, and removes the object from the *set*. Return *NULL* on failure. Raise :exc:`KeyError` if the - set is empty. Raise a :exc:`SystemError` if *set* is an not an instance of + set is empty. Raise a :exc:`SystemError` if *set* is not an instance of :class:`set` or its subtype. diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst index 1ed8140..0b45958 100644 --- a/Doc/c-api/unicode.rst +++ b/Doc/c-api/unicode.rst @@ -367,7 +367,7 @@ These APIs can be used to work with surrogates: .. c:macro:: Py_UNICODE_IS_HIGH_SURROGATE(ch) - Check if *ch* is an high surrogate (``0xD800 <= ch <= 0xDBFF``). + Check if *ch* is a high surrogate (``0xD800 <= ch <= 0xDBFF``). .. c:macro:: Py_UNICODE_IS_LOW_SURROGATE(ch) @@ -450,7 +450,7 @@ APIs: | :attr:`%%` | *n/a* | The literal % character. | +-------------------+---------------------+--------------------------------+ | :attr:`%c` | int | A single character, | - | | | represented as an C int. | + | | | represented as a C int. | +-------------------+---------------------+--------------------------------+ | :attr:`%d` | int | Exactly equivalent to | | | | ``printf("%d")``. | diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst index e66835a..7d6a84e 100644 --- a/Doc/distutils/apiref.rst +++ b/Doc/distutils/apiref.rst @@ -837,7 +837,7 @@ selection by :class:`MSVCCompiler`. .. module:: distutils.bcppcompiler -This module provides :class:`BorlandCCompiler`, an subclass of the abstract +This module provides :class:`BorlandCCompiler`, a subclass of the abstract :class:`CCompiler` class for the Borland C++ compiler. diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst index 659b37c..f68b19d 100644 --- a/Doc/library/asyncio-eventloop.rst +++ b/Doc/library/asyncio-eventloop.rst @@ -513,7 +513,7 @@ Low-level socket operations The *address* must be already resolved to avoid the trap of hanging the entire event loop when the address requires doing a DNS lookup. For - example, it must be an IP address, not an hostname, for + example, it must be an IP address, not a hostname, for :py:data:`~socket.AF_INET` and :py:data:`~socket.AF_INET6` address families. Use :meth:`getaddrinfo` to resolve the hostname asynchronously. diff --git a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst index 828d7ca4..e2a18c1 100644 --- a/Doc/library/ctypes.rst +++ b/Doc/library/ctypes.rst @@ -671,7 +671,7 @@ positive integer:: TenPointsArrayType = POINT * 10 -Here is an example of an somewhat artificial data type, a structure containing 4 +Here is an example of a somewhat artificial data type, a structure containing 4 POINTs among other stuff:: >>> from ctypes import * @@ -1888,7 +1888,7 @@ Utility functions .. function:: POINTER(type) This factory function creates and returns a new ctypes pointer type. Pointer - types are cached an reused internally, so calling this function repeatedly is + types are cached and reused internally, so calling this function repeatedly is cheap. *type* must be a ctypes type. diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst index 4384d56..df08fe8 100644 --- a/Doc/library/idle.rst +++ b/Doc/library/idle.rst @@ -128,7 +128,7 @@ Find Selection Search for the currently selected string, if there is one. Find in Files... - Open a file search dialog. Put results in an new output window. + Open a file search dialog. Put results in a new output window. Replace... Open a search-and-replace dialog. diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst index 904627f..c39a19a 100644 --- a/Doc/library/shutil.rst +++ b/Doc/library/shutil.rst @@ -342,7 +342,7 @@ Directory and files operations Return the path to an executable which would be run if the given *cmd* was called. If no *cmd* would be called, return ``None``. - *mode* is a permission mask passed a to :func:`os.access`, by default + *mode* is a permission mask passed to :func:`os.access`, by default determining if the file exists and executable. When no *path* is specified, the results of :func:`os.environ` are used, diff --git a/Doc/library/tarfile.rst b/Doc/library/tarfile.rst index 5fa4787..bf90fc4 100644 --- a/Doc/library/tarfile.rst +++ b/Doc/library/tarfile.rst @@ -129,7 +129,7 @@ Some facts and figures: | ``'r|bz2'`` | Open a bzip2 compressed *stream* for | | | reading. | +-------------+--------------------------------------------+ - | ``'r|xz'`` | Open a lzma compressed *stream* for | + | ``'r|xz'`` | Open an lzma compressed *stream* for | | | reading. | +-------------+--------------------------------------------+ | ``'w|'`` | Open an uncompressed *stream* for writing. | diff --git a/Doc/library/tkinter.tix.rst b/Doc/library/tkinter.tix.rst index 9de73ad..9da7959 100644 --- a/Doc/library/tkinter.tix.rst +++ b/Doc/library/tkinter.tix.rst @@ -267,7 +267,7 @@ File Selectors The `ExFileSelectBox <http://tix.sourceforge.net/dist/current/man/html/TixCmd/tixExFileSelectBox.htm>`_ - widget is usually embedded in a tixExFileSelectDialog widget. It provides an + widget is usually embedded in a tixExFileSelectDialog widget. It provides a convenient method for the user to select files. The style of the :class:`ExFileSelectBox` widget is very similar to the standard file dialog on MS Windows 3.1. diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst index 0d51480..b39bdf4 100644 --- a/Doc/tutorial/datastructures.rst +++ b/Doc/tutorial/datastructures.rst @@ -397,7 +397,7 @@ objects, such as lists. Though tuples may seem similar to lists, they are often used in different situations and for different purposes. -Tuples are :term:`immutable`, and usually contain an heterogeneous sequence of +Tuples are :term:`immutable`, and usually contain a heterogeneous sequence of elements that are accessed via unpacking (see later in this section) or indexing (or even by attribute in the case of :func:`namedtuples <collections.namedtuple>`). Lists are :term:`mutable`, and their elements are usually homogeneous and are diff --git a/Doc/whatsnew/2.2.rst b/Doc/whatsnew/2.2.rst index 603c63d..75e176c 100644 --- a/Doc/whatsnew/2.2.rst +++ b/Doc/whatsnew/2.2.rst @@ -720,7 +720,7 @@ possible types of the operands. (The controversy is over whether this is *really* a design flaw, and whether it's worth breaking existing code to fix this. It's caused endless discussions -on python-dev, and in July 2001 erupted into an storm of acidly sarcastic +on python-dev, and in July 2001 erupted into a storm of acidly sarcastic postings on :newsgroup:`comp.lang.python`. I won't argue for either side here and will stick to describing what's implemented in 2.2. Read :pep:`238` for a summary of arguments and counter-arguments.) diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst index ca7716a..fdca922 100644 --- a/Doc/whatsnew/3.4.rst +++ b/Doc/whatsnew/3.4.rst @@ -1457,7 +1457,7 @@ s), as well as a :meth:`~ssl.SSLContext.get_ca_certs` method that returns a list of the loaded ``CA`` certificates. (Contributed by Christian Heimes in :issue:`18147`.) -If OpenSSL 0.9.8 or later is available, :class:`~ssl.SSLContext` has an new +If OpenSSL 0.9.8 or later is available, :class:`~ssl.SSLContext` has a new attribute :attr:`~ssl.SSLContext.verify_flags` that can be used to control the certificate verification process by setting it to some combination of the new constants :data:`~ssl.VERIFY_DEFAULT`, :data:`~ssl.VERIFY_CRL_CHECK_LEAF`, |