Merge trunk, and fix conflict in tests/ttk/scrollbar.test (due to [33556bc9]).

32 files changed, 494 insertions, 422 deletions

diff --git a/doc/CrtImgType.3 b/doc/CrtImgType.3
index 4949c50..b0a14fc 100644
--- a/doc/CrtImgType.3
+++ b/doc/CrtImgType.3
@@ -9,7 +9,7 @@
 .so man.macros
 .BS
 .SH NAME
-Tk_CreateImageType, Tk_GetImageMasterData, Tk_InitImageArgs \- define new kind of image
+Tk_CreateImageType, Tk_GetImageModelData, Tk_InitImageArgs \- define new kind of image
 .SH SYNOPSIS
 .nf
 \fB#include <tk.h>\fR
@@ -17,7 +17,7 @@ Tk_CreateImageType, Tk_GetImageMasterData, Tk_InitImageArgs \- define new kind o
 \fBTk_CreateImageType\fR(\fItypePtr\fR)
 .sp
 ClientData
-\fBTk_GetImageMasterData\fR(\fIinterp, name, typePtrPtr\fR)
+\fBTk_GetImageModelData\fR(\fIinterp, name, typePtrPtr\fR)
 .sp
 \fBTk_InitImageArgs\fR(\fIinterp, argc, argvPtr\fR)
 .SH ARGUMENTS
@@ -71,7 +71,7 @@ The fields of this structure will be described in later subsections
 of this entry.
 .PP
 The second major data structure manipulated by an image manager
-is called an \fIimage master\fR;  it contains overall information
+is called an \fIimage model\fR;  it contains overall information
 about a particular image, such as the values of the configuration
 options specified in an \fBimage create\fR command.
 There will usually be one of these structures for each
@@ -113,8 +113,8 @@ typedef int \fBTk_ImageCreateProc\fR(
         int \fIobjc\fR,
         Tcl_Obj *const \fIobjv\fR[],
         const Tk_ImageType *\fItypePtr\fR,
-        Tk_ImageMaster \fImaster\fR,
-        ClientData *\fImasterDataPtr\fR);
+        Tk_ImageModel \fImodel\fR,
+        ClientData *\fImodelDataPtr\fR);
 .CE
 The \fIinterp\fR argument is the interpreter in which the \fBimage\fR
 command was invoked, and \fIname\fR is the name for the new image,
@@ -123,15 +123,15 @@ or generated automatically by the \fBimage\fR command.
 The \fIobjc\fR and \fIobjv\fR arguments describe all the configuration
 options for the new image (everything after the name argument to
 \fBimage\fR).
-The \fImaster\fR argument is a token that refers to Tk's information
+The \fImodel\fR argument is a token that refers to Tk's information
 about this image;  the image manager must return this token to
 Tk when invoking the \fBTk_ImageChanged\fR procedure.
 Typically \fIcreateProc\fR will parse \fIobjc\fR and \fIobjv\fR
-and create an image master data structure for the new image.
+and create an image model data structure for the new image.
 \fIcreateProc\fR may store an arbitrary one-word value at
-*\fImasterDataPtr\fR, which will be passed back to the
+*\fImodelDataPtr\fR, which will be passed back to the
 image manager when other callbacks are invoked.
-Typically the value is a pointer to the master data
+Typically the value is a pointer to the model data
 structure for the image.
 .PP
 If \fIcreateProc\fR encounters an error, it should leave an error
@@ -148,11 +148,11 @@ This procedure must match the following prototype:
 .CS
 typedef ClientData \fBTk_ImageGetProc\fR(
         Tk_Window \fItkwin\fR,
-        ClientData \fImasterData\fR);
+        ClientData \fImodelData\fR);
 .CE
 The \fItkwin\fR argument identifies the window in which the
-image will be used and \fImasterData\fR is the value
-returned by \fIcreateProc\fR when the image master was created.
+image will be used and \fImodelData\fR is the value
+returned by \fIcreateProc\fR when the image model was created.
 \fIgetProc\fR will usually create a data structure for the new
 instance, including such things as the resources needed to
 display the image in the given window.
@@ -221,25 +221,25 @@ each of the image's instances.
 \fIdeleteProc\fR must match the following prototype:
 .CS
 typedef void \fBTk_ImageDeleteProc\fR(
-        ClientData \fImasterData\fR);
+        ClientData \fImodelData\fR);
 .CE
-The \fImasterData\fR argument will be the same as the value
-stored in \fI*masterDataPtr\fR by \fIcreateProc\fR when the
+The \fImodelData\fR argument will be the same as the value
+stored in \fI*modelDataPtr\fR by \fIcreateProc\fR when the
 image was created.
 \fIdeleteProc\fR should release any resources associated with
 the image.
-.SH TK_GETIMAGEMASTERDATA
+.SH TK_GETIMAGEMODELDATA
 .PP
-The procedure \fBTk_GetImageMasterData\fR may be invoked to retrieve
+The procedure \fBTk_GetImageModelData\fR may be invoked to retrieve
 information about an image.  For example, an image manager can use this
-procedure to locate its image master data for an image.
+procedure to locate its image model data for an image.
 If there exists an image named \fIname\fR
 in the interpreter given by \fIinterp\fR, then \fI*typePtrPtr\fR is
 filled in with type information for the image (the \fItypePtr\fR value
 passed to \fBTk_CreateImageType\fR when the image type was registered)
 and the return value is the ClientData value returned by the
 \fIcreateProc\fR when the image was created (this is typically a
-pointer to the image master data structure).  If no such image exists
+pointer to the image model data structure).  If no such image exists
 then NULL is returned and NULL is stored at \fI*typePtrPtr\fR.
 .SH "LEGACY INTERFACE SUPPORT"
 .PP
@@ -252,8 +252,8 @@ typedef int \fBTk_ImageCreateProc\fR(
         int \fIargc\fR,
         char **\fIargv\fR,
         Tk_ImageType *\fItypePtr\fR,
-        Tk_ImageMaster \fImaster\fR,
-        ClientData *\fImasterDataPtr\fR);
+        Tk_ImageModel \fImodel\fR,
+        ClientData *\fImodelDataPtr\fR);
 .CE
 Legacy programs and libraries dating from those days may still
 contain code that defines extended Tk image types using the old
@@ -280,4 +280,4 @@ interfaces.  Expect their support to go away in Tk 9.
 .SH "SEE ALSO"
 Tk_ImageChanged, Tk_GetImage, Tk_FreeImage, Tk_RedrawImage, Tk_SizeOfImage
 .SH KEYWORDS
-image manager, image type, instance, master
+image manager, image type, instance, model
diff --git a/doc/EventHndlr.3 b/doc/EventHndlr.3
index a2cbf8d..cbc5b79 100644
--- a/doc/EventHndlr.3
+++ b/doc/EventHndlr.3
@@ -9,7 +9,7 @@
 .so man.macros
 .BS
 .SH NAME
-Tk_CreateEventHandler, Tk_DeleteEventHandler \- associate procedure callback with an X event
+Tk_CreateEventHandler, Tk_DeleteEventHandler, Tk_GetButtonMask, Tk_SendVirtualEvent \- associate procedure callback with an X event
 .SH SYNOPSIS
 .nf
 \fB#include <tk.h>\fR
@@ -17,8 +17,18 @@ Tk_CreateEventHandler, Tk_DeleteEventHandler \- associate procedure callback wit
 \fBTk_CreateEventHandler\fR(\fItkwin, mask, proc, clientData\fR)
 .sp
 \fBTk_DeleteEventHandler\fR(\fItkwin, mask, proc, clientData\fR)
+.sp
+\fBTk_GetButtonMask\fR(\fIbutton\fR)
+.sp
+\fBTk_SendVirtualEvent\fR(\fItkwin, eventName, detail\fR)
 .SH ARGUMENTS
 .AS "unsigned long" clientData
+.AP unsigned button in
+Button number.
+.AP "const char" *eventName in
+The name of the virtual event.
+.AP Tcl_Obj *detail in
+Detail information for the virtual event.
 .AP Tk_Window tkwin in
 Token for window in which events may occur.
 .AP "unsigned long" mask in
@@ -71,5 +81,10 @@ automatically;  in this case there is no need to call
 If multiple handlers are declared for the same type of X event
 on the same window, then the handlers will be invoked in the
 order they were created.
+.PP
+\fBTk_GetButtonMask\fR returns the button mask corresponding to
+the button. E.g it will return \fIButton1Mask\fR for button \fIButton1\fR.
+.PP
+\fBTk_SendVirtualEvent\fR sends a virtual event to Tk's event queue.
 .SH KEYWORDS
 bind, callback, event, handler
diff --git a/doc/GetFont.3 b/doc/GetFont.3
index 0504916..9497556 100644
--- a/doc/GetFont.3
+++ b/doc/GetFont.3
@@ -9,7 +9,7 @@
 .so man.macros
 .BS
 .SH NAME
-Tk_AllocFontFromObj, Tk_GetFont, Tk_GetFontFromObj, Tk_NameOfFont, Tk_FreeFontFromObj, Tk_FreeFont \- maintain database of fonts
+Tk_AllocFontFromObj, Tk_GetFont, Tk_GetFontFromObj, Tk_NameOfFont, Tk_FontGetDescription, Tk_FreeFontFromObj, Tk_FreeFont \- maintain database of fonts
 .SH SYNOPSIS
 .nf
 \fB#include <tk.h>\fR
@@ -23,6 +23,9 @@ Tk_Font
 Tk_Font
 \fBTk_GetFontFromObj(\fItkwin, objPtr\fB)\fR
 .sp
+Tcl_Obj *
+\fBTk_FontGetDescription(\fItkfont\fB)\fR
+.sp
 const char *
 \fBTk_NameOfFont(\fItkfont\fB)\fR
 .sp
@@ -88,6 +91,9 @@ windows or for different purposes), then a single Tk_Font will be
 shared for all uses.  The underlying resources will be freed automatically
 when no-one is using the font anymore.
 .PP
+The procedure \fBTk_FontGetDescription\fR returns information about the font
+description as a Tcl list. One possible result is "{{DejaVu Sans} -16 bold underline}".
+.PP
 The procedure \fBTk_NameOfFont\fR is roughly the inverse of
 \fBTk_GetFont\fR.  Given a \fItkfont\fR that was created by
 \fBTk_GetFont\fR (or \fBTk_AllocFontFromObj\fR), the return value is
diff --git a/doc/GetPixels.3 b/doc/GetPixels.3
index 6c31af9..568c601 100644
--- a/doc/GetPixels.3
+++ b/doc/GetPixels.3
@@ -9,7 +9,7 @@
 .so man.macros
 .BS
 .SH NAME
-Tk_GetPixelsFromObj, Tk_GetPixels, Tk_GetMMFromObj, Tk_GetScreenMM \- translate between strings and screen units
+Tk_GetPixelsFromObj, Tk_GetPixels, Tk_GetMMFromObj, Tk_GetScreenMM, Tk_GetDoublePixelsFromObj \- translate between strings and screen units
 .SH SYNOPSIS
 .nf
 \fB#include <tk.h>\fR
@@ -18,6 +18,9 @@ int
 \fBTk_GetPixelsFromObj(\fIinterp, tkwin, objPtr, intPtr\fB)\fR
 .sp
 int
+\fBTk_GetDoublePixelsFromObj(\fIinterp, tkwin, objPtr, doublePtr\fB)\fR
+.sp
+int
 \fBTk_GetPixels(\fIinterp, tkwin, string, intPtr\fB)\fR
 .sp
 int
@@ -81,6 +84,9 @@ in \fIinterp\fR's result if \fIinterp\fR is not NULL.
 value in \fIobjPtr\fR, which speeds up future calls to
 \fBTk_GetPixelsFromObj\fR with the same \fIobjPtr\fR.
 .PP
+\fBTk_GetDoublePixelsFromObj\fR is identical to \fBTk_GetPixelsFromObj\fR
+except it returns a double not rounded to the nearest integer.
+.PP
 \fBTk_GetPixels\fR is identical to \fBTk_GetPixelsFromObj\fR except
 that the screen distance is specified with a string instead
 of an object.  This prevents \fBTk_GetPixels\fR from caching the
diff --git a/doc/GetScroll.3 b/doc/GetScroll.3
index 0df159b..91a2585 100644
--- a/doc/GetScroll.3
+++ b/doc/GetScroll.3
@@ -62,7 +62,8 @@ is returned as result and \fI*fractionPtr\fR is filled in with the
 value.
 If \fIobjv\fR has the \fBscroll\fR form, \fBTK_SCROLL_PAGES\fR
 or \fBTK_SCROLL_UNITS\fR is returned and \fI*stepsPtr\fR is filled
