13 files changed, 44 insertions, 47 deletions

diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index f0f686f855c..881bf11a9f0 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -550,11 +550,11 @@ variables is not set, the category defaults to the value of the
 @env{LANG} is not set.  But if @env{LC_ALL} is specified, it overrides
 the settings of all the other locale environment variables.
 
-On MS-Windows and OS X, if @env{LANG} is not already set in the
+On MS-Windows and macOS, if @env{LANG} is not already set in the
 environment, Emacs sets it based on the system-wide default.  You can
 set this in the ``Regional Settings'' Control Panel on some versions
 of MS-Windows, and in the ``Language and Region'' System Preference on
-OS X.
+macOS.
 
 The value of the @env{LC_CTYPE} category is
 matched against entries in @code{locale-language-names},
diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi
index b0597dc2499..6e6520b60bc 100644
--- a/doc/emacs/macos.texi
+++ b/doc/emacs/macos.texi
@@ -3,19 +3,19 @@
 @c See file emacs.texi for copying conditions.
 @node Mac OS / GNUstep
 @appendix Emacs and Mac OS / GNUstep
-@cindex Mac OS X
+@cindex macOS
 @cindex Macintosh
 @cindex GNUstep
 
   This section describes the peculiarities of using Emacs built with
 the GNUstep libraries on GNU/Linux or other operating systems, or on
-Mac OS X with native window system support.  On Mac OS X, Emacs can be
+macOS with native window system support.  On macOS, Emacs can be
 built either without window system support, with X11, or with the
 Cocoa interface; this section only applies to the Cocoa build.  This
-does not support versions of Mac OS X earlier than 10.6.
+does not support versions before Mac OS X 10.6.
 
   For various historical and technical reasons, Emacs uses the term
-@samp{Nextstep} internally, instead of ``Cocoa'' or ``Mac OS X''; for
+@samp{Nextstep} internally, instead of ``Cocoa'' or ``macOS''; for
 instance, most of the commands and variables described in this section
 begin with @samp{ns-}, which is short for @samp{Nextstep}.  NeXTstep
 was an application interface released by NeXT Inc during the 1980s, of
@@ -84,7 +84,7 @@ set, which often causes the subprocesses it launches to behave differently than
 they would when launched from the shell.
 
 For the PATH and MANPATH variables, a system-wide method
-of setting PATH is recommended on Mac OS X, using the
+of setting PATH is recommended on macOS, using the
 @file{/etc/paths} files and the @file{/etc/paths.d} directory.
 
 @node Mac / GNUstep Customization
@@ -117,8 +117,8 @@ close the altered one.
 Useful in this context is the listing of all faces obtained by
 @kbd{M-x list-faces-display}.
 
-@cindex Core Text, on Mac OS X
-In Mac OS X, Emacs uses a Core Text based font backend
+@cindex Core Text, on macOS
+In macOS, Emacs uses a Core Text based font backend
 by default.  If you prefer the older font style, enter the following
 at the command-line before starting Emacs:
 
diff --git a/doc/emacs/msdos.texi b/doc/emacs/msdos.texi
index 6ad12d646a1..47ba23b95aa 100644
--- a/doc/emacs/msdos.texi
+++ b/doc/emacs/msdos.texi
@@ -366,7 +366,7 @@ Emulate @sc{gnu} systems; this is the default.  This sets
 Emulate Unix systems.  Like @code{GNU}, but sets
 @code{ls-lisp-verbosity} to @code{(links uid)}.
 @item MacOS
-Emulate MacOS@.  Sets @code{ls-lisp-ignore-case} to @code{t}, and
+Emulate macOS@.  Sets @code{ls-lisp-ignore-case} to @code{t}, and
 @code{ls-lisp-dirs-first} and @code{ls-lisp-verbosity} to @code{nil}.
 @item MS-Windows
 Emulate MS-Windows.  Sets @code{ls-lisp-ignore-case} and
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index e735343cc75..882d75f5e61 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -745,7 +745,7 @@ exactly what to do for end-of-line conversion:
 @item @dots{}-unix
 Don't do any end-of-line conversion; assume the file uses
 newline to separate lines.  (This is the convention normally used
-on Unix and GNU systems, and Mac OS X.)
+on Unix and GNU systems, and macOS.)
 
 @item @dots{}-dos
 Assume the file uses carriage-return linefeed to separate lines, and do
