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>

2 files changed, 14 insertions, 14 deletions

diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 2398ab0..a9c0931 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -656,7 +656,7 @@ conflict.
 .. envvar:: PYTHONCASEOK
 
    If this is set, Python ignores case in :keyword:`import` statements.  This
-   only works on Windows and OS X.
+   only works on Windows and macOS.
 
 
 .. envvar:: PYTHONDONTWRITEBYTECODE
@@ -739,7 +739,7 @@ conflict.
 
    If this environment variable is set, ``sys.argv[0]`` will be set to its
    value instead of the value got through the C runtime.  Only works on
-   Mac OS X.
+   macOS.
 
 .. envvar:: PYTHONWARNINGS
 
diff --git a/Doc/using/mac.rst b/Doc/using/mac.rst
index ead71e1..2f132a9 100644
--- a/Doc/using/mac.rst
+++ b/Doc/using/mac.rst
@@ -1,14 +1,14 @@
 
 .. _using-on-mac:
 
-***************************
-Using Python on a Macintosh
-***************************
+*********************
+Using Python on a Mac
+*********************
 
 :Author: Bob Savage <bobsavage@mac.com>
 
 
-Python on a Macintosh running Mac OS X is in principle very similar to Python on
+Python on a Mac running macOS is in principle very similar to Python on
 any other Unix platform, but there are a number of additional features such as
 the IDE and the Package Manager that are worth pointing out.
 
@@ -17,7 +17,7 @@ the IDE and the Package Manager that are worth pointing out.
 Getting and Installing MacPython
 ================================
 
-Mac OS X 10.8 comes with Python 2.7 pre-installed by Apple.  If you wish, you
+macOS since version 10.8 comes with Python 2.7 pre-installed by Apple.  If you wish, you
 are invited to install the most recent version of Python 3 from the Python
 website (https://www.python.org).  A current "universal binary" build of Python,
 which runs natively on the Mac's new Intel and legacy PPC CPU's, is available
@@ -54,12 +54,12 @@ section on running Python scripts from the Unix shell.
 How to run a Python script
 --------------------------
 
-Your best way to get started with Python on Mac OS X is through the IDLE
+Your best way to get started with Python on macOS is through the IDLE
 integrated development environment, see section :ref:`ide` and use the Help menu
 when the IDE is running.
 
 If you want to run Python scripts from the Terminal window command line or from
-the Finder you first need an editor to create your script. Mac OS X comes with a
+the Finder you first need an editor to create your script. macOS comes with a
 number of standard Unix command line editors, :program:`vim` and
 :program:`emacs` among them. If you want a more Mac-like editor,
 :program:`BBEdit` or :program:`TextWrangler` from Bare Bones Software (see
@@ -87,7 +87,7 @@ To run your script from the Finder you have two options:
 Running scripts with a GUI
 --------------------------
 
-With older versions of Python, there is one Mac OS X quirk that you need to be
+With older versions of Python, there is one macOS quirk that you need to be
 aware of: programs that talk to the Aqua window manager (in other words,
 anything that has a GUI) need to be run in a special way. Use :program:`pythonw`
 instead of :program:`python` to start such scripts.
@@ -98,7 +98,7 @@ With Python 3.9, you can use either :program:`python` or :program:`pythonw`.
 Configuration
 -------------
 
-Python on OS X honors all standard Unix environment variables such as
+Python on macOS honors all standard Unix environment variables such as
 :envvar:`PYTHONPATH`, but setting these variables for programs started from the
 Finder is non-standard as the Finder does not read your :file:`.profile` or
 :file:`.cshrc` at startup. You need to create a file
@@ -148,10 +148,10 @@ X by Apple, and the latest version can be downloaded and installed from
 https://www.activestate.com; it can also be built from source.
 
 *wxPython* is another popular cross-platform GUI toolkit that runs natively on
-Mac OS X. Packages and documentation are available from https://www.wxpython.org.
+macOS. Packages and documentation are available from https://www.wxpython.org.
 
-*PyQt* is another popular cross-platform GUI toolkit that runs natively on Mac
-OS X. More information can be found at
+*PyQt* is another popular cross-platform GUI toolkit that runs natively on
+macOS. More information can be found at
 https://riverbankcomputing.com/software/pyqt/intro.