-in with the \fInumber\fR value, which must be a proper integer.
+in with the \fInumber\fR value, which must be a  integer or a float,
+but if it is a float then it is converted to an integer, rounded away from 0.
 If an error occurs in parsing the arguments, \fBTK_SCROLL_ERROR\fR
 is returned and an error message is left in interpreter
 \fIinterp\fR's result.
diff --git a/doc/ImgChanged.3 b/doc/ImgChanged.3
index ccf0c11..ed47d26 100644
--- a/doc/ImgChanged.3
+++ b/doc/ImgChanged.3
@@ -14,10 +14,10 @@ Tk_ImageChanged \- notify widgets that image needs to be redrawn
 .nf
 \fB#include <tk.h>\fR
 .sp
-\fBTk_ImageChanged\fR(\fIimageMaster, x, y, width, height, imageWidth, imageHeight\fR)
+\fBTk_ImageChanged\fR(\fImodel, x, y, width, height, imageWidth, imageHeight\fR)
 .SH ARGUMENTS
-.AS Tk_ImageMaster imageHeight
-.AP Tk_ImageMaster imageMaster in
+.AS Tk_ImageModel imageHeight
+.AP Tk_ImageModel model in
 Token for image, which was passed to image's \fIcreateProc\fR when
 the image was created.
 .AP int x in
@@ -42,7 +42,7 @@ whenever anything happens that requires the image to be redrawn.
 As a result of calling \fBTk_ImageChanged\fR, any widgets using
 the image are notified so that they can redisplay themselves
 appropriately.
-The \fIimageMaster\fR argument identifies the image, and
+The \fImodel\fR argument identifies the image, and
 \fIx\fR, \fIy\fR, \fIwidth\fR, and \fIheight\fR
 specify a rectangular region within the image that needs to
 be redrawn.
diff --git a/doc/MaintGeom.3 b/doc/MaintGeom.3
index b34e797..d6418b5 100644
--- a/doc/MaintGeom.3
+++ b/doc/MaintGeom.3
@@ -14,67 +14,67 @@ Tk_MaintainGeometry, Tk_UnmaintainGeometry \- maintain geometry of one window re
 .nf
 \fB#include <tk.h>\fR
 .sp
-\fBTk_MaintainGeometry\fR(\fIslave, master, x, y, width, height\fR)
+\fBTk_MaintainGeometry\fR(\fIwindow, container, x, y, width, height\fR)
 .sp
-\fBTk_UnmaintainGeometry\fR(\fIslave, master\fR)
+\fBTk_UnmaintainGeometry\fR(\fIwindow, container\fR)
 .SH ARGUMENTS
-.AS Tk_Window master
-.AP Tk_Window slave in
+.AS Tk_Window container
+.AP Tk_Window window in
 Window whose geometry is to be controlled.
-.AP Tk_Window master in
-Window relative to which \fIslave\fR's geometry will be controlled.
+.AP Tk_Window container in
+Window relative to which \fIwindow\fR's geometry will be controlled.
 .AP int x in
-Desired x-coordinate of \fIslave\fR in \fImaster\fR, measured in pixels
-from the inside of \fImaster\fR's left border to the outside of
-\fIslave\fR's left border.
+Desired x-coordinate of \fIwindow\fR in \fIcontainer\fR, measured in pixels
+from the inside of \fIcontainer\fR's left border to the outside of
+\fIwindow\fR's left border.
 .AP int y in
-Desired y-coordinate of \fIslave\fR in \fImaster\fR, measured in pixels
-from the inside of \fImaster\fR's top border to the outside of
-\fIslave\fR's top border.
+Desired y-coordinate of \fIwindow\fR in \fIcontainer\fR, measured in pixels
+from the inside of \fIcontainer\fR's top border to the outside of
+\fIwindow\fR's top border.
 .AP int width in
-Desired width for \fIslave\fR, in pixels.
+Desired width for \fIwindow\fR, in pixels.
 .AP int height in
-Desired height for \fIslave\fR, in pixels.
+Desired height for \fIwindow\fR, in pixels.
 .BE
 .SH DESCRIPTION
 .PP
 \fBTk_MaintainGeometry\fR and \fBTk_UnmaintainGeometry\fR make it
-easier for geometry managers to deal with slaves whose masters are not
+easier for geometry managers to deal with windows whose containers are not
 their parents.
-Three problems arise if the master for a slave is not its parent:
+Three problems arise if the container for a window is not its parent:
 .IP [1]
-The x- and y-position of the slave must be translated from the
-coordinate system of the master to that of the parent before
-positioning the slave.
+The x- and y-position of the window must be translated from the
+coordinate system of the container to that of the parent before
+positioning the window.
 .IP [2]
-If the master window, or any of its ancestors up to the slave's
-parent, is moved, then the slave must be repositioned within its
+If the container window, or any of its ancestors up to the window's
+parent, is moved, then the window must be repositioned within its
 parent in order to maintain the correct position relative to the
-master.
+container.
 .IP [3]
-If the master or one of its ancestors is mapped or unmapped, then
-the slave must be mapped or unmapped to correspond.
+If the container or one of its ancestors is mapped or unmapped, then
+the window must be mapped or unmapped to correspond.
 .LP
-None of these problems is an issue if the parent and master are
-the same.  For example, if the master or one of its ancestors
-is unmapped, the slave is automatically removed by the screen
+None of these problems is an issue if the parent and container are
+the same.  For example, if the container or one of its ancestors
+is unmapped, the window is automatically removed by the screen
 by X.
 .PP
-\fBTk_MaintainGeometry\fR deals with these problems for slaves
-whose masters are not their parents, as well as handling the simpler
-case of slaves whose masters are their parents.
+\fBTk_MaintainGeometry\fR deals with these problems for windows
+whose containers are not their parents, as well as handling the simpler
+case of windows whose container are their parents.
 \fBTk_MaintainGeometry\fR is typically called by a window manager
-once it has decided where a slave should be positioned relative
-to its master.
+once it has decided where a window should be positioned relative
+to its container.
 \fBTk_MaintainGeometry\fR translates the coordinates to the
-coordinate system of \fIslave\fR's parent and then moves and
-resizes the slave appropriately.
+coordinate system of \fIwindow\fR's parent and then moves and
+resizes the window appropriately.
 Furthermore, it remembers the desired position and creates event
-handlers to monitor the master and all of its ancestors up
-to (but not including) the slave's parent.
+handlers to monitor the container and all of its ancestors up
+to (but not including) the window's parent.
 If any of these windows is moved, mapped, or unmapped,
-the slave will be adjusted so that it is mapped only when the
-master is mapped and its geometry relative to the master
+the window will be adjusted so that it is mapped only when the
+container is mapped and its geometry relative to the container
 remains as specified by \fIx\fR, \fIy\fR, \fIwidth\fR, and
 \fIheight\fR.
 .PP
@@ -83,17 +83,17 @@ if it decides that it does not want the window to appear on the
 screen under any conditions, it calls \fBTk_UnmaintainGeometry\fR.
 \fBTk_UnmaintainGeometry\fR unmaps the window and cancels any
 previous calls to \fBTk_MaintainGeometry\fR for the
-\fImaster\fR\-\fIslave\fR pair, so that the slave's
+\fIcontainer\fR\-\fIwindow\fR pair, so that the window's
 geometry and mapped state are no longer maintained
 automatically.
 \fBTk_UnmaintainGeometry\fR need not be called by a geometry
-manager if the slave, the master, or any of the master's ancestors
+manager if the window, the container, or any of the container's ancestors
 is destroyed:  Tk will call it automatically.
 .PP
 If \fBTk_MaintainGeometry\fR is called repeatedly for the same
-\fImaster\fR\-\fIslave\fR pair, the information from the most
+\fIcontainer\fR\-\fIwindow\fR pair, the information from the most
 recent call supersedes any older information.
-If \fBTk_UnmaintainGeometry\fR is called for a \fImaster\fR\-\fIslave\fR
+If \fBTk_UnmaintainGeometry\fR is called for a \fIcontainer\fR\-\fIwindow\fR
 pair that is is not currently managed, the call has no effect.
 .SH KEYWORDS
-geometry manager, map, master, parent, position, slave, unmap
+geometry manager, map, container, parent, position, window, unmap
diff --git a/doc/ManageGeom.3 b/doc/ManageGeom.3
index ba12aca..0c72d69 100644
--- a/doc/ManageGeom.3
+++ b/doc/ManageGeom.3
@@ -32,7 +32,7 @@ Arbitrary one-word value to pass to geometry manager callbacks.
 .PP
 \fBTk_ManageGeometry\fR arranges for a particular geometry manager,
 described by the \fImgrPtr\fR argument, to control the geometry
-of a particular slave window, given by \fItkwin\fR.
+of a particular content window, given by \fItkwin\fR.
 If \fItkwin\fR was previously managed by some other geometry manager,
 the previous manager loses control in favor of the new one.
 If \fImgrPtr\fR is NULL, geometry management is cancelled for
@@ -44,7 +44,7 @@ the geometry manager:
 typedef struct {
     const char *\fIname\fR;
     Tk_GeomRequestProc *\fIrequestProc\fR;
-    Tk_GeomLostSlaveProc *\fIlostSlaveProc\fR;
+    Tk_GeomLostContentProc *\fIlostContentProc\fR;
 } \fBTk_GeomMgr\fR;
 .CE
 The \fIname\fR field is the textual name for the geometry manager,
@@ -53,7 +53,7 @@ by the command \fBwinfo manager\fR.
 .PP
 \fIrequestProc\fR is a procedure in the geometry manager that
 will be invoked whenever \fBTk_GeometryRequest\fR is called by the
-slave to change its desired geometry.
+content window to change its desired geometry.
 \fIrequestProc\fR should have arguments and results that match the
 type \fBTk_GeomRequestProc\fR:
 .CS
@@ -67,24 +67,24 @@ corresponding parameters passed to \fBTk_ManageGeometry\fR.
 structure containing application-specific information about
 how to manage \fItkwin\fR's geometry.
 .PP
-The \fIlostSlaveProc\fR field of \fImgrPtr\fR points to another
+The \fIlostContentProc\fR field of \fImgrPtr\fR points to another
 procedure in the geometry manager.
-Tk will invoke \fIlostSlaveProc\fR if some other manager
+Tk will invoke \fIlostContentProc\fR if some other manager
 calls \fBTk_ManageGeometry\fR to claim
 \fItkwin\fR away from the current geometry manager.
-\fIlostSlaveProc\fR is not invoked if \fBTk_ManageGeometry\fR is
+\fIlostContentProc\fR is not invoked if \fBTk_ManageGeometry\fR is
 called with a NULL value for \fImgrPtr\fR (presumably the current
 geometry manager has made this call, so it already knows that the
 window is no longer managed), nor is it called if \fImgrPtr\fR
 is the same as the window's current geometry manager.
-\fIlostSlaveProc\fR should have
+\fIlostContentProc\fR should have
 arguments and results that match the following prototype:
 .CS
-typedef void \fBTk_GeomLostSlaveProc\fR(
+typedef void \fBTk_GeomLostContentProc\fR(
         ClientData \fIclientData\fR,
         Tk_Window \fItkwin\fR);
 .CE
-The parameters to \fIlostSlaveProc\fR will be identical to the
+The parameters to \fIlostContentProc\fR will be identical to the
 corresponding parameters passed to \fBTk_ManageGeometry\fR.
 .SH KEYWORDS
 callback, geometry, managed, request, unmanaged
diff --git a/doc/NameOfImg.3 b/doc/NameOfImg.3
index 8c191ce..781650f 100644
--- a/doc/NameOfImg.3
+++ b/doc/NameOfImg.3
@@ -14,10 +14,10 @@ Tk_NameOfImage \- Return name of image.
 \fB#include <tk.h>\fR
 .sp
 const char *
-\fBTk_NameOfImage\fR(\fIimageMaster\fR)
+\fBTk_NameOfImage\fR(\fIimageModel\fR)
 .SH ARGUMENTS
-.AS Tk_ImageMaster imageMaster
-.AP Tk_ImageMaster imageMaster in
+.AS Tk_ImageModel imageModel
+.AP Tk_ImageModel imageModel in
 Token for image, which was passed to image manager's \fIcreateProc\fR when
 the image was created.
 .BE
diff --git a/doc/WindowId.3 b/doc/WindowId.3
index f937963..477efe1 100644
--- a/doc/WindowId.3
+++ b/doc/WindowId.3
@@ -9,7 +9,7 @@
 .so man.macros
 .BS
 .SH NAME
-Tk_WindowId, Tk_Parent, Tk_Display, Tk_DisplayName, Tk_ScreenNumber, Tk_Screen, Tk_X, Tk_Y, Tk_Width, Tk_Height, Tk_Changes, Tk_Attributes, Tk_IsContainer, Tk_IsEmbedded, Tk_IsMapped, Tk_IsTopLevel, Tk_ReqWidth, Tk_ReqHeight, Tk_MinReqWidth, Tk_MinReqHeight, Tk_InternalBorderLeft, Tk_InternalBorderRight, Tk_InternalBorderTop, Tk_InternalBorderBottom, Tk_Visual, Tk_Depth, Tk_Colormap, Tk_Interp  \- retrieve information from Tk's local data structure
+Tk_WindowId, Tk_Parent, Tk_Display, Tk_DisplayName, Tk_ScreenNumber, Tk_AlwaysShowSelection, Tk_Screen, Tk_X, Tk_Y, Tk_Width, Tk_Height, Tk_Changes, Tk_Attributes, Tk_IsContainer, Tk_IsEmbedded, Tk_IsMapped, Tk_IsTopLevel, Tk_ReqWidth, Tk_ReqHeight, Tk_MinReqWidth, Tk_MinReqHeight, Tk_InternalBorderLeft, Tk_InternalBorderRight, Tk_InternalBorderTop, Tk_InternalBorderBottom, Tk_Visual, Tk_Depth, Tk_Colormap, Tk_Interp, Tk_NewWindowObj  \- retrieve information from Tk's local data structure
 .SH SYNOPSIS
 .nf
 \fB#include <tk.h>\fR
@@ -29,6 +29,9 @@ const char *
 int
 \fBTk_ScreenNumber\fR(\fItkwin\fR)
 .sp
+int
+\fBTk_AlwaysShowSelection\fR(\fItkwin\fR)
+.sp
 Screen *
 \fBTk_Screen\fR(\fItkwin\fR)
 .sp
@@ -97,6 +100,9 @@ Colormap
 .sp
 Tcl_Interp *
 \fBTk_Interp\fR(\fItkwin\fR)
+.sp
+Tcl_Obj *
+\fBTk_NewWindowObj\fR(\fItkwin\fR)
 .SH ARGUMENTS
 .AS Tk_Window tkwin
 .AP Tk_Window tkwin in
@@ -127,6 +133,8 @@ ASCII string identifying \fItkwin\fR's display.  \fBTk_ScreenNumber\fR
 returns the index of \fItkwin\fR's screen among all the screens
 of \fItkwin\fR's display.  \fBTk_Screen\fR returns a pointer to
 the Xlib structure corresponding to \fItkwin\fR's screen.
+\fBTk_AlwaysShowSelection\fR indicates whether text/entry widgets
+should always display their selection, regardless of window focus.
 .PP
 \fBTk_X\fR, \fBTk_Y\fR, \fBTk_Width\fR, and \fBTk_Height\fR
 return information about \fItkwin's\fR location within its
@@ -182,6 +190,8 @@ and \fBTk_Colormap\fR returns the current
 colormap for the window.  The visual characteristics are
 normally set from the defaults for the window's screen, but
 they may be overridden by calling \fBTk_SetWindowVisual\fR.
+.PP
+\fBTk_NewWindowObj\fR creates a new \fBTcl_Obj\fR from the window.
 .SH KEYWORDS
 attributes, colormap, depth, display, height, geometry manager,
 identifier, mapped, requested size, screen, top-level,
diff --git a/doc/bind.n b/doc/bind.n
index 96c5d34..9210357 100644
--- a/doc/bind.n
+++ b/doc/bind.n
@@ -214,11 +214,7 @@ values should scroll up and negative values should scroll down.
 Horizontal scrolling uses \fBShift-MouseWheel\fR events, with positive
 \fB%D\fR \fIdelta\fR substitution indicating left scrolling and negative
 right scrolling.
-Only Windows and macOS Aqua typically fire \fBMouseWheel\fR and
-\fBShift-MouseWheel\fR events.  On
-X11 vertical scrolling is rather supported through \fBButton-4\fR and
-\fBButton-5\fR events, and horizontal scrolling through \fBShift-Button-4\fR
-and \fBShift-Button-5\fR events.  Horizontal scrolling events may fire from
+Horizontal scrolling events may fire from
 many different hardware units such as tilt wheels or touchpads.  Horizontal
 scrolling can also be emulated by holding Shift and scrolling vertically.
 .RE
@@ -286,7 +282,8 @@ it is destroyed.
 When the \fBDestroy\fR event is delivered
 to a widget, it is in a
 .QW half-dead
-state: the widget still exists, but most operations on it will fail.
+state: the widget still exists, but operations that involve it
+may return invalid results, or return an error.
 .RE
 .IP "\fBFocusIn\fR, \fBFocusOut\fR" 5
 The \fBFocusIn\fR and \fBFocusOut\fR events are generated
diff --git a/doc/canvas.n b/doc/canvas.n
index 1b43983..2367e2e 100644
--- a/doc/canvas.n
+++ b/doc/canvas.n
@@ -1147,7 +1147,8 @@ total width of the canvas is off-screen to the left.
 .
 This command shifts the view in the window left or right according to
 \fInumber\fR and \fIwhat\fR.
-\fINumber\fR must be an integer.
+\fINumber\fR must be an integer or a float, but if it is a float then
+it is converted to an integer, rounded away from 0.
 \fIWhat\fR must be either \fBpages\fR or \fBunits\fR or an abbreviation
 of one of these.
 If \fIwhat is \fBpages\fR then the view
diff --git a/doc/colors.n b/doc/colors.n
index 3747ee8..9d8d653 100644
--- a/doc/colors.n
+++ b/doc/colors.n
@@ -919,19 +919,20 @@ On Windows, the following additional system colors are available
 .RS
 .DS
 .ta 6c
-system3dDarkShadow	systemHighlight
-system3dLight	systemHighlightText
-systemActiveBorder	systemInactiveBorder
-systemActiveCaption	systemInactiveCaption
-systemAppWorkspace	systemInactiveCaptionText
-systemBackground	systemInfoBackground
-systemButtonFace	systemInfoText
-systemButtonHighlight	systemMenu
-systemButtonShadow	systemMenuText
+system3dDarkShadow	systemHighlightText
+system3dLight	systemInactiveBorder
+systemActiveBorder	systemInactiveCaption
+systemActiveCaption	systemInactiveCaptionText
+systemAppWorkspace	systemInfoBackground
+systemBackground	systemInfoText
+systemButtonFace	systemMenu
+systemButtonHighlight	systemMenuText
+systemButtonShadow	systemPlaceholderText
 systemButtonText	systemScrollbar
 systemCaptionText	systemWindow
 systemDisabledText	systemWindowFrame
 systemGrayText	systemWindowText
+systemHighlight
 .DE
 .RE
 .SH "SEE ALSO"
diff --git a/doc/console.n b/doc/console.n
index d4d8a74..40b7426 100644
--- a/doc/console.n
+++ b/doc/console.n
@@ -25,9 +25,12 @@ the Tk library. Except for TkAqua, this command is not available when
 Tk is loaded into a tclsh interpreter with
 .QW "\fBpackage require Tk\fR" ,
 as a conventional terminal is expected to be present in that case.
-In TkAqua, this command is only available when stdin is \fB/dev/null\fR
-(as is the case e.g. when the application embedding Tk is started
-from the Mac OS X Finder).
+In TkAqua, this command is disabled when there is a startup script
+and stdin is \fB/dev/null\fR (as is the case e.g. when a bundled application
+embedding Tk is started by the macOS Launcher).  To enable the command
+in that case, define the environment variable \fBTK_CONSOLE\fR.  This can be
+done by modifying the Info.plist file by adding the LSEnvironment key
+to the main dict and setting its value to be a dict with the key \fBTK_CONSOLE\fR.
 .PP
 .TP
 \fBconsole eval \fIscript\fR
diff --git a/doc/entry.n b/doc/entry.n
index 99ebbf4..23b8cab 100644
--- a/doc/entry.n
+++ b/doc/entry.n
@@ -403,7 +403,8 @@ way through the text appears at the left edge of the window.
 \fIpathName \fBxview scroll \fInumber what\fR
 This command shifts the view in the window left or right according to
 \fInumber\fR and \fIwhat\fR.
-\fINumber\fR must be an integer.
+\fINumber\fR must be an integer or a float, but if it is a float then
+it is converted to an integer, rounded away from 0.
 \fIWhat\fR must be either \fBpages\fR or \fBunits\fR or an abbreviation
 of one of these.
 If \fIwhat\fR is \fBpages\fR then the view adjusts by \fInumber\fR screenfuls.
diff --git a/doc/fontchooser.n b/doc/fontchooser.n
index 65aa8e7..465af2e 100644
--- a/doc/fontchooser.n
+++ b/doc/fontchooser.n
@@ -11,7 +11,7 @@
 .SH NAME
 fontchooser \- control font selection dialog
 .SH SYNOPSIS
-\fBtk fontchooser\fR \fBconfigure\fR ?\fI\-option value \-option value ...\fR?
+\fBtk fontchooser\fR \fBconfigure\fR ?\fI\-option value ...\fR?
 .sp
 \fBtk fontchooser\fR \fBshow\fR
 .sp
@@ -31,7 +31,7 @@ caller via callbacks or virtual events.
 .PP
 The \fBtk fontchooser\fR command can have one of the following forms:
 .TP
-\fBtk fontchooser\fR \fBconfigure \fR?\fI\-option value \-option value ...\fR?
+\fBtk fontchooser\fR \fBconfigure \fR?\fI\-option value ...\fR?
 .
 Set or query one or more of the configurations options below (analogous to Tk
 widget configuration).
diff --git a/doc/grid.n b/doc/grid.n
index 3da8cfb..684474b 100644
--- a/doc/grid.n
+++ b/doc/grid.n
@@ -17,30 +17,30 @@ grid \- Geometry manager that arranges widgets in a grid
 .PP
 The \fBgrid\fR command is used to communicate with the grid
 geometry manager that arranges widgets in rows and columns inside
-of another window, called the geometry master (or master window).
+of another window, called the geometry container (or container window).
 The \fBgrid\fR command can have any of several forms, depending
 on the \fIoption\fR argument:
 .TP
-\fBgrid \fIslave \fR?\fIslave ...\fR? ?\fIoptions\fR?
+\fBgrid \fIwindow \fR?\fIwindow ...\fR? ?\fIoptions\fR?
 .
-If the first argument to \fBgrid\fR is suitable as the first slave
+If the first argument to \fBgrid\fR is suitable as the first window
 argument to \fBgrid configure\fR, either a window name (any value
 starting with \fB.\fR) or one of the characters \fBx\fR or \fB^\fR
 (see the \fBRELATIVE PLACEMENT\fR section below), then the command is
 processed in the same way as \fBgrid configure\fR.
 .TP
-\fBgrid anchor \fImaster\fR ?\fIanchor\fR?
+\fBgrid anchor \fIwindow\fR ?\fIanchor\fR?
 .
-The anchor value controls how to place the grid within the master
+The anchor value controls how to place the grid within the container window
 when no row/column has any weight.  See \fBTHE GRID ALGORITHM\fR below
 for further details.  The default \fIanchor\fR is \fInw\fR.
 .TP
-\fBgrid bbox \fImaster\fR ?\fIcolumn row\fR? ?\fIcolumn2 row2\fR?
+\fBgrid bbox \fIwindow\fR ?\fIcolumn row\fR? ?\fIcolumn2 row2\fR?
 .
 With no arguments,
 the bounding box (in pixels) of the grid is returned.
 The return value consists of 4 integers.  The first two are the pixel
-offset from the master window (x then y) of the top-left corner of the
+offset from the container window (x then y) of the top-left corner of the
 grid, and the second two integers are the width and height of the grid,
 also in pixels.  If a single \fIcolumn\fR and \fIrow\fR is specified on
 the command line, then the bounding box for that cell is returned, where the
@@ -48,18 +48,18 @@ top left cell is numbered from zero.  If both \fIcolumn\fR and \fIrow\fR
 arguments are specified, then the bounding box spanning the rows and columns
 indicated is returned.
 .TP
-\fBgrid columnconfigure \fImaster index \fR?\fI\-option value...\fR?
+\fBgrid columnconfigure \fIwindow index \fR?\fI\-option value...\fR?
 .
 Query or set the column properties of the \fIindex\fR column of the
-geometry master, \fImaster\fR.
+geometry container, \fIwindow\fR.
 The valid options are \fB\-minsize\fR, \fB\-weight\fR, \fB\-uniform\fR
 and \fB\-pad\fR.
 If one or more options are provided, then \fIindex\fR may be given as
 a list of column indices to which the configuration options will operate on.
 Indices may be integers, window names or the keyword \fIall\fR. For \fIall\fR
-the options apply to all columns currently occupied be slave windows. For
-a window name, that window must be a slave of this master and the options
-apply to all columns currently occupied be the slave.
+the options apply to all columns currently occupied be content windows. For
+a window name, that window must be a content of this container and the options
+apply to all columns currently occupied be the content.
 The \fB\-minsize\fR option sets the minimum size, in screen units,
 that will be permitted for this column.
 The \fB\-weight\fR option (an integer value)
@@ -80,178 +80,178 @@ added to the largest window contained completely in that column when the
 grid geometry manager requests a size from the containing window.
 If only an option is specified, with no value,
 the current value of that option is returned.
-If only the master window and index is specified, all the current settings
+If only the container window and index is specified, all the current settings
 are returned in a list of
 .QW "\-option value"
 pairs.
 .TP
-\fBgrid configure \fIslave \fR?\fIslave ...\fR? ?\fIoptions\fR?
+\fBgrid configure \fIwindow \fR?\fIwindow ...\fR? ?\fIoptions\fR?
 .
-The arguments consist of the names of one or more slave windows
+The arguments consist of the names of one or more content windows
 followed by pairs of arguments that specify how
-to manage the slaves.
+to manage the content.
 The characters \fB\-\fR,  \fBx\fR and \fB^\fR,
 can be specified instead of a window name to alter the default
-location of a \fIslave\fR, as described in the \fBRELATIVE PLACEMENT\fR
+location of a \fIwindow\fR, as described in the \fBRELATIVE PLACEMENT\fR
 section, below.
 The following options are supported:
 .RS
 .TP
 \fB\-column \fIn\fR
 .
-Insert the slave so that it occupies the \fIn\fRth column in the grid.
+Insert the window so that it occupies the \fIn\fRth column in the grid.
 Column numbers start with 0.  If this option is not supplied, then the
-slave is arranged just to the right of previous slave specified on this
+window is arranged just to the right of previous window specified on this
 call to \fBgrid\fR, or column
 .QW 0
-if it is the first slave.  For each
-\fBx\fR that immediately precedes the \fIslave\fR, the column position
+if it is the first window.  For each
+\fBx\fR that immediately precedes the \fIwindow\fR, the column position
 is incremented by one.  Thus the \fBx\fR represents a blank column
 for this row in the grid.
 .TP
 \fB\-columnspan \fIn\fR
 .
-Insert the slave so that it occupies \fIn\fR columns in the grid.
+Insert the window so that it occupies \fIn\fR columns in the grid.
 The default is one column, unless the window name is followed by a
 \fB\-\fR, in which case the columnspan is incremented once for each immediately
 following \fB\-\fR.
 .TP
-\fB\-in \fIother\fR
+\fB\-in \fIcontainer\fR
 .
-Insert the slave(s) in the master
-window given by \fIother\fR.  The default is the first slave's
+Insert the window(s) in the container
+window given by \fIcontainer\fR.  The default is the first window's
 parent window.
 .TP
 \fB\-ipadx \fIamount\fR
 .
 The \fIamount\fR specifies how much horizontal internal padding to
-leave on each side of the slave(s).  This is space is added
-inside the slave(s) border.
+leave on each side of the content.  This is space is added
+inside the content border.
 The \fIamount\fR must be a valid screen distance, such as \fB2\fR or \fB.5c\fR.
 It defaults to 0.
 .TP
 \fB\-ipady \fIamount\fR
 .
 The \fIamount\fR specifies how much vertical internal padding to
-leave on the top and bottom of the slave(s).
-This space is added inside the slave(s) border.
+leave on the top and bottom of the content.
+This space is added inside the content border.
 The \fIamount\fR  defaults to 0.
 .TP
 \fB\-padx \fIamount\fR
 .
 The \fIamount\fR specifies how much horizontal external padding to
-leave on each side of the slave(s), in screen units.
+leave on each side of the content, in screen units.
 \fIAmount\fR may be a list
 of two values to specify padding for left and right separately.
 The \fIamount\fR defaults to 0.
-This space is added outside the slave(s) border.
+This space is added outside the content border.
 .TP
 \fB\-pady \fIamount\fR
 .
 The \fIamount\fR specifies how much vertical external padding to
-leave on the top and bottom of the slave(s), in screen units.
+leave on the top and bottom of the content, in screen units.
 \fIAmount\fR may be a list
 of two values to specify padding for top and bottom separately.
 The \fIamount\fR defaults to 0.
-This space is added outside the slave(s) border.
+This space is added outside the content border.
 .TP
 \fB\-row \fIn\fR
 .
-Insert the slave so that it occupies the \fIn\fRth row in the grid.
+Insert the content so that it occupies the \fIn\fRth row in the grid.
 Row numbers start with 0.  If this option is not supplied, then the
-slave is arranged on the same row as the previous slave specified on this
+content is arranged on the same row as the previous content specified on this
 call to \fBgrid\fR, or the next row after the highest occupied row
-if this is the first slave.
+if this is the first content.
 .TP
 \fB\-rowspan \fIn\fR
 .
-Insert the slave so that it occupies \fIn\fR rows in the grid.
+Insert the content so that it occupies \fIn\fR rows in the grid.
 The default is one row.  If the next \fBgrid\fR command contains
-\fB^\fR characters instead of \fIslaves\fR that line up with the columns
-of this \fIslave\fR, then the \fBrowspan\fR of this \fIslave\fR is
+\fB^\fR characters instead of \fIcontent\fR that line up with the columns
+of this \fIcontent\fR, then the \fBrowspan\fR of this \fIcontent\fR is
 extended by one.
 .TP
 \fB\-sticky \fIstyle\fR
 .
-If a slave's cell is larger than its requested dimensions, this
-option may be used to position (or stretch) the slave within its cell.
+If a content's cell is larger than its requested dimensions, this
+option may be used to position (or stretch) the content within its cell.
 \fIStyle\fR  is a string that contains zero or more of the characters
 \fBn\fR, \fBs\fR, \fBe\fR or \fBw\fR.
 The string can optionally contain spaces or
 commas, but they are ignored.  Each letter refers to a side (north, south,
-east, or west) that the slave will
+east, or west) that the content will
 .QW stick
 to.  If both \fBn\fR and \fBs\fR (or \fBe\fR and \fBw\fR) are
