From b20df9a89a3735d9cbf0330ceef0100c323fdd93 Mon Sep 17 00:00:00 2001 From: "Andrew M. Kuchling" Date: Fri, 3 Apr 2009 21:56:36 +0000 Subject: [PATCH] Fix 'the the' duplication (partial backport of r71103 --- Doc/howto/cporting.rst | 2 +- Doc/library/abc.rst | 2 +- Doc/library/multiprocessing.rst | 2 +- Doc/library/pdb.rst | 2 +- Doc/library/ssl.rst | 2 +- Doc/whatsnew/2.6.rst | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Doc/howto/cporting.rst b/Doc/howto/cporting.rst index 3451f5c061f..9b66650c388 100644 --- a/Doc/howto/cporting.rst +++ b/Doc/howto/cporting.rst @@ -96,7 +96,7 @@ In Python 3.0, there is only one integer type. It is called :func:`int` on the Python level, but actually corresponds to 2.x's :func:`long` type. In the C-API, ``PyInt_*`` functions are replaced by their ``PyLong_*`` neighbors. The best course of action here is using the ``PyInt_*`` functions aliased to -``PyLong_*`` found in :file:`intobject.h`. The the abstract ``PyNumber_*`` APIs +``PyLong_*`` found in :file:`intobject.h`. The abstract ``PyNumber_*`` APIs can also be used in some cases. :: #include "Python.h" diff --git a/Doc/library/abc.rst b/Doc/library/abc.rst index 8014aedd56b..5833dfa48c2 100644 --- a/Doc/library/abc.rst +++ b/Doc/library/abc.rst @@ -134,7 +134,7 @@ It also provides the following decorators: A class that has a metaclass derived from :class:`ABCMeta` cannot be instantiated unless all of its abstract methods and properties are overridden. - The abstract methods can be called using any of the the normal 'super' call + The abstract methods can be called using any of the normal 'super' call mechanisms. Dynamically adding abstract methods to a class, or attempting to modify the diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst index df2cd8f1c72..f6e223a55e6 100644 --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -1845,7 +1845,7 @@ return value of ``current_process().authkey`` is used (see any :class:`~multiprocessing.Process` object that the current process creates. This means that (by default) all processes of a multi-process program will share a single authentication key which can be used when setting up connections -between the themselves. +between themselves. Suitable authentication keys can also be generated by using :func:`os.urandom`. diff --git a/Doc/library/pdb.rst b/Doc/library/pdb.rst index 700146b6e10..cfc219cbb09 100644 --- a/Doc/library/pdb.rst +++ b/Doc/library/pdb.rst @@ -268,7 +268,7 @@ n(ext) full speed, only stopping at the next line in the current function.) unt(il) - Continue execution until the line with the the line number greater than the + Continue execution until the line with the line number greater than the current one is reached or when returning from current frame. .. versionadded:: 2.6 diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index 30f1fea9d1b..1804fcf34f6 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -261,7 +261,7 @@ SSLSocket Objects If there is no certificate for the peer on the other end of the connection, returns ``None``. - If the the parameter ``binary_form`` is :const:`False`, and a + If the parameter ``binary_form`` is :const:`False`, and a certificate was received from the peer, this method returns a :class:`dict` instance. If the certificate was not validated, the dict is empty. If the certificate was validated, it returns a dict diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst index f04f194376d..297584b1daa 100644 --- a/Doc/whatsnew/2.6.rst +++ b/Doc/whatsnew/2.6.rst @@ -1674,7 +1674,7 @@ Some smaller changes made to the core Python language are: :attr:`__self__`, and :attr:`im_func` is also available as :attr:`__func__`. The old names are still supported in Python 2.6, but are gone in 3.0. -* An obscure change: when you use the the :func:`locals` function inside a +* An obscure change: when you use the :func:`locals` function inside a :keyword:`class` statement, the resulting dictionary no longer returns free variables. (Free variables, in this case, are variables referenced in the :keyword:`class` statement that aren't attributes of the class.)