Merge 8.6

2 files changed, 5 insertions, 5 deletions

diff --git a/doc/FileSystem.3 b/doc/FileSystem.3
index cc19ea8..f36a574 100644
--- a/doc/FileSystem.3
+++ b/doc/FileSystem.3
@@ -54,7 +54,7 @@ Tcl_Obj *
 \fBTcl_FSListVolumes\fR(\fIvoid\fR)
 .sp
 int
-\fBTcl_FSEvalFileEx\fR(\fIinterp, pathPtr, encodingName\fR)
+\fBTcl_FSEvalFileEx\fR(\fIinterp, pathPtr, encoding\fR)
 .sp
 int
 \fBTcl_FSEvalFile\fR(\fIinterp, pathPtr\fR)
@@ -199,7 +199,7 @@ As for \fIpathPtr\fR, but used for the destination filename for a copy or
 rename operation.
 .AP int recursive in
 Whether to remove subdirectories and their contents as well.
-.AP "const char" *encodingName in
+.AP "const char" *encoding in
 The encoding of the data stored in the
 file identified by \fIpathPtr\fR and to be evaluated.
 .AP "const char" *pattern in
@@ -417,10 +417,10 @@ accumulates the return values in a list which is returned to the
 caller (with a reference count of 0).
 .PP
 \fBTcl_FSEvalFileEx\fR reads the file given by \fIpathPtr\fR using
-the encoding identified by \fIencodingName\fR and evaluates
+the encoding identified by \fIencoding\fR and evaluates
 its contents as a Tcl script. It returns the same information as
 \fBTcl_EvalObjEx\fR.
-If \fIencodingName\fR is NULL, the utf-8 encoding is used for
+If \fIencoding\fR is NULL, the utf-8 encoding is used for
 reading the file contents.
 If the file could not be read then a Tcl error is returned to describe
 why the file could not be read.
diff --git a/doc/source.n b/doc/source.n
index cee1312..0364c41 100644
--- a/doc/source.n
+++ b/doc/source.n
@@ -15,7 +15,7 @@ source \- Evaluate a file or resource as a Tcl script
 .SH SYNOPSIS
 \fBsource \fIfileName\fR
 .sp
-\fBsource\fR \fB\-encoding \fIencodingName fileName\fR
+\fBsource\fR \fB\-encoding \fIencoding fileName\fR
 .BE
 .SH DESCRIPTION
 .PP