-specified, the slave will be stretched to fill the entire
+specified, the content will be stretched to fill the entire
 height (or width) of its cavity.  The \fB\-sticky\fR option subsumes the
 combination of \fB\-anchor\fR and \fB\-fill\fR that is used by \fBpack\fR.
 The default is
 .QW "" ,
-which causes the slave to be centered in its cavity, at its requested size.
+which causes the content to be centered in its cavity, at its requested size.
 .LP
-If any of the slaves are already managed by the geometry manager
+If any of the content is already managed by the geometry manager
 then any unspecified options for them retain their previous values rather
 than receiving default values.
 .RE
 .TP
-\fBgrid forget \fIslave \fR?\fIslave ...\fR?
+\fBgrid forget \fIwindow \fR?\fIwindow ...\fR?
 .
-Removes each of the \fIslave\fRs from grid for its
-master and unmaps their windows.
-The slaves will no longer be managed by the grid geometry manager.
+Removes each of the \fIwindow\fRs from grid for its
+container and unmaps their windows.
+The content will no longer be managed by the grid geometry manager.
 The configuration options for that window are forgotten, so that if the
-slave is managed once more by the grid geometry manager, the initial
+window is managed once more by the grid geometry manager, the initial
 default settings are used.
 .RS
 .PP
-.VS TIP518
-If the last slave of the master becomes unmanaged, this will also send
-the virtual event \fB<<NoManagedChild>>\fR to the master; the master
+.VS "TIP 518"
+If the last content window of the container becomes unmanaged, this will also send
+the virtual event \fB<<NoManagedChild>>\fR to the container; the container
 may choose to resize itself (or otherwise respond) to such a change.
-.VE TIP518
+.VE "TIP 518"
 .RE
 .TP
-\fBgrid info \fIslave\fR
+\fBgrid info \fIwindow\fR
 .
 Returns a list whose elements are the current configuration state of
-the slave given by \fIslave\fR in the same option-value form that
+the content given by \fIwindow\fR in the same option-value form that
 might be specified to \fBgrid configure\fR.
 The first two elements of the list are
-.QW "\fB\-in \fImaster\fR"
-where \fImaster\fR is the slave's master.
+.QW "\fB\-in \fIcontainer\fR"
+where \fIcontainer\fR is the windows's container window.
 .TP
-\fBgrid location \fImaster x y\fR
+\fBgrid location \fIwindow x y\fR
 .
-Given  \fIx\fR and \fIy\fR values in screen units relative to the master window,
+Given  \fIx\fR and \fIy\fR values in screen units relative to the container window,
 the column and row number at that \fIx\fR and \fIy\fR location is returned.
 For locations that are above or to the left of the grid, \fB\-1\fR is
 returned.
 .TP
-\fBgrid propagate \fImaster\fR ?\fIboolean\fR?
+\fBgrid propagate \fIwindow\fR ?\fIboolean\fR?
 .
 If \fIboolean\fR has a true boolean value such as \fB1\fR or \fBon\fR
-then propagation is enabled for \fImaster\fR, which must be a window
+then propagation is enabled for \fIwindow\fR, which must be a window
 name (see \fBGEOMETRY PROPAGATION\fR below).
 If \fIboolean\fR has a false boolean value then propagation is
-disabled for \fImaster\fR.
+disabled for \fIwindow\fR.
 In either of these cases an empty string is returned.
 If \fIboolean\fR is omitted then the command returns \fB0\fR or
 \fB1\fR to indicate whether propagation is currently enabled
-for \fImaster\fR.
+for \fIwindow\fR.
 Propagation is enabled by default.
 .TP
-\fBgrid rowconfigure \fImaster index \fR?\fI\-option value...\fR?
+\fBgrid rowconfigure \fIwindow index \fR?\fI\-option value...\fR?
 .
 Query or set the row properties of the \fIindex\fR row of the
-geometry master, \fImaster\fR.
+geometry container, \fIwindow\fR.
 The valid options are \fB\-minsize\fR, \fB\-weight\fR, \fB\-uniform\fR
 and \fB\-pad\fR.
 If one or more options are provided, then \fIindex\fR may be given as
 a list of row indices to which the configuration options will operate on.
 Indices may be integers, window names or the keyword \fIall\fR. For \fIall\fR
-the options apply to all rows currently occupied be slave windows. For
-a window name, that window must be a slave of this master and the options
-apply to all rows currently occupied be the slave.
+the options apply to all rows currently occupied by content windows. For
+a window name, that window must be a content window of this container and the options
+apply to all rows currently occupied by the container window.
 The \fB\-minsize\fR option sets the minimum size, in screen units,
 that will be permitted for this row.
 The \fB\-weight\fR option (an integer value)
@@ -272,99 +272,102 @@ added to the largest window contained completely in that row when the
 grid geometry manager requests a size from the containing window.
 If only an option is specified, with no value,
 the current value of that option is returned.
-If only the master window and index is specified, all the current settings
+If only the container window and index is specified, all the current settings
 are returned in a list of
 .QW "-option value"
 pairs.
 .TP
-\fBgrid remove \fIslave \fR?\fIslave ...\fR?
+\fBgrid remove \fIwindow \fR?\fIwindow ...\fR?
 .
-Removes each of the \fIslave\fRs from grid for its
-master and unmaps their windows.
-The slaves will no longer be managed by the grid geometry manager.
+Removes each of the \fIwindow\fRs from grid for its
+container and unmaps their windows.
+The content will no longer be managed by the grid geometry manager.
 However, the configuration options for that window are remembered,
-so that if the
-slave is managed once more by the grid geometry manager, the previous
-values are retained.
+so that if the content window is managed once more by the grid
+geometry manager, the previous values are retained.
 .RS
 .PP
-.VS TIP518
-If the last slave of the master becomes unmanaged, this will also send
-the virtual event \fB<<NoManagedChild>>\fR to the master; the master
+.VS "TIP 518"
+If the last content window of the container becomes unmanaged, this will also send
+the virtual event \fB<<NoManagedChild>>\fR to the container; the container
 may choose to resize itself (or otherwise respond) to such a change.
-.VE TIP518
+.VE "TIP 518"
 .RE
 .TP
-\fBgrid size \fImaster\fR
+\fBgrid size \fIcontainer\fR
 .
-Returns the size of the grid (in columns then rows) for \fImaster\fR.
-The size is determined either by the \fIslave\fR occupying the largest
+Returns the size of the grid (in columns then rows) for \fIcontainer\fR.
+The size is determined either by the \fIcontent\fR occupying the largest
 row or column, or the largest column or row with a \fB\-minsize\fR,
 \fB\-weight\fR, or \fB\-pad\fR that is non-zero.
 .TP
-\fBgrid slaves \fImaster\fR ?\fI\-option value\fR?
+\fBgrid content \fIwindow\fR ?\fI\-option value\fR?
 .
-If no options are supplied, a list of all of the slaves in \fImaster\fR
-are returned, most recently manages first.
+If no options are supplied, a list of all of the content in \fIwindow\fR
+is returned, most recently managed first.
 \fIOption\fR can be either \fB\-row\fR or \fB\-column\fR which
-causes only the slaves in the row (or column) specified by \fIvalue\fR
+causes only the content in the row (or column) specified by \fIvalue\fR
 to be returned.
+.TP
+\fBgrid slaves \fIwindow\fR ?\fI\-option value\fR?
+.
+Synonym for . \fBgrid content \fIwindow\fR ?\fI\-option value\fR?
 .SH "RELATIVE PLACEMENT"
 .PP
 The \fBgrid\fR command contains a limited set of capabilities that
 permit layouts to be created without specifying the row and column
-information for each slave.  This permits slaves to be rearranged,
+information for each content.  This permits content to be rearranged,
 added, or removed without the need to explicitly specify row and
 column information.
-When no column or row information is specified for a \fIslave\fR,
+When no column or row information is specified for a \fIcontent\fR,
 default values are chosen for
 \fB\-column\fR, \fB\-row\fR, \fB\-columnspan\fR and \fB\-rowspan\fR
-at the time the \fIslave\fR is managed. The values are chosen
-based upon the current layout of the grid, the position of the \fIslave\fR
-relative to other \fIslave\fRs in the same grid command, and the presence
+at the time the \fIcontent\fR is managed. The values are chosen
+based upon the current layout of the grid, the position of the \fIcontent\fR
+relative to other \fIcontent\fRs in the same grid command, and the presence
 of the characters \fB\-\fR, \fBx\fR, and \fB^\fR in \fBgrid\fR
-command where \fIslave\fR names are normally expected.
+command where \fIcontent\fR names are normally expected.
 .RS
 .TP
 \fB\-\fR
 .
-This increases the \fB\-columnspan\fR of the \fIslave\fR to the left.  Several
+This increases the \fB\-columnspan\fR of the \fIcontent\fR to the left.  Several
 \fB\-\fR's in a row will successively increase the number of columns spanned. A \fB\-\fR
-may not follow a \fB^\fR or a \fBx\fR, nor may it be the first \fIslave\fR
+may not follow a \fB^\fR or a \fBx\fR, nor may it be the first \fIcontent\fR
 argument to \fBgrid configure\fR.
 .TP
 \fBx\fR
 .
-This leaves an empty column between the \fIslave\fR on the left and
-the \fIslave\fR on the right.
+This leaves an empty column between the \fIcontent\fR on the left and
+the \fIcontent\fR on the right.
 .TP
 \fB^\fR
 .
-This extends the \fB\-rowspan\fR of the \fIslave\fR above the \fB^\fR's
+This extends the \fB\-rowspan\fR of the \fIcontent\fR above the \fB^\fR's
 in the grid.  The number of \fB^\fR's in a row must match the number of
-columns spanned by the \fIslave\fR above it.
+columns spanned by the \fIcontent\fR above it.
 .RE
 .SH "THE GRID ALGORITHM"
 .PP
-The grid geometry manager lays out its slaves in three steps.
-In the first step, the minimum size needed to fit all of the slaves
+The grid geometry manager lays out its content in three steps.
+In the first step, the minimum size needed to fit all of the content
 is computed, then (if propagation is turned on), a request is made
-of the master window to become that size.
+of the container window to become that size.
 In the second step, the requested size is compared against the actual size
-of the master.  If the sizes are different, then spaces is added to or taken
+of the container.  If the sizes are different, then spaces is added to or taken
 away from the layout as needed.
-For the final step, each slave is positioned in its row(s) and column(s)
+For the final step, each content is positioned in its row(s) and column(s)
 based on the setting of its \fIsticky\fR flag.
 .PP
 To compute the minimum size of a layout, the grid geometry manager
-first looks at all slaves whose \fB\-columnspan\fR and \fB\-rowspan\fR values are one,
+first looks at all content whose \fB\-columnspan\fR and \fB\-rowspan\fR values are one,
 and computes the nominal size of each row or column to be either the
 \fIminsize\fR for that row or column, or the sum of the \fIpad\fRding
-plus the size of the largest slave, whichever is greater.  After that
+plus the size of the largest content, whichever is greater.  After that
 the rows or columns in each uniform group adapt to each other.  Then
-the slaves whose row-spans or column-spans are greater than one are
+the content whose row-spans or column-spans are greater than one are
 examined.  If a group of rows or columns need to be increased in size
-in order to accommodate these slaves, then extra space is added to each
+in order to accommodate these content, then extra space is added to each
 row or column in the group according to its \fIweight\fR.  For each
 group whose weights are all zero, the additional space is apportioned
 equally.
@@ -385,11 +388,11 @@ minimum size.  For example, if all rows or columns in a group have the
 same weight, then each row or column will have the same size as the
 largest row or column in the group.
 .PP
-For masters whose size is larger than the requested layout, the additional
+For containers whose size is larger than the requested layout, the additional
 space is apportioned according to the row and column weights.  If all of
-the weights are zero, the layout is placed within its master according to
+the weights are zero, the layout is placed within its container according to
 the \fIanchor\fR value.
-For masters whose size is smaller than the requested layout, space is taken
+For containers whose size is smaller than the requested layout, space is taken
 away from columns and rows according to their weights.  However, once a
 column or row shrinks to its minsize, its weight is taken to be zero.
 If more space needs to be removed from a layout than would be permitted, as
@@ -397,34 +400,34 @@ when all the rows or columns are at their minimum sizes, the layout is
 placed and clipped according to the \fIanchor\fR value.
 .SH "GEOMETRY PROPAGATION"
 .PP
-The grid geometry manager normally computes how large a master must be to
-just exactly meet the needs of its slaves, and it sets the
-requested width and height of the master to these dimensions.
+The grid geometry manager normally computes how large a container must be to
+just exactly meet the needs of its content, and it sets the
+requested width and height of the container to these dimensions.
 This causes geometry information to propagate up through a
 window hierarchy to a top-level window so that the entire
 sub-tree sizes itself to fit the needs of the leaf windows.
 However, the \fBgrid propagate\fR command may be used to
-turn off propagation for one or more masters.
+turn off propagation for one or more containers.
 If propagation is disabled then grid will not set
-the requested width and height of the master window.
-This may be useful if, for example, you wish for a master
+the requested width and height of the container window.
+This may be useful if, for example, you wish for a container
 window to have a fixed size that you specify.
-.SH "RESTRICTIONS ON MASTER WINDOWS"
+.SH "RESTRICTIONS ON CONTAINER WINDOWS"
 .PP
-The master for each slave must either be the slave's parent
-(the default) or a descendant of the slave's parent.
+The container for each content must either be the content's parent
+(the default) or a descendant of the content's parent.
 This restriction is necessary to guarantee that the
-slave can be placed over any part of its master that is
-visible without danger of the slave being clipped by its parent.
-In addition, all slaves in one call to \fBgrid\fR must have the same master.
+content can be placed over any part of its container that is
+visible without danger of the content being clipped by its parent.
+In addition, all content in one call to \fBgrid\fR must have the same container.
 .SH "STACKING ORDER"
 .PP
-If the master for a slave is not its parent then you must make sure
-that the slave is higher in the stacking order than the master.
-Otherwise the master will obscure the slave and it will appear as
-if the slave has not been managed correctly.
-The easiest way to make sure the slave is higher than the master is
-to create the master window first:  the most recently created window
+If the container for a content is not its parent then you must make sure
+that the content is higher in the stacking order than the container.
+Otherwise the container will obscure the content and it will appear as
+if the content has not been managed correctly.
+The easiest way to make sure the content is higher than the container is
+to create the container window first:  the most recently created window
 will be highest in the stacking order.
 .SH CREDITS
 .PP
diff --git a/doc/listbox.n b/doc/listbox.n
index 9e4a459..02bd169 100644
--- a/doc/listbox.n
+++ b/doc/listbox.n
@@ -383,7 +383,8 @@ total width of the listbox text is off-screen to the left.
 .
 This command shifts the view in the window left or right according to
 \fInumber\fR and \fIwhat\fR.
-\fINumber\fR must be an integer.
+\fINumber\fR must be an integer or a float, but if it is a float then
+it is converted to an integer, rounded away from 0.
 \fIWhat\fR must be either \fBpages\fR or \fBunits\fR or an abbreviation
 of one of these.
 If \fIwhat\fR is \fBpages\fR then the view adjusts by
diff --git a/doc/options.n b/doc/options.n
index 56e65dd..b1af80d 100644
--- a/doc/options.n
+++ b/doc/options.n
@@ -230,8 +230,7 @@ that is when the widget is empty. The placeholder text is displayed using
 the values of the \fB\-font\fR and \fB\-justify\fR options.
 .OP \-placeholderforeground placeholderForeground PlaceholderForeground
 Specifies the foreground color to use when the placeholder text is
-displayed. If this option is the empty string, the default color gray70
-is used.
+displayed. The default color is platform-specific.
 .OP \-relief relief Relief
 Specifies the 3-D effect desired for the widget.  Acceptable
 values are \fBraised\fR, \fBsunken\fR, \fBflat\fR, \fBridge\fR,
diff --git a/doc/pack.n b/doc/pack.n
index 980dd6e..da09a6d 100644
--- a/doc/pack.n
+++ b/doc/pack.n
@@ -22,16 +22,16 @@ packing them in order around the edges of the parent.
 The \fBpack\fR command can have any of several forms, depending
 on the \fIoption\fR argument:
 .TP
-\fBpack \fIslave \fR?\fIslave ...\fR? ?\fIoptions\fR?
+\fBpack \fIwindow \fR?\fIwindow ...\fR? ?\fIoptions\fR?
 If the first argument to \fBpack\fR is a window name (any value
 starting with
 .QW . ),
 then the command is processed in the same way as \fBpack configure\fR.
 .TP
-\fBpack configure \fIslave \fR?\fIslave ...\fR? ?\fIoptions\fR?
-The arguments consist of the names of one or more slave windows
+\fBpack configure \fIwindow \fR?\fIwindow ...\fR? ?\fIoptions\fR?
+The arguments consist of the names of one or more content windows
 followed by pairs of arguments that specify how
-to manage the slaves.
+to manage the content.
 See \fBTHE PACKER ALGORITHM\fR below for details on how the options
 are used by the packer.
 The following options are supported:
@@ -39,232 +39,236 @@ The following options are supported:
 .TP
 \fB\-after \fIother\fR
 \fIOther\fR must the name of another window.
-Use its master as the master for the slaves, and insert
-the slaves just after \fIother\fR in the packing order.
+Use its container as the container for the content, and insert
+the content just after \fIother\fR in the packing order.
 .TP
 \fB\-anchor \fIanchor\fR
 \fIAnchor\fR must be a valid anchor position such as \fBn\fR
-or \fBsw\fR; it specifies where to position each slave in its
+or \fBsw\fR; it specifies where to position each content in its
 parcel.
 Defaults to \fBcenter\fR.
 .TP
 \fB\-before \fIother\fR
 \fIOther\fR must the name of another window.
-Use its master as the master for the slaves, and insert
-the slaves just before \fIother\fR in the packing order.
+Use its container as the container for the content, and insert
+the content just before \fIother\fR in the packing order.
 .TP
 \fB\-expand \fIboolean\fR
-Specifies whether the slaves should be expanded to consume
-extra space in their master.
+Specifies whether the content should be expanded to consume
+extra space in their container.
 \fIBoolean\fR may have any proper boolean value, such as \fB1\fR
 or \fBno\fR.
 Defaults to 0.
 .TP
 \fB\-fill \fIstyle\fR
-If a slave's parcel is larger than its requested dimensions, this
-option may be used to stretch the slave.
+If a content's parcel is larger than its requested dimensions, this
+option may be used to stretch the content.
 \fIStyle\fR must have one of the following values:
 .RS
 .TP
 \fBnone\fR
-Give the slave its requested dimensions plus any internal padding
+Give the content its requested dimensions plus any internal padding
 requested with \fB\-ipadx\fR or \fB\-ipady\fR.  This is the default.
 .TP
 \fBx\fR
-Stretch the slave horizontally to fill the entire width of its
+Stretch the content horizontally to fill the entire width of its
 parcel (except leave external padding as specified by \fB\-padx\fR).
 .TP
 \fBy\fR
-Stretch the slave vertically to fill the entire height of its
+Stretch the content vertically to fill the entire height of its
 parcel (except leave external padding as specified by \fB\-pady\fR).
 .TP
 \fBboth\fR
-Stretch the slave both horizontally and vertically.
+Stretch the content both horizontally and vertically.
 .RE
 .TP
-\fB\-in \fIother\fR
-Insert the slave(s) at the end of the packing order for the master
-window given by \fIother\fR.
+\fB\-in \fIcontainer\fR
+Insert the window at the end of the packing order for the container
+window given by \fIcontainer\fR.
 .TP
 \fB\-ipadx \fIamount\fR
 \fIAmount\fR specifies how much horizontal internal padding to
-leave on each side of the slave(s).
+leave on each side of the content.
 \fIAmount\fR must be a valid screen distance, such as \fB2\fR or \fB.5c\fR.
 It defaults to 0.
 .TP
 \fB\-ipady \fIamount\fR
 \fIAmount\fR specifies how much vertical internal padding to
-leave on each side of the slave(s).
+leave on each side of the content.
 \fIAmount\fR  defaults to 0.
 .TP
 \fB\-padx \fIamount\fR
 \fIAmount\fR specifies how much horizontal external padding to
-leave on each side of the slave(s).  \fIAmount\fR may be a list
+leave on each side of the content.  \fIAmount\fR may be a list
 of two values to specify padding for left and right separately.
 \fIAmount\fR defaults to 0.
 .TP
 \fB\-pady \fIamount\fR
 \fIAmount\fR specifies how much vertical external padding to
-leave on each side of the slave(s).  \fIAmount\fR may be a list
+leave on each side of the content.  \fIAmount\fR may be a list
 of two values to specify padding for top and bottom separately.
 \fIAmount\fR defaults to 0.
 .TP
 \fB\-side \fIside\fR
-Specifies which side of the master the slave(s) will be packed against.
+Specifies which side of the container the content will be packed against.
 Must be \fBleft\fR, \fBright\fR, \fBtop\fR, or \fBbottom\fR.
 Defaults to \fBtop\fR.
 .LP
 If no \fB\-in\fR, \fB\-after\fR or \fB\-before\fR option is specified
-then each of the slaves will be inserted at the end of the packing list
+then each of the content will be inserted at the end of the packing list
 for its parent unless it is already managed by the packer (in which
 case it will be left where it is).
-If one of these options is specified then all the slaves will be
+If one of these options is specified then all the content will be
 inserted at the specified point.
-If any of the slaves are already managed by the geometry manager
+If any of the content are already managed by the geometry manager
 then any unspecified options for them retain their previous values rather
 than receiving default values.
 .RE
 .TP
-\fBpack forget \fIslave \fR?\fIslave ...\fR?
-Removes each of the \fIslave\fRs from the packing order for its
-master and unmaps their windows.
-The slaves will no longer be managed by the packer.
+\fBpack forget \fIwindow \fR?\fIwindow ...\fR?
+Removes each of the \fIwindow\fRs from the packing order for its
+container and unmaps their windows.
+The content will no longer be managed by the packer.
 .RS
 .PP
-.VS TIP518
-If the last slave of the master becomes unmanaged, this will also send
-the virtual event \fB<<NoManagedChild>>\fR to the master; the master
+.VS "TIP 518"
+If the last content window of the container becomes unmanaged, this will also send
+the virtual event \fB<<NoManagedChild>>\fR to the container; the container
 may choose to resize itself (or otherwise respond) to such a change.
-.VE TIP518
+.VE "TIP 518"
 .RE
 .TP
-\fBpack info \fIslave\fR
+\fBpack info \fIwindow\fR
 Returns a list whose elements are the current configuration state of
-the slave given by \fIslave\fR in the same option-value form that
+the window given by \fIwindow\fR in the same option-value form that
 might be specified to \fBpack configure\fR.
 The first two elements of the list are
-.QW "\fB\-in \fImaster\fR"
-where \fImaster\fR is the slave's master.
+.QW "\fB\-in \fIcontainer\fR"
+where \fIcontainer\fR is the window's container.
 .TP
-\fBpack propagate \fImaster\fR ?\fIboolean\fR?
+\fBpack propagate \fIcontainer\fR ?\fIboolean\fR?
 If \fIboolean\fR has a true boolean value such as \fB1\fR or \fBon\fR
-then propagation is enabled for \fImaster\fR, which must be a window
+then propagation is enabled for \fIcontainer\fR, which must be a window
 name (see \fBGEOMETRY PROPAGATION\fR below).
 If \fIboolean\fR has a false boolean value then propagation is
-disabled for \fImaster\fR.
+disabled for \fIcontainer\fR.
 In either of these cases an empty string is returned.
 If \fIboolean\fR is omitted then the command returns \fB0\fR or
 \fB1\fR to indicate whether propagation is currently enabled
-for \fImaster\fR.
+for \fIcontainer\fR.
 Propagation is enabled by default.
 .TP
-\fBpack slaves \fImaster\fR
-Returns a list of all of the slaves in the packing order for \fImaster\fR.
-The order of the slaves in the list is the same as their order in
+\fBpack content \fIwindow\fR
+Returns a list of all of the content windows in the packing order for \fIwindow\fR.
+The order of the content windows in the list is the same as their order in
 the packing order.
-If \fImaster\fR has no slaves then an empty string is returned.
+If \fIwindow\fR has no content then an empty string is returned.
+.TP
+\fBpack slaves \fIwindow\fR
+.
+Synonym for . \fBpack content \fIwindow\fR
 .SH "THE PACKER ALGORITHM"
 .PP
-For each master the packer maintains an ordered list of slaves
-called the \fIpacking list\fR.
+For each container the packer maintains an ordered list of content
+windows called the \fIpacking list\fR.
 The \fB\-in\fR, \fB\-after\fR, and \fB\-before\fR configuration
-options are used to specify the master for each slave and the slave's
+options are used to specify the container for each content and the content's
 position in the packing list.
-If none of these options is given for a slave then the slave
+If none of these options is given for a content then the content
 is added to the end of the packing list for its parent.
 .PP
-The packer arranges the slaves for a master by scanning the
+The packer arranges the content windows for a container by scanning the
 packing list in order.
-At the time it processes each slave, a rectangular area within
-the master is still unallocated.
-This area is called the \fIcavity\fR;  for the first slave it
-is the entire area of the master.
+At the time it processes each content, a rectangular area within
+the container is still unallocated.
+This area is called the \fIcavity\fR;  for the first content it
+is the entire area of the container.
 .PP
-For each slave the packer carries out the following steps:
+For each content the packer carries out the following steps:
 .IP [1]
-The packer allocates a rectangular \fIparcel\fR for the slave
-along the side of the cavity given by the slave's \fB\-side\fR option.
+The packer allocates a rectangular \fIparcel\fR for the content
+along the side of the cavity given by the content's \fB\-side\fR option.
 If the side is top or bottom then the width of the parcel is
 the width of the cavity and its height is the requested height
-of the slave plus the \fB\-ipady\fR and \fB\-pady\fR options.
+of the content plus the \fB\-ipady\fR and \fB\-pady\fR options.
 For the left or right side the height of the parcel is
 the height of the cavity and the width is the requested width
-of the slave plus the \fB\-ipadx\fR and \fB\-padx\fR options.
+of the content plus the \fB\-ipadx\fR and \fB\-padx\fR options.
 The parcel may be enlarged further because of the \fB\-expand\fR
 option (see \fBEXPANSION\fR below)
 .IP [2]
-The packer chooses the dimensions of the slave.
-The width will normally be the slave's requested width plus
+The packer chooses the dimensions of the content.
+The width will normally be the content's requested width plus
 twice its \fB\-ipadx\fR option and the height will normally be
-the slave's requested height plus twice its \fB\-ipady\fR
+the content's requested height plus twice its \fB\-ipady\fR
 option.
 However, if the \fB\-fill\fR option is \fBx\fR or \fBboth\fR
-then the width of the slave is expanded to fill the width of the parcel,
+then the width of the content is expanded to fill the width of the parcel,
 minus twice the \fB\-padx\fR option.
 If the \fB\-fill\fR option is \fBy\fR or \fBboth\fR
-then the height of the slave is expanded to fill the width of the parcel,
+then the height of the content is expanded to fill the width of the parcel,
 minus twice the \fB\-pady\fR option.
 .IP [3]
-The packer positions the slave over its parcel.
-If the slave is smaller than the parcel then the \fB\-anchor\fR
-option determines where in the parcel the slave will be placed.
+The packer positions the content over its parcel.
+If the content is smaller than the parcel then the \fB\-anchor\fR
+option determines where in the parcel the content will be placed.
 If \fB\-padx\fR or \fB\-pady\fR is non-zero, then the given
 amount of external padding will always be left between the
-slave and the edges of the parcel.
+content and the edges of the parcel.
 .PP
-Once a given slave has been packed, the area of its parcel
+Once a given content has been packed, the area of its parcel
 is subtracted from the cavity, leaving a smaller rectangular
-cavity for the next slave.
-If a slave does not use all of its parcel, the unused space
-in the parcel will not be used by subsequent slaves.
+cavity for the next content.
+If a content does not use all of its parcel, the unused space
+in the parcel will not be used by subsequent content.
 If the cavity should become too small to meet the needs of
-a slave then the slave will be given whatever space is
+a content then the content will be given whatever space is
 left in the cavity.
-If the cavity shrinks to zero size, then all remaining slaves
+If the cavity shrinks to zero size, then all remaining content
 on the packing list will be unmapped from the screen until
-the master window becomes large enough to hold them again.
+the container window becomes large enough to hold them again.
 .SS "EXPANSION"
 .PP
-If a master window is so large that there will be extra space
-left over after all of its slaves have been packed, then the
-extra space is distributed uniformly among all of the slaves
+If a container window is so large that there will be extra space
+left over after all of its content have been packed, then the
+extra space is distributed uniformly among all of the content
 for which the \fB\-expand\fR option is set.
 Extra horizontal space is distributed among the expandable
-slaves whose \fB\-side\fR is \fBleft\fR or \fBright\fR,
+content whose \fB\-side\fR is \fBleft\fR or \fBright\fR,
 and extra vertical space is distributed among the expandable
-slaves whose \fB\-side\fR is \fBtop\fR or \fBbottom\fR.
+content whose \fB\-side\fR is \fBtop\fR or \fBbottom\fR.
 .SS "GEOMETRY PROPAGATION"
 .PP
-The packer normally computes how large a master must be to
-just exactly meet the needs of its slaves, and it sets the
-requested width and height of the master to these dimensions.
+The packer normally computes how large a container must be to
+just exactly meet the needs of its content, and it sets the
+requested width and height of the container to these dimensions.
 This causes geometry information to propagate up through a
 window hierarchy to a top-level window so that the entire
 sub-tree sizes itself to fit the needs of the leaf windows.
 However, the \fBpack propagate\fR command may be used to
-turn off propagation for one or more masters.
+turn off propagation for one or more containers.
 If propagation is disabled then the packer will not set
 the requested width and height of the packer.
-This may be useful if, for example, you wish for a master
+This may be useful if, for example, you wish for a container
 window to have a fixed size that you specify.
-.SH "RESTRICTIONS ON MASTER WINDOWS"
+.SH "RESTRICTIONS ON CONTAINER WINDOWS"
 .PP
-The master for each slave must either be the slave's parent
-(the default) or a descendant of the slave's parent.
+The container for each content must either be the content's parent
+(the default) or a descendant of the content's parent.
 This restriction is necessary to guarantee that the
-slave can be placed over any part of its master that is
-visible without danger of the slave being clipped by its parent.
+content can be placed over any part of its container that is
+visible without danger of the content being clipped by its parent.
 .SH "PACKING ORDER"
 .PP
-If the master for a slave is not its parent then you must make sure
-that the slave is higher in the stacking order than the master.
-Otherwise the master will obscure the slave and it will appear as
-if the slave has not been packed correctly.
-The easiest way to make sure the slave is higher than the master is
-to create the master window first:  the most recently created window
+If the container for a content is not its parent then you must make sure
+that the content is higher in the stacking order than the container.
+Otherwise the container will obscure the content and it will appear as
+if the content has not been packed correctly.
+The easiest way to make sure the content is higher than the container is
+to create the container window first:  the most recently created window
 will be highest in the stacking order.
 Or, you can use the \fBraise\fR and \fBlower\fR commands to change
-the stacking order of either the master or the slave.
+the stacking order of either the container or the content.
 .SH EXAMPLE
 .PP
 .CS
