diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2021-09-23 10:25:31 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-23 10:25:31 (GMT) |
| commit | 1493e1a40d04a048cce9c5080ec47478a4941054 (patch) | |
| tree | 5a80debb9955fcae915c579641b422b521131f75 /Doc/faq | |
| parent | 44396aaba9b92b3a38a4b422a000d1a8eb05185a (diff) | |
| download | cpython-1493e1a40d04a048cce9c5080ec47478a4941054.zip cpython-1493e1a40d04a048cce9c5080ec47478a4941054.tar.gz cpython-1493e1a40d04a048cce9c5080ec47478a4941054.tar.bz2 | |
bpo-41203: Replace Mac OS X and OS X with macOS (GH-28515) (GH-28523)
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>
(cherry picked from commit 36122e18148c5b6c78ebce1d36d514fd7cf250f5)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
Diffstat (limited to 'Doc/faq')
| -rw-r--r-- | Doc/faq/gui.rst | 2 | ||||
| -rw-r--r-- | Doc/faq/installed.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/faq/gui.rst b/Doc/faq/gui.rst index 145283d..86c56d9 100644 --- a/Doc/faq/gui.rst +++ b/Doc/faq/gui.rst @@ -23,7 +23,7 @@ install (since it comes included with most `binary distributions <https://www.python.org/downloads/>`_ of Python) and use. For more info about Tk, including pointers to the source, see the `Tcl/Tk home page <https://www.tcl.tk>`_. Tcl/Tk is fully portable to the -Mac OS X, Windows, and Unix platforms. +macOS, Windows, and Unix platforms. Depending on what platform(s) you are aiming at, there are also several alternatives. A `list of cross-platform diff --git a/Doc/faq/installed.rst b/Doc/faq/installed.rst index 4229653..16c9a74 100644 --- a/Doc/faq/installed.rst +++ b/Doc/faq/installed.rst @@ -29,7 +29,7 @@ there are several possible ways it could have gotten there. * Some Windows machines also have Python installed. At this writing we're aware of computers from Hewlett-Packard and Compaq that include Python. Apparently some of HP/Compaq's administrative tools are written in Python. -* Many Unix-compatible operating systems, such as Mac OS X and some Linux +* Many Unix-compatible operating systems, such as macOS and some Linux distributions, have Python installed by default; it's included in the base installation. |