diff -r 20d515982b43 Doc/library/concurrent.futures.rst --- a/Doc/library/concurrent.futures.rst Thu May 26 09:56:46 2016 -0700 +++ b/Doc/library/concurrent.futures.rst Thu May 26 16:31:37 2016 -0400 @@ -153,7 +153,7 @@ 'http://www.bbc.co.uk/', 'http://some-made-up-domain.com/'] - # Retrieve a single page and report the url and contents + # Retrieve a single page and report the URL and contents def load_url(url, timeout): with urllib.request.urlopen(url, timeout=timeout) as conn: return conn.read() diff -r 20d515982b43 Doc/library/ftplib.rst --- a/Doc/library/ftplib.rst Thu May 26 09:56:46 2016 -0700 +++ b/Doc/library/ftplib.rst Thu May 26 16:31:37 2016 -0400 @@ -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 20d515982b43 Doc/library/http.client.rst --- a/Doc/library/http.client.rst Thu May 26 09:56:46 2016 -0700 +++ b/Doc/library/http.client.rst Thu May 26 16:31:37 2016 -0400 @@ -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 20d515982b43 Doc/library/urllib.parse.rst --- a/Doc/library/urllib.parse.rst Thu May 26 09:56:46 2016 -0700 +++ b/Doc/library/urllib.parse.rst Thu May 26 16:31:37 2016 -0400 @@ -592,7 +592,7 @@ Names (URNs) and Uniform Resource Locators (URLs). :rfc:`2368` - The mailto URL scheme. - Parsing requirements for mailto url schemes. + Parsing requirements for mailto URL schemes. :rfc:`1808` - Relative Uniform Resource Locators This Request For Comments includes the rules for joining an absolute and a diff -r 20d515982b43 Doc/library/urllib.request.rst --- a/Doc/library/urllib.request.rst Thu May 26 09:56:46 2016 -0700 +++ b/Doc/library/urllib.request.rst Thu May 26 16:31:37 2016 -0400 @@ -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` @@ -79,7 +79,7 @@ the response headers as it is specified in the documentation for :class:`~http.client.HTTPResponse`. - For ftp, file, and data urls and requests explicitly handled by legacy + For FTP, file, and data URLs and requests explicitly handled by legacy :class:`URLopener` and :class:`FancyURLopener` classes, this function returns a :class:`urllib.response.addinfourl` object. @@ -453,7 +453,7 @@ .. attribute:: Request.selector The URI path. If the :class:`Request` uses a proxy, then selector - will be the full url that is passed to the proxy. + will be the full URL that is passed to the proxy. .. attribute:: Request.data @@ -772,8 +772,8 @@ details of the precise meanings of the various redirection codes. An :class:`HTTPError` exception raised as a security consideration if the - HTTPRedirectHandler is presented with a redirected url which is not an HTTP, - HTTPS or FTP url. + HTTPRedirectHandler is presented with a redirected URL which is not an HTTP, + HTTPS or FTP URL. .. method:: HTTPRedirectHandler.redirect_request(req, fp, code, msg, hdrs, newurl) @@ -1126,7 +1126,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 20d515982b43 Doc/library/xmlrpc.client.rst --- a/Doc/library/xmlrpc.client.rst Thu May 26 09:56:46 2016 -0700 +++ b/Doc/library/xmlrpc.client.rst Thu May 26 16:31:37 2016 -0400 @@ -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, \ @@ -67,7 +67,7 @@ portion will be base64-encoded as an HTTP 'Authorization' header, and sent to the remote server as part of the connection process when invoking an XML-RPC method. You only need to use this if the remote server requires a Basic - Authentication user and password. If an HTTPS url is provided, *context* may + Authentication user and password. If an HTTPS URL is provided, *context* may be :class:`ssl.SSLContext` and configures the SSL settings of the underlying HTTPS connection.