Merge 8.7

3 files changed, 31 insertions, 31 deletions

diff --git a/doc/Encoding.3 b/doc/Encoding.3
index 0d70658..19e7fab 100644
--- a/doc/Encoding.3
+++ b/doc/Encoding.3
@@ -547,13 +547,13 @@ encoding:
 E
 init		{}
 final		{}
-iso8859-1	\ex1b(B
-jis0201		\ex1b(J
-jis0208		\ex1b$@
-jis0208		\ex1b$B
-jis0212		\ex1b$(D
-gb2312		\ex1b$A
-ksc5601		\ex1b$(C
+iso8859-1	\ex1B(B
+jis0201		\ex1B(J
+jis0208		\ex1B$@
+jis0208		\ex1B$B
+jis0212		\ex1B$(D
+gb2312		\ex1B$A
+ksc5601		\ex1B$(C
 .CE
 .PP
 In the file, the first column represents an option and the second column
@@ -565,7 +565,7 @@ marks that encoding.  Tcl syntax is used for the values; in the above
 example, for instance,
 .QW \fB{}\fR
 represents the empty string and
-.QW \fB\ex1b\fR
+.QW \fB\ex1B\fR
 represents character 27.
 .PP
 When \fBTcl_GetEncoding\fR encounters an encoding \fIname\fR that has not
diff --git a/doc/binary.n b/doc/binary.n
index c54bcc9..864b0f9 100644
--- a/doc/binary.n
+++ b/doc/binary.n
@@ -241,7 +241,7 @@ which returns a binary string equivalent to:
 \fB\e254\fR
 .CE
 .PP
-(i.e. \fB\exac\fR) by
+(i.e. \fB\exAC\fR) by
 truncating the high-bits of the character, and which is probably not
 what is desired.
 .RE
@@ -299,7 +299,7 @@ high-to-low order within each byte.  For example,
 will return a binary string equivalent to:
 .PP
 .CS
-\fB\exe0\exe1\exa0\fR
+\fB\exE0\exE1\exA0\fR
 .CE
 .RE
 .IP \fBH\fR 5
@@ -326,7 +326,7 @@ remaining bits of the last byte will be zeros.  For example,
 will return a binary string equivalent to:
 .PP
 .CS
-\fB\exab\ex00\exde\exf0\ex98\fR
+\fB\exAB\ex00\exDE\exF0\ex98\fR
 .CE
 .RE
 .IP \fBh\fR 5
@@ -341,7 +341,7 @@ low-to-high order within each byte. This is seldom required. For example,
 will return a binary string equivalent to:
 .PP
 .CS
-\fB\exba\ex00\exed\ex0f\ex89\fR
+\fB\exBA\ex00\exED\ex0F\ex89\fR
 .CE
 .RE
 .IP \fBc\fR 5
@@ -363,7 +363,7 @@ than \fIcount\fR, then the extra elements are ignored.  For example,
 will return a binary string equivalent to:
 .PP
 .CS
-\fB\ex03\exfd\ex80\ex04\ex02\ex05\fR
+\fB\ex03\exFD\ex80\ex04\ex02\ex05\fR
 .CE
 .PP
 whereas:
@@ -389,7 +389,7 @@ example,
 will return a binary string equivalent to:
 .PP
 .CS
-\fB\ex03\ex00\exfd\exff\ex02\ex01\fR
+\fB\ex03\ex00\exFD\exFF\ex02\ex01\fR
 .CE
 .RE
 .IP \fBS\fR 5
@@ -405,7 +405,7 @@ example,
 will return a binary string equivalent to:
 .PP
 .CS
-\fB\ex00\ex03\exff\exfd\ex01\ex02\fR
+\fB\ex00\ex03\exFF\exFD\ex01\ex02\fR
 .CE
 .RE
 .IP \fBt\fR 5
@@ -429,7 +429,7 @@ example,
 will return a binary string equivalent to:
 .PP
 .CS
-\fB\ex03\ex00\ex00\ex00\exfd\exff\exff\exff\ex00\ex00\ex01\ex00\fR
+\fB\ex03\ex00\ex00\ex00\exFD\exFF\exFF\exFF\ex00\ex00\ex01\ex00\fR
 .CE
 .RE
 .IP \fBI\fR 5
@@ -445,7 +445,7 @@ For example,
 will return a binary string equivalent to:
 .PP
 .CS
-\fB\ex00\ex00\ex00\ex03\exff\exff\exff\exfd\ex00\ex01\ex00\ex00\fR
+\fB\ex00\ex00\ex00\ex03\exFF\exFF\exFF\exFD\ex00\ex01\ex00\ex00\fR
 .CE
 .RE
 .IP \fBn\fR 5
@@ -510,7 +510,7 @@ on a Windows system running on an Intel Pentium processor,
 will return a binary string equivalent to:
 .PP
 .CS
-\fB\excd\excc\excc\ex3f\ex9a\ex99\ex59\ex40\fR
+\fB\exCD\exCC\exCC\ex3F\ex9A\ex99\ex59\ex40\fR
 .CE
 .RE
 .IP \fBr\fR 5
@@ -536,7 +536,7 @@ Windows system running on an Intel Pentium processor,
 will return a binary string equivalent to:
 .PP
 .CS
-\fB\ex9a\ex99\ex99\ex99\ex99\ex99\exf9\ex3f\fR
+\fB\ex9A\ex99\ex99\ex99\ex99\ex99\exF9\ex3F\fR
 .CE
 .RE
 .IP \fBq\fR 5
@@ -788,7 +788,7 @@ scanned. For example,
 .RS
 .PP
 .CS
-\fBbinary scan\fR \ex07\exC6\ex05\ex1f\ex34 H3H* var1 var2
+\fBbinary scan\fR \ex07\exC6\ex05\ex1F\ex34 H3H* var1 var2
 .CE
 .PP
 will return \fB2\fR with \fB07c\fR stored in \fIvar1\fR and
@@ -839,7 +839,7 @@ example,
 .RS
 .PP
 .CS
-\fBbinary scan\fR \ex05\ex00\ex07\ex00\exf0\exff s2s* var1 var2
+\fBbinary scan\fR \ex05\ex00\ex07\ex00\exF0\exFF s2s* var1 var2
 .CE
 .PP
 will return \fB2\fR with \fB5 7\fR stored in \fIvar1\fR and \fB\-16\fR
@@ -853,7 +853,7 @@ order.  For example,
 .RS
 .PP
 .CS
-\fBbinary scan\fR \ex00\ex05\ex00\ex07\exff\exf0 S2S* var1 var2
+\fBbinary scan\fR \ex00\ex05\ex00\ex07\exFF\exF0 S2S* var1 var2
 .CE
 .PP
 will return \fB2\fR with \fB5 7\fR stored in \fIvar1\fR and \fB\-16\fR
@@ -878,7 +878,7 @@ example,
 .RS
 .PP
 .CS
-set str \ex05\ex00\ex00\ex00\ex07\ex00\ex00\ex00\exf0\exff\exff\exff
+set str \ex05\ex00\ex00\ex00\ex07\ex00\ex00\ex00\exF0\exFF\exFF\exFF
 \fBbinary scan\fR $str i2i* var1 var2
 .CE
 .PP
@@ -894,7 +894,7 @@ immediately after the \fBI\fR.  For example,
 .RS
 .PP
 .CS
-set str \ex00\ex00\ex00\ex05\ex00\ex00\ex00\ex07\exff\exff\exff\exf0
+set str \ex00\ex00\ex00\ex05\ex00\ex00\ex00\ex07\exFF\exFF\exFF\exF0
 \fBbinary scan\fR $str I2I* var1 var2
 .CE
 .PP
@@ -920,7 +920,7 @@ example,
 .RS
 .PP
 .CS
-set str \ex05\ex00\ex00\ex00\ex07\ex00\ex00\ex00\exf0\exff\exff\exff
+set str \ex05\ex00\ex00\ex00\ex07\ex00\ex00\ex00\exF0\exFF\exFF\exFF
 \fBbinary scan\fR $str wi* var1 var2
 .CE
 .PP
@@ -935,7 +935,7 @@ immediately after the \fBW\fR.  For example,
 .RS
 .PP
 .CS
-set str \ex00\ex00\ex00\ex05\ex00\ex00\ex00\ex07\exff\exff\exff\exf0
+set str \ex00\ex00\ex00\ex05\ex00\ex00\ex00\ex07\exFF\exFF\exFF\exF0
 \fBbinary scan\fR $str WI* var1 var2
 .CE
 .PP
@@ -966,7 +966,7 @@ Intel Pentium processor,
 .RS
 .PP
 .CS
-\fBbinary scan\fR \ex3f\excc\excc\excd f var1
+\fBbinary scan\fR \ex3F\exCC\exCC\exCD f var1
 .CE
 .PP
 will return \fB1\fR with \fB1.6000000238418579\fR stored in
@@ -990,7 +990,7 @@ running on an Intel Pentium processor,
 .RS
 .PP
 .CS
-\fBbinary scan\fR \ex9a\ex99\ex99\ex99\ex99\ex99\exf9\ex3f d var1
+\fBbinary scan\fR \ex9A\ex99\ex99\ex99\ex99\ex99\exF9\ex3F d var1
 .CE
 .PP
 will return \fB1\fR with \fB1.6000000000000001\fR
diff --git a/doc/chan.n b/doc/chan.n
index 538f86d..75615b6 100644
--- a/doc/chan.n
+++ b/doc/chan.n
@@ -152,7 +152,7 @@ If \fIchar\fR is the empty string, there is no special character that marks
 the end of the data.
 
 The default value is the empty string.  The acceptable range is \ex01 -
-\ex7f.  A value outside this range results in an error.
+\ex7F.  A value outside this range results in an error.
 .VS "TCL8.7 TIP656"
 .TP
 \fB\-profile\fR \fIprofile\fR
@@ -245,10 +245,10 @@ 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
+an error occurs during the background copy, another argument provides message
 for the error.  \fIinputChan\fR and \fIoutputChan\fR are automatically
 configured for non-blocking mode if needed.  Background copying only works
 correctly if events are being processed, e.g. via \fBvwait\fR or Tk.