9 files changed, 54 insertions, 51 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.
 
diff --git a/etc/MACHINES b/etc/MACHINES
index 085f169e85b..fcab23c7b53 100644
--- a/etc/MACHINES
+++ b/etc/MACHINES
@@ -64,9 +64,9 @@ the list at the end of this file.
   This was tested on a little-endian sh4 system (cpu type SH7751R) running
   Gentoo Linux 2008.0.
 
-** Mac OS X
+** macOS
 
-  Version 10.6 or newer.  PowerPC is not supported.
+  Mac OS X 10.6 or newer.  PowerPC is not supported.
   For installation instructions see the file nextstep/INSTALL.
 
 ** Microsoft Windows
diff --git a/etc/NEWS b/etc/NEWS
index a5bcb8dabdc..f6792431907 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -88,7 +88,7 @@ If gnustep-config is not available, the old heuristics are used.
 unless gfile is explicitly requested via --with-file-notification='gfile'.
 
 ** 'configure' detects the kqueue file notification library on *BSD
-and Mac OS X machines.
+and macOS machines.
 
 ** The configure option '--with-pkg-config-prog' has been removed.
 Use './configure PKG_CONFIG=/full/name/of/pkg-config' if you need to.
@@ -202,10 +202,10 @@ the 'network-security-level' variable.
 
 ** 'x-select-enable-clipboard' is renamed 'select-enable-clipboard'
 and 'x-select-enable-primary' is renamed 'select-enable-primary'.
-Additionally they both now apply to all systems (OSX, GNUstep, Windows, you
-name it), with the proviso that on some systems (e.g. Windows)
-'select-enable-primary' is ineffective since the system doesn't
-have the equivalent of a primary selection.
+Additionally they both now apply to all systems (macOS, GNUstep,
+MS-Windows, you name it), with the proviso that on some systems (e.g.,
+MS-Windows) 'select-enable-primary' is ineffective since the system
+doesn't have the equivalent of a primary selection.
 
 ** New option 'switch-to-buffer-in-dedicated-window' allows you to
 customize how 'switch-to-buffer' proceeds interactively when the
@@ -817,7 +817,7 @@ PLIST will contain a :peer element that has the output of
 
 ** Tramp
 
-*** New connection method "afp", which allows you to access Mac OS X
+*** New connection method "afp", which allows you to access macOS
 volumes via the Apple Filing Protocol.
 
 *** New connection method "nc", which allows you to access dumb
@@ -1076,7 +1076,7 @@ See <http://debbugs.gnu.org/22814>.
 
 ** File Notifications
 
-*** The kqueue library is integrated for *BSD and Mac OS X machines.
+*** The kqueue library is integrated for *BSD and macOS machines.
 
 *** The new event 'stopped' signals, that a file notification watch is
 not active any longer.
@@ -1743,19 +1743,19 @@ of Windows starting with Windows 9X.
 ** The byte counts in etags-generated TAGS files are now the same on
 MS-Windows as they are on other platforms.
 
-** On OS X, configure creates a Cocoa ("Nextstep") build by default.
+** On macOS, configure creates a Cocoa ("Nextstep") build by default.
 Pass '--without-ns' to configure to create an X11 build, the old default.
 
-** OS X 10.5 or older is no longer supported.
+** Mac OS X 10.5 or older is no longer supported.
 
-** OS X on PowerPC is no longer supported.
+** Mac OS X on PowerPC is no longer supported.
 
 ** New variable 'ns-use-fullscreen-animation' controls animation for
 non-native NS fullscreen.  The default is nil.  Set to t to enable
-animation when entering and leaving fullscreen.  For native OSX fullscreen
-this has no effect.
+animation when entering and leaving fullscreen.  For native macOS
+fullscreen this has no effect.
 
