diff -r eb2c2671e7d6 Doc/library/ftplib.rst --- a/Doc/library/ftplib.rst Thu Mar 17 15:02:39 2016 -0700 +++ b/Doc/library/ftplib.rst Fri Mar 18 11:49:03 2016 +0545 @@ -16,7 +16,7 @@ This module defines the class :class:`FTP` and a few related items. The :class:`FTP` class implements the client side of the FTP protocol. You can use this to write Python programs that perform a variety of automated FTP jobs, such -as mirroring other ftp servers. It is also used by the module +as mirroring other FTP servers. It is also used by the module :mod:`urllib.request` to handle URLs that use FTP. For more information on FTP (File Transfer Protocol), see Internet :rfc:`959`. diff -r eb2c2671e7d6 Doc/library/http.client.rst --- a/Doc/library/http.client.rst Thu Mar 17 15:02:39 2016 -0700 +++ b/Doc/library/http.client.rst Fri Mar 18 11:49:03 2016 +0545 @@ -22,7 +22,7 @@ .. seealso:: The `Requests package `_ - is recommended for a higher-level http client interface. + is recommended for a higher-level HTTP client interface. .. note:: diff -r eb2c2671e7d6 Doc/library/urllib.request.rst --- a/Doc/library/urllib.request.rst Thu Mar 17 15:02:39 2016 -0700 +++ b/Doc/library/urllib.request.rst Fri Mar 18 11:49:03 2016 +0545 @@ -15,7 +15,7 @@ .. seealso:: The `Requests package `_ - is recommended for a higher-level http client interface. + is recommended for a higher-level HTTP client interface. The :mod:`urllib.request` module defines the following functions: @@ -71,7 +71,7 @@ * :meth:`~urllib.response.addinfourl.getcode` -- return the HTTP status code of the response. - For http and https urls, this function returns a + For HTTP and HTTPS urls, this function returns a :class:`http.client.HTTPResponse` object slightly modified. In addition to the three new methods above, the msg attribute contains the same information as the :attr:`~http.client.HTTPResponse.reason` @@ -1119,7 +1119,7 @@ Note that urlopen returns a bytes object. This is because there is no way for urlopen to automatically determine the encoding of the byte stream -it receives from the http server. In general, a program will decode +it receives from the HTTP server. In general, a program will decode the returned bytes object to string once it determines or guesses the appropriate encoding. diff -r eb2c2671e7d6 Doc/library/xmlrpc.client.rst --- a/Doc/library/xmlrpc.client.rst Thu Mar 17 15:02:39 2016 -0700 +++ b/Doc/library/xmlrpc.client.rst Fri Mar 18 11:49:03 2016 +0545 @@ -29,7 +29,7 @@ .. versionchanged:: 3.5 - For https URIs, :mod:`xmlrpc.client` now performs all the necessary + For HTTPS URIs, :mod:`xmlrpc.client` now performs all the necessary certificate and hostname checks by default .. class:: ServerProxy(uri, transport=None, encoding=None, verbose=False, \