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.

3 files changed, 4 insertions, 4 deletions

diff --git a/nextstep/templates/Emacs.desktop.in b/nextstep/templates/Emacs.desktop.in
index 170f195f270..4fed1e3b159 100644
--- a/nextstep/templates/Emacs.desktop.in
+++ b/nextstep/templates/Emacs.desktop.in
@@ -4,7 +4,7 @@ Type=Application
 Version=@version@
 Categories=GNUstep
 Name=Emacs
-Comment=GNU Emacs for NeXT/Open/GNUstep and OS X
+Comment=GNU Emacs for NeXT/Open/GNUstep and macOS
 Icon=emacs.tiff
 Exec=openapp Emacs.app
 #TryExec=Emacs.app
diff --git a/nextstep/templates/Info-gnustep.plist.in b/nextstep/templates/Info-gnustep.plist.in
index 679eb4fa435..1fd31849ab8 100644
--- a/nextstep/templates/Info-gnustep.plist.in
+++ b/nextstep/templates/Info-gnustep.plist.in
@@ -1,11 +1,11 @@
 {
-    ApplicationDescription = "GNU Emacs for GNUstep / OS X";
+    ApplicationDescription = "GNU Emacs for GNUstep / macOS";
     ApplicationIcon = emacs.tiff;
     ApplicationName = Emacs;
     ApplicationRelease = "@version@";
     Authors = (
         "Adrian Robert (GNUstep)",
-        "Christophe de Dinechin (MacOS X)",
+        "Christophe de Dinechin (macOS)",
         "Scott Bender (OpenStep)",
         "Christian Limpach (NeXTstep)",
         "Carl Edman (NeXTstep)",
diff --git a/nextstep/templates/Info.plist.in b/nextstep/templates/Info.plist.in
index dcd2fe34167..686b8047dfb 100644
--- a/nextstep/templates/Info.plist.in
+++ b/nextstep/templates/Info.plist.in
@@ -504,7 +504,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
                 </dict>
         </array>
 
-        <!-- Export definitions so that OS X understands about the file types -->
+        <!-- Export definitions so that macOS understands about the file types -->
         <key>UTExportedTypeDeclarations</key>
         <array>
                 <dict>