[Python-checkins] cpython (2.7): Issue #26553: Capitalization of HTTP, HTTPS, FTP, and URL

[martin.panter]

https://hg.python.org/cpython/rev/d914d681b7f3
changeset:   101533:d914d681b7f3
branch:      2.7
parent:      101526:0df93ab07a8f
user:        Martin Panter <vadmium+py at gmail.com>
date:        Sat May 28 02:33:05 2016 +0000
summary:
  Issue #26553: Capitalization of HTTP, HTTPS, FTP, and URL

Patch by Anish Shah and Aatish Neupane.

files:
  Doc/library/fl.rst        |  2 +-
  Doc/library/ftplib.rst    |  2 +-
  Doc/library/httplib.rst   |  2 +-
  Doc/library/urllib.rst    |  8 ++++----
  Doc/library/urllib2.rst   |  2 +-
  Doc/library/urlparse.rst  |  2 +-
  Doc/library/xmlrpclib.rst |  4 ++--
  7 files changed, 11 insertions(+), 11 deletions(-)


diff --git a/Doc/library/fl.rst b/Doc/library/fl.rst
--- 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
--- 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
--- a/Doc/library/httplib.rst
+++ b/Doc/library/httplib.rst
@@ -27,7 +27,7 @@
 .. 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
--- a/Doc/library/urllib.rst
+++ b/Doc/library/urllib.rst
@@ -27,7 +27,7 @@
 .. 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 @@
    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 @@
 
 .. 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
--- a/Doc/library/urllib2.rst
+++ b/Doc/library/urllib2.rst
@@ -21,7 +21,7 @@
 .. 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
--- a/Doc/library/urlparse.rst
+++ b/Doc/library/urlparse.rst
@@ -290,7 +290,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 --git a/Doc/library/xmlrpclib.rst b/Doc/library/xmlrpclib.rst
--- a/Doc/library/xmlrpclib.rst
+++ b/Doc/library/xmlrpclib.rst
@@ -36,7 +36,7 @@
 
 .. 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 @@
    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.
 

-- 
Repository URL: https://hg.python.org/cpython