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.

1 files changed, 2 insertions, 2 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 796b57db3d8..cf8360316c2 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -22,7 +22,7 @@ WINDOWSNT	Compiling the native MS-Windows (W32) port.
 __MINGW32__     Compiling the W32 port with the MinGW or MinGW-w64 ports of GCC.
 _MSC_VER        Compiling the W32 port with the Microsoft C compiler.
 MINGW_W64       Compiling the W32 port with the MinGW-w64 port of GCC.
-DARWIN_OS       Compiling on Mac OS X or pure Darwin (and using s/darwin.h).
+DARWIN_OS       Compiling on macOS or pure Darwin (and using s/darwin.h).
 SOLARIS2
 USG
 USG5_4
@@ -30,7 +30,7 @@ USG5_4
 ** Distinguishing GUIs **
 
 HAVE_NTGUI      Use the native W32 GUI for windows, frames, menus&scrollbars.
-HAVE_NS         Use the NeXT/OpenStep/Cocoa UI under Mac OS X or GNUstep.
+HAVE_NS         Use the NeXT/OpenStep/Cocoa UI under macOS or GNUstep.
 NS_IMPL_GNUSTEP Compile support for GNUstep implementation of NS GUI API.
 NS_IMPL_COCOA   Compile support for Cocoa (Apple) implementation of NS GUI API.
 HAVE_X11        Compile support for the X11 GUI.