@@ -757,8 +757,8 @@ Emacs doesn't support directly.})
 
 @item @dots{}-mac
 Assume the file uses carriage-return to separate lines, and do the
-appropriate conversion.  (This was the convention used on the
-Macintosh system prior to OS X.)
+appropriate conversion.  (This was the convention used in Classic Mac
+OS.)
 @end table
 
   These variant coding systems are omitted from the
@@ -1393,7 +1393,7 @@ of @code{standard-fontset-spec}.  This fontset's name is
 @noindent
 or just @samp{fontset-standard} for short.
 
-  On GNUstep and Mac OS X, the standard fontset is created using the value of
+  On GNUstep and macOS, the standard fontset is created using the value of
 @code{ns-standard-fontset-spec}, and on MS Windows it is
 created using the value of @code{w32-standard-fontset-spec}.
 
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index f94628ce105..a49bfc8ca8c 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -6958,7 +6958,7 @@ Emacs is displaying the frame using X.
 Emacs is displaying the frame using native MS-Windows GUI.
 @item ns
 Emacs is displaying the frame using the Nextstep interface (used on
-GNUstep and Mac OS X).
+GNUstep and macOS).
 @item pc
 Emacs is displaying the frame using MS-DOS direct screen writes.
 @item nil
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index 9cf3b5750f2..e4581b3d68e 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -1034,8 +1034,7 @@ Unix convention, used on GNU and Unix systems, is to use the linefeed
 character (also called newline).  The DOS convention, used on
 MS-Windows and MS-DOS systems, is to use a carriage-return and a
 linefeed at the end of a line.  The Mac convention is to use just
-carriage-return.  (This was the convention used on the Macintosh
-system prior to OS X.)
+carriage-return.  (This was the convention used in Classic Mac OS.)
 
 @cindex base coding system
 @cindex variant coding system
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 0d999ae9b99..6b9b2c7faf3 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -888,7 +888,7 @@ Berkeley BSD and its variants.
 Cygwin, a Posix layer on top of MS-Windows.
 
 @item darwin
-Darwin (Mac OS X).
+Darwin (macOS).
 
 @item gnu
 The GNU system (using the GNU kernel, which consists of the HURD and Mach).
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index 72a90a1ff21..9efe0e73c5c 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -1206,7 +1206,7 @@ Emacs can be started as a daemon in the background.
 
 @cindex NeXTstep port
 @cindex GNUstep port
-@cindex Mac OS X Cocoa
+@cindex macOS Cocoa
 @item
 There is a new NeXTstep port of Emacs.  This supports GNUstep and Mac OS
 X (via the Cocoa libraries).  The Carbon port of Emacs, which supported
@@ -3341,7 +3341,7 @@ problem (@pxref{Reporting bugs}).
 * Emacs for MS-DOS::
 * Emacs for MS-Windows::
 * Emacs for GNUstep::
-* Emacs for Mac OS X::
+* Emacs for macOS::
 @end menu
 
 @node Finding Emacs on the Internet
@@ -3561,13 +3561,13 @@ For MS-DOS, @pxref{Emacs for MS-DOS}.
 Beginning with version 23.1, Emacs supports GNUstep natively.
 See the file @file{nextstep/INSTALL} in the distribution.
 
-@node Emacs for Mac OS X
-@section Where can I get Emacs for Mac OS X?
+@node Emacs for macOS
+@section Where can I get Emacs for macOS?
 @cindex Apple computers, Emacs for
 @cindex Macintosh, Emacs for
-@cindex Mac OS X, Emacs for
+@cindex macOS, Emacs for
 
-Beginning with version 22.1, Emacs supports Mac OS X natively.
+Beginning with version 22.1, Emacs supports macOS natively.
 See the file @file{nextstep/INSTALL} in the distribution.
 
 @c ------------------------------------------------------------
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 08067b0c735..11f9f35227d 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -21520,7 +21520,7 @@ bound to mairix searches and are automatically updated.
 Mairix is a tool for indexing and searching words in locally stored
 mail.  It was written by Richard Curnow and is licensed under the
 GPL@.  Mairix comes with most popular GNU/Linux distributions, but it also