diff --git a/doc/panedwindow.n b/doc/panedwindow.n
index a3c63a0..cad256a 100644
--- a/doc/panedwindow.n
+++ b/doc/panedwindow.n
@@ -330,7 +330,7 @@ When a pane is resized from outside (e.g. it is packed to expand and
 fill, and the containing toplevel is resized), space is added to the final
 (rightmost or bottommost) pane in the window.
 .PP
-Unlike slave windows managed by e.g. pack or grid, the panes managed by a
+Unlike child windows managed by e.g. pack or grid, the panes managed by a
 panedwindow do not change width or height to accommodate changes in the
 requested widths or heights of the panes, once these have become mapped.
 Therefore it may be advisable, particularly when creating layouts
diff --git a/doc/place.n b/doc/place.n
index 3ebaf20..d887ee7 100644
--- a/doc/place.n
+++ b/doc/place.n
@@ -18,26 +18,26 @@ place \- Geometry manager for fixed or rubber-sheet placement
 .PP
 The placer is a geometry manager for Tk.
 It provides simple fixed placement of windows, where you specify
-the exact size and location of one window, called the \fIslave\fR,
-within another window, called the \fImaster\fR.
+the exact size and location of one window, called the \fIcontent\fR,
+within another window, called the \fIcontainer\fR.
 The placer also provides rubber-sheet placement, where you specify the
-size and location of the slave in terms of the dimensions of
-the master, so that the slave changes size and location
-in response to changes in the size of the master.
+size and location of the content in terms of the dimensions of
+the container, so that the content changes size and location
+in response to changes in the size of the container.
 Lastly, the placer allows you to mix these styles of placement so
-that, for example, the slave has a fixed width and height but is
-centered inside the master.
+that, for example, the content has a fixed width and height but is
+centered inside the container.
 .PP
 .TP
 \fBplace \fIwindow option value \fR?\fIoption value ...\fR?
-Arrange for the placer to manage the geometry of a slave whose
+Arrange for the placer to manage the geometry of a content whose
 pathName is \fIwindow\fR.  The remaining arguments consist of one or
 more \fIoption\-value\fR pairs that specify the way in which
 \fIwindow\fR's geometry is managed.  \fIOption\fR may have any of the
 values accepted by the \fBplace configure\fR command.
 .TP
 \fBplace configure \fIwindow \fR?\fIoption\fR? ?\fIvalue option value ...\fR?
-Query or modify the geometry options of the slave given by
+Query or modify the geometry options of the content given by
 \fIwindow\fR.  If no \fIoption\fR is specified, this command returns a
 list describing the available options (see \fBTk_ConfigureInfo\fR for
 information on the format of this list).  If \fIoption\fR is specified
@@ -59,27 +59,27 @@ The anchor point is in terms of the outer area of \fIwindow\fR
 including its border, if any.
 Thus if \fIwhere\fR is \fBse\fR then the lower-right corner of
 \fIwindow\fR's border will appear at the given (x,y) location
-in the master.
+in the container.
 The anchor position defaults to \fBnw\fR.
 .TP
 \fB\-bordermode \fImode\fR
 \fIMode\fR determines the degree to which borders within the
-master are used in determining the placement of the slave.
+container are used in determining the placement of the content.
 The default and most common value is \fBinside\fR.
-In this case the placer considers the area of the master to
-be the innermost area of the master, inside any border:
+In this case the placer considers the area of the container to
+be the innermost area of the container, inside any border:
 an option of \fB\-x 0\fR corresponds to an x-coordinate just
 inside the border and an option of \fB\-relwidth 1.0\fR
-means \fIwindow\fR will fill the area inside the master's
+means \fIwindow\fR will fill the area inside the container's
 border.
 .RS
 .PP
 If \fImode\fR is \fBoutside\fR then the placer considers
-the area of the master to include its border;
+the area of the container to include its border;
 this mode is typically used when placing \fIwindow\fR
-outside its master, as with the options \fB\-x 0 \-y 0 \-anchor ne\fR.
+outside its container, as with the options \fB\-x 0 \-y 0 \-anchor ne\fR.
 Lastly, \fImode\fR may be specified as \fBignore\fR, in which
-case borders are ignored:  the area of the master is considered
+case borders are ignored:  the area of the container is considered
 to be its official X area, which includes any internal border but
 no external border.  A bordermode of \fBignore\fR is probably
 not very useful.
@@ -94,61 +94,61 @@ If \fIsize\fR is an empty string, or if no \fB\-height\fR or
 \fB\-relheight\fR option is specified, then the height requested
 internally by the window will be used.
 .TP
-\fB\-in \fImaster\fR
-\fIMaster\fR specifies the path name of the window relative
+\fB\-in \fIcontainer\fR
+\fIContainer\fR specifies the path name of the window relative
 to which \fIwindow\fR is to be placed.
-\fIMaster\fR must either be \fIwindow\fR's parent or a descendant
+\fIContainer\fR must either be \fIwindow\fR's parent or a descendant
 of \fIwindow\fR's parent.
-In addition, \fImaster\fR and \fIwindow\fR must both be descendants
+In addition, \fIcontainer\fR and \fIwindow\fR must both be descendants
 of the same top-level window.
 These restrictions are necessary to guarantee
-that \fIwindow\fR is visible whenever \fImaster\fR is visible.
-If this option is not specified then the master defaults to
+that \fIwindow\fR is visible whenever \fIcontainer\fR is visible.
+If this option is not specified then the other window defaults to
 \fIwindow\fR's parent.
 .TP
 \fB\-relheight \fIsize\fR
 \fISize\fR specifies the height for \fIwindow\fR.
 In this case the height is specified as a floating-point number
-relative to the height of the master: 0.5 means \fIwindow\fR will
-be half as high as the master, 1.0 means \fIwindow\fR will have
-the same height as the master, and so on.
-If both \fB\-height\fR and \fB\-relheight\fR are specified for a slave,
+relative to the height of the container: 0.5 means \fIwindow\fR will
+be half as high as the container, 1.0 means \fIwindow\fR will have
+the same height as the container, and so on.
+If both \fB\-height\fR and \fB\-relheight\fR are specified for a content,
 their values are summed.  For example, \fB\-relheight 1.0 \-height \-2\fR
-makes the slave 2 pixels shorter than the master.
+makes the content 2 pixels shorter than the container.
 .TP
 \fB\-relwidth \fIsize\fR
 \fISize\fR specifies the width for \fIwindow\fR.
 In this case the width is specified as a floating-point number
-relative to the width of the master: 0.5 means \fIwindow\fR will
-be half as wide as the master, 1.0 means \fIwindow\fR will have
-the same width as the master, and so on.
-If both \fB\-width\fR and \fB\-relwidth\fR are specified for a slave,
+relative to the width of the container: 0.5 means \fIwindow\fR will
+be half as wide as the container, 1.0 means \fIwindow\fR will have
+the same width as the container, and so on.
+If both \fB\-width\fR and \fB\-relwidth\fR are specified for a content,
 their values are summed.  For example, \fB\-relwidth 1.0 \-width 5\fR
-makes the slave 5 pixels wider than the master.
+makes the content 5 pixels wider than the container.
 .TP
 \fB\-relx \fIlocation\fR
-\fILocation\fR specifies the x-coordinate within the master window
+\fILocation\fR specifies the x-coordinate within the container window
 of the anchor point for \fIwindow\fR.
 In this case the location is specified in a relative fashion
 as a floating-point number:  0.0 corresponds to the left edge
-of the master and 1.0 corresponds to the right edge of the master.
+of the container and 1.0 corresponds to the right edge of the container.
 \fILocation\fR need not be in the range 0.0\-1.0.
-If both \fB\-x\fR and \fB\-relx\fR are specified for a slave
+If both \fB\-x\fR and \fB\-relx\fR are specified for a content
 then their values are summed.  For example, \fB\-relx 0.5 \-x \-2\fR
-positions the left edge of the slave 2 pixels to the left of the
-center of its master.
+positions the left edge of the content 2 pixels to the left of the
+center of its container.
 .TP
 \fB\-rely \fIlocation\fR
-\fILocation\fR specifies the y-coordinate within the master window
+\fILocation\fR specifies the y-coordinate within the container window
 of the anchor point for \fIwindow\fR.
 In this case the value is specified in a relative fashion
 as a floating-point number:  0.0 corresponds to the top edge
-of the master and 1.0 corresponds to the bottom edge of the master.
+of the container and 1.0 corresponds to the bottom edge of the container.
 \fILocation\fR need not be in the range 0.0\-1.0.
-If both \fB\-y\fR and \fB\-rely\fR are specified for a slave
+If both \fB\-y\fR and \fB\-rely\fR are specified for a content
 then their values are summed.  For example, \fB\-rely 0.5 \-x 3\fR
-positions the top edge of the slave 3 pixels below the
-center of its master.
+positions the top edge of the content 3 pixels below the
+center of its container.
 .TP
 \fB\-width \fIsize\fR
 \fISize\fR specifies the width for \fIwindow\fR in screen units
@@ -160,18 +160,18 @@ or \fB\-relwidth\fR option is specified, then the width requested
 internally by the window will be used.
 .TP
 \fB\-x \fIlocation\fR
-\fILocation\fR specifies the x-coordinate within the master window
+\fILocation\fR specifies the x-coordinate within the container window
 of the anchor point for \fIwindow\fR.
 The location is specified in screen units (i.e. any of the forms
 accepted by \fBTk_GetPixels\fR) and need not lie within the bounds
-of the master window.
+of the container window.
 .TP
 \fB\-y \fIlocation\fR
-\fILocation\fR specifies the y-coordinate within the master window
+\fILocation\fR specifies the y-coordinate within the container window
 of the anchor point for \fIwindow\fR.
 The location is specified in screen units (i.e. any of the forms
 accepted by \fBTk_GetPixels\fR) and need not lie within the bounds
-of the master window.
+of the container window.
 .PP
 If the same value is specified separately with
 two different options, such as \fB\-x\fR and \fB\-relx\fR, then
@@ -191,9 +191,13 @@ The list consists of \fIoption\-value\fR pairs in exactly the
 same form as might be specified to the \fBplace configure\fR
 command.
 .TP
+\fBplace content \fIwindow\fR
+Returns a list of all the content windows for which \fIwindow\fR is the container.
+If there is no content for \fIwindow\fR then an empty string is returned.
+.TP
 \fBplace slaves \fIwindow\fR
-Returns a list of all the slave windows for which \fIwindow\fR is the master.
-If there are no slaves for \fIwindow\fR then an empty string is returned.
+.
+Synonym for . \fBplace content \fIwindow\fR
 .PP
 If the configuration of a window has been retrieved with
 \fBplace info\fR, that configuration can be restored later by
@@ -202,8 +206,8 @@ for the window and then invoking \fBplace configure\fR with
 the saved information.
 .SH "FINE POINTS"
 .PP
-It is not necessary for the master window to be the parent
-of the slave window.
+It is not necessary for the container window to be the parent
+of the content window.
 This feature is useful in at least two situations.
 First, for complex window layouts it means you can create a
 hierarchy of subwindows whose only purpose
@@ -221,7 +225,7 @@ can specify options for the real children
 without being aware of the structure of the geometry-management
 hierarchy.
 .PP
-A second reason for having a master different than the slave's
+A second reason for having a container different than the content's
 parent is to tie two siblings together.
 For example, the placer can be used to force a window always to
 be positioned centered just below one of its
@@ -229,12 +233,12 @@ siblings by specifying the configuration
 .CS
 \fB\-in \fIsibling\fB \-relx 0.5 \-rely 1.0 \-anchor n \-bordermode outside\fR
 .CE
-Whenever the sibling is repositioned in the future, the slave
+Whenever the sibling is repositioned in the future, the content
 will be repositioned as well.
 .PP
 Unlike many other geometry managers (such as the packer)
 the placer does not make any attempt to manipulate the geometry of
