summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2021-07-26 22:34:32 (GMT)
committerGitHub <noreply@github.com>2021-07-26 22:34:32 (GMT)
commit6fc1efa4546ad94a904239fd5efb84e02894eb31 (patch)
tree0e7ca76239d3056cbf0d153179043b8f69c96296 /Doc/library
parent0ea5e0d792a85b435ef299319dcd52e59f535cb1 (diff)
downloadcpython-6fc1efa4546ad94a904239fd5efb84e02894eb31.zip
cpython-6fc1efa4546ad94a904239fd5efb84e02894eb31.tar.gz
cpython-6fc1efa4546ad94a904239fd5efb84e02894eb31.tar.bz2
bpo-44740: Lowercase "internet" and "web" where appropriate. (GH-27378) (GH-27380)
Co-authored-by: Ɓukasz Langa <lukasz@langa.pl> (cherry picked from commit 11749e2dc20ad6a76e9a39e948853e89b2b4bbed) Co-authored-by: Mariusz Felisiak <felisiak.mariusz@gmail.com>
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/cgi.rst6
-rw-r--r--Doc/library/ftplib.rst2
-rw-r--r--Doc/library/hashlib.rst2
-rw-r--r--Doc/library/http.cookiejar.rst2
-rw-r--r--Doc/library/http.server.rst2
-rw-r--r--Doc/library/idle.rst2
-rw-r--r--Doc/library/internet.rst2
-rw-r--r--Doc/library/logging.handlers.rst12
-rw-r--r--Doc/library/mailcap.rst6
-rw-r--r--Doc/library/netdata.rst2
-rw-r--r--Doc/library/pydoc.rst6
-rw-r--r--Doc/library/smtplib.rst2
-rwxr-xr-xDoc/library/socket.rst10
-rw-r--r--Doc/library/socketserver.rst4
-rw-r--r--Doc/library/ssl.rst4
-rw-r--r--Doc/library/test.rst4
-rw-r--r--Doc/library/urllib.parse.rst2
-rw-r--r--Doc/library/urllib.request.rst2
-rw-r--r--Doc/library/urllib.robotparser.rst2
-rw-r--r--Doc/library/webbrowser.rst6
20 files changed, 40 insertions, 40 deletions
diff --git a/Doc/library/cgi.rst b/Doc/library/cgi.rst
index d3bd20d..1494fa7 100644
--- a/Doc/library/cgi.rst
+++ b/Doc/library/cgi.rst
@@ -73,7 +73,7 @@ When you write a new script, consider adding these lines::
cgitb.enable()
This activates a special exception handler that will display detailed reports in
-the Web browser if any errors occur. If you'd rather not show the guts of your
+the web browser if any errors occur. If you'd rather not show the guts of your
program to users of your script, you can have the reports saved to files
instead, with code like this::
@@ -350,7 +350,7 @@ There's one important rule: if you invoke an external program (via
:func:`os.system`, :func:`os.popen` or other functions with similar
functionality), make very sure you don't pass arbitrary strings received from
the client to the shell. This is a well-known security hole whereby clever
-hackers anywhere on the Web can exploit a gullible CGI script to invoke
+hackers anywhere on the web can exploit a gullible CGI script to invoke
arbitrary shell commands. Even parts of the URL or field names cannot be
trusted, since the request doesn't have to come from your form!
@@ -457,7 +457,7 @@ likely the traceback will end up in one of the HTTP server's log files, or be
discarded altogether.
Fortunately, once you have managed to get your script to execute *some* code,
-you can easily send tracebacks to the Web browser using the :mod:`cgitb` module.
+you can easily send tracebacks to the web browser using the :mod:`cgitb` module.
If you haven't done so already, just add the lines::
import cgitb
diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst
index 3a9165a..2f94ac4 100644
--- a/Doc/library/ftplib.rst
+++ b/Doc/library/ftplib.rst
@@ -17,7 +17,7 @@ This module defines the class :class:`FTP` and a few related items. The
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.request` to handle URLs that use FTP. For more information on FTP
-(File Transfer Protocol), see Internet :rfc:`959`.
+(File Transfer Protocol), see internet :rfc:`959`.
The default encoding is UTF-8, following :rfc:`2640`.
diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst
index d77a2e5..d22efa2 100644
--- a/Doc/library/hashlib.rst
+++ b/Doc/library/hashlib.rst
@@ -23,7 +23,7 @@
This module implements a common interface to many different secure hash and
message digest algorithms. Included are the FIPS secure hash algorithms SHA1,
SHA224, SHA256, SHA384, and SHA512 (defined in FIPS 180-2) as well as RSA's MD5
-algorithm (defined in Internet :rfc:`1321`). The terms "secure hash" and
+algorithm (defined in internet :rfc:`1321`). The terms "secure hash" and
"message digest" are interchangeable. Older algorithms were called message
digests. The modern term is secure hash.
diff --git a/Doc/library/http.cookiejar.rst b/Doc/library/http.cookiejar.rst
index 7b1aa80..6234e65 100644
--- a/Doc/library/http.cookiejar.rst
+++ b/Doc/library/http.cookiejar.rst
@@ -20,7 +20,7 @@ Both the regular Netscape cookie protocol and the protocol defined by
:rfc:`2965` are handled. RFC 2965 handling is switched off by default.
:rfc:`2109` cookies are parsed as Netscape cookies and subsequently treated
either as Netscape or RFC 2965 cookies according to the 'policy' in effect.
-Note that the great majority of cookies on the Internet are Netscape cookies.
+Note that the great majority of cookies on the internet are Netscape cookies.
:mod:`http.cookiejar` attempts to follow the de-facto Netscape cookie protocol (which
differs substantially from that set out in the original Netscape specification),
including taking note of the ``max-age`` and ``port`` cookie-attributes
diff --git a/Doc/library/http.server.rst b/Doc/library/http.server.rst
index 029e9ec..1aa0cba 100644
--- a/Doc/library/http.server.rst
+++ b/Doc/library/http.server.rst
@@ -14,7 +14,7 @@
--------------
-This module defines classes for implementing HTTP servers (Web servers).
+This module defines classes for implementing HTTP servers (web servers).
.. warning::
diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst
index faa34e6..91c5405 100644
--- a/Doc/library/idle.rst
+++ b/Doc/library/idle.rst
@@ -869,7 +869,7 @@ Running without a subprocess
By default, IDLE executes user code in a separate subprocess via a socket,
which uses the internal loopback interface. This connection is not
-externally visible and no data is sent to or received from the Internet.
+externally visible and no data is sent to or received from the internet.
If firewall software complains anyway, you can ignore it.
If the attempt to make the socket connection fails, Idle will notify you.
diff --git a/Doc/library/internet.rst b/Doc/library/internet.rst
index b8950bb..e745dd1 100644
--- a/Doc/library/internet.rst
+++ b/Doc/library/internet.rst
@@ -11,7 +11,7 @@ Internet Protocols and Support
.. index:: module: socket
-The modules described in this chapter implement Internet protocols and support
+The modules described in this chapter implement internet protocols and support
for related technology. They are all implemented in Python. Most of these
modules require the presence of the system-dependent module :mod:`socket`, which
is currently supported on most popular platforms. Here is an overview:
diff --git a/Doc/library/logging.handlers.rst b/Doc/library/logging.handlers.rst
index 059ab3d..73c542b 100644
--- a/Doc/library/logging.handlers.rst
+++ b/Doc/library/logging.handlers.rst
@@ -927,7 +927,7 @@ HTTPHandler
^^^^^^^^^^^
The :class:`HTTPHandler` class, located in the :mod:`logging.handlers` module,
-supports sending logging messages to a Web server, using either ``GET`` or
+supports sending logging messages to a web server, using either ``GET`` or
``POST`` semantics.
@@ -957,17 +957,17 @@ supports sending logging messages to a Web server, using either ``GET`` or
.. method:: emit(record)
- Sends the record to the Web server as a URL-encoded dictionary. The
+ Sends the record to the web server as a URL-encoded dictionary. The
:meth:`mapLogRecord` method is used to convert the record to the
dictionary to be sent.
- .. note:: Since preparing a record for sending it to a Web server is not
+ .. note:: Since preparing a record for sending it to a web server is not
the same as a generic formatting operation, using
:meth:`~logging.Handler.setFormatter` to specify a
:class:`~logging.Formatter` for a :class:`HTTPHandler` has no effect.
Instead of calling :meth:`~logging.Handler.format`, this handler calls
:meth:`mapLogRecord` and then :func:`urllib.parse.urlencode` to encode the
- dictionary in a form suitable for sending to a Web server.
+ dictionary in a form suitable for sending to a web server.
.. _queue-handler:
@@ -984,7 +984,7 @@ supports sending logging messages to a queue, such as those implemented in the
Along with the :class:`QueueListener` class, :class:`QueueHandler` can be used
to let handlers do their work on a separate thread from the one which does the
-logging. This is important in Web applications and also other service
+logging. This is important in web applications and also other service
applications where threads servicing clients need to respond as quickly as
possible, while any potentially slow operations (such as sending an email via
:class:`SMTPHandler`) are done on a separate thread.
@@ -1046,7 +1046,7 @@ because it works hand-in-hand with :class:`QueueHandler`.
Along with the :class:`QueueHandler` class, :class:`QueueListener` can be used
to let handlers do their work on a separate thread from the one which does the
-logging. This is important in Web applications and also other service
+logging. This is important in web applications and also other service
applications where threads servicing clients need to respond as quickly as
possible, while any potentially slow operations (such as sending an email via
:class:`SMTPHandler`) are done on a separate thread.
diff --git a/Doc/library/mailcap.rst b/Doc/library/mailcap.rst
index bf9639b..7749b7d 100644
--- a/Doc/library/mailcap.rst
+++ b/Doc/library/mailcap.rst
@@ -9,16 +9,16 @@
--------------
Mailcap files are used to configure how MIME-aware applications such as mail
-readers and Web browsers react to files with different MIME types. (The name
+readers and web browsers react to files with different MIME types. (The name
"mailcap" is derived from the phrase "mail capability".) For example, a mailcap
file might contain a line like ``video/mpeg; xmpeg %s``. Then, if the user
-encounters an email message or Web document with the MIME type
+encounters an email message or web document with the MIME type
:mimetype:`video/mpeg`, ``%s`` will be replaced by a filename (usually one
belonging to a temporary file) and the :program:`xmpeg` program can be
automatically started to view the file.
The mailcap format is documented in :rfc:`1524`, "A User Agent Configuration
-Mechanism For Multimedia Mail Format Information", but is not an Internet
+Mechanism For Multimedia Mail Format Information", but is not an internet
standard. However, mailcap files are supported on most Unix systems.
diff --git a/Doc/library/netdata.rst b/Doc/library/netdata.rst
index 4915016..e76280f 100644
--- a/Doc/library/netdata.rst
+++ b/Doc/library/netdata.rst
@@ -6,7 +6,7 @@ Internet Data Handling
**********************
This chapter describes modules which support handling data formats commonly used
-on the Internet.
+on the internet.
.. toctree::
diff --git a/Doc/library/pydoc.rst b/Doc/library/pydoc.rst
index f956b9d..94daf4a 100644
--- a/Doc/library/pydoc.rst
+++ b/Doc/library/pydoc.rst
@@ -18,7 +18,7 @@
The :mod:`pydoc` module automatically generates documentation from Python
modules. The documentation can be presented as pages of text on the console,
-served to a Web browser, or saved to HTML files.
+served to a web browser, or saved to HTML files.
For modules, classes, functions and methods, the displayed documentation is
derived from the docstring (i.e. the :attr:`__doc__` attribute) of the object,
@@ -65,9 +65,9 @@ manner similar to the Unix :program:`man` command. The synopsis line of a
module is the first line of its documentation string.
You can also use :program:`pydoc` to start an HTTP server on the local machine
-that will serve documentation to visiting Web browsers. :program:`pydoc -p 1234`
+that will serve documentation to visiting web browsers. :program:`pydoc -p 1234`
will start a HTTP server on port 1234, allowing you to browse the
-documentation at ``http://localhost:1234/`` in your preferred Web browser.
+documentation at ``http://localhost:1234/`` in your preferred web browser.
Specifying ``0`` as the port number will select an arbitrary unused port.
:program:`pydoc -n <hostname>` will start the server listening at the given
diff --git a/Doc/library/smtplib.rst b/Doc/library/smtplib.rst
index 52220f7..aaab6b1 100644
--- a/Doc/library/smtplib.rst
+++ b/Doc/library/smtplib.rst
@@ -15,7 +15,7 @@
--------------
The :mod:`smtplib` module defines an SMTP client session object that can be used
-to send mail to any Internet machine with an SMTP or ESMTP listener daemon. For
+to send mail to any internet machine with an SMTP or ESMTP listener daemon. For
details of SMTP and ESMTP operation, consult :rfc:`821` (Simple Mail Transfer
Protocol) and :rfc:`1869` (SMTP Service Extensions).
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index eb3090c..e1db1b5 100755
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -66,7 +66,7 @@ created. Socket addresses are represented as follows:
.. _host_port:
- A pair ``(host, port)`` is used for the :const:`AF_INET` address family,
- where *host* is a string representing either a hostname in Internet domain
+ where *host* is a string representing either a hostname in internet domain
notation like ``'daring.cwi.nl'`` or an IPv4 address like ``'100.50.200.5'``,
and *port* is an integer.
@@ -640,7 +640,7 @@ The following functions all create :ref:`socket objects <socket-objects>`.
.. function:: create_connection(address[, timeout[, source_address]])
- Connect to a TCP service listening on the Internet *address* (a 2-tuple
+ Connect to a TCP service listening on the internet *address* (a 2-tuple
``(host, port)``), and return the socket object. This is a higher-level
function than :meth:`socket.connect`: if *host* is a non-numeric hostname,
it will try to resolve it for both :data:`AF_INET` and :data:`AF_INET6`,
@@ -877,7 +877,7 @@ The :mod:`socket` module also offers various network-related services:
.. function:: getprotobyname(protocolname)
- Translate an Internet protocol name (for example, ``'icmp'``) to a constant
+ Translate an internet protocol name (for example, ``'icmp'``) to a constant
suitable for passing as the (optional) third argument to the :func:`.socket`
function. This is usually only needed for sockets opened in "raw" mode
(:const:`SOCK_RAW`); for the normal socket modes, the correct protocol is chosen
@@ -886,7 +886,7 @@ The :mod:`socket` module also offers various network-related services:
.. function:: getservbyname(servicename[, protocolname])
- Translate an Internet service name and protocol name to a port number for that
+ Translate an internet service name and protocol name to a port number for that
service. The optional protocol name, if given, should be ``'tcp'`` or
``'udp'``, otherwise any protocol will match.
@@ -895,7 +895,7 @@ The :mod:`socket` module also offers various network-related services:
.. function:: getservbyport(port[, protocolname])
- Translate an Internet port number and protocol name to a service name for that
+ Translate an internet port number and protocol name to a service name for that
service. The optional protocol name, if given, should be ``'tcp'`` or
``'udp'``, otherwise any protocol will match.
diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst
index 232c061..b65a3e8 100644
--- a/Doc/library/socketserver.rst
+++ b/Doc/library/socketserver.rst
@@ -15,7 +15,7 @@ There are four basic concrete server classes:
.. class:: TCPServer(server_address, RequestHandlerClass, bind_and_activate=True)
- This uses the Internet TCP protocol, which provides for
+ This uses the internet TCP protocol, which provides for
continuous streams of data between the client and server.
If *bind_and_activate* is true, the constructor automatically attempts to
invoke :meth:`~BaseServer.server_bind` and
@@ -263,7 +263,7 @@ Server Objects
The address on which the server is listening. The format of addresses varies
depending on the protocol family;
see the documentation for the :mod:`socket` module
- for details. For Internet protocols, this is a tuple containing a string giving
+ for details. For internet protocols, this is a tuple containing a string giving
the address, and an integer port number: ``('127.0.0.1', 80)``, for example.
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 4b41d11..b96dda4 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -1056,7 +1056,7 @@ Constants
Option for :func:`create_default_context` and
:meth:`SSLContext.load_default_certs`. This value indicates that the
- context may be used to authenticate Web servers (therefore, it will
+ context may be used to authenticate web servers (therefore, it will
be used to create client-side sockets).
.. versionadded:: 3.4
@@ -1065,7 +1065,7 @@ Constants
Option for :func:`create_default_context` and
:meth:`SSLContext.load_default_certs`. This value indicates that the
- context may be used to authenticate Web clients (therefore, it will
+ context may be used to authenticate web clients (therefore, it will
be used to create server-side sockets).
.. versionadded:: 3.4
diff --git a/Doc/library/test.rst b/Doc/library/test.rst
index 7ee96d3..64d767e 100644
--- a/Doc/library/test.rst
+++ b/Doc/library/test.rst
@@ -267,10 +267,10 @@ The :mod:`test.support` module defines the following constants:
.. data:: INTERNET_TIMEOUT
- Timeout in seconds for network requests going to the Internet.
+ Timeout in seconds for network requests going to the internet.
The timeout is short enough to prevent a test to wait for too long if the
- Internet request is blocked for whatever reason.
+ internet request is blocked for whatever reason.
Usually, a timeout using :data:`INTERNET_TIMEOUT` should not mark a test as
failed, but skip the test instead: see
diff --git a/Doc/library/urllib.parse.rst b/Doc/library/urllib.parse.rst
index 0aaac56..a060cc9 100644
--- a/Doc/library/urllib.parse.rst
+++ b/Doc/library/urllib.parse.rst
@@ -20,7 +20,7 @@ strings up in components (addressing scheme, network location, path etc.), to
combine the components back into a URL string, and to convert a "relative URL"
to an absolute URL given a "base URL."
-The module has been designed to match the Internet RFC on Relative Uniform
+The module has been designed to match the internet RFC on Relative Uniform
Resource Locators. It supports the following URL schemes: ``file``, ``ftp``,
``gopher``, ``hdl``, ``http``, ``https``, ``imap``, ``mailto``, ``mms``,
``news``, ``nntp``, ``prospero``, ``rsync``, ``rtsp``, ``rtspu``, ``sftp``,
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
index b4435a6..130c7d6 100644
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -1543,7 +1543,7 @@ some point in the future.
* The :func:`urlopen` and :func:`urlretrieve` functions can cause arbitrarily
long delays while waiting for a network connection to be set up. This means
- that it is difficult to build an interactive Web client using these functions
+ that it is difficult to build an interactive web client using these functions
without using threads.
.. index::
diff --git a/Doc/library/urllib.robotparser.rst b/Doc/library/urllib.robotparser.rst
index 544f502..f063e46 100644
--- a/Doc/library/urllib.robotparser.rst
+++ b/Doc/library/urllib.robotparser.rst
@@ -19,7 +19,7 @@
This module provides a single class, :class:`RobotFileParser`, which answers
questions about whether or not a particular user agent can fetch a URL on the
-Web site that published the :file:`robots.txt` file. For more details on the
+web site that published the :file:`robots.txt` file. For more details on the
structure of :file:`robots.txt` files, see http://www.robotstxt.org/orig.html.
diff --git a/Doc/library/webbrowser.rst b/Doc/library/webbrowser.rst
index b7bfb65..85a15b4 100644
--- a/Doc/library/webbrowser.rst
+++ b/Doc/library/webbrowser.rst
@@ -1,8 +1,8 @@
-:mod:`webbrowser` --- Convenient Web-browser controller
+:mod:`webbrowser` --- Convenient web-browser controller
=======================================================
.. module:: webbrowser
- :synopsis: Easy-to-use controller for Web browsers.
+ :synopsis: Easy-to-use controller for web browsers.
.. moduleauthor:: Fred L. Drake, Jr. <fdrake@acm.org>
.. sectionauthor:: Fred L. Drake, Jr. <fdrake@acm.org>
@@ -12,7 +12,7 @@
--------------
The :mod:`webbrowser` module provides a high-level interface to allow displaying
-Web-based documents to users. Under most circumstances, simply calling the
+web-based documents to users. Under most circumstances, simply calling the
:func:`.open` function from this module will do the right thing.
Under Unix, graphical browsers are preferred under X11, but text-mode browsers