Merge 8.7

3 files changed, 8 insertions, 15 deletions

diff --git a/doc/ToUpper.3 b/doc/ToUpper.3
index 5456538..fd9ddfb 100644
--- a/doc/ToUpper.3
+++ b/doc/ToUpper.3
@@ -8,7 +8,7 @@
 .so man.macros
 .BS
 .SH NAME
-Tcl_UniCharToUpper, Tcl_UniCharToLower, Tcl_UniCharFold, Tcl_UniCharToTitle, Tcl_UtfToUpper, Tcl_UtfToLower, Tcl_UtfToTitle \- routines for manipulating the case of Unicode characters and UTF-8 strings
+Tcl_UniCharToUpper, Tcl_UniCharToLower, Tcl_UniCharToTitle, Tcl_UtfToUpper, Tcl_UtfToLower, Tcl_UtfToTitle \- routines for manipulating the case of Unicode characters and UTF-8 strings
 .SH SYNOPSIS
 .nf
 \fB#include <tcl.h>\fR
@@ -17,9 +17,6 @@ int
 \fBTcl_UniCharToUpper\fR(\fIch\fR)
 .sp
 int
-\fBTcl_UniCharFold\fR(\fIch\fR)
-.sp
-int
 \fBTcl_UniCharToLower\fR(\fIch\fR)
 .sp
 int
@@ -55,11 +52,6 @@ If \fIch\fR represents an upper-case character,
 character.  If no lower-case character is defined, it returns the
 character unchanged.
 .PP
-If \fIch\fR represents an upper-case or lower-case character,
-\fBTcl_UniCharFold\fR returns the corresponding folded
-character.  If no upper-case or lower-case character is defined, it returns the
-character unchanged.
-.PP
 If \fIch\fR represents a lower-case character,
 \fBTcl_UniCharToTitle\fR returns the corresponding title-case
 character.  If no title-case character is defined, it returns the
diff --git a/doc/Utf.3 b/doc/Utf.3
index 6ebf57d..f00ddf8 100644
--- a/doc/Utf.3
+++ b/doc/Utf.3
@@ -275,12 +275,12 @@ always a pointer to a location in the string. It always returns a pointer to
 a byte that begins a character when scanning for characters beginning
 from \fIstart\fR. When \fIsrc\fR is greater than \fIstart\fR, it
 always returns a pointer less than \fIsrc\fR and greater than or
-equal to (\fIsrc\fR - \fB4\fR).  The character that begins
+equal to (\fIsrc\fR - \fBTCL_UTF_MAX\fR).  The character that begins
 at the returned pointer is the first one that either includes the
 byte \fIsrc[-1]\fR, or might include it if the right trail bytes are
 present at \fIsrc\fR and greater. \fBTcl_UtfPrev\fR never reads the
 byte \fIsrc[0]\fR nor the byte \fIstart[-1]\fR nor the byte
-\fIsrc[-\fB5\fI]\fR.
+\fIsrc[-\fBTCL_UTF_MAX\fI-1]\fR.
 .PP
 \fBTcl_UniCharAtIndex\fR corresponds to a C string array dereference or the
 Pascal Ord() function.  It returns the Unicode character represented at the
diff --git a/doc/expr.n b/doc/expr.n
index 1498ba1..69f6399 100644
--- a/doc/expr.n
+++ b/doc/expr.n
@@ -82,9 +82,9 @@ produces the value on the right side.
 .PP
 .CS
 .ta 9c
-\fBexpr\fR 3.1 + $a	\fI6.1\fR
-\fBexpr\fR 2 + "$a.$b"	\fI5.6\fR
-\fBexpr\fR 4*[llength "6 2"]	\fI8\fR
+\fBexpr\fR {3.1 + $a}	\fI6.1\fR
+\fBexpr\fR {2 + "$a.$b"}	\fI5.6\fR
+\fBexpr\fR {4*[llength "6 2"]}	\fI8\fR
 \fBexpr\fR {{word one} < "word $a"}	\fI0\fR
 .CE
 .PP
@@ -270,7 +270,7 @@ which means that operands are not evaluated if they are
 not needed to determine the outcome.  For example, in
 .PP
 .CS
-\fBexpr\fR {$v ? [a] : [b]}
+\fBexpr\fR {$v?[a]:[b]}
 .CE
 .PP
 only one of \fB[a]\fR or \fB[b]\fR is evaluated,
@@ -510,4 +510,5 @@ Copyright \(co 2005 by Kevin B. Kenny <kennykb@acm.org>. All rights reserved.
 .fi
 '\" Local Variables:
 '\" mode: nroff
+'\" fill-column: 78
 '\" End: