diff options
author | Berker Peksag <berker.peksag@gmail.com> | 2014-09-27 21:00:58 (GMT) |
---|---|---|
committer | Berker Peksag <berker.peksag@gmail.com> | 2014-09-27 21:00:58 (GMT) |
commit | 9c1dba2758fc601f6c4d7fe2aeb62272ffd688a8 (patch) | |
tree | accb8efa32cfdc7efac1196a33e445f84fb59b35 /Doc/library | |
parent | 9ce69672f3a1fbd9f337737bf35ace1a1a592598 (diff) | |
download | cpython-9c1dba2758fc601f6c4d7fe2aeb62272ffd688a8.zip cpython-9c1dba2758fc601f6c4d7fe2aeb62272ffd688a8.tar.gz cpython-9c1dba2758fc601f6c4d7fe2aeb62272ffd688a8.tar.bz2 |
Revert #22251
Diffstat (limited to 'Doc/library')
-rw-r--r-- | Doc/library/argparse.rst | 1 | ||||
-rw-r--r-- | Doc/library/asyncio-eventloop.rst | 4 | ||||
-rw-r--r-- | Doc/library/asyncio-protocol.rst | 2 | ||||
-rw-r--r-- | Doc/library/asyncio-task.rst | 1 | ||||
-rw-r--r-- | Doc/library/email.contentmanager.rst | 4 | ||||
-rw-r--r-- | Doc/library/logging.handlers.rst | 4 | ||||
-rw-r--r-- | Doc/library/multiprocessing.rst | 1 | ||||
-rw-r--r-- | Doc/library/os.rst | 1 | ||||
-rw-r--r-- | Doc/library/pathlib.rst | 3 | ||||
-rw-r--r-- | Doc/library/pickle.rst | 1 | ||||
-rw-r--r-- | Doc/library/ssl.rst | 3 | ||||
-rw-r--r-- | Doc/library/statistics.rst | 4 | ||||
-rw-r--r-- | Doc/library/stdtypes.rst | 1 | ||||
-rw-r--r-- | Doc/library/sys.rst | 1 | ||||
-rw-r--r-- | Doc/library/warnings.rst | 1 |
15 files changed, 4 insertions, 28 deletions
diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst index 9a3514c..3260667 100644 --- a/Doc/library/argparse.rst +++ b/Doc/library/argparse.rst @@ -1894,7 +1894,6 @@ the populated namespace and the list of remaining argument strings. (Namespace(bar='BAR', foo=True), ['--badger', 'spam']) .. warning:: - :ref:`Prefix matching <prefix-matching>` rules apply to :meth:`parse_known_args`. The parser may consume an option even if it's just a prefix of one of its known options, instead of leaving it in the remaining diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst index cc848aa..8706b41 100644 --- a/Doc/library/asyncio-eventloop.rst +++ b/Doc/library/asyncio-eventloop.rst @@ -197,9 +197,7 @@ Creating connections the transport; if *ssl* is :const:`True`, a context with some unspecified default settings is used. - .. seealso:: - - :ref:`SSL/TLS security considerations <ssl-security>` + .. seealso:: :ref:`SSL/TLS security considerations <ssl-security>` * *server_hostname*, is only for use together with *ssl*, and sets or overrides the hostname that the target server's certificate diff --git a/Doc/library/asyncio-protocol.rst b/Doc/library/asyncio-protocol.rst index 4299a21..92b055a 100644 --- a/Doc/library/asyncio-protocol.rst +++ b/Doc/library/asyncio-protocol.rst @@ -407,7 +407,6 @@ even more), and eventually :meth:`resume_writing` is called once when the buffer size reaches the low-water mark. .. note:: - If the buffer size equals the high-water mark, :meth:`pause_writing` is not called -- it must go strictly over. Conversely, :meth:`resume_writing` is called when the buffer size is @@ -416,7 +415,6 @@ buffer size reaches the low-water mark. mark is zero. .. note:: - On BSD systems (OS X, FreeBSD, etc.) flow control is not supported for :class:`DatagramProtocol`, because send failures caused by writing too many packets cannot be detected easily. The socket diff --git a/Doc/library/asyncio-task.rst b/Doc/library/asyncio-task.rst index 3223001..e7c316d 100644 --- a/Doc/library/asyncio-task.rst +++ b/Doc/library/asyncio-task.rst @@ -269,7 +269,6 @@ and it stores the result into the future. The the future. .. note:: - The :meth:`~BaseEventLoop.run_until_complete` method uses internally the :meth:`~Future.add_done_callback` method to be notified when the future is done. diff --git a/Doc/library/email.contentmanager.rst b/Doc/library/email.contentmanager.rst index ba2f5ea..8f33a14 100644 --- a/Doc/library/email.contentmanager.rst +++ b/Doc/library/email.contentmanager.rst @@ -405,9 +405,7 @@ Currently the email package provides only one concrete content manager, ``message/rfc822``, use ``8bit`` if *cte* is not specified. For all other values of *subtype*, use ``7bit``. - .. note:: - - A *cte* of ``binary`` does not actually work correctly yet. + .. note:: A *cte* of ``binary`` does not actually work correctly yet. The ``Message`` object as modified by ``set_content`` is correct, but :class:`~email.generator.BytesGenerator` does not serialize it correctly. diff --git a/Doc/library/logging.handlers.rst b/Doc/library/logging.handlers.rst index 37678f0..a2b14de 100644 --- a/Doc/library/logging.handlers.rst +++ b/Doc/library/logging.handlers.rst @@ -864,9 +864,7 @@ supports sending logging messages to a Web server, using either ``GET`` or :meth:`mapLogRecord` method is used to convert the record to the dictionary to be sent. - .. note:: - - Since preparing a record for sending it to a Web server is not + .. note:: Since preparing a record for sending it to a Web server is not the same as a generic formatting operation, using :meth:`~logging.Handler.setFormatter` to specify a :class:`~logging.Formatter` for a :class:`HTTPHandler` has no effect. diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst index 1121f07..e568e68 100644 --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -851,7 +851,6 @@ Miscellaneous :exc:`NotImplementedError`. .. seealso:: - :func:`os.cpu_count` .. function:: current_process() diff --git a/Doc/library/os.rst b/Doc/library/os.rst index b9eaba0..0a59108 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -57,7 +57,6 @@ Notes on the availability of these functions: ``'ce'``, ``'java'``. .. seealso:: - :attr:`sys.platform` has a finer granularity. :func:`os.uname` gives system-dependent version information. diff --git a/Doc/library/pathlib.rst b/Doc/library/pathlib.rst index ba0bcbf..ec1dc4f 100644 --- a/Doc/library/pathlib.rst +++ b/Doc/library/pathlib.rst @@ -32,18 +32,15 @@ Pure paths are useful in some special cases; for example: useful since those simply don't have any OS-accessing operations. .. note:: - This module has been included in the standard library on a :term:`provisional basis <provisional package>`. Backwards incompatible changes (up to and including removal of the package) may occur if deemed necessary by the core developers. .. seealso:: - :pep:`428`: The pathlib module -- object-oriented filesystem paths. .. seealso:: - For low-level path manipulation on strings, you can also use the :mod:`os.path` module. diff --git a/Doc/library/pickle.rst b/Doc/library/pickle.rst index aceb686..ce5467f 100644 --- a/Doc/library/pickle.rst +++ b/Doc/library/pickle.rst @@ -141,7 +141,6 @@ to read the pickle produced. brought by protocol 4. .. note:: - Serialization is a more primitive notion than persistence; although :mod:`pickle` reads and writes file objects, it does not handle the issue of naming persistent objects, nor the (even more complicated) issue of concurrent diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index 676e937..5ab6c14 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -259,7 +259,6 @@ purposes. default CA certificates. .. note:: - The protocol, options, cipher and other settings may change to more restrictive values anytime without prior deprecation. The values represent a fair balance between compatibility and security. @@ -268,7 +267,6 @@ purposes. :class:`SSLContext` and apply the settings yourself. .. note:: - If you find that when certain older clients or servers attempt to connect with a :class:`SSLContext` created by this function that they get an error stating "Protocol or cipher suite mismatch", it may be that they @@ -934,7 +932,6 @@ to speed up repeated connections from the same clients. interoperability. .. seealso:: - :func:`create_default_context` lets the :mod:`ssl` module choose security settings for a given purpose. diff --git a/Doc/library/statistics.rst b/Doc/library/statistics.rst index 7058e40..4e77838 100644 --- a/Doc/library/statistics.rst +++ b/Doc/library/statistics.rst @@ -135,9 +135,7 @@ However, for reading convenience, most of the examples show sorted sequences. This is suited for when your data is discrete, and you don't mind that the median may not be an actual data point. - .. seealso:: - - :func:`median_low`, :func:`median_high`, :func:`median_grouped` + .. seealso:: :func:`median_low`, :func:`median_high`, :func:`median_grouped` .. function:: median_low(data) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index fa715d3..8778212 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -3872,7 +3872,6 @@ pairs within braces, for example: ``{'jack': 4098, 'sjoerd': 4127}`` or ``{4098: :ref:`documentation of view objects <dict-views>`. .. seealso:: - :class:`types.MappingProxyType` can be used to create a read-only view of a :class:`dict`. diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst index fe3dc75..bee309e 100644 --- a/Doc/library/sys.rst +++ b/Doc/library/sys.rst @@ -798,7 +798,6 @@ always available. .. seealso:: - Module :mod:`site` This describes how to use .pth files to extend :data:`sys.path`. diff --git a/Doc/library/warnings.rst b/Doc/library/warnings.rst index 5ca8336..8a538ad 100644 --- a/Doc/library/warnings.rst +++ b/Doc/library/warnings.rst @@ -41,7 +41,6 @@ message by calling :func:`formatwarning`, which is also available for use by custom implementations. .. seealso:: - :func:`logging.captureWarnings` allows you to handle all warnings with the standard logging infrastructure. |