Merge 8.7

35 files changed, 66 insertions, 108 deletions

diff --git a/doc/CrtTrace.3 b/doc/CrtTrace.3
index d5353ac..b1e6483 100644
--- a/doc/CrtTrace.3
+++ b/doc/CrtTrace.3
@@ -1,7 +1,7 @@
 '\"
 '\" Copyright (c) 1989-1993 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\" Copyright (c) 2002 by Kevin B. Kenny <kennykb@acm.org>.  All rights reserved.
+'\" Copyright (c) 2002 Kevin B. Kenny <kennykb@acm.org>.  All rights reserved.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
diff --git a/doc/DumpActiveMemory.3 b/doc/DumpActiveMemory.3
index 972c985..226209a 100644
--- a/doc/DumpActiveMemory.3
+++ b/doc/DumpActiveMemory.3
@@ -1,6 +1,6 @@
 '\"
 '\" Copyright (c) 1992-1999 Karl Lehenbauer & Mark Diekhans.
-'\" Copyright (c) 2000 by Scriptics Corporation.
+'\" Copyright (c) 2000 Scriptics Corporation.
 '\" All rights reserved.
 '\"
 .TH "Tcl_DumpActiveMemory" 3 8.1 Tcl "Tcl Library Procedures"
diff --git a/doc/GetHostName.3 b/doc/GetHostName.3
index 73432d3..8e43f8e 100644
--- a/doc/GetHostName.3
+++ b/doc/GetHostName.3
@@ -1,5 +1,5 @@
 '\"
-'\" Copyright (c) 1998-2000 by Scriptics Corporation.
+'\" Copyright (c) 1998-2000 Scriptics Corporation.
 '\" All rights reserved.
 '\"
 .TH Tcl_GetHostName 3 8.3 Tcl "Tcl Library Procedures"
diff --git a/doc/GetStdChan.3 b/doc/GetStdChan.3
index be0e79f..3472fee 100644
--- a/doc/GetStdChan.3
+++ b/doc/GetStdChan.3
@@ -1,5 +1,5 @@
 '\"
-'\" Copyright (c) 1996 by Sun Microsystems, Inc.
+'\" Copyright (c) 1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
diff --git a/doc/GetTime.3 b/doc/GetTime.3
index 9f96be5..9dc4056 100644
--- a/doc/GetTime.3
+++ b/doc/GetTime.3
@@ -1,5 +1,5 @@
 '\"
-'\" Copyright (c) 2001 by Kevin B. Kenny <kennykb@acm.org>.
+'\" Copyright (c) 2001 Kevin B. Kenny <kennykb@acm.org>.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
diff --git a/doc/Init.3 b/doc/Init.3
index 0a6635e..d9fc2e1 100644
--- a/doc/Init.3
+++ b/doc/Init.3
@@ -1,5 +1,5 @@
 '\"
-'\" Copyright (c) 1998-2000 by Scriptics Corporation.
+'\" Copyright (c) 1998-2000 Scriptics Corporation.
 '\" All rights reserved.
 '\"
 .TH Tcl_Init 3 8.0 Tcl "Tcl Library Procedures"
diff --git a/doc/NRE.3 b/doc/NRE.3
index 6024b6a..20efe2f 100644
--- a/doc/NRE.3
+++ b/doc/NRE.3
@@ -1,6 +1,6 @@
 .\"
-.\" Copyright (c) 2008 by Kevin B. Kenny.
-.\" Copyright (c) 2018 by Nathan Coulter.
+.\" Copyright (c) 2008 Kevin B. Kenny.
+.\" Copyright (c) 2018 Nathan Coulter.
 .\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -232,5 +232,5 @@ Tcl_CreateCommand(3), Tcl_CreateObjCommand(3), Tcl_EvalObjEx(3), Tcl_GetCommandF
 .SH KEYWORDS
 stackless, nonrecursive, execute, command, global, value, result, script
 .SH COPYRIGHT
