* Merged updates from HEAD.

3 files changed, 40 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 9ba9e93..c4799dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,32 @@
-2001-07-04  Don Porter  <dgp@users.sourceforge.net>
+2001-07-04  Jeff Hobbs  <jeffh@ActiveState.com>
+
+	* README:
+	* mac/README:
+	* unix/README:
+	* win/README: updated READMEs with purls
+
+2001-07-03  Jeff Hobbs  <jeffh@ActiveState.com>
+
+	* tests/canvas.test:
+	* generic/tkCanvPoly.c (PolygonToArea): Added patch that respects
+	the polygon difference of including points in the polygon even
+	when fill is empty.  [Bug #226357]
+
+2001-07-03  Mo DeJong  <mdejong@redhat.com>
+
+	* win/Makefile.in: Remove PATHTYPE variable.
+	* win/configure: Regen.
+	* win/configure.in: Don't subst PATHTYPE.
+	* win/tcl.m4: Update from Tcl.
+
+2001-07-03  Mo DeJong  <mdejong@redhat.com>
+
+	* win/Makefile.in: Don't use VPSEP, instead just use :
+	in the VPATH.
+	* win/configure: Regen.
+	* win/configure.in: Don't subst VPSEP.
+
+2001-07-03  Don Porter  <dgp@users.sourceforge.net>
 
 	BRANCH dgp-privates-into-namespace:
 	* ChangeLog:
@@ -81,6 +109,7 @@
 	* tests/winClipboard.test:
 	* tests/winDialog.test:
 	* unix/Makefile.in:
+	* unix/README:
 	* unix/configure:
 	* unix/configure.in:
 	* unix/tcl.m4:
diff --git a/README b/README
index a8be72d..11c1730 100644
--- a/README
+++ b/README
@@ -1,11 +1,11 @@
 README:  Tk
     This is the Tk 8.4a3 source distribution.
-    You can get any release of Tcl from:
-        http://dev.scriptics.com/registration/<version>.html
     Tcl/Tk is also available through NetCVS:
 	http://tcl.sourceforge.net/
+    You can get any release of Tcl from:
+        http://www.purl.org/tcl/home/registration/<version>.html
 
-RCS: @(#) $Id: README,v 1.27.4.1 2001/07/03 20:01:07 dgp Exp $
+RCS: @(#) $Id: README,v 1.27.4.2 2001/07/05 19:14:13 dgp Exp $
 
 1. Introduction
 ---------------
@@ -16,7 +16,7 @@ toolkit implemented with the Tcl scripting language.
 For details on features, incompatibilities, and potential problems with
 this release, see the Tcl/Tk 8.4 Web page at
 
-	http://dev.scriptics.com/software/tcltk/8.4.html
+	http://www.purl.org/tcl/home/software/tcltk/8.4.html
 
 or refer to the "changes" file in this directory, which contains a
 historical record of all changes to Tk.
@@ -29,7 +29,7 @@ SourceForge at:
 
 with the Tcl Developer Xchange at:
 
-	http://dev.scriptics.com
+	http://www.purl.org/tcl/home/
 
 Tk is a freely available open source package.  You can do virtually
 anything you like with it, such as modifying it, redistributing it,
diff --git a/unix/README b/unix/README
index b5d546c..e283176 100644
--- a/unix/README
+++ b/unix/README
@@ -6,11 +6,11 @@ UNIX versions of Tk.  This directory also contains source files for Tk
 that are specific to UNIX.
 
 The information in this file is maintained at:
-	http://dev.scriptics.com/doc/howto/compile.html
+	http://www.purl.org/tcl/home/doc/howto/compile.html
 
 For information on platforms where Tcl/Tk is known to compile, along
 with any porting notes for getting it to work on those platforms, see:
-	http://dev.scriptics.com/software/tcltk/platforms.html
+	http://www.purl.org/tcl/home/software/tcltk/platforms.html
 
 The rest of this file contains instructions on how to do this.  The
 release should compile and run either "out of the box" or with trivial
@@ -20,7 +20,7 @@ SGI, as well as PCs running Linux, BSDI, and SCO UNIX.  To compile for
 a PC running Windows, see the README file in the directory ../win.  To
 compile for a Macintosh, see the README file in the directory ../mac.
 
-RCS: @(#) $Id: README,v 1.11 2000/08/25 05:55:05 mo Exp $
+RCS: @(#) $Id: README,v 1.11.4.1 2001/07/05 19:14:13 dgp Exp $
 
 How To Compile And Install Tk:
 ------------------------------
@@ -65,7 +65,7 @@ How To Compile And Install Tk:
     to use gcc after configure is run.
 
     Note: be sure to use only absolute path names (those starting with "/")
-    in the --prefix and --exec_prefix options.
+    in the --prefix and --exec-prefix options.
 
 (e) Type "make".  This will create a library archive called
     "libtk<version>.a" or "libtk<version>.so" and an interpreter
@@ -83,7 +83,7 @@ How To Compile And Install Tk:
     standard places.  You'll need write permission on the installation
     directoryies to do this.  The installation directories are
     determined by the "configure" script and may be specified with
-    the --prefix and --exec_prefix options to "configure".  See the
+    the --prefix and --exec-prefix options to "configure".  See the
     Makefile for information on what directories were chosen; you
     can override these choices by modifying the "prefix" and
     "exec_prefix" variables in the Makefile.