Merge 8.7 and doc fix

4 files changed, 6 insertions, 7 deletions

diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
index bf3c420..a57a6cf 100644
--- a/.github/workflows/mac-build.yml
+++ b/.github/workflows/mac-build.yml
@@ -2,7 +2,7 @@ name: macOS
 on: [push]
 jobs:
   xcode:
-    runs-on: macos-11.0
+    runs-on: macos-11
     defaults:
       run:
         shell: bash
@@ -24,7 +24,7 @@ jobs:
           ERROR_ON_FAILURES: 1
           MAC_CI: 1
   clang:
-    runs-on: macos-11.0
+    runs-on: macos-11
     strategy:
       matrix:
         cfgopt:
diff --git a/.github/workflows/onefiledist.yml b/.github/workflows/onefiledist.yml
index 0cad3d2..f2f6c1e 100644
--- a/.github/workflows/onefiledist.yml
+++ b/.github/workflows/onefiledist.yml
@@ -38,7 +38,7 @@ jobs:
           path: 1dist/*.tar
   macos:
     name: macOS
-    runs-on: macos-11.0
+    runs-on: macos-11
     defaults:
       run:
         shell: bash
diff --git a/generic/tcl.h b/generic/tcl.h
index 759adc9..e7212aa 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2150,7 +2150,7 @@ typedef struct Tcl_EncodingType {
 #if TCL_UTF_MAX > 3
     /*
      * int isn't 100% accurate as it should be a strict 4-byte value
-     * (perhaps wchar_t). ILP64/SILP64 systems may have troubles. The
+     * (perhaps int32_t). ILP64/SILP64 systems may have troubles. The
      * size of this value must be reflected correctly in regcustom.h.
      */
 typedef int Tcl_UniChar;
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 7a9f0b7..45136ef 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -1103,7 +1103,7 @@ Tcl_CreateEncoding(
  * Results:
  *	The converted bytes are stored in the DString, which is then NULL
  *	terminated. The return value is a pointer to the value stored in the
- *	DString resp. the index of the first erratic byte in 'src'.
+ *	DString.
  *
  * Side effects:
  *	None.
@@ -1341,8 +1341,7 @@ Tcl_ExternalToUtf(
  * Results:
  *	The converted bytes are stored in the DString, which is then NULL
  *	terminated in an encoding-specific manner. The return value is a
- *	pointer to the value stored in the DString resp. the index of the
- *	first erratic byte in 'src'.
+ *	pointer to the value stored in the DString.
  *
  * Side effects:
  *	None.