rename 'Mac OS X' to 'macOS'

From the the release of macOS Sierra (Version 10.12) the Macintosh
operating system is called 'macOS'

diff --git a/README b/README
index 9c59f3a28b9505a2cedbee745de0fcbcd25122a0..005cba18043421a653d6e21a1837d77078fa4e78 100644 (file)
--- a/README
+++ b/README
@@ -27,7 +27,7 @@ operating parameters whilst it is running.
 What will chrony run on?
 ========================
 
-The software is known to work on Linux, FreeBSD, NetBSD, Mac OS X and
+The software is known to work on Linux, FreeBSD, NetBSD, macOS and
 Solaris.  Closely related systems may work too.  Any other system will
 likely require a porting exercise.  You would need to start from one
 of the existing system-specific drivers and look into the quirks of
@@ -139,7 +139,7 @@ Erik Bryer <ebryer@spots.ab.ca>
     Entries in contrib directory
 
 Bryan Christianson <bryan@whatroute.net>
-    Support for Mac OS X
+    Support for macOS
     Support for privilege separation
     Entries in contrib directory
 

diff --git a/configure b/configure
index 249b134d2dccf77deb539f91c9b0785bb174ad06..5e9b7f45159a5f5e7aa522392cfb3f796452f069 100755 (executable)
--- a/configure
+++ b/configure
@@ -402,7 +402,7 @@ case $OPERATINGSYSTEM in
           add_def FEAT_PRIVDROP
           priv_ops="ADJUSTTIME SETTIME BINDSOCKET"
         fi
-        echo "Configuring for MacOS X (" $SYSTEM "MacOS X version" $VERSION ")"
+        echo "Configuring for macOS (" $SYSTEM "macOS version" $VERSION ")"
     ;;
     SunOS)
         EXTRA_OBJECTS="sys_generic.o sys_solaris.o sys_timex.o"

diff --git a/contrib/bryan_christianson_1/README.txt b/contrib/bryan_christianson_1/README.txt
index 0a221aa27e3cb025d8e7c677504245520522977a..3a0a2efa65886c8b91e3c3b7e9b3da5f1b7c76ac 100644 (file)
--- a/contrib/bryan_christianson_1/README.txt
+++ b/contrib/bryan_christianson_1/README.txt
@@ -1,16 +1,16 @@
-Notes for installing chrony on MacOS X
+Notes for installing chrony on macOS
 Author: Bryan Christianson (bryan@whatroute.net)
 ------------------------------------------------
 
 These files are for those admins/users who would prefer to install chrony
 from the source distribution and are intended as guidelines rather than
 being definitive. They can be edited with a plain text editor, such as
-vi, emacs or your favourite IDE (xcode)
+vi, emacs or your favourite IDE (Xcode)
 
 It is assumed you are comfortable with installing software from the
 terminal command line and know how to use sudo to acquire root access.
 
-If you are not familiar with the MacOS X command line then
+If you are not familiar with the macOS command line then
 please consider using ChronyControl from http://whatroute.net/chronycontrol.html
 
 ChronyControl provides a gui wrapper for installing these files and sets the
@@ -72,7 +72,7 @@ Installing the support files
 
 1. chronylogrotate.sh
 This is a simple shell script that deletes old log files. Unfortunately because
-of the need to run chronyc, the standard MacOS X logrotation does not work with
+of the need to run chronyc, the standard macOS logrotation does not work with
 chrony logs.
 
 This script runs on a daily basis under control of launchd and should be

diff --git a/doc/chrony.conf.adoc b/doc/chrony.conf.adoc
index 33fbfca85f46ad955323b006c93a8da4b2145160..995c1c770637c245ee349336dd5b7ea64960e966 100644 (file)
--- a/doc/chrony.conf.adoc
+++ b/doc/chrony.conf.adoc
@@ -1428,7 +1428,7 @@ cannot be used with the <<rtcfile,*rtcfile*>> directive.
 +
 On Linux, the RTC copy is performed by the kernel every 11 minutes.
 +
-On Mac OS X, <<chronyd,*chronyd*>> will perform the RTC copy every 60 minutes
+On macOS, <<chronyd,*chronyd*>> will perform the RTC copy every 60 minutes
 when the system clock is in a synchronised state.
 +
 On other systems this directive does nothing.
@@ -1786,8 +1786,8 @@ pidfile /run/chronyd.pid
 
 [[sched_priority]]*sched_priority* _priority_::
 On Linux, the *sched_priority* directive will select the SCHED_FIFO real-time
