Fix some typos (MacmacOS, etc.) that slipped in due to inconsistent usage.

6 files changed, 10 insertions, 10 deletions

diff --git a/scheduler/auth.c b/scheduler/auth.c
index 2b7eec7af..fca183b5c 100644
--- a/scheduler/auth.c
+++ b/scheduler/auth.c
@@ -1206,7 +1206,7 @@ cupsdCheckGroup(
 
 #ifdef HAVE_MBR_UID_TO_UUID
  /*
-  * Check group membership through MacmacOS membership API...
+  * Check group membership through macOS membership API...
   */
 
   if (user && !mbr_uid_to_uuid(user->pw_uid, useruuid))
diff --git a/scheduler/cert.c b/scheduler/cert.c
index 2ac8ed720..eb34f6738 100644
--- a/scheduler/cert.c
+++ b/scheduler/cert.c
@@ -1,7 +1,7 @@
 /*
  * Authentication certificate routines for the CUPS scheduler.
  *
- * Copyright 2007-2015 by Apple Inc.
+ * Copyright 2007-2016 by Apple Inc.
  * Copyright 1997-2006 by Easy Software Products.
  *
  * These coded instructions, statements, and computer programs are the
@@ -120,7 +120,7 @@ cupsdAddCert(int        pid,		/* I - Process ID */
 
 #  ifdef HAVE_MBR_UID_TO_UUID
      /*
-      * On MacmacOS, ACLs use UUIDs instead of GIDs...
+      * On macOS, ACLs use UUIDs instead of GIDs...
       */
 
       acl = acl_init(NumSystemGroups - 1);
diff --git a/scheduler/cupsfilter.c b/scheduler/cupsfilter.c
index 5a829e745..5f08c5300 100644
--- a/scheduler/cupsfilter.c
+++ b/scheduler/cupsfilter.c
@@ -1,7 +1,7 @@
 /*
  * Filtering program for CUPS.
  *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2016 by Apple Inc.
  * Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  * These coded instructions, statements, and computer programs are the
@@ -820,7 +820,7 @@ exec_filter(const char *filter,		/* I - Filter to execute */
 
 
  /*
-  * Add special voodoo magic for MacmacOS - this allows MacmacOS
+  * Add special voodoo magic for macOS - this allows macOS
   * programs to access their bundle resources properly...
   */
 
diff --git a/scheduler/env.c b/scheduler/env.c
index c5e8c61e9..a2d0ffceb 100644
--- a/scheduler/env.c
+++ b/scheduler/env.c
@@ -1,7 +1,7 @@
 /*
  * Environment management routines for the CUPS scheduler.
  *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2016 by Apple Inc.
  * Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  * These coded instructions, statements, and computer programs are the
@@ -49,7 +49,7 @@ cupsdInitEnv(void)
 
 #if defined(__APPLE__)
  /*
-  * Add special voodoo magic for MacmacOS - this allows MacmacOS
+  * Add special voodoo magic for macOS - this allows macOS
   * programs to access their bundle resources properly...
   *
   * This string is replaced in cupsdStartProcess()...
diff --git a/scheduler/job.c b/scheduler/job.c
index 1ce21234a..e6434d974 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -3206,7 +3206,7 @@ finalize_job(cupsd_job_t *job,		/* I - Job */
 
    /*
     * Convert the status to an exit code.  Due to the way the W* macros are
-    * implemented on MacmacOS (bug?), we have to store the exit status in a
+    * implemented on macOS (bug?), we have to store the exit status in a
     * variable first and then convert...
     */
 
diff --git a/scheduler/select.c b/scheduler/select.c
index 3d655cee7..d8d7e19dc 100644
--- a/scheduler/select.c
+++ b/scheduler/select.c
@@ -1,7 +1,7 @@
 /*
  * Select abstraction functions for the CUPS scheduler.
  *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2016 by Apple Inc.
  * Copyright 2006-2007 by Easy Software Products.
  *
  * These coded instructions, statements, and computer programs are the
@@ -42,7 +42,7 @@
  *     FreeBSD         YES     YES     NO      YES     NO
  *     HP-UX           YES     YES     NO      NO      NO
  *     Linux           YES     YES     YES     NO      NO
- *     MacmacOS         YES     YES     NO      YES     NO
+ *     macOS           YES     YES     NO      YES     NO
  *     NetBSD          YES     YES     NO      YES     NO
  *     OpenBSD         YES     YES     NO      YES     NO
  *     Solaris         YES     YES     NO      NO      YES