-runs under Windows (with cygwin), Mac OS X and Solaris.  The homepage can
+runs under Windows (with cygwin), macOS and Solaris.  The homepage can
 be found at
 @uref{http://www.rpcurnow.force9.co.uk/mairix/index.html}
 
diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi
index 26c81d65948..32b33641656 100644
--- a/doc/misc/idlwave.texi
+++ b/doc/misc/idlwave.texi
@@ -75,7 +75,7 @@ Interactive Data Language (IDL), and running IDL as an inferior shell.
 * Sources of Routine Info::     How does IDLWAVE know about routine XYZ
 * HTML Help Browser Tips::
 * Configuration Examples::      The user is king
-* Windows and MacOS::           What still works, and how
+* Windows and macOS::           What still works, and how
 * Troubleshooting::             When good computers turn bad
 * GNU Free Documentation License:: The license for this documentation.
 * Index::                       Fast access
@@ -2372,7 +2372,7 @@ Normal hook.  Executed when @file{idlwave.el} is loaded.
 @cindex Subprocess of Emacs, IDL
 @cindex Comint, Emacs package
 @cindex Windows
-@cindex MacOS
+@cindex macOS
 
 The IDLWAVE shell is an Emacs major mode which permits running the IDL
 program as an inferior process of Emacs, and works closely with the
@@ -2382,7 +2382,7 @@ debug these programs.  The IDLWAVE shell is built on @file{comint}, an
 Emacs packages which handles the communication with the IDL program.
 Unfortunately, IDL for Windows does not have command-prompt versions and
 thus do not allow the interaction with Emacs, so the IDLWAVE shell
-currently only works under Unix and MacOSX.
+currently works under only Unix and macOS.
 
 @menu
 * Starting the Shell::          How to launch IDL as a subprocess
@@ -3533,14 +3533,14 @@ to locate library catalogs.
 @end defopt
 
 @defopt idlwave-library-path
-IDL library path for Windows and MacOS@.  Under Unix/MacOSX, will be
+IDL library path for Windows and macOS@.  Under Unix/macOS, will be
 obtained from the Shell when run.
 @end defopt
 
 @defopt idlwave-system-directory
-The IDL system directory for Windows and MacOS@.  Also needed for
+The IDL system directory for Windows and macOS@.  Also needed for
 locating HTML help and the IDL Assistant for IDL v6.2 and later.  Under
-Unix/MacOSX, will be obtained from the Shell and recorded, if run.
+Unix/macOS, will be obtained from the Shell and recorded, if run.
 @end defopt
 
 @defopt idlwave-config-directory (@file{~/.emacs.d/idlwave})
@@ -3626,7 +3626,7 @@ performance is a problem and/or the catalogs are not needed.
 @cindex User catalog
 @cindex IDL library routine info
 @cindex Windows
-@cindex MacOS
+@cindex macOS
 @cindex IDL variable @code{!DIR}
 @cindex @code{!DIR}, IDL variable
 
@@ -3651,7 +3651,7 @@ catalog must be rescanned to update it.  Creating the user catalog is
 also much slower than scanning library catalogs.
 
 You can scan any of the directories on the currently known path.  Under
-Windows and MacOS (not OSX), you need to specify the IDL search path in
+Windows, you need to specify the IDL search path in
 the variable @code{idlwave-library-path}, and the location of the IDL
 directory (the value of the @code{!DIR} system variable) in the variable
 @code{idlwave-system-directory}, like this@footnote{The initial @samp{+}
@@ -3742,10 +3742,9 @@ files.  Therefore, such local files should not be installed inside the
 many other reasons.
 
 @cindex Windows
-@cindex MacOS
 @cindex IDL variable @code{!DIR}
 @cindex @code{!DIR}, IDL variable
-Users of Windows and MacOS (not X) also must set the variable
+Users of Windows also must set the variable
 @code{idlwave-system-directory} to the value of the @code{!DIR} system
 variable in IDL@.  IDLWAVE appends @file{lib} to the value of this
 variable and assumes that all files found on that path are system
@@ -3822,7 +3821,7 @@ etc.).
 @noindent Individual platform recommendations:
 
 @itemize @bullet
-@item Unix/MacOSX: The @uref{http://www.w3m.org,@code{w3m}} browser
+@item Unix/macOS: The @uref{http://www.w3m.org,@code{w3m}} browser
 and its associated
 @uref{http://emacs-w3m.namazu.org/,@code{emacs-w3m}} emacs mode
 provide in-buffer browsing with image display, and excellent speed and
@@ -4020,18 +4019,17 @@ user is King!
 @html
 <A NAME="WINDOWS_MAC"></A>
 @end html
-@node Windows and MacOS
-@appendix Windows and MacOS
+@node Windows and macOS
+@appendix Windows and macOS
 @cindex Windows
-@cindex MacOS
-@cindex MacOSX
+@cindex macOS
 
 IDLWAVE was developed on a UNIX system.  However, thanks to the
 portability of Emacs, much of IDLWAVE does also work under different
-operating systems like Windows (with NTEmacs or NTXEmacs) or MacOS.
+operating systems like Windows (with NTEmacs or NTXEmacs).
 
 The only real problem is that there is no command-line version of IDL
-for Windows or MacOS(<=9) with which IDLWAVE can interact.  As a
+for Windows with which IDLWAVE can interact.  As a
 result, the IDLWAVE Shell does not work and you have to rely on IDLDE
 to run and debug your programs.  However, editing IDL source files
 with Emacs/IDLWAVE works with all bells and whistles, including
@@ -4112,10 +4110,10 @@ ensure @samp{idl} is on your @samp{$PATH}, or specify the full
 pathname to the idl program with the variable
 @code{idlwave-shell-explicit-file-name}.  Note that you may need to
 set your shell search path in two places when running Emacs as an Aqua
-application with MacOSX; see the next topic.
+application with macOS; see the next topic.
 
 @item @strong{IDLWAVE is disregarding my @samp{IDL_PATH} which I set
-under MacOSX}
+under macOS}
 
 If you run Emacs directly as an Aqua application, rather than from the
 console shell, the environment is set not from your usual shell
diff --git a/doc/misc/mairix-el.texi b/doc/misc/mairix-el.texi
index 8deead52dc6..69d3fc42277 100644
--- a/doc/misc/mairix-el.texi
+++ b/doc/misc/mairix-el.texi
@@ -68,7 +68,7 @@ database.
 Mairix is a tool for indexing and searching words in locally stored
 mail.  It was written by Richard Curnow and is licensed under the
 GPL@.  Mairix comes with most popular GNU/Linux distributions, but it also
-runs under Windows (with cygwin), Mac OS X and Solaris.  The homepage can
+runs under Windows (with cygwin), macOS and Solaris.  The homepage can
 be found at
 @uref{http://www.rpcurnow.force9.co.uk/mairix/index.html}
 
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index a5239acb59f..a6f9dbde7cb 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -6616,7 +6616,7 @@ applying it to another one.
 @vindex org-clock-idle-time
 By customizing the variable @code{org-clock-idle-time} to some integer, such
 as 10 or 15, Emacs can alert you when you get back to your computer after
-being idle for that many minutes@footnote{On computers using Mac OS X,
+being idle for that many minutes@footnote{On computers using macOS,
 idleness is based on actual user idleness, not just Emacs' idle time.  For
 X11, you can install a utility program @file{x11idle.c}, available in the
 @code{contrib/scripts} directory of the Org git distribution, or install the
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 5ce10d298c0..dae514033f8 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -977,7 +977,7 @@ active, @pxref{Top, , D-Bus, dbus}.
 @cindex afp method
 
 This method is for connecting to remote hosts with the Apple Filing
-Protocol for accessing files on Mac OS X volumes.  @value{tramp} access
+Protocol for accessing files on macOS volumes.  @value{tramp} access
 syntax requires a leading volume (share) name, for example:
 @file{@trampfn{afp,user@@host,/volume}}.