Merge 8.6

3 files changed, 38 insertions, 42 deletions

diff --git a/README b/README
deleted file mode 100644
index b688c1f..0000000
--- a/README
+++ /dev/null
@@ -1,41 +0,0 @@
-README:  Tk
-    This is the Tk 8.7a2 source distribution.
-	http://sourceforge.net/projects/tcl/files/Tcl/
-    You can get any source release of Tk from the URL above.
-
-1. Introduction
----------------
-
-This directory contains the sources and documentation for Tk, an X11
-toolkit implemented with the Tcl scripting language.
-
-For details on features, incompatibilities, and potential problems with
-this release, see the Tcl/Tk 8.7 Web page at
-
-	http://www.tcl-lang.org/software/tcltk/8.7.html
-
-or refer to the "changes" file in this directory, which contains a
-historical record of all changes to Tk.
-
-Tk is maintained, enhanced, and distributed freely by the Tcl community.
-Source code development and tracking of bug reports and feature requests
-takes place at:
-
-	http://core.tcl-lang.org/tk/
-
-with the Tcl Developer Xchange at:
-
-	http://www.tcl-lang.org/
-
-Tk is a freely available open source package.  You can do virtually
-anything you like with it, such as modifying it, redistributing it,
-and selling it either in whole or in part.  See the file
-"license.terms" for complete information.
-
-2. See Tcl README
------------------
-
-Please see the README file that comes with the associated Tcl release
-for more information.  There are pointers there to extensive
-documentation.  In addition, there are additional README files
-in the subdirectories of this distribution.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..4ace0b2
--- /dev/null
+++ b/README.md
@@ -0,0 +1,37 @@
+# README:  Tk
+
+This is the **Tk 8.7a2** source distribution.
+
+You can get any source release of Tk from [our distribution
+site](https://sourceforge.net/projects/tcl/files/Tcl/).
+
+
+## <a id="intro">1.</a> Introduction
+
+This directory contains the sources and documentation for Tk, a
+cross-platform GUI toolkit implemented with the Tcl scripting language.
+
+For details on features, incompatibilities, and potential problems with
+this release, see [the Tcl/Tk 8.7 Web page](https://www.tcl.tk/software/tcltk/8.7.html)
+or refer to the "changes" file in this directory, which contains a
+historical record of all changes to Tk.
+
+Tk is maintained, enhanced, and distributed freely by the Tcl community.
+Source code development and tracking of bug reports and feature requests
+takes place at [core.tcl-lang.org](https://core.tcl-lang.org/).
+Tcl/Tk release and mailing list services are [hosted by
+SourceForge](https://sourceforge.net/projects/tcl/)
+with the Tcl Developer Xchange hosted at
+[www.tcl-lang.org](https://www.tcl-lang.org).
+
+Tk is a freely available open source package.  You can do virtually
+anything you like with it, such as modifying it, redistributing it,
+and selling it either in whole or in part.  See the file
+`license.terms` for complete information.
+
+## <a id="tcl">2.</a> See Tcl README.md
+
+Please see the README.md file that comes with the associated Tcl release
+for more information.  There are pointers there to extensive
+documentation.  In addition, there are additional README files
+in the subdirectories of this distribution.
diff --git a/unix/Makefile.in b/unix/Makefile.in
index d26ab98..c89fefe 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1601,7 +1601,7 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(MAC
 	$(DIST_INSTALL_DATA) $(GENERIC_DIR)/*.decls $(DISTDIR)/generic
 	$(DIST_INSTALL_DATA) $(GENERIC_DIR)/README $(DISTDIR)/generic
 	$(DIST_INSTALL_DATA) $(TOP_DIR)/changes $(TOP_DIR)/ChangeLog \
-		$(TOP_DIR)/ChangeLog.2??? $(TOP_DIR)/README \
+		$(TOP_DIR)/ChangeLog.2??? $(TOP_DIR)/README.md \
 		$(TOP_DIR)/license.terms $(DISTDIR)
 	rm -f $(DISTDIR)/generic/blt*.[ch]
 	$(INSTALL_DATA_DIR) $(DISTDIR)/generic/ttk