-** On the OS X Cocoa ("Nextstep") port, multicolor font (such as color
+** On the macOS Cocoa ("Nextstep") port, multicolor font (such as color
 emoji) display is disabled.  This feature was accidentally added when
 Emacs 24.4 included the new Core Text based font backend code that was
 originally implemented for a non-mainline port.  This will be enabled
diff --git a/etc/NEWS.22 b/etc/NEWS.22
index 1bc4967d6ab..5e414f18d64 100644
--- a/etc/NEWS.22
+++ b/etc/NEWS.22
@@ -262,7 +262,7 @@ item was added to the menu bar to make it easily accessible
 You no longer need to download a separate tarball in order to build
 Emacs with Leim.
 
-** Support for MacOS X was added.
+** Support for Mac OS X was added.
 See the files mac/README and mac/INSTALL for build instructions.
 
 ** Mac OS 9 port now uses the Carbon API by default.  You can also
@@ -3390,7 +3390,7 @@ obsolete; use `dframe-update-speed' instead.
 
 *** display-battery-mode replaces display-battery.
 
-*** battery.el now works on recent versions of OS X.
+*** battery.el now works on recent versions of Mac OS X.
 
 ** Games
 
diff --git a/etc/NEWS.24 b/etc/NEWS.24
index df2e11f08e7..08021f4ee04 100644
--- a/etc/NEWS.24
+++ b/etc/NEWS.24
@@ -84,7 +84,7 @@ It is no longer needed, as the crt*.o files are no longer linked specially.
 ** Directories passed to configure option `--enable-locallisppath' are
 no longer created during installation.
 
-** Emacs for Nextstep (Mac OS X, GNUstep) can be built with ImageMagick support.
+** Emacs for Nextstep (OS X, GNUstep) can be built with ImageMagick support.
 This requires pkg-config to be available at build time.
 
 
@@ -1559,7 +1559,7 @@ The previous binding, introduced in Emacs 24.1, was a mistake, because
 
 *** New input method `vietnamese-vni'.
 
-** Nextstep (GNUstep / Mac OS X) port
+** Nextstep (GNUstep / OS X) port
 
 *** Support for fullscreen and the frame parameter fullscreen.
 
@@ -2373,9 +2373,9 @@ Emacs now supports `mouse-highlight', help-echo (in the echo area), and
 ** On MS Windows, you can pass `--without-libxml2' to configure.bat to omit
 support for libxml2, even if its presence is detected.
 
-** On Mac OS X, the Nextstep port requires OS X 10.4 or later.
+** On OS X, the Nextstep port requires Mac OS X 10.4 or later.
 
-** On Mac OS X, configure no longer automatically adds the Fink "/sw"
+** On OS X, configure no longer automatically adds the Fink "/sw"
 directories to the search path.  You must add them yourself if you want them.
 
 
@@ -3833,7 +3833,7 @@ and also when HOME is set to C:\ by default.
 (It is only used internally in the Emacs C code.)
 
 ** Customize ns-auto-hide-menu-bar to have the menu-bar hidden, but
-reappear on mouse-over.  (Requires OS X 10.6 or later.)
+reappear on mouse-over.  (Requires Mac OS X 10.6 or later.)
 
 ** On Mac OS X, dragging a file into Emacs visits the file, like on
 other platforms, rather than inserting its contents into the buffer.
diff --git a/etc/NEXTSTEP b/etc/NEXTSTEP
index ad2ab959e6d..60c49ad8c7e 100644
--- a/etc/NEXTSTEP
+++ b/etc/NEXTSTEP
@@ -3,8 +3,8 @@ See the end of the file for license conditions.
 
 This file contains information about GNU Emacs on "Nextstep" platforms.
 The Nextstep support code works on many POSIX systems (and possibly
-W32) using the GNUstep libraries, and on MacOS X systems using the
-Cocoa libraries.
+W32) using the GNUstep libraries, and on macOS systems using the Cocoa
+libraries.
 
 Background
 ----------
@@ -17,9 +17,9 @@ system in the late 1980's.  Later on, in collaboration with Sun, this
 API was published as a specification called OpenStep.  The GNUstep
 project started in the early 1990's to provide a free implementation
 of this API.  Later on, Apple bought NeXT (some would say "NeXT bought
-Apple") and made OpenStep the basis of OS X, calling the API "Cocoa".
-Since then, Cocoa has evolved beyond the OpenStep specification, and
-GNUstep has followed it.
+Apple") and made OpenStep the basis of Mac OS X, calling the API
+"Cocoa".  Since then, Cocoa has evolved beyond the OpenStep
+specification, and GNUstep has followed it.
 
 Thus, calling this port "OpenStep" is not technically accurate, and in
 the absence of any other determinant, we are using the term
@@ -30,8 +30,8 @@ begin with the letters "NS".
 (See http://en.wikipedia.org/wiki/Nextstep)
 
 This Emacs port was first released in the early 1990's on the NeXT
-computer, and was successively updated to OpenStep, Rhapsody, OS X,
-and then finally GNUstep, tracking GNU emacs core releases in the
+computer, and was successively updated to OpenStep, Rhapsody, Mac OS
+X, and then finally GNUstep, tracking GNU Emacs core releases in the
 meantime.
 
 
@@ -62,13 +62,13 @@ Release History
 
 1999/05/??      6.0b3           Scott Bender: "OS X Server", Emacs 20.3.
 
-2001/06/25      7.0             Ported to MacOS X (10.1) by Christophe de
+2001/06/25      7.0             Ported to Mac OS X (10.1) by Christophe de
                                 Dinechin. Release based on Emacs 20.7. Hosting
                                 moved to SourceForge.
 
 2002/01/03      7.0.1           Bug fixes.
 
-2002/08/27      7.0.2           Jaguar (OS X 10.2) support. Added an autoconf
+2002/08/27      7.0.2           Jaguar (Mac OS X 10.2) support. Added autoconf
                                 option for sys_nerr being in stdio. Added
                                 libncurses to the build libraries. Fixed a
                                 problem with ns-alternate-is-meta. Changed the
@@ -76,7 +76,7 @@ Release History
 
 2004/10/07      8.0-pre1        Ported to GNUstep by Adrian Robert.
 
-2004/11/04      8.0-pre2        Restored functionality on OS X (menu code
+2004/11/04      8.0-pre2        Restored functionality on Mac OS X (menu code
                                 cleanup).  Improved scrollbar handling and
                                 paste from other applications.  File icons
                                 obtained properly from NSWorkspace.  Dropped
@@ -116,7 +116,8 @@ Release History
                                 and Planner go away.  Improved scrollbar
                                 handling and rendering speed.  Color panel
                                 and other bug fixes. mac-fix-env utility.
-                                Font handling improvements (OS X 10.3, 10.4):
+                                Font handling improvements (Mac OS X 10.3,
+                                10.4):
                                 - heed 'GSFontAntiAlias' default
                                 - heed system antialiasing threshold
                                 - added 'UseQuickdrawSmoothing' default to
@@ -150,8 +151,9 @@ Release History
                                 handling improved.  Fixed some portability
                                 problems on Tiger and Puma.
 
-2005/09/12      8.0             Bundled ispell on OS X.  Minor bug fixes and
-                                stability improvements.  Compiles under gcc-4.
+2005/09/12      8.0             Bundled ispell on Mac OS X.  Minor bug fixes
+                                and stability improvements.  Compiles under
+                                gcc-4.
 
 2005/09/26      8.0.1           Correct clipped rendering for synthetic
                                 italics. Include the info directory.
@@ -247,7 +249,7 @@ Christian Limpach
 Scott Bender
     OpenStep, Rhapsody ports
 Christophe de Dinechin
-    MacOS X port
+    macOS port
 Adrian Robert
     GNUstep port, update Emacs 20 -> 21+
 
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 9d80139fa94..8d8c0c604a7 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -952,7 +952,7 @@ instead of requiring each Babel library one by one.
 - New option [[doc:org-gnus-no-server][org-gnus-no-server]] to start Gnus with =gnus-no-server=
 - Org is now distributed with =htmlize.el= version 1.43
 - ~org-drill.el~ has been updated to version 2.3.7
-- ~org-mac-iCal.el~ now supports MacOSX version up to 10.8
+- ~org-mac-iCal.el~ now supports OS X versions up to 10.8
 - Various improvements to ~org-contacts.el~ and =orgpan.el=
 
 ** Outside Org
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 008f5a15310..9904339be40 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -604,7 +604,7 @@ See <http://debbugs.gnu.org/22814>.
 When you have a large number of buffers running auto-revert-mode, and
 Emacs is configured to use the kqueue file notification library, it
 uses an own file descriptor for every watched file.  On systems with a
-small limit of file descriptors allowed per process, like OS X, you
+small limit of file descriptors allowed per process, like macOS, you
 could run out of file descriptors.  You won't be able to open new files.
 
 auto-revert-use-notify is set to nil in global-auto-revert-mode, therefore.
diff --git a/etc/TODO b/etc/TODO
index 48c1654aa1f..84c1b6d8ffd 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -700,7 +700,7 @@ resize the frame.
 **** Support 'proced' (implement 'process-attributes')
 
 Unfortunately, a user-level process like Emacs does not have the
-privileges to get information about other processes under OS X.
+privileges to get information about other processes under macOS.
 
 There are other ways to do this:
 
@@ -711,7 +711,7 @@ There are other ways to do this:
  3) Ask the user to self-sign Emacs, if this feature is of interest.
 
 Anders Lindgren <andlind@gmail.com> has implemented
-'process-attributes' for OS X, which currently only work when
+'process-attributes' for macOS, which currently only work when
 running Emacs as root.
 
 See this article by Bozhidar Batsov for an overview of Proced:
@@ -724,11 +724,11 @@ even though Emacs allows a user to customize such features.
 
 *** New features
 
-This section contains features unique to Nextstep and/or OS X.
+This section contains features unique to Nextstep and/or macOS.
 
 **** PressAndHold for writing accented character
 
-On OS X, many application support the press and hold pattern to
+On macOS, many application support the press and hold pattern to
 invoke a menu of accented characters.  (See example at
 https://support.apple.com/en-us/HT201586 .)
 
@@ -741,7 +741,7 @@ implemented in Emacs for a free system.
 
 **** Floating scroll bars
 
-In modern OS X applications, the scroll bar often floats over the
+In modern macOS applications, the scroll bar often floats over the
 content, and is invisible unless actually used.  This makes the user
 interface less cluttered and more area could be used to contain text.
 
@@ -804,7 +804,7 @@ This section contains issues where there is an ongoing debate.
 **** Key bindings of CMD and ALT
 
 Currently in the "ns" port, ALT is bound to Meta and CMD is bound to
-Super -- allowing the user to use typical OS X commands like CMD-A to
+Super -- allowing the user to use typical macOS commands like CMD-A to
 mark everything.
 
 Unfortunately, when using an international keyboard, you can't type
@@ -852,9 +852,10 @@ Emacs can be build in a number of different ways.  For each feature,
 consider if is really is "NS" specific, or if it should be applied to
 all build versions.
 
-- With the "NS" interface.  This is the normal way to build Emacs on OS X.
+- With the "NS" interface.  This is the normal way to build Emacs on
+  macOS.
 
-- With the "X11" interface.  On OS X, this is mainly of interest to
+- With the "X11" interface.  On macOS, this is mainly of interest to
   developers of Emacs to get a "reference" interface implementations.
   However, it might be of interest for people working remotely, as X11
   applications can be used over a network connection.
@@ -863,12 +864,12 @@ all build versions.
 
 *** Bugs
 
-**** Incorrect translation of Super modifier with Ctrl or Meta on OS X
+**** Incorrect translation of Super modifier with Ctrl or Meta on macOS
 
 When pressing 'M-s-a', Emacs replies "M-s-å is undefined".  What
 happened is a mix of Emacs view that Meta and Super has been pressed,
-and OS X view that ALT-a should yield "å" (U+00E5 LATIN SMALL LETTER A
-WITH RING ABOVE).
+and macOS view that ALT-a should yield "å" (U+00E5 LATIN SMALL LETTER
+A WITH RING ABOVE).
 
 The bug reports suggest two different patches; unfortunately, neither
 works properly.  For example: