Merge 8.6

4 files changed, 4 insertions, 4 deletions

diff --git a/doc/AddErrInfo.3 b/doc/AddErrInfo.3
index 357b3eb..e77df6c 100644
--- a/doc/AddErrInfo.3
+++ b/doc/AddErrInfo.3
@@ -68,7 +68,7 @@ If negative, all bytes up to the first null byte are used.
 The \fB\-errorcode\fR return option will be set to this value.
 .AP "const char" *element in
 String to record as one element of the \fB\-errorcode\fR return option.
-Last \fIelement\fR argument must be NULL.
+Last \fIelement\fR argument must be (char *)NULL.
 .AP va_list argList in
 An argument list which must have been initialized using
 \fBva_start\fR, and cleared using \fBva_end\fR.
diff --git a/doc/Eval.3 b/doc/Eval.3
index 57a67c4..d0a1551 100644
--- a/doc/Eval.3
+++ b/doc/Eval.3
@@ -149,7 +149,7 @@ of any length, concatenates them into a single string,
 then calls \fBTcl_Eval\fR to execute that string as a Tcl command.
 It returns the result of the command and also modifies
 the interpreter result in the same way as \fBTcl_Eval\fR.
-The last argument to \fBTcl_VarEval\fR must be NULL to indicate the end
+The last argument to \fBTcl_VarEval\fR must be (char *)NULL to indicate the end
 of arguments.
 .PP
 \fBTcl_VarEvalVA\fR is the same as \fBTcl_VarEval\fR except that
diff --git a/doc/SetResult.3 b/doc/SetResult.3
index c9ff84c..0c24525 100644
--- a/doc/SetResult.3
+++ b/doc/SetResult.3
@@ -141,7 +141,7 @@ It also manages conversion to and from the \fIresult\fR field of the
 \fIinterp\fR so as to handle backward-compatibility with old-style
 extensions.
 Any number of \fIresult\fR arguments may be passed in a single
-call; the last argument in the list must be a NULL pointer.
+call; the last argument in the list must (char *)NULL.
 .PP
 \fBTcl_AppendResultVA\fR is the same as \fBTcl_AppendResult\fR except that
 instead of taking a variable number of arguments it takes an argument list.
diff --git a/doc/StringObj.3 b/doc/StringObj.3
index 02fda8b..87a6c58 100644
--- a/doc/StringObj.3
+++ b/doc/StringObj.3
@@ -251,7 +251,7 @@ except that it can be passed more than one value to append and
 each value must be a null-terminated string (i.e. none of the
 values may contain internal null characters).  Any number of
 \fIstring\fR arguments may be provided, but the last argument
-must be a NULL pointer to indicate the end of the list.
+must be (char *)NULL to indicate the end of the list.
 .PP
 \fBTcl_AppendStringsToObjVA\fR is the same as \fBTcl_AppendStringsToObj\fR
 except that instead of taking a variable number of arguments it takes an