Merge 8.6. More documentation updates

11 files changed, 49 insertions, 45 deletions

diff --git a/generic/regexec.c b/generic/regexec.c
index b5f161b..e7260cd 100644
--- a/generic/regexec.c
+++ b/generic/regexec.c
@@ -73,7 +73,7 @@ struct dfa {
     chr *lastnopr;		/* location of last cache-flushed NOPROGRESS */
     struct sset *search;	/* replacement-search-pointer memory */
     int cptsmalloced;		/* were the areas individually malloced? */
-    char *mallocarea;		/* self, or master malloced area, or NULL */
+    char *mallocarea;		/* self, or malloced area, or NULL */
 };
 
 #define	WORK	1		/* number of work bitvectors needed */
diff --git a/generic/tcl.decls b/generic/tcl.decls
index c05da7e..9414440 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -316,12 +316,12 @@ declare 85 {
 	    int flags)
 }
 declare 86 {
-    int Tcl_CreateAlias(Tcl_Interp *slave, const char *slaveCmd,
+    int Tcl_CreateAlias(Tcl_Interp *childInterp, const char *childCmd,
 	    Tcl_Interp *target, const char *targetCmd, int argc,
 	    const char *const *argv)
 }
 declare 87 {
-    int Tcl_CreateAliasObj(Tcl_Interp *slave, const char *slaveCmd,
+    int Tcl_CreateAliasObj(Tcl_Interp *childInterp, const char *childCmd,
 	    Tcl_Interp *target, const char *targetCmd, int objc,
 	    Tcl_Obj *const objv[])
 }
@@ -364,7 +364,7 @@ declare 96 {
 	    Tcl_CmdDeleteProc *deleteProc)
 }
 declare 97 {
-    Tcl_Interp *Tcl_CreateSlave(Tcl_Interp *interp, const char *slaveName,
+    Tcl_Interp *Tcl_CreateChild(Tcl_Interp *interp, const char *slaveName,
 	    int isSafe)
 }
 declare 98 {
@@ -585,7 +585,7 @@ declare 163 {
     int Tcl_GetInterpPath(Tcl_Interp *interp, Tcl_Interp *slaveInterp)
 }
 declare 164 {
-    Tcl_Interp *Tcl_GetMaster(Tcl_Interp *interp)
+    Tcl_Interp *Tcl_GetParent(Tcl_Interp *interp)
 }
 declare 165 {
     const char *Tcl_GetNameOfExecutable(void)
@@ -616,7 +616,7 @@ declare 171 {
     int Tcl_GetServiceMode(void)
 }
 declare 172 {
-    Tcl_Interp *Tcl_GetSlave(Tcl_Interp *interp, const char *slaveName)
+    Tcl_Interp *Tcl_GetChild(Tcl_Interp *interp, const char *slaveName)
 }
 declare 173 {
     Tcl_Channel Tcl_GetStdChannel(int type)
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 2b1bae9..24440dc 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -4321,7 +4321,7 @@ TclResetCancellation(
  * Tcl_Canceled --
  *
  *	Check if the script in progress has been canceled, i.e.,
- *	Tcl_CancelEval was called for this interpreter or any of its master
+ *	Tcl_CancelEval was called for this interpreter or any of its parent
  *	interpreters.
  *
  * Results:
diff --git a/generic/tclClock.c b/generic/tclClock.c
index baaa568..ba85fec 100644
--- a/generic/tclClock.c
+++ b/generic/tclClock.c
@@ -263,7 +263,7 @@ TclClockInit(
     };
 
     /*
-     * Safe interps get [::clock] as alias to a master, so do not need their
+     * Safe interps get [::clock] as alias to a parent, so do not need their
      * own copies of the support routines.
      */
 
diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index 60331f5..176db71 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -1026,7 +1026,7 @@ InfoErrorStackCmd(
 
     target = interp;
     if (objc == 2) {
-	target = Tcl_GetSlave(interp, TclGetString(objv[1]));
+	target = Tcl_GetChild(interp, TclGetString(objv[1]));
 	if (target == NULL) {
 	    return TCL_ERROR;
 	}
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index 9d1c56d..fd63da3 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -848,7 +848,7 @@ TclSetByteCodeFromAny(
      * faster code in some cases, and more compact code in more.
      */
 
-    if (Tcl_GetMaster(interp) == NULL &&
+    if (Tcl_GetParent(interp) == NULL &&
 	    !Tcl_LimitTypeEnabled(interp, TCL_LIMIT_COMMANDS|TCL_LIMIT_TIME)
 	    && IsCompactibleCompileEnv(&compEnv)) {
 	TclFreeCompileEnv(&compEnv);
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 8e8df30..21bd192 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -300,13 +300,13 @@ EXTERN int		Tcl_ConvertElement(const char *src, char *dst,
 EXTERN int		Tcl_ConvertCountedElement(const char *src,
 				int length, char *dst, int flags);
 /* 86 */
-EXTERN int		Tcl_CreateAlias(Tcl_Interp *slave,
-				const char *slaveCmd, Tcl_Interp *target,
+EXTERN int		Tcl_CreateAlias(Tcl_Interp *childInterp,
+				const char *childCmd, Tcl_Interp *target,
 				const char *targetCmd, int argc,
 				const char *const *argv);
 /* 87 */
-EXTERN int		Tcl_CreateAliasObj(Tcl_Interp *slave,
-				const char *slaveCmd, Tcl_Interp *target,
+EXTERN int		Tcl_CreateAliasObj(Tcl_Interp *childInterp,
+				const char *childCmd, Tcl_Interp *target,
 				const char *targetCmd, int objc,
 				Tcl_Obj *const objv[]);
 /* 88 */
@@ -345,7 +345,7 @@ EXTERN Tcl_Command	Tcl_CreateObjCommand(Tcl_Interp *interp,
 				ClientData clientData,
 				Tcl_CmdDeleteProc *deleteProc);
 /* 97 */
-EXTERN Tcl_Interp *	Tcl_CreateSlave(Tcl_Interp *interp,
+EXTERN Tcl_Interp *	Tcl_CreateChild(Tcl_Interp *interp,
 				const char *slaveName, int isSafe);
 /* 98 */
 EXTERN Tcl_TimerToken	Tcl_CreateTimerHandler(int milliseconds,
@@ -530,7 +530,7 @@ EXTERN const char *	Tcl_GetHostName(void);
 EXTERN int		Tcl_GetInterpPath(Tcl_Interp *interp,
 				Tcl_Interp *slaveInterp);
 /* 164 */
-EXTERN Tcl_Interp *	Tcl_GetMaster(Tcl_Interp *interp);
+EXTERN Tcl_Interp *	Tcl_GetParent(Tcl_Interp *interp);
 /* 165 */
 EXTERN const char *	Tcl_GetNameOfExecutable(void);
 /* 166 */
@@ -556,7 +556,7 @@ EXTERN int		Tcl_GetsObj(Tcl_Channel chan, Tcl_Obj *objPtr);
 /* 171 */
 EXTERN int		Tcl_GetServiceMode(void);
 /* 172 */
-EXTERN Tcl_Interp *	Tcl_GetSlave(Tcl_Interp *interp,
+EXTERN Tcl_Interp *	Tcl_GetChild(Tcl_Interp *interp,
 				const char *slaveName);
 /* 173 */
 EXTERN Tcl_Channel	Tcl_GetStdChannel(int type);
@@ -2034,8 +2034,8 @@ typedef struct TclStubs {
     char * (*tcl_Concat) (int argc, const char *const *argv); /* 83 */
     int (*tcl_ConvertElement) (const char *src, char *dst, int flags); /* 84 */
     int (*tcl_ConvertCountedElement) (const char *src, int length, char *dst, int flags); /* 85 */
-    int (*tcl_CreateAlias) (Tcl_Interp *slave, const char *slaveCmd, Tcl_Interp *target, const char *targetCmd, int argc, const char *const *argv); /* 86 */
-    int (*tcl_CreateAliasObj) (Tcl_Interp *slave, const char *slaveCmd, Tcl_Interp *target, const char *targetCmd, int objc, Tcl_Obj *const objv[]); /* 87 */
+    int (*tcl_CreateAlias) (Tcl_Interp *childInterp, const char *childCmd, Tcl_Interp *target, const char *targetCmd, int argc, const char *const *argv); /* 86 */
+    int (*tcl_CreateAliasObj) (Tcl_Interp *childInterp, const char *childCmd, Tcl_Interp *target, const char *targetCmd, int objc, Tcl_Obj *const objv[]); /* 87 */
     Tcl_Channel (*tcl_CreateChannel) (const Tcl_ChannelType *typePtr, const char *chanName, ClientData instanceData, int mask); /* 88 */
     void (*tcl_CreateChannelHandler) (Tcl_Channel chan, int mask, Tcl_ChannelProc *proc, ClientData clientData); /* 89 */
     void (*tcl_CreateCloseHandler) (Tcl_Channel chan, Tcl_CloseProc *proc, ClientData clientData); /* 90 */
@@ -2045,7 +2045,7 @@ typedef struct TclStubs {
     Tcl_Interp * (*tcl_CreateInterp) (void); /* 94 */
     TCL_DEPRECATED_API("") void (*tcl_CreateMathFunc) (Tcl_Interp *interp, const char *name, int numArgs, Tcl_ValueType *argTypes, Tcl_MathProc *proc, ClientData clientData); /* 95 */
     Tcl_Command (*tcl_CreateObjCommand) (Tcl_Interp *interp, const char *cmdName, Tcl_ObjCmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *deleteProc); /* 96 */
-    Tcl_Interp * (*tcl_CreateSlave) (Tcl_Interp *interp, const char *slaveName, int isSafe); /* 97 */
+    Tcl_Interp * (*tcl_CreateChild) (Tcl_Interp *interp, const char *slaveName, int isSafe); /* 97 */
     Tcl_TimerToken (*tcl_CreateTimerHandler) (int milliseconds, Tcl_TimerProc *proc, ClientData clientData); /* 98 */
     Tcl_Trace (*tcl_CreateTrace) (Tcl_Interp *interp, int level, Tcl_CmdTraceProc *proc, ClientData clientData); /* 99 */
     void (*tcl_DeleteAssocData) (Tcl_Interp *interp, const char *name); /* 100 */
@@ -2112,7 +2112,7 @@ typedef struct TclStubs {
     int (*tcl_GetErrno) (void); /* 161 */
     const char * (*tcl_GetHostName) (void); /* 162 */
     int (*tcl_GetInterpPath) (Tcl_Interp *interp, Tcl_Interp *slaveInterp); /* 163 */
-    Tcl_Interp * (*tcl_GetMaster) (Tcl_Interp *interp); /* 164 */
+    Tcl_Interp * (*tcl_GetParent) (Tcl_Interp *interp); /* 164 */
     const char * (*tcl_GetNameOfExecutable) (void); /* 165 */
     Tcl_Obj * (*tcl_GetObjResult) (Tcl_Interp *interp); /* 166 */
 #if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
@@ -2128,7 +2128,7 @@ typedef struct TclStubs {
     int (*tcl_Gets) (Tcl_Channel chan, Tcl_DString *dsPtr); /* 169 */
     int (*tcl_GetsObj) (Tcl_Channel chan, Tcl_Obj *objPtr); /* 170 */
     int (*tcl_GetServiceMode) (void); /* 171 */
-    Tcl_Interp * (*tcl_GetSlave) (Tcl_Interp *interp, const char *slaveName); /* 172 */
+    Tcl_Interp * (*tcl_GetChild) (Tcl_Interp *interp, const char *slaveName); /* 172 */
     Tcl_Channel (*tcl_GetStdChannel) (int type); /* 173 */
     const char * (*tcl_GetStringResult) (Tcl_Interp *interp); /* 174 */
     TCL_DEPRECATED_API("No longer in use, changed to macro") const char * (*tcl_GetVar) (Tcl_Interp *interp, const char *varName, int flags); /* 175 */
@@ -2825,8 +2825,8 @@ extern const TclStubs *tclStubsPtr;
 	(tclStubsPtr->tcl_CreateMathFunc) /* 95 */
 #define Tcl_CreateObjCommand \
 	(tclStubsPtr->tcl_CreateObjCommand) /* 96 */
-#define Tcl_CreateSlave \
-	(tclStubsPtr->tcl_CreateSlave) /* 97 */
+#define Tcl_CreateChild \
+	(tclStubsPtr->tcl_CreateChild) /* 97 */
 #define Tcl_CreateTimerHandler \
 	(tclStubsPtr->tcl_CreateTimerHandler) /* 98 */
 #define Tcl_CreateTrace \
@@ -2959,8 +2959,8 @@ extern const TclStubs *tclStubsPtr;
 	(tclStubsPtr->tcl_GetHostName) /* 162 */
 #define Tcl_GetInterpPath \
 	(tclStubsPtr->tcl_GetInterpPath) /* 163 */
-#define Tcl_GetMaster \
-	(tclStubsPtr->tcl_GetMaster) /* 164 */
+#define Tcl_GetParent \
+	(tclStubsPtr->tcl_GetParent) /* 164 */
 #define Tcl_GetNameOfExecutable \
 	(tclStubsPtr->tcl_GetNameOfExecutable) /* 165 */
 #define Tcl_GetObjResult \
@@ -2981,8 +2981,8 @@ extern const TclStubs *tclStubsPtr;
 	(tclStubsPtr->tcl_GetsObj) /* 170 */
 #define Tcl_GetServiceMode \
 	(tclStubsPtr->tcl_GetServiceMode) /* 171 */
-#define Tcl_GetSlave \
-	(tclStubsPtr->tcl_GetSlave) /* 172 */
+#define Tcl_GetChild \
+	(tclStubsPtr->tcl_GetChild) /* 172 */
 #define Tcl_GetStdChannel \
 	(tclStubsPtr->tcl_GetStdChannel) /* 173 */
 #define Tcl_GetStringResult \
@@ -4183,5 +4183,8 @@ extern const TclStubs *tclStubsPtr;
 #   define Tcl_UtfCharComplete(src, length) (((unsigned)((unsigned char)*(src) - 0xF0) < 5) \
 	    ? ((length) >= 4) : tclStubsPtr->tcl_UtfCharComplete((src), (length)))
 #endif
+#define Tcl_CreateSlave Tcl_CreateChild
+#define Tcl_GetSlave Tcl_GetChild
+#define Tcl_GetMaster Tcl_GetParent
 
 #endif /* _TCLDECLS */
diff --git a/generic/tclInterp.c b/generic/tclInterp.c
index de8cd32..8b0781d 100644
--- a/generic/tclInterp.c
+++ b/generic/tclInterp.c
@@ -620,7 +620,7 @@ NRInterpCmd(
     int index;
     static const char *const options[] = {
 	"alias",	"aliases",	"bgerror",	"cancel",
-	"create",	"debug",	"delete",
+	"children",	"create",	"debug",	"delete",
 	"eval",		"exists",	"expose",
 	"hide",		"hidden",	"issafe",
 	"invokehidden",	"limit",	"marktrusted",	"recursionlimit",
@@ -629,7 +629,7 @@ NRInterpCmd(
     };
     enum option {
 	OPT_ALIAS,	OPT_ALIASES,	OPT_BGERROR,	OPT_CANCEL,
-	OPT_CREATE,	OPT_DEBUG,	OPT_DELETE,
+	OPT_CHILDREN,	OPT_CREATE,	OPT_DEBUG,	OPT_DELETE,
 	OPT_EVAL,	OPT_EXISTS,	OPT_EXPOSE,
 	OPT_HIDE,	OPT_HIDDEN,	OPT_ISSAFE,
 	OPT_INVOKEHID,	OPT_LIMIT,	OPT_MARKTRUSTED,OPT_RECLIMIT,
@@ -1017,6 +1017,7 @@ NRInterpCmd(
 	    return TCL_ERROR;
 	}
 	return SlaveRecursionLimit(interp, slaveInterp, objc - 3, objv + 3);
+    case OPT_CHILDREN:
     case OPT_SLAVES: {
 	InterpInfo *iiPtr;
 	Tcl_Obj *resultPtr;
@@ -2062,7 +2063,7 @@ AliasObjCmdDeleteProc(
 /*
  *----------------------------------------------------------------------
  *
- * Tcl_CreateSlave --
+ * Tcl_CreateChild --
  *
  *	Creates a slave interpreter. The slavePath argument denotes the name
  *	of the new slave relative to the current interpreter; the slave is a
@@ -2083,7 +2084,7 @@ AliasObjCmdDeleteProc(
  */
 
 Tcl_Interp *
-Tcl_CreateSlave(
+Tcl_CreateChild(
     Tcl_Interp *interp,		/* Interpreter to start search at. */
     const char *slavePath,	/* Name of slave to create. */
     int isSafe)			/* Should new slave be "safe" ? */
@@ -2101,7 +2102,7 @@ Tcl_CreateSlave(
 /*
  *----------------------------------------------------------------------
  *
- * Tcl_GetSlave --
+ * Tcl_GetChild --
  *
  *	Finds a slave interpreter by its path name.
  *
@@ -2115,7 +2116,7 @@ Tcl_CreateSlave(
  */
 
 Tcl_Interp *
-Tcl_GetSlave(
+Tcl_GetChild(
     Tcl_Interp *interp,		/* Interpreter to start search from. */
     const char *slavePath)	/* Path of slave to find. */
 {
@@ -2132,7 +2133,7 @@ Tcl_GetSlave(
 /*
  *----------------------------------------------------------------------
  *
- * Tcl_GetMaster --
+ * Tcl_GetParent --
  *
  *	Finds the master interpreter of a slave interpreter.
  *
@@ -2146,7 +2147,7 @@ Tcl_GetSlave(
  */
 
 Tcl_Interp *
-Tcl_GetMaster(
+Tcl_GetParent(
     Tcl_Interp *interp)		/* Get the master of this interpreter. */
 {
     Slave *slavePtr;		/* Slave record of this interpreter. */
diff --git a/generic/tclLoad.c b/generic/tclLoad.c
index 738f65b..651f18d 100644
--- a/generic/tclLoad.c
+++ b/generic/tclLoad.c
@@ -198,7 +198,7 @@ Tcl_LoadObjCmd(
     if (objc == 4) {
 	const char *slaveIntName = Tcl_GetString(objv[3]);
 
-	target = Tcl_GetSlave(interp, slaveIntName);
+	target = Tcl_GetChild(interp, slaveIntName);
 	if (target == NULL) {
 	    code = TCL_ERROR;
 	    goto done;
@@ -634,7 +634,7 @@ Tcl_UnloadObjCmd(
     if (objc - i == 3) {
 	const char *slaveIntName = Tcl_GetString(objv[i + 2]);
 
-	target = Tcl_GetSlave(interp, slaveIntName);
+	target = Tcl_GetChild(interp, slaveIntName);
 	if (target == NULL) {
 	    return TCL_ERROR;
 	}
@@ -1087,7 +1087,7 @@ TclGetLoadedPackagesEx(
 	return TCL_OK;
     }
 
-    target = Tcl_GetSlave(interp, targetName);
+    target = Tcl_GetChild(interp, targetName);
     if (target == NULL) {
 	return TCL_ERROR;
     }
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 5411d88..5d79d7d 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -1312,7 +1312,7 @@ const TclStubs tclStubs = {
     Tcl_CreateInterp, /* 94 */
     Tcl_CreateMathFunc, /* 95 */
     Tcl_CreateObjCommand, /* 96 */
-    Tcl_CreateSlave, /* 97 */
+    Tcl_CreateChild, /* 97 */
     Tcl_CreateTimerHandler, /* 98 */
     Tcl_CreateTrace, /* 99 */
     Tcl_DeleteAssocData, /* 100 */
@@ -1379,7 +1379,7 @@ const TclStubs tclStubs = {
     Tcl_GetErrno, /* 161 */
     Tcl_GetHostName, /* 162 */
     Tcl_GetInterpPath, /* 163 */
-    Tcl_GetMaster, /* 164 */
+    Tcl_GetParent, /* 164 */
     Tcl_GetNameOfExecutable, /* 165 */
     Tcl_GetObjResult, /* 166 */
 #if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
@@ -1395,7 +1395,7 @@ const TclStubs tclStubs = {
     Tcl_Gets, /* 169 */
     Tcl_GetsObj, /* 170 */
     Tcl_GetServiceMode, /* 171 */
-    Tcl_GetSlave, /* 172 */
+    Tcl_GetChild, /* 172 */
     Tcl_GetStdChannel, /* 173 */
     Tcl_GetStringResult, /* 174 */
     Tcl_GetVar, /* 175 */
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 7b0df05..a8a1252 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -1521,7 +1521,7 @@ TestdelCmd(
 	return TCL_ERROR;
     }
 
-    slave = Tcl_GetSlave(interp, argv[1]);
+    slave = Tcl_GetChild(interp, argv[1]);
     if (slave == NULL) {
 	return TCL_ERROR;
     }
@@ -2702,7 +2702,7 @@ TestinterpdeleteCmd(
 		" path\"", NULL);
 	return TCL_ERROR;
     }
-    slaveToDelete = Tcl_GetSlave(interp, argv[1]);
+    slaveToDelete = Tcl_GetChild(interp, argv[1]);
     if (slaveToDelete == NULL) {
 	return TCL_ERROR;
     }
@@ -7937,7 +7937,7 @@ TestInterpResolverCmd(
 	return TCL_ERROR;
     }
     if (objc == 3) {
-	interp = Tcl_GetSlave(interp, Tcl_GetString(objv[2]));
+	interp = Tcl_GetChild(interp, Tcl_GetString(objv[2]));
 	if (interp == NULL) {
 	    Tcl_AppendResult(interp, "provided interpreter not found", NULL);
 	    return TCL_ERROR;