Unified naming of the Mac to 'macOS' as other names are outdated since 2016 (macOS Sierra, version 10.12)

15 files changed, 35 insertions, 35 deletions

diff --git a/doc/busy.n b/doc/busy.n
index b1453bb..10617f9 100644
--- a/doc/busy.n
+++ b/doc/busy.n
@@ -264,7 +264,7 @@ its descendants. It also makes sure it's not possible to leave button
 \fB.cancel\fR using the keyboard.
 .SH PORTABILITY
 .PP
-Note that the \fBtk busy\fR command does not currently have any effect on OSX
+Note that the \fBtk busy\fR command does not currently have any effect on macOS
 when Tk is built using Aqua support.
 .SH "SEE ALSO"
 grab(n)
diff --git a/doc/button.n b/doc/button.n
index 9850670..cbbd704 100644
--- a/doc/button.n
+++ b/doc/button.n
@@ -183,7 +183,7 @@ The behavior of buttons can be changed by defining new bindings for
 individual widgets or by redefining the class bindings.
 .SH "PLATFORM NOTES"
 .PP
-On Aqua/Mac OS X, some configuration options are ignored for the purpose of
+On Aqua/macOS, some configuration options are ignored for the purpose of
 drawing of the widget because they would otherwise conflict with platform
 guidelines. The \fBconfigure\fR and \fBcget\fR subcommands can still
 manipulate the values, but do not cause any variation to the look of the
diff --git a/doc/chooseDirectory.n b/doc/chooseDirectory.n
index 44e9530..a12207b 100644
--- a/doc/chooseDirectory.n
+++ b/doc/chooseDirectory.n
@@ -24,7 +24,7 @@ Specifies the prefix of a Tcl command to invoke when the user closes the
 dialog after having selected an item. This callback is not called if the
 user cancelled the dialog. The actual command consists of \fIstring\fR
 followed by a space and the value selected by the user in the dialog. This
-is only available on Mac OS X.
+is only available on macOS.
 .\" OPTION: -initialdir
 .TP
 \fB\-initialdir\fI dirname\fR
@@ -42,7 +42,7 @@ relative path to an absolute path.
 \fB\-message\fI string\fR
 .
 Specifies a message to include in the client area of the dialog.
-This is only available on Mac OS X.
+This is only available on macOS.
 .\" OPTION: -mustexist
 .TP
 \fB\-mustexist\fI boolean\fR
@@ -55,7 +55,7 @@ already exist.  The default value is \fIfalse\fR.
 \fB\-parent\fI window\fR
 .
 Makes \fIwindow\fR the logical parent of the dialog. The dialog
-is displayed on top of its parent window. On Mac OS X, this
+is displayed on top of its parent window. On macOS, this
 turns the file dialog into a sheet attached to the parent window.
 .\" OPTION: -title
 .TP
diff --git a/doc/colors.n b/doc/colors.n
index 09c2289..1150956 100644
--- a/doc/colors.n
+++ b/doc/colors.n
@@ -782,7 +782,7 @@ YellowGreen	154	205 	50
 .DE
 .SH "PORTABILITY ISSUES"
 .TP
-\fBMac OS X\fR
+\fBmacOS\fR
 .
 On macOS, the following additional system colors are available.  This
 first group contains all of the HIBrush colors available in the
@@ -870,7 +870,7 @@ systemWindowBody
 .
 Tk supports all of the NSColors in the macOS System ColorList.  The
 convention for naming these colors is that the Tk name is generated by
-capitalizing the macOS name and adding the prefix "system".  On OSX
+capitalizing the macOS name and adding the prefix "system".  On macOS
 10.14 (Mojave) and later many of these "semantic" colors will appear
 differently depending on whether the NSWindow in which they are used has
 the Aqua or DarkAqua appearance.  The System ColorList differs between
diff --git a/doc/cursors.n b/doc/cursors.n
index 7a757f5..df60ea3 100644
--- a/doc/cursors.n
+++ b/doc/cursors.n
@@ -131,9 +131,9 @@ wait
 .CE
 .RE
 .TP
-\fBMac OS X\fR
+\fBmacOS\fR
 .
-On Mac OS X systems, the following cursors are mapped to native cursors:
+On macOS, the following cursors are mapped to native cursors:
 .RS
 .CS
 arrow