-Copyright (c) 2008 by Kevin B. Kenny.
-Copyright (c) 2018 by Nathan Coulter.
+Copyright \(co 2008 Kevin B. Kenny.
+Copyright \(co 2018 Nathan Coulter.
diff --git a/doc/SaveResult.3 b/doc/SaveResult.3
index e62d22d..804f9ec 100644
--- a/doc/SaveResult.3
+++ b/doc/SaveResult.3
@@ -1,5 +1,5 @@
 '\"
-'\" Copyright (c) 1997 by Sun Microsystems, Inc.
+'\" Copyright (c) 1997 Sun Microsystems, Inc.
 '\" Contributions from Don Porter, NIST, 2004. (not subject to US copyright)
 '\" Copyright (c) 2018 Nathan Coulter.
 '\"
diff --git a/doc/SourceRCFile.3 b/doc/SourceRCFile.3
index 0afb66b..bf8c527 100644
--- a/doc/SourceRCFile.3
+++ b/doc/SourceRCFile.3
@@ -1,5 +1,5 @@
 '\"
-'\" Copyright (c) 1998-2000 by Scriptics Corporation.
+'\" Copyright (c) 1998-2000 Scriptics Corporation.
 '\" All rights reserved.
 '\"
 .TH Tcl_SourceRCFile 3 8.3 Tcl "Tcl Library Procedures"
diff --git a/doc/StdChannels.3 b/doc/StdChannels.3
index 7cb75a0..d3ecff2 100644
--- a/doc/StdChannels.3
+++ b/doc/StdChannels.3
@@ -1,5 +1,5 @@
 '\"
-'\" Copyright (c) 2001 by ActiveState Corporation
+'\" Copyright (c) 2001 ActiveState Corporation
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
diff --git a/doc/TCL_MEM_DEBUG.3 b/doc/TCL_MEM_DEBUG.3
index 79fd0a4..59af6ba 100644
--- a/doc/TCL_MEM_DEBUG.3
+++ b/doc/TCL_MEM_DEBUG.3
@@ -1,6 +1,6 @@
 '\"
 '\" Copyright (c) 1992-1999 Karl Lehenbauer & Mark Diekhans.
-'\" Copyright (c) 2000 by Scriptics Corporation.
+'\" Copyright (c) 2000 Scriptics Corporation.
 '\" All rights reserved.
 '\"
 .TH TCL_MEM_DEBUG 3 8.1 Tcl "Tcl Library Procedures"
diff --git a/doc/Tcl.n b/doc/Tcl.n
index 48a3488..0f46f73 100644
--- a/doc/Tcl.n
+++ b/doc/Tcl.n
@@ -224,7 +224,7 @@ is reached.  The upper bits of the Unicode character will be 0.
 .RS
 .PP
 The range U+00D800\(enU+00DFFF is reserved for surrogates, which
-are illegal on its own. Therefore, such sequences will result in
+are illegal on their own. Therefore, such sequences will result in
 the replacement character U+FFFD. Surrogate pairs should be
 encoded as single \e\fBU\fIhhhhhhhh\fR character.
 .RE
diff --git a/doc/ToUpper.3 b/doc/ToUpper.3
index fd9ddfb..37ebd2b 100644
--- a/doc/ToUpper.3
+++ b/doc/ToUpper.3
@@ -1,5 +1,5 @@
 '\"
-'\" Copyright (c) 1997 by Sun Microsystems, Inc.
+'\" Copyright (c) 1997 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
diff --git a/doc/binary.n b/doc/binary.n
index 9b8b106..4a5d6c8 100644
--- a/doc/binary.n
+++ b/doc/binary.n
@@ -1,6 +1,6 @@
 '\"
-'\" Copyright (c) 1997 by Sun Microsystems, Inc.
-'\" Copyright (c) 2008 by Donal K. Fellows
+'\" Copyright (c) 1997 Sun Microsystems, Inc.
+'\" Copyright (c) 2008 Donal K. Fellows
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
diff --git a/doc/chan.n b/doc/chan.n
index 82f5200..f788bbf 100644
--- a/doc/chan.n
+++ b/doc/chan.n
@@ -175,7 +175,7 @@ operating system, as returned by \fBencoding system\fR.
 .TP
 \fB\-eofchar\fR \fB{\fIinChar outChar\fB}\fR
 .
-This option supports DOS file systems that use Control-z (\ex1a) as an
+This option supports DOS file systems that use Control-z (\ex1A) as an
 end of file marker.  If \fIchar\fR is not an empty string, then this
 character signals end-of-file when it is encountered during input.
 For output, the end-of-file character is output when the channel is
@@ -188,7 +188,7 @@ will apply to both reading and writing.  When querying the end-of-file
 character of a read-write channel, a two-element list will always be
 returned.  The default value for \fB\-eofchar\fR is the empty string
 in all cases except for files under Windows.  In that case the
-\fB\-eofchar\fR is Control-z (\ex1a) for reading and the empty string
+\fB\-eofchar\fR is Control-z (\ex1A) for reading and the empty string
 for writing.
 The acceptable range for \fB\-eofchar\fR values is \ex01 - \ex7f;
 attempting to set \fB\-eofchar\fR to a value outside of this range will
diff --git a/doc/clock.n b/doc/clock.n
index a3f934a..6a887d9 100644
--- a/doc/clock.n
+++ b/doc/clock.n
@@ -951,7 +951,7 @@ msgcat(n)
 .SH KEYWORDS
 clock, date, time
 .SH "COPYRIGHT"
-Copyright (c) 2004 Kevin B. Kenny <kennykb@acm.org>. All rights reserved.
+Copyright \(co 2004 Kevin B. Kenny <kennykb@acm.org>. All rights reserved.
 '\" Local Variables:
 '\" mode: nroff
 '\" End:
diff --git a/doc/encoding.n b/doc/encoding.n
index 50ad083..5aac181 100644
--- a/doc/encoding.n
+++ b/doc/encoding.n
@@ -1,5 +1,5 @@
 '\"
-'\" Copyright (c) 1998 by Scriptics Corporation.
+'\" Copyright (c) 1998 Scriptics Corporation.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
diff --git a/doc/exec.n b/doc/exec.n
index 855a192..373b980 100644
--- a/doc/exec.n
+++ b/doc/exec.n
@@ -246,15 +246,6 @@ the backslash character.  If an argument contains forward slashes as the
 path separator, it may or may not be recognized as a path name, depending on
 the program.
 .PP
-Additionally, when calling a 16-bit DOS or Windows 3.X application, all path
-names must use the short, cryptic, path format (e.g., using
-.QW applba~1.def
-instead of
-.QW applbakery.default ),
-which can be obtained with the
-.QW "\fBfile attributes\fI fileName \fB\-shortname\fR"
-command.
-.PP
 Two or more forward or backward slashes in a row in a path refer to a
 network path.  For example, a simple concatenation of the root directory
 \fBc:/\fR with a subdirectory \fB/windows/system\fR will yield
@@ -295,11 +286,9 @@ The directory from which the Tcl executable was loaded.
 .IP \(bu 3
 The current directory.
 .IP \(bu 3
-The Windows NT 32-bit system directory.
-.IP \(bu 3
-The Windows NT 16-bit system directory.
+The Windows 32-bit system directory.
 .IP \(bu 3
-The Windows NT home directory.
+The Windows home directory.
 .IP \(bu 3
 The directories listed in the path.
 .PP
diff --git a/doc/expr.n b/doc/expr.n
index 2c2742c..43ad26f 100644
--- a/doc/expr.n
+++ b/doc/expr.n
@@ -1,7 +1,7 @@
 '\"
 '\" Copyright (c) 1993 The Regents of the University of California.
 '\" Copyright (c) 1994-2000 Sun Microsystems, Inc.
-'\" Copyright (c) 2005 by Kevin B. Kenny <kennykb@acm.org>. All rights reserved
+'\" Copyright (c) 2005 Kevin B. Kenny <kennykb@acm.org>. All rights reserved
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -514,7 +514,7 @@ arithmetic, boolean, compare, expression, fuzzy comparison, integer value
 .nf
 Copyright \(co 1993 The Regents of the University of California.
 Copyright \(co 1994-2000 Sun Microsystems Incorporated.
-Copyright \(co 2005 by Kevin B. Kenny <kennykb@acm.org>. All rights reserved.
+Copyright \(co 2005 Kevin B. Kenny <kennykb@acm.org>. All rights reserved.
 .fi
 '\" Local Variables:
 '\" mode: nroff
diff --git a/doc/fconfigure.n b/doc/fconfigure.n
index 8da76c6..2926777 100644
--- a/doc/fconfigure.n
+++ b/doc/fconfigure.n
@@ -105,7 +105,7 @@ system, as returned by \fBencoding system\fR.
 .TP
 \fB\-eofchar\fR \fB{\fIinChar outChar\fB}\fR
 .
-This option supports DOS file systems that use Control-z (\ex1a) as an
+This option supports DOS file systems that use Control-z (\ex1A) as an
 end of file marker.  If \fIchar\fR is not an empty string, then this
 character signals end-of-file when it is encountered during input.  For
 output, the end-of-file character is output when the channel is closed.
@@ -117,9 +117,9 @@ channel you can specify a single value that will apply to both reading
 and writing.  When querying the end-of-file character of a read-write
 channel, a two-element list will always be returned.  The default value
 for \fB\-eofchar\fR is the empty string in all cases except for files
-under Windows.  In that case the \fB\-eofchar\fR is Control-z (\ex1a) for
+under Windows.  In that case the \fB\-eofchar\fR is Control-z (\ex1A) for
 reading and the empty string for writing.
-The acceptable range for \fB\-eofchar\fR values is \ex01 - \ex7f;
+The acceptable range for \fB\-eofchar\fR values is \ex01 - \ex7F;
 attempting to set \fB\-eofchar\fR to a value outside of this range will
 generate an error.
 .TP
diff --git a/doc/fpclassify.n b/doc/fpclassify.n
index 5bf21c5..41c658c 100644
--- a/doc/fpclassify.n
+++ b/doc/fpclassify.n
@@ -1,6 +1,6 @@
 '\"
-'\" Copyright (c) 2018 by Kevin B. Kenny <kennykb@acm.org>. All rights reserved
-'\" Copyright (c) 2019 by Donal Fellows
+'\" Copyright (c) 2018 Kevin B. Kenny <kennykb@acm.org>. All rights reserved
+'\" Copyright (c) 2019 Donal Fellows
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
diff --git a/doc/http.n b/doc/http.n
index 34fdf9d..b7eac6b 100644
--- a/doc/http.n
+++ b/doc/http.n
@@ -1,6 +1,6 @@
 '\"
 '\" Copyright (c) 1995-1997 Sun Microsystems, Inc.
-'\" Copyright (c) 1998-2000 by Ajuba Solutions.
+'\" Copyright (c) 1998-2000 Ajuba Solutions.
 '\" Copyright (c) 2004 ActiveState Corporation.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
diff --git a/doc/lindex.n b/doc/lindex.n
index 01e0d8b..75fe5e8 100644
--- a/doc/lindex.n
+++ b/doc/lindex.n
@@ -1,7 +1,7 @@
 '\"
 '\" Copyright (c) 1993 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\" Copyright (c) 2001 by Kevin B. Kenny <kennykb@acm.org>.  All rights reserved.
+'\" Copyright (c) 2001 Kevin B. Kenny <kennykb@acm.org>.  All rights reserved.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
diff --git a/doc/load.n b/doc/load.n
index b592bb3..f98a053 100644
--- a/doc/load.n
+++ b/doc/load.n
@@ -89,9 +89,10 @@ Tcl tries to guess the name of the package.
 This may be done differently on different platforms.
 The default guess, which is used on most UNIX platforms, is to
 take the last element of \fIfileName\fR, strip off the first
-three characters if they are \fBlib\fR, and use any following
+three characters if they are \fBlib\fR, then strip off the next
+three characters if they are \fBtcl\fR, and use any following
 alphabetic and underline characters as the module name.
-For example, the command \fBload libxyz4.2.so\fR uses the module
+For example, the command \fBload libtclxyz4.2.so\fR uses the module
 name \fBxyz\fR and the command \fBload bin/last.so {}\fR uses the
 module name \fBlast\fR.
 .PP
diff --git a/doc/lpop.n b/doc/lpop.n
index 631bc58..3d88638 100644
--- a/doc/lpop.n
+++ b/doc/lpop.n
@@ -1,5 +1,5 @@
 '\"
-'\" Copyright (c) 2018 by Peter Spjuth.  All rights reserved.
+'\" Copyright (c) 2018 Peter Spjuth.  All rights reserved.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
diff --git a/doc/lrepeat.n b/doc/lrepeat.n
index 2e17f9c..9a3fc88 100644
--- a/doc/lrepeat.n
+++ b/doc/lrepeat.n
@@ -1,5 +1,5 @@
 '\"
-'\" Copyright (c) 2003 by Simon Geard.  All rights reserved.
+'\" Copyright (c) 2003 Simon Geard.  All rights reserved.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
diff --git a/doc/lreverse.n b/doc/lreverse.n
index 2ed496a..e2e3b69 100644
--- a/doc/lreverse.n
+++ b/doc/lreverse.n
@@ -1,5 +1,5 @@
 '\"
-'\" Copyright (c) 2006 by Donal K. Fellows.  All rights reserved.
+'\" Copyright (c) 2006 Donal K. Fellows.  All rights reserved.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
diff --git a/doc/lset.n b/doc/lset.n
index afc721f..4b97ed6 100644
--- a/doc/lset.n
+++ b/doc/lset.n
@@ -1,5 +1,5 @@
 '\"
-'\" Copyright (c) 2001 by Kevin B. Kenny <kennykb@acm.org>.  All rights reserved.
+'\" Copyright (c) 2001 Kevin B. Kenny <kennykb@acm.org>.  All rights reserved.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
diff --git a/doc/mathfunc.n b/doc/mathfunc.n
index 375d867..3b7d915 100644
--- a/doc/mathfunc.n
+++ b/doc/mathfunc.n
@@ -1,7 +1,7 @@
 '\"
 '\" Copyright (c) 1993 The Regents of the University of California.
 '\" Copyright (c) 1994-2000 Sun Microsystems, Inc.
-'\" Copyright (c) 2005 by Kevin B. Kenny <kennykb@acm.org>. All rights reserved
+'\" Copyright (c) 2005 Kevin B. Kenny <kennykb@acm.org>. All rights reserved
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -360,7 +360,7 @@ expr(n), fpclassify(n), mathop(n), namespace(n)
 .nf
 Copyright \(co 1993 The Regents of the University of California.
 Copyright \(co 1994-2000 Sun Microsystems Incorporated.
-Copyright \(co 2005, 2006 by Kevin B. Kenny <kennykb@acm.org>.
+Copyright \(co 2005-2006 Kevin B. Kenny <kennykb@acm.org>.
 .fi
 '\" Local Variables:
 '\" mode: nroff
diff --git a/doc/memory.n b/doc/memory.n
index 18666ce..4d6a7d1 100644
--- a/doc/memory.n
+++ b/doc/memory.n
@@ -1,6 +1,6 @@
 '\"
-'\" Copyright (c) 1992-1999 by Karl Lehenbauer & Mark Diekhans
-'\" Copyright (c) 2000 by Scriptics Corporation.
+'\" Copyright (c) 1992-1999 Karl Lehenbauer & Mark Diekhans
+'\" Copyright (c) 2000 Scriptics Corporation.
 '\" All rights reserved.
 '\"
 .TH memory n 8.1 Tcl "Tcl Built-In Commands"
diff --git a/doc/packagens.n b/doc/packagens.n
index a6eee1e..65535ef 100644
--- a/doc/packagens.n
+++ b/doc/packagens.n
@@ -1,5 +1,5 @@
 '\"
-'\" Copyright (c) 1998-2000 by Scriptics Corporation.
+'\" Copyright (c) 1998-2000 Scriptics Corporation.
 '\" All rights reserved.
 '\"
 .TH pkg::create n 8.3 Tcl "Tcl Built-In Commands"
diff --git a/doc/socket.n b/doc/socket.n
index 823dbd5..8836150 100644
--- a/doc/socket.n
+++ b/doc/socket.n
@@ -1,6 +1,6 @@
 '\"
 '\" Copyright (c) 1996 Sun Microsystems, Inc.
-'\" Copyright (c) 1998-1999 by Scriptics Corporation.
+'\" Copyright (c) 1998-1999 Scriptics Corporation.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
diff --git a/doc/string.n b/doc/string.n
index f9cc373..7cd53ca 100644
--- a/doc/string.n
+++ b/doc/string.n
@@ -33,20 +33,6 @@ and is more efficient than building a list of arguments and using
 \fBjoin\fR with an empty join string.
 .RE
 .TP
-\fBstring charend \fIstring charIndex\fR
-.
-Returns the index of the next character just after position \fIcharIndex\fR
-in the \fIstring\fR.  \fIcharIndex\fR may be specified using the forms in
-\fBSTRING INDICES\fR.  If position \fIcharIndex\fR of \fIstring\fR holds a
-character > U+FFFF, the returned index will be 2 higher than \fIcharIndex\fR.
-.TP
-\fBstring charstart \fIstring charIndex\fR
-.
-Returns the index of the character containing \fIcharIndex\fR in the \fIstring\fR.
-\fIcharIndex\fR may be specified using the forms in \fBSTRING INDICES\fR.
-Normally this will return \fIcharIndex\fR, except if position \fIcharIndex\fR-1
-holds a chraracter > U+FFFF: In that case the returned index will be one higher.
-.TP
 \fBstring compare\fR ?\fB\-nocase\fR? ?\fB\-length\fI length\fR? \fIstring1 string2\fR
 .
 Perform a character-by-character comparison of strings \fIstring1\fR
@@ -237,24 +223,6 @@ number of bytes used to store the string.  If the value is a
 byte array value (such as those returned from reading a binary encoded
 channel), then this will return the actual byte length of the value.
 .TP
-\fBstring lineend \fIstring charIndex\fR
-.
-Returns the index of the character just after the last one in the word
-containing character \fIcharIndex\fR of \fIstring\fR.  \fIcharIndex\fR
-may be specified using the forms in \fBSTRING INDICES\fR.  A word is
-considered to be any contiguous range of alphanumeric (Unicode letters
-or decimal digits) or underscore (Unicode connector punctuation)
-characters, or any single character other than these.
-.TP
-\fBstring linestart \fIstring charIndex\fR
-.
-Returns the index of the first character in the word containing character
-\fIcharIndex\fR of \fIstring\fR.  \fIcharIndex\fR may be specified using the
-forms in \fBSTRING INDICES\fR.  A word is considered to be any contiguous
-range of alphanumeric (Unicode letters or decimal digits) or underscore
-(Unicode connector punctuation) characters, or any single character other than
-these.
-.TP
 \fBstring map\fR ?\fB\-nocase\fR? \fImapping string\fR
 .
 Replaces substrings in \fIstring\fR based on the key-value pairs in
@@ -403,24 +371,6 @@ characters present in the string given by \fIchars\fR are removed.  If
 \fIchars\fR is not specified then white space is removed (any character
 for which \fBstring is space\fR returns 1, and "\e0").
 .TP
-\fBstring wordend \fIstring charIndex\fR
-.
-Returns the index of the character just after the last one in the word
-containing character \fIcharIndex\fR of \fIstring\fR.  \fIcharIndex\fR
-may be specified using the forms in \fBSTRING INDICES\fR.  A word is
-considered to be any contiguous range of alphanumeric (Unicode letters
-or decimal digits) or underscore (Unicode connector punctuation)
-characters, or any single character other than these.
-.TP
-\fBstring wordstart \fIstring charIndex\fR
-.
-Returns the index of the first character in the word containing character
-\fIcharIndex\fR of \fIstring\fR.  \fIcharIndex\fR may be specified using the
-forms in \fBSTRING INDICES\fR.  A word is considered to be any contiguous
-range of alphanumeric (Unicode letters or decimal digits) or underscore
-(Unicode connector punctuation) characters, or any single character other than
-these.
-.TP
 \fBstring trimright \fIstring\fR ?\fIchars\fR?
 .
 Returns a value equal to \fIstring\fR except that any trailing
@@ -472,6 +422,24 @@ encoding and then apply \fBstring length\fR to that.
 \fBstring length\fR [encoding convertto utf-8 $theString]
 .CE
 .RE
+.TP
+\fBstring wordend \fIstring charIndex\fR
+.
+Returns the index of the character just after the last one in the word
+containing character \fIcharIndex\fR of \fIstring\fR.  \fIcharIndex\fR
+may be specified using the forms in \fBSTRING INDICES\fR.  A word is
+considered to be any contiguous range of alphanumeric (Unicode letters
+or decimal digits) or underscore (Unicode connector punctuation)
+characters, or any single character other than these.
+.TP
+\fBstring wordstart \fIstring charIndex\fR
+.
+Returns the index of the first character in the word containing character
+\fIcharIndex\fR of \fIstring\fR.  \fIcharIndex\fR may be specified using the
+forms in \fBSTRING INDICES\fR.  A word is considered to be any contiguous
+range of alphanumeric (Unicode letters or decimal digits) or underscore
+(Unicode connector punctuation) characters, or any single character other than
+these.
 .SH "STRING INDICES"
 .PP
 When referring to indices into a string (e.g., for \fBstring index\fR
diff --git a/doc/tclsh.1 b/doc/tclsh.1
index c37eb81..8dbacc0 100644
--- a/doc/tclsh.1
+++ b/doc/tclsh.1
@@ -44,7 +44,7 @@ If this character is present in the file, the \fBtclsh\fR application
 will read text up to but not including the character.  An application
 that requires this character in the file may safely encode it as
 .QW \e032 ,
-.QW \ex1a ,
+.QW \ex1A ,
 or
 .QW \eu001a ;
 or may generate it by use of commands such as \fBformat\fR or \fBbinary\fR.
diff --git a/doc/zipfs.n b/doc/zipfs.n
index 2d84173..da2e026 100644
--- a/doc/zipfs.n
+++ b/doc/zipfs.n
@@ -14,7 +14,7 @@
 zipfs \- Mount and work with ZIP files within Tcl
 .SH SYNOPSIS
 .nf
-\fBpackage require zipfs \fR?\fB1.0\fR?
+\fBpackage require tcl::zipfs \fR?\fB1.0\fR?
 .sp
 \fBzipfs canonical\fR ?\fImntpnt\fR? \fIfilename\fR ?\fIZIPFS\fR?
 \fBzipfs exists\fR \fIfilename\fR