Merge 8.7

2 files changed, 5 insertions, 16 deletions

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/tools/tcltk-man2html-utils.tcl b/tools/tcltk-man2html-utils.tcl
index 68d380a..94440d5 100644
--- a/tools/tcltk-man2html-utils.tcl
+++ b/tools/tcltk-man2html-utils.tcl
@@ -199,7 +199,7 @@ proc process-text {text} {
 	    {\(eu}	"€" \
 	    {\fP}	{\fR} \
 	    {\.}	. \
-	    {\(bu}	"•" \
+	    {\(bu}	"•" \
 	    {\*(qo}	"ô" \
 	    ]
     # This might make a few invalid mappings, but we don't use them
@@ -573,7 +573,7 @@ proc output-IP-list {context code rest} {
 	    if {[regexp {^\[[\da-f]+\]|\(?[\da-f]+\)$} $rest]} {
 		set dl "<ol class=\"[string tolower $manual(section)]\">"
 		set enddl "</ol>"
-	    } elseif {"&#8226;" eq $rest} {
+	    } elseif {"&bull;" eq $rest} {
 		set dl "<ul class=\"[string tolower $manual(section)]\">"
 		set enddl "</ul>"
 	    }
@@ -599,7 +599,7 @@ proc output-IP-list {context code rest} {
 			    man-puts "$para<li value=\"$value\">"
 			} elseif {[regexp {^\(?([\da-f]+)\)$} $rest -> value]} {
 			    man-puts "$para<li value=\"$value\">"
-			} elseif {"&#8226;" eq $rest} {
+			} elseif {"&bull;" eq $rest} {
 			    man-puts "$para<li>"
 			} else {
 			    man-puts "$para<dt>[long-toc $rest]<dd>"