diff --git a/doc/font.n b/doc/font.n
index c479e48..e1bdf05 100644
--- a/doc/font.n
+++ b/doc/font.n
@@ -54,7 +54,7 @@ new attributes for the font.  See \fBFONT OPTIONS\fR below for a list of the
 possible attributes.
 .RS
 .PP
-Note that on Aqua/Mac OS X, the system fonts (see
+Note that on Aqua/macOS, the system fonts (see
 \fBPLATFORM SPECIFIC FONTS\fR below) may not be actually altered because they
 are implemented by the system theme. To achieve the effect of modification,
 use \fBfont actual\fR to get their configuration and \fBfont create\fR to
@@ -362,7 +362,7 @@ style defaults.
 .DE
 .RE
 .TP
-\fBMac OS X\fR
+\fBmacOS\fR
 .
 The following fonts are supported, and are mapped to the user's
 style defaults.
diff --git a/doc/fontchooser.n b/doc/fontchooser.n
index 4e667e5..3dbafa2 100644
--- a/doc/fontchooser.n
+++ b/doc/fontchooser.n
@@ -24,7 +24,7 @@ the native platform font selection dialog where available, or a dialog
 implemented in Tcl otherwise.
 .PP
 Unlike most of the other Tk dialog commands, \fBtk fontchooser\fR does not
-return an immediate result, as on some platforms (Mac OS X) the standard font
+return an immediate result, as on some platforms (macOS) the standard font
 dialog is modeless while on others (Windows) it is modal. To accommodate this
 difference, all user interaction with the dialog will be communicated to the
 caller via callbacks or virtual events.
@@ -121,7 +121,7 @@ It is implementation dependent which exact user actions result in the callback
 being called resp. the virtual events being sent. Where an Apply or OK button
 is present in the dialog, that button will trigger the \fB\-command\fR callback
 and \fB<<TkFontchooserFontChanged>>\fR virtual event. On some implementations
-other user actions may also have that effect; on Mac OS X for instance, the
+other user actions may also have that effect; on macOS for instance, the
 standard font selection dialog immediately reflects all user choices to the
 caller.
 .PP
diff --git a/doc/getOpenFile.n b/doc/getOpenFile.n
index 757d91f..70adf70 100644
--- a/doc/getOpenFile.n
+++ b/doc/getOpenFile.n
@@ -42,7 +42,7 @@ Specifies the prefix of a Tcl command to invoke when the user closes the
 dialog after having selected an item. This callback is not called if the
 user cancelled the dialog. The actual command consists of \fIstring\fR
 followed by a space and the value selected by the user in the dialog. This
-is only available on Mac OS X.
+is only available on macOS.
 .\" OPTION: -confirmoverwrite
 .TP
 \fB\-confirmoverwrite\fI boolean\fR
@@ -58,7 +58,7 @@ that the overwrite take place without confirmation.  Default value is true.
 Specifies a string that will be appended to the filename if the user
 enters a filename without an extension. The default value is the empty
 string, which means no extension will be appended to the filename in
-any case. This option is ignored on Mac OS X, which
+any case. This option is ignored on macOS, which
 does not require extensions to filenames,
 and the UNIX implementation guesses reasonable values for this from
 the \fB\-filetypes\fR option when this is not supplied.
@@ -96,7 +96,7 @@ Specifies a filename to be displayed in the dialog when it pops up.
 \fB\-message\fI string\fR
 .
 Specifies a message to include in the client area of the dialog.
-This is only available on Mac OS X.
+This is only available on macOS.
 .\" OPTION: -multiple
 .TP
 \fB\-multiple\fI boolean\fR
@@ -107,7 +107,7 @@ Allows the user to choose multiple files from the Open dialog.
 \fB\-parent\fI window\fR
 .
 Makes \fIwindow\fR the logical parent of the file dialog. The file
-dialog is displayed on top of its parent window. On Mac OS X, this
+dialog is displayed on top of its parent window. On macOS, this
 turns the file dialog into a sheet attached to the parent window.
 .\" OPTION: -title
 .TP
diff --git a/doc/menu.n b/doc/menu.n
index 9894a6c..cbdc754 100644
--- a/doc/menu.n
+++ b/doc/menu.n
@@ -41,7 +41,7 @@ entry at the top.  If so, it will exist as entry 0 of the menu and
 the other entries will number starting at 1.  The default menu
 bindings arrange for the menu to be torn off when the tear-off entry
 is invoked.
-This option is ignored under Aqua/MacOS, where menus cannot
+This option is ignored under Aqua/macOS, where menus cannot
 be torn off.
 .OP \-tearoffcommand tearOffCommand TearOffCommand
 If this option has a non-empty value, then it specifies a Tcl command
@@ -55,7 +55,7 @@ and menu \fB.x.y\fR is torn off to
 create a new menu \fB.x.tearoff1\fR, then the command
 .QW "\fBa b .x.y .x.tearoff1\fR"
 will be invoked.
-This option is ignored under Aqua/MacOS, where menus cannot
+This option is ignored under Aqua/macOS, where menus cannot
 be torn off.
 .OP \-title title Title
 The string will be used to title the window created when this menu is
@@ -263,7 +263,7 @@ becoming the Application menu.
 When Tk sees a .menubar.window menu on the Macintosh, the menu's
 contents are inserted into the standard Window menu of the user's
 menubar whenever the window's menubar is in front. The first items in
-the menu are provided by Mac OS X, and the names of the current
+the menu are provided by macOS, and the names of the current
 toplevels are automatically appended after all the Tk-defined items and
 a separator. The Window menu on the Mac also allows toggling the
 window into a fullscreen state, and managing a tabbed window interface
@@ -273,7 +273,7 @@ version of the operating system.
 When Tk sees a .menubar.help menu on the Macintosh, the menu's contents
 are appended to the standard Help menu of the user's menubar whenever
 the window's menubar is in front. The first items in the menu
-are provided by Mac OS X.
+are provided by macOS.
 .PP
 When Tk sees a System menu on Windows, its items are appended to the
 system menu that the menubar is attached to. This menu is tied to the
@@ -545,7 +545,7 @@ supported by all entry types.
 \fB\-activebackground \fIvalue\fR
 .
 Specifies a background color to use for displaying this entry when it
-is active. This option is ignored on Aqua/MacOS.
+is active. This option is ignored on Aqua/macOS.
 If it is specified as an empty string (the default), then the
 \fB\-activebackground\fR option for the overall menu is used.
 If the \fBtk_strictMotif\fR variable has been set to request strict
diff --git a/doc/menubutton.n b/doc/menubutton.n
index 375b69a..6252374 100644
--- a/doc/menubutton.n
+++ b/doc/menubutton.n
@@ -95,7 +95,7 @@ is released, the menu is unposted.
 .PP
 Menubuttons are used to construct a \fBtk_optionMenu\fR, which is the
 preferred mechanism for allowing a user to select one item from a list
-on Mac OS X.
+on macOS.
 .PP
 Menubuttons were also typically organized into groups called menu bars
 that allow scanning:
diff --git a/doc/messageBox.n b/doc/messageBox.n
index 33825dc..e46550f 100644
--- a/doc/messageBox.n
+++ b/doc/messageBox.n
@@ -30,7 +30,7 @@ The following option-value pairs are supported:
 Specifies the prefix of a Tcl command to invoke when the user closes the
 dialog. The actual command consists of \fIstring\fR followed by a space
 and the name of the button clicked by the user to close the dialog. This
-is only available on Mac OS X.
+is only available on macOS.
 .\" OPTION: -default
 .TP
 \fB\-default\fI name\fR
diff --git a/doc/tk.n b/doc/tk.n
index e2a81c4..23066d0 100644
--- a/doc/tk.n
+++ b/doc/tk.n
@@ -156,7 +156,7 @@ state is returned.  This is turned on by default for the main display.
 .
 Returns the current Tk windowing system, one of
 \fBx11\fR (X11-based), \fBwin32\fR (MS Windows),
-or \fBaqua\fR (Mac OS X Aqua).
+or \fBaqua\fR (macOS Aqua).
 .SH "SEE ALSO"
 busy(n), fontchooser(n), print(n), send(n), sysnotify(n), systray(n), winfo(n)
 .SH KEYWORDS
diff --git a/doc/tk_mac.n b/doc/tk_mac.n
index 18b6336..7af9606 100644
--- a/doc/tk_mac.n
+++ b/doc/tk_mac.n
@@ -10,7 +10,7 @@
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME
-tk::mac \- Access Mac-Specific Functionality on OS X from Tk
+tk::mac \- Access Mac-Specific Functionality on macOS from Tk
 .SH SYNOPSIS
 .nf
 \fB::tk::mac::DoScriptFile\fR
@@ -40,7 +40,7 @@ tk::mac \- Access Mac-Specific Functionality on OS X from Tk
 .BE
 .SH "EVENT HANDLER CALLBACKS"
 .PP
-The Aqua/Mac OS X application environment defines a number of additional
+The Aqua/macOS application environment defines a number of additional
 events that applications should respond to. These events are mapped by Tk to
 calls to commands in the \fB::tk::mac\fR namespace; unless otherwise noted, if
 the command is absent, no action will be taken.
@@ -223,7 +223,7 @@ Returns the current applications's file path.
 .PP
 .SH "ADDITIONAL DIALOGS"
 .PP
-The Aqua/Mac OS X defines additional dialogs that applications should
+Aqua/macOS defines additional dialogs that applications should
 support.
 .\" COMMAND: standardAboutPanel
 .TP
diff --git a/doc/ttk_sizegrip.n b/doc/ttk_sizegrip.n
index 050d0bf..9992234 100644
--- a/doc/ttk_sizegrip.n
+++ b/doc/ttk_sizegrip.n
@@ -29,7 +29,7 @@ Sizegrip widgets support the standard commands
 (see \fBttk::widget\fR).
 .SH "PLATFORM-SPECIFIC NOTES"
 .PP
-On Mac OSX, toplevel windows automatically include a built-in
+On macOS, toplevel windows automatically include a built-in
 size grip by default.
 Adding a \fBttk::sizegrip\fR there is harmless, since
 the built-in grip will just mask the widget.
diff --git a/doc/wm.n b/doc/wm.n
index 5f76384..725af2c 100644
--- a/doc/wm.n
+++ b/doc/wm.n
@@ -74,7 +74,7 @@ remains at \fB1.0\fR.
 .
 Places the window in a mode that takes up the entire screen, has no
 borders, and covers the general use area (i.e. Start menu and taskbar on
-Windows, dock and menubar on OSX, general window decorations on X11).
+Windows, dock and menubar on macOS, general window decorations on X11).
 .\" OPTION: -topmost
 .TP
 \fB\-topmost\fR
