summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-10-22 14:31:26 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-10-22 14:31:26 (GMT)
commit021af90722d6cf901b75e8f36f0d6cf0a62ed56e (patch)
tree210b8a5ec1f4880f7174f9fa3f59c93e14544f3b /doc
parentd970d6f3f67a50a0b71ef5d61f77c9353a09ef64 (diff)
parentbe83197ee590ec252235b5684a13f8d42e35c814 (diff)
downloadtcl-021af90722d6cf901b75e8f36f0d6cf0a62ed56e.zip
tcl-021af90722d6cf901b75e8f36f0d6cf0a62ed56e.tar.gz
tcl-021af90722d6cf901b75e8f36f0d6cf0a62ed56e.tar.bz2
Merge 8.7
Diffstat (limited to 'doc')
-rw-r--r--doc/FileSystem.34
-rw-r--r--doc/interp.n2
-rw-r--r--doc/source.n2
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/FileSystem.3 b/doc/FileSystem.3
index 6703638..4e77114 100644
--- a/doc/FileSystem.3
+++ b/doc/FileSystem.3
@@ -414,7 +414,7 @@ caller (with a reference count of 0).
the encoding identified by \fIencodingName\fR and evaluates
its contents as a Tcl script. It returns the same information as
\fBTcl_EvalObjEx\fR.
-If \fIencodingName\fR is NULL, the system encoding is used for
+If \fIencodingName\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.
@@ -430,7 +430,7 @@ or
which will be safely substituted by the Tcl interpreter into
.QW ^Z .
\fBTcl_FSEvalFile\fR is a simpler version of
-\fBTcl_FSEvalFileEx\fR that always uses the system encoding
+\fBTcl_FSEvalFileEx\fR that always uses the utf-8 encoding
when reading the file.
.PP
\fBTcl_FSLoadFile\fR dynamically loads a binary code file into memory and
diff --git a/doc/interp.n b/doc/interp.n
index 35f26d5..2943404 100644
--- a/doc/interp.n
+++ b/doc/interp.n
@@ -58,7 +58,7 @@ kernel call) between a child interpreter and its parent.
See \fBALIAS INVOCATION\fR, below, for more details
on how the alias mechanism works.
.PP
-A qualified interpreter name is a proper Tcl lists containing a subset of its
+A qualified interpreter name is a proper Tcl list containing a subset of its
ancestors in the interpreter hierarchy, terminated by the string naming the
interpreter in its immediate parent. Interpreter names are relative to the
interpreter in which they are used. For example, if
diff --git a/doc/source.n b/doc/source.n
index 353b8fb..8757cb8 100644
--- a/doc/source.n
+++ b/doc/source.n
@@ -47,7 +47,7 @@ A leading BOM (Byte order mark) contained in the file is ignored for unicode enc
.PP
The \fB\-encoding\fR option is used to specify the encoding of
the data stored in \fIfileName\fR. When the \fB\-encoding\fR option
-is omitted, the system encoding is assumed.
+is omitted, the utf-8 encoding is assumed.
.SH EXAMPLE
.PP
Run the script in the file \fBfoo.tcl\fR and then the script in the