-the master windows or the parents of slave windows (i.e. it does not
+the container windows or the parents of content windows (i.e. it does not
 set their requested sizes).
 To control the sizes of these windows, make them windows like
 frames and canvases that provide configuration options for this purpose.
@@ -249,7 +253,7 @@ label .l \-text "In the\enMiddle!" \-bg black \-fg white
 .SH "SEE ALSO"
 grid(n), pack(n)
 .SH KEYWORDS
-geometry manager, height, location, master, place, rubber sheet, slave, width
+geometry manager, height, location, container, place, rubber sheet, content, width
 '\" Local Variables:
 '\" mode: nroff
 '\" End:
diff --git a/doc/scrollbar.n b/doc/scrollbar.n
index ba11f5c..4f808f4 100644
--- a/doc/scrollbar.n
+++ b/doc/scrollbar.n
@@ -223,7 +223,8 @@ it is slightly less than what fits in the window, so that there
 is a slight overlap between the old and new views.
 \fINumber\fR is either 1, which means the next page should
 become visible, or \-1, which means that the previous page should
-become visible.
+become visible. Fractional number are rounded away from 0, so
+scrolling 0.001 pages has the same effect as scrolling 1 page.
 .TP
 \fIprefix \fBscroll \fInumber \fBunits\fR
 .
@@ -232,7 +233,9 @@ The units are defined in whatever way makes sense for the widget,
 such as characters or lines in a text widget.
 \fINumber\fR is either 1, which means one unit should scroll off
 the top or left of the window, or \-1, which means that one unit
-should scroll off the bottom or right of the window.
+should scroll off the bottom or right of the window. Fractional
+numbers are rounded away from 0, so scrolling 0.001 units has
+the same effect as scrolling 1 unit.
 .SH "OLD COMMAND SYNTAX"
 .PP
 In versions of Tk before 4.0, the \fBset\fR and \fBget\fR widget
diff --git a/doc/selection.n b/doc/selection.n
index eb199ef..a26c5d9 100644
--- a/doc/selection.n
+++ b/doc/selection.n
@@ -150,7 +150,7 @@ A GUI event, for example \fB<<PasteSelection>>\fR, can copy the \fBPRIMARY\fR se
 .PP
 On X11, the \fBPRIMARY\fR selection is a system-wide feature of the X server, allowing communication between different processes that are X11 clients.
 .PP
-On Windows, the \fBPRIMARY\fR selection is not provided by the system, but only by Tk, and so it is shared only between windows of a parent interpreter and its unsafe child interpreters.  It is not shared between interpreters in different processes or different threads.  Each parent interpreter has a separate \fBPRIMARY\fR selection that is shared only with its unsafe slaves.
+On Windows, the \fBPRIMARY\fR selection is not provided by the system, but only by Tk, and so it is shared only between windows of a parent interpreter and its child interpreters.  It is not shared between interpreters in different processes or different threads.  Each parent interpreter has a separate \fBPRIMARY\fR selection that is shared only with its child interpreters which are not safe interpreters.
 .PP
 .SH SECURITY
 .PP
diff --git a/doc/spinbox.n b/doc/spinbox.n
index 1f556ba..6c8801d 100644
--- a/doc/spinbox.n
+++ b/doc/spinbox.n
@@ -470,7 +470,8 @@ way through the text appears at the left edge of the window.
 \fIpathName \fBxview scroll \fInumber what\fR
 This command shifts the view in the window left or right according to
 \fInumber\fR and \fIwhat\fR.
-\fINumber\fR must be an integer.
+\fINumber\fR must be an integer or a float, but if it is a float then
+it is converted to an integer, rounded away from 0.
 \fIWhat\fR must be either \fBpages\fR or \fBunits\fR or an abbreviation
 of one of these.
 If \fIwhat\fR is \fBpages\fR then the view adjusts by \fInumber\fR
diff --git a/doc/ttk_combobox.n b/doc/ttk_combobox.n
index c36b640..b6eddd8 100644
--- a/doc/ttk_combobox.n
+++ b/doc/ttk_combobox.n
@@ -19,7 +19,7 @@ the user may select the value of the text field from among the
 values in the list.
 .SO ttk_widget
 \-class	\-cursor	\-takefocus
-\-style	\-placeholder
+\-style	\-placeholder	\-placeholderforeground
 .SE
 .\" ALSO: Other entry widget options
 .SH "WIDGET-SPECIFIC OPTIONS"
@@ -119,12 +119,16 @@ are:
 .RS
 Can only be changed when using non-native and non-graphical themes.
 .RE
+\fB\-insertcolor\fP \fIcolor\fP
+.br
 \fB\-insertwidth\fP \fIamount\fP
 .br
 \fB\-lightcolor\fP \fIcolor\fP
 .br
 \fB\-padding\fP \fIpadding\fP
 .br
+\fB\-placeholderforeground\fP \fIcolor\fP
+.br
 \fB\-postoffset\fP \fIpadding\fP
 .br
 \fB\-selectbackground\fP \fIcolor\fP
diff --git a/doc/ttk_entry.n b/doc/ttk_entry.n
index 6d4a015..816c08b 100644
--- a/doc/ttk_entry.n
+++ b/doc/ttk_entry.n
@@ -26,7 +26,7 @@ standard \fB\-xscrollcommand\fR option and \fBxview\fR widget command.
 \-class	\-cursor
 \-font	\-foreground
 \-style
-\-takefocus	\-xscrollcommand	\-placeholder
+\-takefocus	\-xscrollcommand	\-placeholder	\-placeholderforeground
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-exportselection exportSelection ExportSelection
@@ -424,12 +424,16 @@ Some themes use a graphical background and their field background colors cannot
 .RE
 \fB\-foreground\fP \fIcolor\fP
 .br
+\fB\-insertcolor\fP \fIcolor\fP
+.br
 \fB\-insertwidth\fP \fIamount\fP
 .br
 \fB\-lightcolor\fP \fIcolor\fP
 .br
 \fB\-padding\fP \fIpadding\fP
 .br
+\fB\-placeholderforeground\fP \fIcolor\fP
+.br
 \fB\-relief\fP \fIrelief\fP
 .br
 \fB\-selectbackground\fP \fIcolor\fP
diff --git a/doc/ttk_notebook.n b/doc/ttk_notebook.n
index 341053f..bc6c95a 100644
--- a/doc/ttk_notebook.n
+++ b/doc/ttk_notebook.n
@@ -20,7 +20,7 @@ ttk::notebook \- Multi-paned container widget
 .SH DESCRIPTION
 A \fBttk::notebook\fR widget manages a collection of windows
 and displays a single one at a time.
-Each slave window is associated with a \fItab\fR,
+Each content window is associated with a \fItab\fR,
 which the user may select to change the currently-displayed window.
 .SO ttk_widget
 \-class	\-cursor	\-takefocus
@@ -56,11 +56,11 @@ Either \fBnormal\fR, \fBdisabled\fR or \fBhidden\fR.
 If \fBdisabled\fR, then the tab is not selectable.
 If \fBhidden\fR, then the tab is not shown.
 .OP \-sticky sticky Sticky
-Specifies how the slave window is positioned within the pane area.
+Specifies how the content window is positioned within the pane area.
 Value is a string containing zero or more of the characters
 \fBn, s, e,\fR or \fBw\fR.
 Each letter refers to a side (north, south, east, or west)
-that the slave window will
+that the content window will
 .QW stick
 to, as per the \fBgrid\fR geometry manager.
 .OP \-padding padding Padding
@@ -86,7 +86,7 @@ any of the following forms:
 .IP \(bu
 An integer between zero and the number of tabs;
 .IP \(bu
-The name of a slave window;
+The name of a content window;
 .IP \(bu
 A positional specification of the form
 .QW @\fIx\fR,\fIy\fR ,
@@ -153,7 +153,7 @@ See \fBTAB OPTIONS\fR for the list of available options.
 .TP
 \fIpathname \fBselect\fR ?\fItabid\fR?
 Selects the specified tab.
-The associated slave window will be displayed,
+The associated content window will be displayed,
 and the previously-selected window (if different) is unmapped.
 If \fItabid\fR is omitted, returns the widget name of the
 currently selected pane.
diff --git a/doc/ttk_spinbox.n b/doc/ttk_spinbox.n
index c18f987..49dc8ff 100644
--- a/doc/ttk_spinbox.n
+++ b/doc/ttk_spinbox.n
@@ -22,7 +22,7 @@ of the \fBttk::entry\fR widget including support of the
 to a Tcl variable.
 .SO ttk_widget
 \-class	\-cursor	\-state	\-style
-\-takefocus	\-xscrollcommand	\-placeholder
+\-takefocus	\-xscrollcommand	\-placeholder	\-placeholderforeground
 .SE
 .SO ttk_entry
 \-validate	\-validatecommand
@@ -107,10 +107,16 @@ value is specified for \fB\-fieldbackground\fP. Otherwise it is ignored.
 .br
 \fB\-foreground\fP \fIcolor\fP
 .br
+\fB\-insertcolor\fP \fIcolor\fP
+.br
+\fB\-insertwidth\fP \fIamount\fP
+.br
 \fB\-lightcolor\fP \fIcolor\fP
 .br
 \fB\-padding\fP \fIpadding\fP
 .br
+\fB\-placeholderforeground\fP \fIcolor\fP
+.br
 \fB\-selectbackground\fP \fIcolor\fP
 .br
 \fB\-selectforeground\fP \fIcolor\fP
diff --git a/doc/ttk_style.n b/doc/ttk_style.n
index 312de1b..a8ecf06 100644
--- a/doc/ttk_style.n
+++ b/doc/ttk_style.n
@@ -152,7 +152,7 @@ as \fB\-expand\fR 1).
 \fB\-sticky\fR \fB[\fInswe\fB]\fR
 Specifies the actual parcel position and size inside the allocated parcel.
 If specified as an empty string then the actual parcel is centered in
-the allocated parcel. Default is \fBnswe\fR. 
+the allocated parcel. Default is \fBnswe\fR.
 .\" -unit should remain undocumented for now (dubious usefulness)
 .\" .TP
 .\" \fB\-unit\fR \fIboolean\fR
diff --git a/doc/ttk_widget.n b/doc/ttk_widget.n
index a1393bf..06cb83c 100644
--- a/doc/ttk_widget.n
+++ b/doc/ttk_widget.n
@@ -152,13 +152,14 @@ to zero, then automatic wrapping is not performed; otherwise
 the text is split into lines such that no line is longer
 than the specified value.
 .SH "ENTRY OPTIONS"
-The following option is supported by entry, spinbox and combobox:
+The following options are supported by entry, spinbox and combobox:
 .OP \-placeholder placeHolder PlaceHolder
 Specifies a help text string to display if no text is otherwise displayed,
 that is when the widget is empty. The placeholder text is displayed using
-the values of the \fB\-font\fR and \fB\-justify\fR options. The foreground
-color of the placeholder text can be changed using the
-\fB\-placeholderforeground\fR style option.
+the values of the \fB\-font\fR, \fB\-justify\fR and
+\fB\-placeholderforeground\fR options.
+.OP \-placeholderforeground placeHolderForeground PlaceHolderForeground
+Specifies the foreground color of the placeholder text.
 .SH "COMPATIBILITY OPTIONS"
 This option is only available for themed widgets that have
 .QW corresponding
@@ -255,7 +256,8 @@ way through the content appears at the left edge of the window.
 \fIpathName \fBxview scroll \fInumber what\fR
 This command shifts the view in the window left or right according to
 \fInumber\fR and \fIwhat\fR.
-\fINumber\fR must be an integer.
+\fINumber\fR must be an integer or a float, but if it is a float then
+it is converted to an integer, rounded away from 0.
 \fIWhat\fR must be either \fBpages\fR or \fBunits\fR.
 '\" or an abbreviation of one of these, but we don't document that.
 If \fIwhat\fR is
diff --git a/doc/wm.n b/doc/wm.n
index aae68d9..5e6c394 100644
--- a/doc/wm.n
+++ b/doc/wm.n
@@ -708,18 +708,18 @@ case the command returns an empty string.  If \fIstring\fR is not
 specified then the command returns the current title for the
 \fIwindow\fR.  The title for a window defaults to its name.
 .TP
-\fBwm transient \fIwindow\fR ?\fImaster\fR?
+\fBwm transient \fIwindow\fR ?\fIcontainer\fR?
 .
-If \fImaster\fR is specified, then the window manager is informed that
+If \fIcontainer\fR is specified, then the window manager is informed that
 \fIwindow\fR is a transient window (e.g. pull-down menu) working on
-behalf of \fImaster\fR (where \fImaster\fR is the path name for a
-top-level window).  If \fImaster\fR is specified as an empty string
+behalf of \fIcontainer\fR (where \fIcontainer\fR is the path name for a
+top-level window).  If \fIcontainer\fR is specified as an empty string
 then \fIwindow\fR is marked as not being a transient window any more.
 Otherwise the command returns the path name of \fIwindow\fR's current
-master, or an empty string if \fIwindow\fR is not currently a
+container, or an empty string if \fIwindow\fR is not currently a
 transient window.  A transient window will mirror state changes in the
-master and inherit the state of the master when initially mapped. The
-directed graph with an edge from each transient to its master must be
+container and inherit the state of the container when initially mapped. The
+directed graph with an edge from each transient to its container must be
 acyclic.  In particular, it is an error to attempt to make a window a
 transient of itself.  The window manager may also decorate a transient
 window differently, removing some features normally present (e.g.,