diff options
author | Martin Panter <vadmium+py@gmail.com> | 2016-07-11 12:54:44 (GMT) |
---|---|---|
committer | Martin Panter <vadmium+py@gmail.com> | 2016-07-11 12:54:44 (GMT) |
commit | 702f4f5d6fdb1a49222bb1e70866717f34c3b847 (patch) | |
tree | ae1ee298d781dfd3f0cf82a95d5f1f8175c90fda /Doc | |
parent | 7386268ffd5a87ec03f80773c4cd8bf9dc9953f6 (diff) | |
parent | 204bf0b9aecd221c33f3e0909f261411783acf1b (diff) | |
download | cpython-702f4f5d6fdb1a49222bb1e70866717f34c3b847.zip cpython-702f4f5d6fdb1a49222bb1e70866717f34c3b847.tar.gz cpython-702f4f5d6fdb1a49222bb1e70866717f34c3b847.tar.bz2 |
Issue #23804: Merge spelling and NEWS fixes from 3.5
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/library/pyexpat.rst | 2 | ||||
-rw-r--r-- | Doc/library/urllib.request.rst | 2 | ||||
-rw-r--r-- | Doc/library/xml.dom.minidom.rst | 2 | ||||
-rw-r--r-- | Doc/library/xmlrpc.server.rst | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/pyexpat.rst b/Doc/library/pyexpat.rst index 29c9f34..d6445f8 100644 --- a/Doc/library/pyexpat.rst +++ b/Doc/library/pyexpat.rst @@ -244,7 +244,7 @@ XMLParser Objects The following attributes contain values relating to the most recent error encountered by an :class:`xmlparser` object, and will only have correct values -once a call to :meth:`Parse` or :meth:`ParseFile` has raised a +once a call to :meth:`Parse` or :meth:`ParseFile` has raised an :exc:`xml.parsers.expat.ExpatError` exception. diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst index 1338906..6c1bfb8 100644 --- a/Doc/library/urllib.request.rst +++ b/Doc/library/urllib.request.rst @@ -1138,7 +1138,7 @@ the returned bytes object to string once it determines or guesses the appropriate encoding. The following W3C document, https://www.w3.org/International/O-charset\ , lists -the various ways in which a (X)HTML or a XML document could have specified its +the various ways in which an (X)HTML or an XML document could have specified its encoding information. As the python.org website uses *utf-8* encoding as specified in its meta tag, we diff --git a/Doc/library/xml.dom.minidom.rst b/Doc/library/xml.dom.minidom.rst index e1042e7..2e9e814 100644 --- a/Doc/library/xml.dom.minidom.rst +++ b/Doc/library/xml.dom.minidom.rst @@ -94,7 +94,7 @@ document: the one that holds all others. Here is an example program:: When you are finished with a DOM tree, you may optionally call the :meth:`unlink` method to encourage early cleanup of the now-unneeded -objects. :meth:`unlink` is a :mod:`xml.dom.minidom`\ -specific +objects. :meth:`unlink` is an :mod:`xml.dom.minidom`\ -specific extension to the DOM API that renders the node and its descendants are essentially useless. Otherwise, Python's garbage collector will eventually take care of the objects in the tree. diff --git a/Doc/library/xmlrpc.server.rst b/Doc/library/xmlrpc.server.rst index 2b9107f..0511ddf 100644 --- a/Doc/library/xmlrpc.server.rst +++ b/Doc/library/xmlrpc.server.rst @@ -292,7 +292,7 @@ requests sent to Python CGI scripts. .. method:: CGIXMLRPCRequestHandler.handle_request(request_text=None) - Handle a XML-RPC request. If *request_text* is given, it should be the POST + Handle an XML-RPC request. If *request_text* is given, it should be the POST data provided by the HTTP server, otherwise the contents of stdin will be used. Example:: |