Rebase to 9.0

3 files changed, 16 insertions, 16 deletions

diff --git a/doc/Encoding.3 b/doc/Encoding.3
index 0d70658..aaf7313 100644
--- a/doc/Encoding.3
+++ b/doc/Encoding.3
@@ -105,9 +105,9 @@ byte is converted and then to reset to an initial state. The
 \fBTCL_PROFILE_*\fR bits defined in the \fBPROFILES\fR section below
 control the encoding profile to be used for dealing with invalid data or
 other errors in the encoding transform.
-\fBTCL_ENCODING_STOPONERROR\fR is present for backward compatibility with
-Tcl 8.6 and forces the encoding profile to \fBstrict\fR.
-
+The flag \fBTCL_ENCODING_STOPONERROR\fR has no effect,
+it only has meaning in Tcl 8.x.
+.PP
 Some flags bits may not be usable with some functions as noted in the
 function descriptions below.
 .AP Tcl_EncodingState *statePtr in/out
@@ -590,7 +590,7 @@ with at most one of \fBTCL_ENCODING_PROFILE_TCL8\fR,
 \fBTCL_ENCODING_PROFILE_STRICT\fR or \fBTCL_ENCODING_PROFILE_REPLACE\fR.
 These correspond to the \fBtcl8\fR, \fBstrict\fR and \fBreplace\fR profiles
 respectively. If none are specified, a version-dependent default profile is used.
-For Tcl 9.0, the default profile is \fBtcl8\fR.
+For Tcl 9.0, the default profile is \fBstrict\fR.
 .PP
 For details about profiles, see the \fBPROFILES\fR section in
 the documentation of the \fBencoding\fR command.
diff --git a/doc/chan.n b/doc/chan.n
index 538f86d..3846e72 100644
--- a/doc/chan.n
+++ b/doc/chan.n
@@ -200,16 +200,15 @@ platforms it is \fBcrlf\fR for both input and output.
 \fBbinary\fR
 .
 Like \fBlf\fR, no end-of-line translation is performed, but in addition, sets
-\fB\-eofchar\fR to the empty string to disable it, sets \fB\-encoding\fR to
-\fBiso8859-1\fR, and sets \fB-profile\fR to \fBstrict\fR so the the channel is
-fully configured for binary input and output:  Each byte read from the channel
+\fB\-eofchar\fR to the empty string to disable it, and sets \fB\-encoding\fR
+to \fBiso8859-1\fR.  With this one setting, a channel is fully configured
+for binary input and output:  Each byte read from the channel
 becomes the Unicode character having the same value as that byte, and each
 character written to the channel becomes a single byte in the output.  This
 makes it possible to work seamlessly with binary data as long as each character
 in the data remains in the range of 0 to 255 so that there is no distinction
 between binary data and text.  For example, A JPEG image can be read from a
 such a channel, manipulated, and then written back to such a channel.
-
 .TP
 \fBcr\fR
 .
@@ -245,7 +244,7 @@ files to slow destinations like network sockets.
 .PP
 \fB\-size\fR limits the number of characters copied.
 .PP
-If \fB\-command\fR is gviven, \fBchan copy\fR returns immediately, works in the
+If \fB\-command\fR is given, \fBchan copy\fR returns immediately, works in the
 background, and calls \fIcallback\fR when the copy completes, providing as an
 additional argument the number of characters written to \fIoutputChan\fR.  If
 an error occurres during the background copy, another argument provides message
diff --git a/doc/encoding.n b/doc/encoding.n
index 793348f..255e070 100644
--- a/doc/encoding.n
+++ b/doc/encoding.n
@@ -111,9 +111,14 @@ encoding.
 The following profiles are currently implemented.
 .VS "TCL8.7 TIP656"
 .TP
+\fBstrict\fR
+.
+The default profile.  The operation fails when invalid data for the encoding
+are encountered.
+.TP
 \fBtcl8\fR
 .
-The default profile.  Provides for behaviour identical to that of Tcl 8.6: When
+Provides for behaviour identical to that of Tcl 8.6: When
 decoding, for encodings \fBother than utf-8\fR, each invalid byte is interpreted
 as the Unicode value given by that one byte. For example, the byte 0x80, which
 is invalid in the ASCII encoding would be mapped to the Unicode value U+0080.
@@ -127,10 +132,6 @@ an additional special case, the sequence 0xC0 0x80 is mapped to U+0000.
 When encoding, each character that cannot be represented in the encoding is
 replaced by an encoding-dependent character, usually the question mark \fB?\fR.
 .TP
-\fBstrict\fR
-.
-The operation fails when invalid data for the encoding are encountered.
-.TP
 \fBreplace\fR
 .
 When decoding, invalid bytes are replaced by U+FFFD, the Unicode REPLACEMENT
@@ -180,7 +181,7 @@ unexpected byte sequence starting at index 1: '\ex80'
 Example 3: Get partial data and the error location:
 .PP
 .CS
-% codepoints [encoding convertfrom -profile strict -failindex idx ascii AB\ex80]
+% codepoints [encoding convertfrom -failindex idx ascii AB\ex80]
 U+000041 U+000042
 % set idx
 2
@@ -193,7 +194,7 @@ Example 4: Encode a character that is not representable in ISO8859-1:
 A?
 % encoding convertto -profile strict iso8859-1 A\eu0141
 unexpected character at index 1: 'U+000141'
-% encoding convertto -profile strict -failindex idx iso8859-1 A\eu0141
+% encoding convertto -failindex idx iso8859-1 A\eu0141
 A
 % set idx
 1