Prevent the usage of the term safe/unsafe child. Suggested by Keith Nash. Thanks!

4 files changed, 11 insertions, 11 deletions

diff --git a/doc/interp.n b/doc/interp.n
index 4be7ef8..35f26d5 100644
--- a/doc/interp.n
+++ b/doc/interp.n
@@ -663,9 +663,9 @@ including itself.
 .SH "ALIAS INVOCATION"
 .PP
 The alias mechanism has been carefully designed so that it can
-be used safely when an untrusted script is executing
-in a safe child and the target of the alias is a trusted
-parent.  The most important thing in guaranteeing safety is to
+be used safely in an untrusted script which is being executed in a
+safe interpreter even if the target of the alias is not a safe
+interpreter.  The most important thing in guaranteeing safety is to
 ensure that information passed from the child to the parent is
 never evaluated or substituted in the parent;  if this were to
 occur, it would enable an evil script in the child to invoke
@@ -747,7 +747,7 @@ To help avoid this problem, no substitutions or evaluations are
 applied to arguments of \fBinterp invokehidden\fR.
 .PP
 Safe interpreters are not allowed to invoke hidden commands in themselves
-or in their descendants. This prevents safe children from gaining access to
+or in their descendants. This prevents them from gaining access to
 hidden functionality in themselves or their descendants.
 .PP
 The set of hidden commands in an interpreter can be manipulated by a trusted
diff --git a/generic/tclInterp.c b/generic/tclInterp.c
index 42ef1fa..b84c065 100644
--- a/generic/tclInterp.c
+++ b/generic/tclInterp.c
@@ -123,7 +123,7 @@ typedef struct Target {
  *
  * NB: the flags field in the interp structure, used with SAFE_INTERP mask
  * denotes whether the interpreter is safe or not. Safe interpreters have
- * restricted functionality, can only create safe child interpreters and can
+ * restricted functionality, can only create safe interpreters and can
  * only load safe extensions.
  */
 
@@ -3286,7 +3286,7 @@ Tcl_MakeSafe(
      */
 
     /*
-     * No env array in a safe child.
+     * No env array in a safe interpreter.
      */
 
     Tcl_UnsetVar2(interp, "env", NULL, TCL_GLOBAL_ONLY);
diff --git a/library/http/http.tcl b/library/http/http.tcl
index 4117f44..21d6671 100644
--- a/library/http/http.tcl
+++ b/library/http/http.tcl
@@ -2791,7 +2791,7 @@ proc http::Event {sock token} {
 			    # scan any list for "close".
 			    if {$tmpHeader in {close keep-alive}} {
 				# The common cases, continue.
-			    } elseif {[string first , $tmpHeader] == -1} {
+			    } elseif {[string first , $tmpHeader] < 0} {
 				# Not a comma-separated list, not "close",
 				# therefore "keep-alive".
 				set tmpHeader keep-alive
diff --git a/library/safe.tcl b/library/safe.tcl
index 6090a46..1f8c3d2 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -260,7 +260,7 @@ proc ::safe::interpConfigure {args} {
 #
 # safe::InterpCreate : doing the real job
 #
-# This procedure creates a safe child and initializes it with the safe
+# This procedure creates a safe interpreter and initializes it with the safe
 # base aliases.
 # NB: child name must be simple alphanumeric string, no spaces, no (), no
 # {},...  {because the state array is stored as part of the name}
@@ -576,7 +576,7 @@ proc ::safe::AddSubDirs {pathList} {
     return $res
 }
 
-# This procedure deletes a safe child managed by Safe Tcl and cleans up
+# This procedure deletes a safe interpreter managed by Safe Tcl and cleans up
 # associated state.
 # - The command will also delete non-Safe-Base interpreters.
 # - This is regrettable, but to avoid breaking existing code this should be
@@ -1133,8 +1133,8 @@ proc ::safe::BadSubcommand {child command subcommand args} {
 # interpreters.
 proc ::safe::AliasEncodingSystem {child args} {
     try {
-	# Must not pass extra arguments; safe childs may not set the system
-	# encoding but they may read it.
+	# Must not pass extra arguments; safe interpreters may not set the
+	# system encoding but they may read it.
 	if {[llength $args]} {
 	    return -code error -errorcode {TCL WRONGARGS} \
 		"wrong # args: should be \"encoding system\""