Merge 9.0core-tip-626

28 files changed, 75 insertions, 68 deletions

diff --git a/doc/3DBorder.3 b/doc/3DBorder.3
index d609d6d..dbe88e2 100644
--- a/doc/3DBorder.3
+++ b/doc/3DBorder.3
@@ -67,7 +67,7 @@ must be the window for which the border was allocated).
 Pointer to value whose value describes color corresponding to
 background (flat areas).  Illuminated edges will be brighter than
 this and shadowed edges will be darker than this.
-.AP char *colorName in
+.AP "const char" *colorName in
 Same as \fIobjPtr\fR except value is supplied as a string rather
 than a value.
 .AP Drawable drawable in
@@ -185,7 +185,7 @@ compile time.
 a widget to indicate that it has received the input focus.
 On the Macintosh, this puts a 1 pixel border in the bgGC color between
 the widget and the focus ring, except in the case where highlightWidth
-is 1, in which case the border is left out.
+is 0 or 1, in which case the border is left out.
 For proper Mac L&F, use highlightWidth of 3.
 .PP
 \fBTk_Get3DBorder\fR is identical to \fBTk_Alloc3DBorderFromObj\fR except
diff --git a/doc/CanvTxtInfo.3 b/doc/CanvTxtInfo.3
index 9bc280b..b8dd1bf 100644
--- a/doc/CanvTxtInfo.3
+++ b/doc/CanvTxtInfo.3
@@ -37,10 +37,10 @@ typedef struct {
     int \fIselBorderWidth\fR;
     XColor *\fIselFgColorPtr\fR;
     Tk_Item *\fIselItemPtr\fR;
-    int \fIselectFirst\fR;
-    int \fIselectLast\fR;
+    Tcl_Size \fIselectFirst\fR;
+    Tcl_Size \fIselectLast\fR;
     Tk_Item *\fIanchorItemPtr\fR;
-    int \fIselectAnchor\fR;
+    Tcl_Size \fIselectAnchor\fR;
     Tk_3DBorder \fIinsertBorder\fR;
     int \fIinsertWidth\fR;
     int \fIinsertBorderWidth\fR;
diff --git a/doc/CrtPhImgFmt.3 b/doc/CrtPhImgFmt.3
index ff6f839..6f89ef7 100644
--- a/doc/CrtPhImgFmt.3
+++ b/doc/CrtPhImgFmt.3
@@ -9,7 +9,7 @@
 '\"	    Department of Computer Science,
 '\"	    Australian National University.
 '\"
-.TH Tk_CreatePhotoImageFormat 3 8.7 Tk "Tk Library Procedures"
+.TH Tk_CreatePhotoImageFormat 3 9.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
diff --git a/doc/GetColor.3 b/doc/GetColor.3
index bfb7ac0..4dce903 100644
--- a/doc/GetColor.3
+++ b/doc/GetColor.3
@@ -45,7 +45,7 @@ Token for window in which color will be used.
 .AP Tcl_Obj *objPtr in/out
 String value describes desired color; internal rep will be
 modified to cache pointer to corresponding (XColor *).
-.AP char *name in
+.AP "const char" *name in
 Same as \fIobjPtr\fR except description of color is passed as a string and
 resulting (XColor *) is not cached.
 .AP XColor *prefPtr in
diff --git a/doc/GetCursor.3 b/doc/GetCursor.3
index 6f8e34f..6bfad3f 100644
--- a/doc/GetCursor.3
+++ b/doc/GetCursor.3
@@ -42,7 +42,7 @@ Token for window in which the cursor will be used.
 .AP Tcl_Obj *objPtr in/out
 Description of cursor;  see below for possible values.  Internal rep will be
 modified to cache pointer to corresponding Tk_Cursor.
-.AP char *name in
+.AP "const char" *name in
 Same as \fIobjPtr\fR except description of cursor is passed as a string and
 resulting Tk_Cursor is not cached.
 .AP "const char" *source in
@@ -57,9 +57,9 @@ Height of \fIsource\fR and \fImask\fR.
 X-location of cursor hot-spot.
 .AP "int" yHot in
 Y-location of cursor hot-spot.
-.AP Tk_Uid fg in
+.AP "const char" *fg in
 Textual description of foreground color for cursor.
-.AP Tk_Uid bg in
+.AP "const char" *bg in
 Textual description of background color for cursor.
 .AP Display *display in
 Display for which \fIcursor\fR was allocated.
@@ -174,7 +174,7 @@ Tk_Cursor cursor;
 #include "mask.cursor"
 cursor = Tk_GetCursorFromData(interp, tkwin, source_bits,
     mask_bits, source_width, source_height, source_x_hot,
-    source_y_hot, Tk_GetUid("red"), Tk_GetUid("blue"));
+    source_y_hot, "red", "blue");
 .CE
 .PP
 Under normal conditions \fBTk_GetCursorFromData\fR