-scheduler at the specified priority (which must be between 0 and 100). On Mac
-OS X, this option must have either a value of 0 (the default) to disable the
+scheduler at the specified priority (which must be between 0 and 100). On
+macOS, this option must have either a value of 0 (the default) to disable the
 thread time constraint policy or 1 for the policy to be enabled. Other systems
 do not support this option.
 +
@@ -1802,7 +1802,7 @@ wait for the scheduler to get around to running it. You should not use this
 unless you really need it. The *sched_setscheduler(2)* man page has more
 details.
 +
-On Mac OS X, this directive uses the *thread_policy_set()* kernel call to
+On macOS, this directive uses the *thread_policy_set()* kernel call to
 specify real-time scheduling. As noted for Linux, you should not use this
 directive unless you really need it.
 
@@ -1811,7 +1811,7 @@ The *user* directive sets the name of the system user to which *chronyd* will
 switch after start in order to drop root privileges.
 +
 On Linux, *chronyd* needs to be compiled with support for the *libcap* library.
-On Mac OS X, FreeBSD, NetBSD and Solaris *chronyd* forks into two processes.
+On macOS, FreeBSD, NetBSD and Solaris *chronyd* forks into two processes.
 The child process retains root privileges, but can only perform a very limited
 range of privileged system calls on behalf of the parent.
 +

diff --git a/doc/chronyd.adoc b/doc/chronyd.adoc
index d54d58589af50e8e5b1a2a4301a19c214e6420fb..c4001c22732e55a21797dccfe39da4e868443f16 100644 (file)
--- a/doc/chronyd.adoc
+++ b/doc/chronyd.adoc
@@ -115,7 +115,7 @@ after start in order to drop root privileges. It overrides the
 <<chrony.conf.adoc#user,*user*>> directive (default _@DEFAULT_USER@_).
 +
 On Linux, *chronyd* needs to be compiled with support for the *libcap* library.
-On Mac OS X, FreeBSD, NetBSD and Solaris *chronyd* forks into two processes.
+On macOS, FreeBSD, NetBSD and Solaris *chronyd* forks into two processes.
 The child process retains root privileges, but can only perform a very limited
 range of privileged system calls on behalf of the parent.
 
@@ -134,7 +134,7 @@ killed even in normal operation.
 
 *-P* _priority_::
 On Linux, this option will select the SCHED_FIFO real-time scheduler at the
-specified priority (which must be between 0 and 100). On Mac OS X, this option
+specified priority (which must be between 0 and 100). On macOS, this option
 must have either a value of 0 (the default) to disable the thread time
 constraint policy or 1 for the policy to be enabled. Other systems do not
 support this option.

diff --git a/doc/faq.adoc b/doc/faq.adoc
index 01076ef9fdda94d1f909453ef5c738a1c6683dbc..da9a94f9a149741b05f9b9278e67d303fbd99ad9 100644 (file)
--- a/doc/faq.adoc
+++ b/doc/faq.adoc
@@ -61,8 +61,8 @@ that.
 In order to keep the real-time clock (RTC) close to the true time, so the
 system time is reasonably close to the true time when it's initialized on the
 next boot from the RTC, the `rtcsync` directive enables a mode in which the
-system time is periodically copied to the RTC. It is supported on Linux and Mac
-OS X.
+system time is periodically copied to the RTC. It is supported on Linux and
+macOS.
 
 If you want to use public NTP servers from the
 http://www.pool.ntp.org/[pool.ntp.org] project, the minimal _chrony.conf_ file

diff --git a/sys_macosx.c b/sys_macosx.c
index 46e439ea6955d03cfcf68044d2906983fee057d3..b6d8e80324005596ff8690e1b4dd943b66fe7a07 100644 (file)
--- a/sys_macosx.c
+++ b/sys_macosx.c
@@ -23,7 +23,7 @@
 
   =======================================================================
 
-  Driver file for the MacOS X operating system.
+  Driver file for the macOS operating system.
 
   */
 

diff --git a/sys_macosx.h b/sys_macosx.h
index b9114ff7465a717bc605a15ea67b813359f18d2b..55556161d768381983e3bcc8c5ba4bcfff6abe64 100644 (file)
--- a/sys_macosx.h
+++ b/sys_macosx.h
@@ -23,7 +23,7 @@
 
   =======================================================================
 
-  Header file for MacOS X driver
+  Header file for macOS driver
 
   */