Issue #26553: Capitalization of HTTP, HTTPS, FTP, and URL

Patch by Anish Shah and Aatish Neupane.

diff --git a/Doc/library/fl.rst b/Doc/library/fl.rst
index b7551348d8e481fe573039a442ae60f538e61272..c5928d571dc9d56db1ee2699a14017cabcc22054 100644 (file)
--- a/Doc/library/fl.rst
+++ b/Doc/library/fl.rst
@@ -17,7 +17,7 @@
    single: Overmars, Mark
 
 This module provides an interface to the FORMS Library by Mark Overmars.  The
-source for the library can be retrieved by anonymous ftp from host
+source for the library can be retrieved by anonymous FTP from host
 ``ftp.cs.ruu.nl``, directory :file:`SGI/FORMS`.  It was last tested with version
 2.0b.
 

diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst
index 2d85de1e9f3f4f28437cf6720fd05df2063ab6c1..3ab7b3b6cc602f17cee0a18c5c2842ee31d4714e 100644 (file)
--- a/Doc/library/ftplib.rst
+++ b/Doc/library/ftplib.rst
@@ -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 :mod:`urllib` to
+as mirroring other FTP servers.  It is also used by the module :mod:`urllib` to
 handle URLs that use FTP.  For more information on FTP (File Transfer Protocol),
 see Internet :rfc:`959`.
 

diff --git a/Doc/library/httplib.rst b/Doc/library/httplib.rst
index 45d829558e45cdbd1f14b2ecadc4484bfebd2433..4bf20067fa57112d6a1e342d26de586a7ff52cae 100644 (file)
--- a/Doc/library/httplib.rst
+++ b/Doc/library/httplib.rst
@@ -27,7 +27,7 @@ uses it to handle URLs that use HTTP and HTTPS.
 .. seealso::
 
     The `Requests package <http://requests.readthedocs.org/>`_
-    is recommended for a higher-level http client interface.
+    is recommended for a higher-level HTTP client interface.
 
 .. note::
 

diff --git a/Doc/library/urllib.rst b/Doc/library/urllib.rst
index 4c34b90e88166579edc54ee0afb0139fb4fe4645..3b5dc16c0297915c5487c9fa6cdc8572b7f80dbe 100644 (file)
--- a/Doc/library/urllib.rst
+++ b/Doc/library/urllib.rst
@@ -27,7 +27,7 @@ reading, and no seek operations are available.
 .. seealso::
 
     The `Requests package <http://requests.readthedocs.org/>`_
-    is recommended for a higher-level http client interface.
+    is recommended for a higher-level HTTP client interface.
 
 .. warning:: When opening HTTPS URLs, it does not attempt to validate the
    server certificate.  Use at your own risk!
@@ -118,7 +118,7 @@ High-level interface
    causes environmental proxy settings to be used as discussed above.  For
    example::
 
-      # Use http://www.someproxy.com:3128 for http proxying
+      # Use http://www.someproxy.com:3128 for HTTP proxying
       proxies = {'http': 'http://www.someproxy.com:3128'}
       filehandle = urllib.urlopen(some_url, proxies=proxies)
       # Don't use any proxies
@@ -297,8 +297,8 @@ Utility functions
 
 .. note::
     urllib also exposes certain utility functions like splittype, splithost and
-    others parsing url into various components. But it is recommended to use
-    :mod:`urlparse` for parsing urls rather than using these functions directly.
+    others parsing URL into various components. But it is recommended to use
+    :mod:`urlparse` for parsing URLs rather than using these functions directly.
     Python 3 does not expose these helper functions from :mod:`urllib.parse`
     module.
 

diff --git a/Doc/library/urllib2.rst b/Doc/library/urllib2.rst
index f36890c55460ae09383156cebdc3d9e26fb80ac4..735694e3e0c282572d9e6ff5a6edcde1073d66f9 100644 (file)
--- a/Doc/library/urllib2.rst
+++ b/Doc/library/urllib2.rst
@@ -21,7 +21,7 @@ redirections, cookies and more.
 .. seealso::
 
     The `Requests package <http://requests.readthedocs.org/>`_
-    is recommended for a higher-level http client interface.
+    is recommended for a higher-level HTTP client interface.
 
 
 The :mod:`urllib2` module defines the following functions:

diff --git a/Doc/library/urlparse.rst b/Doc/library/urlparse.rst
index 37f2aae5a7cfa5b53dfdad80297f1b2b1bb2027f..1f05e5bcae50bf43ff7519d64262d7b75b9bd678 100644 (file)
--- a/Doc/library/urlparse.rst
+++ b/Doc/library/urlparse.rst
@@ -290,7 +290,7 @@ The :mod:`urlparse` module defines the following functions:
       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 --git a/Doc/library/xmlrpclib.rst b/Doc/library/xmlrpclib.rst
index 07ed1244bf08087c5d4130a9a6ed95878bd3782f..e818c3de6ab1a66f9e6642c30332a5e72ac86d47 100644 (file)
--- a/Doc/library/xmlrpclib.rst
+++ b/Doc/library/xmlrpclib.rst
@@ -36,7 +36,7 @@ between conformable Python objects and XML on the wire.
 
 .. versionchanged:: 2.7.9
 
-   For https URIs, :mod:`xmlrpclib` now performs all the necessary certificate
+   For HTTPS URIs, :mod:`xmlrpclib` now performs all the necessary certificate
    and hostname checks by default.
 
 .. class:: ServerProxy(uri[, transport[, encoding[, verbose[, allow_none[, use_datetime[, context]]]]]])
@@ -65,7 +65,7 @@ between conformable Python objects and XML on the wire.
    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.