diff --git a/doc/GetRelief.3 b/doc/GetRelief.3
index 528e1ba..d9ecb13 100644
--- a/doc/GetRelief.3
+++ b/doc/GetRelief.3
@@ -38,14 +38,12 @@ or
 .QW \fBsunken\fR
 (or any unique abbreviation thereof on input);
 the internal rep will be modified to cache corresponding relief value.
-.AP char *string in
+.AP "const char" *name in
 Same as \fIobjPtr\fR except description of relief is passed as
 a string.
 .AP int *reliefPtr out
 Pointer to location in which to store relief value corresponding to
 \fIobjPtr\fR or \fIname\fR.
-.AP "const char" *name
-Name of the relief.
 .AP int relief in
 Relief value (one of \fBTK_RELIEF_FLAT\fR, \fBTK_RELIEF_RAISED\fR,
 \fBTK_RELIEF_SUNKEN\fR, \fBTK_RELIEF_GROOVE\fR, \fBTK_RELIEF_SOLID\fR,
diff --git a/doc/SetOptions.3 b/doc/SetOptions.3
index cc206d4..2dc9450 100644
--- a/doc/SetOptions.3
+++ b/doc/SetOptions.3
@@ -505,11 +505,13 @@ integer pixel value corresponding to \fB2m\fR.  Unfortunately, this loses
 the original screen-independent value. Thus for \fBTK_OPTION_PIXELS\fR options
 it is better to use the \fIobjOffset\fR field.  In this case the original
 value of the option is retained in the object and can be returned when
-the option is retrieved.  In most cases it is convenient to use the
+the option is retrieved.  It might seem convenient to use the
 \fIinternalOffset\fR field as well, so that the integer value is
-immediately available for use in the widget code (alternatively,
-\fBTk_GetPixelsFromObj\fR can be used to extract the integer value from
-the object whenever it is needed).  Note that the problem of losing
+immediately available for use in the widget code. But if scaling is
+involved, \fIinternalOffset\fR won't change value when the scaling
+changes. Therefore it is better always to use
+\fBTk_GetPixelsFromObj\fR to extract the integer value from
+the object whenever it is needed.  Note: the problem of losing
 information on retrievals exists only for \fBTK_OPTION_PIXELS\fR options.
 .PP
 The second reason to use the \fIobjOffset\fR field is in order to
@@ -530,7 +532,7 @@ free, and restore saved copies of the type and creating a structure
 pointing to those procedures:
 .CS
 typedef struct {
-    char *name;
+    const char *\fIname\fR;
     Tk_CustomOptionSetProc *\fIsetProc\fR;
     Tk_CustomOptionGetProc *\fIgetProc\fR;
     Tk_CustomOptionRestoreProc *\fIrestoreProc\fR;
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/keysyms.n b/doc/keysyms.n
index b9ccd84..c10923c 100644
--- a/doc/keysyms.n
+++ b/doc/keysyms.n
@@ -573,7 +573,7 @@ Greek_ETA                         1991     0x7C7
 Greek_THETA                       1992     0x7C8
 Greek_IOTA                        1993     0x7C9
 Greek_KAPPA                       1994     0x7CA
-Greek_LAMDA                       1995     0x7CB
+Greek_LAMBDA                      1995     0x7CB
 Greek_MU                          1996     0x7CC
 Greek_NU                          1997     0x7CD
 Greek_XI                          1998     0x7CE
@@ -597,7 +597,7 @@ Greek_eta                         2023     0x7E7
 Greek_theta                       2024     0x7E8
 Greek_iota                        2025     0x7E9
 Greek_kappa                       2026     0x7EA
-Greek_lamda                       2027     0x7EB
+Greek_lambda                      2027     0x7EB
 Greek_mu                          2028     0x7EC
 Greek_nu                          2029     0x7ED
 Greek_xi                          2030     0x7EE
@@ -1096,6 +1096,7 @@ dead_U                           65161     0xFE89
 dead_schwa                       65162     0xFE8A
 dead_SCHWA                       65163     0xFE8B
 dead_greek                       65164     0xFE8C
+dead_hamza                       65165     0xFE8D
 dead_lowline                     65168     0xFE90
 dead_aboveverticalline           65169     0xFE91
 dead_belowverticalline           65170     0xFE92
@@ -1155,7 +1156,7 @@ Escape                           65307     0xFF1B
 Multi_key                        65312     0xFF20
 Kanji                            65313     0xFF21
 Muhenkan                         65314     0xFF22
-Henkan_Mode                      65315     0xFF23
+Henkan                           65315     0xFF23
 Romaji                           65316     0xFF24
 Hiragana                         65317     0xFF25
 Katakana                         65318     0xFF26
diff --git a/doc/menu.n b/doc/menu.n
index 9894a6c..97f1fdf 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
@@ -285,8 +285,7 @@ system menu.
 When Tk sees a Help menu on X Windows and Motif menu compatibility is
 enabled the menu is moved to be last in the menubar and is right
 justified. Motif menu compatibility is enabled by setting the Tk option
-\fB*Menu.useMotifHelp\fR to true or by calling
-\fBtk::classic::restore menu\fR.
+\fB*Menu.useMotifHelp\fR to true.
 .SH "CLONES"
 .PP
 When a menu is set as a menubar for a toplevel window, or when a menu
@@ -545,7 +544,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..cf878e1 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
@@ -87,7 +87,7 @@ following values are possible for \fIpredefinedType\fR:
 Displays three buttons whose symbolic names are \fBabort\fR,
 \fBretry\fR and \fBignore\fR.
 .IP \fBok\fR 18
-Displays one button whose symbolic name is \fBok\fR.
+Displays one button whose symbolic name is \fBok\fR. This is the default.
 .IP \fBokcancel\fR 18
 Displays two buttons whose symbolic names are \fBok\fR and \fBcancel\fR.
 .IP \fBretrycancel\fR 18
diff --git a/doc/nsimage.n b/doc/nsimage.n
index d62416f..76e5c9a 100644
--- a/doc/nsimage.n
+++ b/doc/nsimage.n
@@ -4,7 +4,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\"
-.TH nsimage n 8.7 Tk "Tk Built-In Commands"
+.TH nsimage n 9.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
diff --git a/doc/options.n b/doc/options.n
index 41bf565..141f4cb 100644
--- a/doc/options.n
+++ b/doc/options.n
@@ -169,7 +169,7 @@ milliseconds the insertion cursor should remain
 .QW on
 in each blink cycle.
 .OP \-insertwidth insertWidth InsertWidth
-Specifies a  value indicating the total width of the insertion cursor.
+Specifies a non-negative value indicating the total width of the insertion cursor.
 The value may have any of the forms acceptable to \fBTk_GetPixels\fR.
 If a border has been specified for the insertion
 cursor (using the \fB\-insertborderwidth\fR option), the border
diff --git a/doc/scrollbar.n b/doc/scrollbar.n
index b7e177e..a19b6e8 100644
--- a/doc/scrollbar.n
+++ b/doc/scrollbar.n
@@ -320,7 +320,7 @@ grid columnconfigure .tl 0 -weight 1
 grid rowconfigure .tl 0 -weight 1
 .CE
 .SH "SEE ALSO"
-ttk:scrollbar(n)
+ttk::scrollbar(n)
 .SH KEYWORDS
 scrollbar, widget
 '\" Local Variables:
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_notebook.n b/doc/ttk_notebook.n
index b7844a7..a53bb43 100644
--- a/doc/ttk_notebook.n
+++ b/doc/ttk_notebook.n
@@ -292,6 +292,9 @@ you will have to adapt the above settings as follows:
 ttk::style configure $nbStyle -tabmargins {2 0 2 2}
 ttk::style map $nbStyle.Tab -expand {selected {2 2 2 2}}
 .CE
+The easiest way to do this is to invoke the library procedure
+\fBttk::configureNotebookStyle\fP with \fB$nbStyle\fP as argument, after
+setting the style's \fB\-tabposition\fP option.
 .RE
 \fB\-font\fP \fIfont\fP
 .br
@@ -299,9 +302,8 @@ ttk::style map $nbStyle.Tab -expand {selected {2 2 2 2}}
 .br
 \fB\-padding\fP \fIpadding\fP
 .RS
-Some themes (e.g., \fBclam\fP) use a different \fIpadding\fP for the
-selected tab.  For example, the Ttk library file \fBclamTheme.tcl\fP
-contains the lines
+Some themes use a different \fIpadding\fP for the selected tab.  For example,
+the Ttk library file \fBclamTheme.tcl\fP contains the lines
 .CS
 ttk::style configure TNotebook.Tab \\
     -padding {4.5p 1.5p 4.5p 1.5p}
@@ -309,8 +311,11 @@ ttk::style map TNotebook.Tab \\
     -padding {selected {4.5p 3p 4.5p 1.5p}}
 .CE
 which are valid for the default value \fBnw\fP of the \fB\-tabposition\fP
-style option.  Again, for a different tab position you will have to adapt
-the above settings accordingly.
+style option.  For a \fBttk::notebook\fP style having a different tab position
+you will have to adapt the above settings accordingly.  Again, the easiest way
+to do this is to invoke the library procedure \fBttk::configureNotebookStyle\fP
+with the style name as argument, after setting the style's \fB\-tabposition\fP
+option.
 .RE
 .PP
 Some options are only available for specific themes.
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/ttk_treeview.n b/doc/ttk_treeview.n
index 404f95e..e8e3ebd 100644
--- a/doc/ttk_treeview.n
+++ b/doc/ttk_treeview.n
@@ -164,6 +164,8 @@ The rectangle defined is removed from the cell selection.
 \fIpathname \fBcellselection toggle \fIcellList\fR
 .
 Toggle the cell selection state of each cell in \fIcellList\fR.
+If the element is partially visible, the result gives the full area of the
+element, including any parts that are not visible.
 .TP
 \fIpathname \fBcellselection toggle \fIfirstCell lastCell\fR
 .
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