(bpo-41203) Macintosh -> Mac

python · pxeger · Jul 4, 2020 · Jul 4, 2020 · Jul 4, 2020 · Jul 4, 2020
commit 3c955c218f39d8022e58ff748b9ef603a420efd1
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
@@ -1118,7 +1118,7 @@ Glossary
    universal newlines
       A manner of interpreting text streams in which all of the following are
       recognized as ending a line: the Unix end-of-line convention ``'\n'``,
-      the Windows convention ``'\r\n'``, and the old Macintosh convention
+      the Windows convention ``'\r\n'``, and the old Mac convention
       ``'\r'``.  See :pep:`278` and :pep:`3116`, as well as
       :func:`bytes.splitlines` for an additional use.
 

diff --git a/Doc/library/binascii.rst b/Doc/library/binascii.rst
@@ -211,7 +211,7 @@ The :mod:`binascii` module defines the following functions:
       and 85.
 
    Module :mod:`binhex`
-      Support for the binhex format used on the Macintosh.
+      Support for the binhex format used on the Mac.
 
    Module :mod:`uu`
       Support for UU encoding used on Unix.

diff --git a/Doc/library/binhex.rst b/Doc/library/binhex.rst
@@ -11,7 +11,7 @@
 --------------
 
 This module encodes and decodes files in binhex4 format, a format allowing
-representation of Macintosh files in ASCII. Only the data fork is handled.
+representation of Mac files in ASCII. Only the data fork is handled.
 
 The :mod:`binhex` module defines the following functions:
 
@@ -54,6 +54,6 @@ Notes
 There is an alternative, more powerful interface to the coder and decoder, see
 the source for details.
 
-If you code or decode textfiles on non-Macintosh platforms they will still use
-the old Macintosh newline convention (carriage-return as end of line).
+If you code or decode textfiles on non-Mac platforms they will still use
+the old Mac newline convention (carriage-return as end of line).
 
diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst
@@ -1201,7 +1201,7 @@ particular, the following variants typically exist:
 | mac_latin2      | maclatin2, maccentraleurope,   | Central and Eastern Europe     |
 |                 | mac_centeuro                   |                                |
 +-----------------+--------------------------------+--------------------------------+
-| mac_roman       | macroman, macintosh            | Western Europe                 |
+| mac_roman       | macroman, Mac            | Western Europe                 |
 +-----------------+--------------------------------+--------------------------------+
 | mac_turkish     | macturkish                     | Turkish                        |
 +-----------------+--------------------------------+--------------------------------+

diff --git a/Doc/library/site.rst b/Doc/library/site.rst
@@ -32,7 +32,7 @@ It starts by constructing up to four directories from a head and a tail part.
 For the head part, it uses ``sys.prefix`` and ``sys.exec_prefix``; empty heads
 are skipped.  For the tail part, it uses the empty string and then
 :file:`lib/site-packages` (on Windows) or
-:file:`lib/python{X.Y}/site-packages` (on Unix and Macintosh).  For each
+:file:`lib/python{X.Y}/site-packages` (on Unix and Mac).  For each
 of the distinct head-tail combinations, it sees if it refers to an existing
 directory, and if so, adds it to ``sys.path`` and also inspects the newly
 added path for configuration files.

diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst
@@ -50,7 +50,7 @@ A physical line is a sequence of characters terminated by an end-of-line
 sequence.  In source files and strings, any of the standard platform line
 termination sequences can be used - the Unix form using ASCII LF (linefeed),
 the Windows form using the ASCII sequence CR LF (return followed by linefeed),
-or the old Macintosh form using the ASCII CR (return) character.  All of these
+or the old Mac form using the ASCII CR (return) character.  All of these
 forms can be used equally, regardless of platform. The end of input also serves
 as an implicit terminator for the final physical line.
 

diff --git a/Doc/using/mac.rst b/Doc/using/mac.rst
@@ -2,13 +2,13 @@
 .. _using-on-mac:
 
 ***************************
-Using Python on a Macintosh
+Using Python on a Mac
 ***************************
 
 :Author: Bob Savage <bobsavage@mac.com>
 
 
-Python on a Macintosh running macOS 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.