diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2021-09-22 17:33:36 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-22 17:33:36 (GMT) |
commit | 36122e18148c5b6c78ebce1d36d514fd7cf250f5 (patch) | |
tree | 2da76a2182b026faf0ef209c120cb6ca69491a11 /Doc/library/urllib.request.rst | |
parent | ecb6922ff2d56476a6cfb0941ae55aca5e7fae3d (diff) | |
download | cpython-36122e18148c5b6c78ebce1d36d514fd7cf250f5.zip cpython-36122e18148c5b6c78ebce1d36d514fd7cf250f5.tar.gz cpython-36122e18148c5b6c78ebce1d36d514fd7cf250f5.tar.bz2 |
bpo-41203: Replace Mac OS X and OS X with macOS (GH-28515)
Replace old names when they refer to actual versions of macOS.
Keep historical names in references to older versions.
Co-authored-by: Patrick Reader <_@pxeger.com>
Diffstat (limited to 'Doc/library/urllib.request.rst')
-rw-r--r-- | Doc/library/urllib.request.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst index dbb8c25..659a363 100644 --- a/Doc/library/urllib.request.rst +++ b/Doc/library/urllib.request.rst @@ -169,8 +169,8 @@ The :mod:`urllib.request` module defines the following functions: This helper function returns a dictionary of scheme to proxy server URL mappings. It scans the environment for variables named ``<scheme>_proxy``, in a case insensitive approach, for all operating systems first, and when it - cannot find it, looks for proxy information from Mac OSX System - Configuration for Mac OS X and Windows Systems Registry for Windows. + cannot find it, looks for proxy information from System + Configuration for macOS and Windows Systems Registry for Windows. If both lowercase and uppercase environment variables exist (and disagree), lowercase is preferred. @@ -303,8 +303,8 @@ The following classes are provided: the list of proxies from the environment variables ``<protocol>_proxy``. If no proxy environment variables are set, then in a Windows environment proxy settings are obtained from the registry's - Internet Settings section, and in a Mac OS X environment proxy information - is retrieved from the OS X System Configuration Framework. + Internet Settings section, and in a macOS environment proxy information + is retrieved from the System Configuration Framework. To disable autodetected proxy pass an empty dictionary. |