Merge 8.6

doc/FileSystem.3

@@ -20,10 +20,9 @@ int
 int
 \fBTcl_FSUnregister\fR(\fIfsPtr\fR)
 .sp
-ClientData
+void *
 \fBTcl_FSData\fR(\fIfsPtr\fR)
 .sp
-void
 \fBTcl_FSMountsChanged\fR(\fIfsPtr\fR)
 .sp
 const Tcl_Filesystem *
@@ -123,7 +122,7 @@ Tcl_Obj *
 int
 \fBTcl_FSConvertToPathType\fR(\fIinterp, pathPtr\fR)
 .sp
-ClientData
+void *
 \fBTcl_FSGetInternalRep\fR(\fIpathPtr, fsPtr\fR)
 .sp
 Tcl_Obj *
@@ -210,7 +209,7 @@ this structure will be returned. This parameter may be NULL.
 .AP Tcl_Interp *interp in
 Interpreter to use either for results, evaluation, or reporting error
 messages.
-.AP ClientData clientData in
+.AP void *clientData in
 The native description of the path value to create.
 .AP Tcl_Obj *firstPtr in
 The first of two path values to compare. The value may be converted
@@ -221,7 +220,7 @@ to \fBpath\fR type.
 .AP Tcl_Obj *listObj in
 The list of path elements to operate on with a \fBjoin\fR operation.
 .AP int elements in
-If non-negative, the number of elements in the \fIlistObj\fR which should
+The number of elements in the \fIlistObj\fR which should
 be joined together. If negative, then all elements are joined.
 .AP Tcl_Obj **errorPtr out
 In the case of an error, filled with a value containing the name of
@@ -251,7 +250,7 @@ Name of a procedure to look up in the file's symbol table
 Filled with the init function for this code.
 .AP Tcl_LibraryInitProc **proc2Ptr out
 Filled with the safe-init function for this code.
-.AP ClientData *clientDataPtr out
+.AP void **clientDataPtr out
 Filled with the clientData value to pass to this code's unload
 function when it is called.
 .AP Tcl_LoadHandle *loadHandlePtr out
@@ -742,7 +741,7 @@ filesystems, so that they can easily retrieve the native (char* or
 TCHAR*) representation of a path. This function is a convenience
 wrapper around \fBTcl_FSGetInternalRep\fR. It may be desirable in the
 future to have non-string-based native representations (for example,
-on MacOSX, a representation using a fileSpec of FSRef structure would
+on macOS, a representation using a fileSpec of FSRef structure would
 probably be more efficient). On Windows a full Unicode representation
 would allow for paths of unlimited length. Currently the representation
 is simply a character string which may contain either the relative path
@@ -837,7 +836,7 @@ general that is not a good thing to do). \fBTCL_OK\fR will be returned.
 the list of known filesystems, if it is known, and returns \fBTCL_OK\fR. If
 the filesystem is not currently registered, \fBTCL_ERROR\fR is returned.
 .PP
-\fBTcl_FSData\fR will return the ClientData associated with the given
+\fBTcl_FSData\fR will return the clientData associated with the given
 filesystem, if that filesystem is registered. Otherwise it will
 return NULL.
 .PP

doc/exec.n

@@ -335,7 +335,7 @@ the caller must prepend the desired command with
 because built-in commands are not implemented using executables.
 .RE
 .TP
-\fBUnix\fR (including Mac OS X)
+\fBUnix\fR (including macOS)
 .
 The \fBexec\fR command is fully functional and works as described.
 .SH "UNIX EXAMPLES"

doc/file.n

@@ -78,7 +78,7 @@ names, the long name is retained. This attribute cannot be set.
 \fB\-system\fR gives or sets or clears the value of the system
 attribute of the file.
 .PP
-On Mac OS X and Darwin, \fB\-creator\fR gives or sets the
+On macOS and Darwin, \fB\-creator\fR gives or sets the
 Finder creator type of the file. \fB\-hidden\fR gives or sets or clears
 the hidden attribute of the file. \fB\-readonly\fR gives or sets or
 clears the readonly attribute of the file. \fB\-rsrclength\fR gives

doc/filename.n

@@ -42,7 +42,7 @@ The rules for native names depend on the value reported in the Tcl
 .TP 10
 \fBUnix\fR
 .
-On Unix and Apple MacOS X platforms, Tcl uses path names where the
+On Unix and Apple macOS platforms, Tcl uses path names where the
 components are separated by slashes.  Path names may be relative or
 absolute, and file names may contain any character other than slash.
 The file names \fB\&.\fR and \fB\&..\fR are special and refer to the
@@ -150,7 +150,7 @@ the tilde is followed immediately by a separator, then the \fB$HOME\fR
 environment variable is substituted.  Otherwise the characters between
 the tilde and the next separator are taken as a user name, which is used
 to retrieve the user's home directory for substitution.  This works on
-Unix, MacOS X and Windows (except very old releases).
+Unix, macOS and Windows (except very old releases).
 .PP
 Old Windows platforms do not support tilde substitution when a user name
 follows the tilde.  On these platforms, attempts to use a tilde followed

doc/glob.n

@@ -102,11 +102,11 @@ a directory will be returned if \fB\-types d\fR was specified.
 The second form specifies types where all the types given must match.
 These are \fIr\fR, \fIw\fR, \fIx\fR as file permissions, and
 \fIreadonly\fR, \fIhidden\fR as special permission cases. On the
-Macintosh, MacOS types and creators are also supported, where any item
-which is four characters long is assumed to be a MacOS type
+Macintosh, macOS types and creators are also supported, where any item
+which is four characters long is assumed to be a macOS type
 (e.g. \fBTEXT\fR). Items which are of the form \fI{macintosh type XXXX}\fR
 or \fI{macintosh creator XXXX}\fR will match types or creators
-respectively. Unrecognized types, or specifications of multiple MacOS
+respectively. Unrecognized types, or specifications of multiple macOS
 types/creators will signal an error.
 .PP
 The two forms may be mixed, so \fB\-types {d f r w}\fR will find all