From dc152c54f4e44f5f2040883b03f71ff6aa66c893 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 6 Nov 2016 00:33:43 -0700 Subject: 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. --- nextstep/INSTALL | 2 +- nextstep/Makefile.in | 4 ++-- nextstep/README | 22 +++++++++++----------- nextstep/templates/Emacs.desktop.in | 2 +- nextstep/templates/Info-gnustep.plist.in | 4 ++-- nextstep/templates/Info.plist.in | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) (limited to 'nextstep') diff --git a/nextstep/INSTALL b/nextstep/INSTALL index dd690abf1b1..3740346acd5 100644 --- a/nextstep/INSTALL +++ b/nextstep/INSTALL @@ -19,7 +19,7 @@ In the top-level directory, use: ./configure --with-ns -(On Mac OS X, --with-ns is enabled by default.) +(On macOS, --with-ns is enabled by default.) This will compile all the files, but emacs will not be able to be run except in -nw (terminal) mode. diff --git a/nextstep/Makefile.in b/nextstep/Makefile.in index 9aa034ad98d..d6e12825613 100644 --- a/nextstep/Makefile.in +++ b/nextstep/Makefile.in @@ -35,12 +35,12 @@ MKDIR_P = @MKDIR_P@ ## Emacs.app. ns_appdir = @ns_appdir@ -## GNUstep: ns_appdir; OS X: ns_appdir/Contents/MacOS +## GNUstep: ns_appdir; macOS: ns_appdir/Contents/MacOS ns_appbindir = @ns_appbindir@ ## GNUstep/Emacs.base or Cocoa/Emacs.base. ns_appsrc = @ns_appsrc@ ## GNUstep: GNUstep/Emacs.base/Resources/Info-gnustep.plist -## OS X: Cocoa/Emacs.base/Contents/Info.plist +## macOS: Cocoa/Emacs.base/Contents/Info.plist ns_check_file = @ns_appdir@/@ns_check_file@ .PHONY: all diff --git a/nextstep/README b/nextstep/README index 7a1a0921cd8..6d37bb7b2d2 100644 --- a/nextstep/README +++ b/nextstep/README @@ -1,8 +1,8 @@ - NS -- the Cocoa interface for OS X and compatible systems - --------------------------------------------------------- + NS -- the Cocoa interface for macOS and compatible systems + ---------------------------------------------------------- This directory contains files needed to build Emacs on system based on -NextStep (NS), including OS X (Mac) and GNUstep, using the Cocoa API. +NextStep (NS), including macOS and GNUstep, using the Cocoa API. HISTORY @@ -14,14 +14,14 @@ OpenStep and then Rhapsody, which became Mac OS X. In 2004 it was adapted to GNUstep, a free OpenStep implementation, and in 2008 it was merged to the GNU Emacs trunk and released with Emacs 23. Around the same time a separate Mac-only port using the Carbon APIs and -descending from a 2001 MacOS 8/9 port of Emacs 21 was removed. (It +descending from a 2001 Mac OS 8/9 port of Emacs 21 was removed. (It remains available externally under the name "mac".) OVERVIEW OF COCOA AND OBJECTIVE-C Cocoa is an API for the Objective-C language, an objective oriented -superset of C. Anybody with experience with iOS or modern OS X +superset of C. Anybody with experience with iOS or modern macOS application development should feel at home. A method call in Objective-C differs from most other languages in the @@ -58,11 +58,11 @@ Classes are declared like the following: * Don't use macros and types intended for the XCode Interface Builder, like 'IBAction'. -* The NS interface should work on all version of OS X from 10.6.8 - (Snow Leopard) to the latest official release. +* The NS interface should work on all version of macOS from Mac OS X + 10.6.8 (Snow Leopard) to the latest official release. -* Under OS X, it is possible to build Emacs using NS, X11, or console - only. A new OS X feature should work in all appropriate builds. +* Under macOS, it is possible to build Emacs using NS, X11, or console + only. A new macOS feature should work in all appropriate builds. TRACING SUPPORT @@ -76,7 +76,7 @@ uncomment the lines defining symbols starting with 'NSTRACE_GROUP'. GNUSTEP AND OTHER COMPATIBLE SYSTEMS -The NS interface works on system compatible with OS X, for example +The NS interface works on systems compatible with macOS, for example GNUstep. Even though they are less frequently used, this is important for a number of reasons: @@ -84,7 +84,7 @@ for a number of reasons: look-and-feel as the rest of the system. * This allows other Emacs developers to test their changes on the NS - interface without having access to an OS X machine. + interface without having access to a macOS machine. * If a feature in the NS interface work on free systems like GNUstep, this meets the FSF requirement that features in GNU software should 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 . - + UTExportedTypeDeclarations -- cgit v1.2.1