@@ -102,7 +102,7 @@ value accepted by \fBTk_GetColor\fR.  If the empty string is specified
 2000/XP+.  Where not supported, the \fB\-transparentcolor\fR value remains
 at \fB{}\fR.
 .PP
-On MacOS, the following attributes may be set.
+On macOS, the following attributes may be set.
 .\" OPTION: -appearance
 .TP
 \fB\-appearance\fR
@@ -261,7 +261,7 @@ indicates a window that has no special interpretation.
 \fB\-zoomed\fR
 .
 Requests that the window should be maximized. This is the same as \fBwm state
-zoomed\fR on Windows and Mac OS X.
+zoomed\fR on Windows and macOS.
 .PP
 On X11, changes to window attributes are performed asynchronously. Querying
 the value of an attribute returns the current state, which will not be the
@@ -592,7 +592,7 @@ simultaneously.  It is recommended to use not more than 2 icons, placing
 the larger icon first. This command also sets the panel icon for the
 application if the window manager or desktop environment supports it.
 .PP
-On Macintosh, the first image called is loaded into an OSX-native icon
+On Macintosh, the first image called is loaded into an OS-native icon
 format, and becomes the application icon in dialogs, the Dock, and
 other contexts. At the
 script level the command will accept only the first image passed in the
@@ -821,8 +821,8 @@ window in the stacking order.
 .
 If \fInewstate\fR is specified, the window will be set to the new state,
 otherwise it returns the current state of \fIwindow\fR: either
-\fBnormal\fR, \fBiconic\fR, \fBwithdrawn\fR, \fBicon\fR, or (Windows and Mac
-OS X only) \fBzoomed\fR.
+\fBnormal\fR, \fBiconic\fR, \fBwithdrawn\fR, \fBicon\fR, or (Windows and macOS
+only) \fBzoomed\fR.
 The difference between \fBiconic\fR and \fBicon\fR is that
 \fBiconic\fR refers to a window that has been iconified (e.g., with the
 \fBwm iconify\fR command) while \fBicon\fR refers to a window whose only