summaryrefslogtreecommitdiff
path: root/etc/DISTRIB
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-11-06 00:33:43 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2016-11-06 00:42:03 -0700
commitdc152c54f4e44f5f2040883b03f71ff6aa66c893 (patch)
tree7b4f0336a1f03e7a53d980000a42568b10907409 /etc/DISTRIB
parent84c53436ab25b6c8f76c133e59b34e533ea33cc7 (diff)
downloademacs-dc152c54f4e44f5f2040883b03f71ff6aa66c893.tar.gz
Modernize usage of 'macOS' in doc and comments
Apple changed the spelling of its operating system again, to "macOS", effective with macOS 10.12 Sierra (2016-09-20). Change Emacs documentation and comments to match this. Stick with older OS spellings ("OS X", "Mac OS X") when talking about older releases where the older names are more correct.
Diffstat (limited to 'etc/DISTRIB')
-rw-r--r--etc/DISTRIB4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/DISTRIB b/etc/DISTRIB
index 7c0cd4cbaca..237e7f265f9 100644
--- a/etc/DISTRIB
+++ b/etc/DISTRIB
@@ -31,8 +31,8 @@ manuals, including the Emacs manual, are available from the FSF's
online store at http://shop.fsf.org.
Emacs has been run on GNU/Linux, FreeBSD, NetBSD, OpenBSD, and on many
-Unix systems, on a variety of types of cpu, as well as on MSDOS,
-Windows and MacOS. See the file 'etc/MACHINES' in the Emacs
+Unix systems, on a variety of types of CPU, as well as on MS-DOS,
+MS-Windows and macOS. See the file 'etc/MACHINES' in the Emacs
distribution for a full list of machines that GNU Emacs has been tested
on, with machine-specific installation notes and warnings.