Index: general/prog/tcl.xml
===================================================================
--- general/prog/tcl.xml	(revision 19bf3801687ff9268e8364c9dd6bdf3a1f8e34ee)
+++ general/prog/tcl.xml	(revision b1fc792b59cec53f132a2ac65c4579acf38f8f45)
@@ -9,6 +9,6 @@
 <!ENTITY tcl-md5sum "7e01b409925e4eb59ad44a4c12b9c681">
 <!ENTITY tcl-size "3.4 MB">
-<!ENTITY tcl-buildsize "34 MB">
-<!ENTITY tcl-time "0.33 SBU">
+<!ENTITY tcl-buildsize "24.2 MB">
+<!ENTITY tcl-time "0.28 SBU (additional 0.73 SBU to run the test suite)">
 ]>
 
@@ -120,11 +120,13 @@
 
 <segmentedlist>
-<segtitle>Installed Program</segtitle>
+<segtitle>Installed Programs</segtitle>
 <segtitle>Installed Libraries</segtitle>
 <segtitle>Installed Directories</segtitle>
+
 <seglistitem>
-<seg>tclsh</seg>
+<seg>tclsh and tclsh8.4</seg>
 <seg>libtcl.so and libtclstub8.4.a</seg>
-<seg>/usr/lib/tcl8.4 and /usr/include/tcl8.4</seg></seglistitem>
+<seg>/usr/include/tcl8.4 and /usr/lib/tcl8.4</seg>
+</seglistitem>
 </segmentedlist>
 
@@ -135,8 +137,17 @@
 <varlistentry id="tclsh">
 <term><command>tclsh</command></term>
+<listitem><para> is a symlink to the <command>tclsh8.4</command> 
+program.</para>
+<indexterm zone="tcl tclsh">
+<primary sortas="g-tclsh">tclsh</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="tclsh8.4">
+<term><command>tclsh8.4</command></term>
 <listitem><para> is a simple shell containing the
 <application>Tcl</application> interpreter.</para>
-<indexterm zone="tcl tclsh">
-<primary sortas="b-tclsh">tclsh</primary></indexterm>
+<indexterm zone="tcl tclsh8.4">
+<primary sortas="b-tclsh8.4">tclsh8.4</primary></indexterm>
 </listitem>
 </varlistentry>
Index: general/prog/tk.xml
===================================================================
--- general/prog/tk.xml	(revision 19bf3801687ff9268e8364c9dd6bdf3a1f8e34ee)
+++ general/prog/tk.xml	(revision b1fc792b59cec53f132a2ac65c4579acf38f8f45)
@@ -9,6 +9,6 @@
 <!ENTITY tk-md5sum "1b64258abaf258e9a86f331d8de17a71">
 <!ENTITY tk-size "3.2 MB">
-<!ENTITY tk-buildsize "26 MB">
-<!ENTITY tk-time "0.40 SBU">
+<!ENTITY tk-buildsize "23.3 MB">
+<!ENTITY tk-time "0.35 SBU">
 ]>
 
@@ -66,4 +66,8 @@
 sed -i "s:${DIR}:/usr/include/tk${V}:" tkConfig.sh</command></userinput></screen>
 
+<para>If you run <command>make test</command> to run the test suite,
+ensure you do it from an X Window display device with the 
+<acronym>GLX</acronym> extensions loaded, else the tests will hang.</para>
+
 <para>Now, as the root user:</para>
 
@@ -119,11 +123,13 @@
 
 <segmentedlist>
-<segtitle>Installed Program</segtitle>
+<segtitle>Installed Programs</segtitle>
 <segtitle>Installed Libraries</segtitle>
 <segtitle>Installed Directories</segtitle>
+
 <seglistitem>
-<seg>wish</seg>
+<seg>wish and wish8.4</seg>
 <seg>libtk.so and libtkstub8.4.a</seg>
-<seg>/usr/lib/tk8.4 and /usr/include/tk8.4</seg></seglistitem>
+<seg>/usr/include/tk8.4 and /usr/lib/tk8.4</seg>
+</seglistitem>
 </segmentedlist>
 
@@ -134,9 +140,17 @@
 <varlistentry id="wish">
 <term><command>wish</command></term>
+<listitem><para> is a symlink to the <command>wish8.4</command> program.</para>
+<indexterm zone="tk wish">
+<primary sortas="b-wish">wish</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="wish8.4">
+<term><command>wish8.4</command></term>
 <listitem><para> is a simple shell containing the
 <application>Tk</application> toolkit that creates a main window and
 then processes <application>Tcl</application> commands.</para>
-<indexterm zone="tk wish">
-<primary sortas="b-wish">wish</primary></indexterm>
+<indexterm zone="tk wish8.4">
+<primary sortas="b-wish8.4">wish8.4</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -150,5 +164,4 @@
 </listitem>
 </varlistentry>
-
 </variablelist>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 19bf3801687ff9268e8364c9dd6bdf3a1f8e34ee)
+++ introduction/welcome/changelog.xml	(revision b1fc792b59cec53f132a2ac65c4579acf38f8f45)
@@ -24,5 +24,6 @@
 
 <listitem><para>March 24th, 2005 [randy]: Updated to Sysstat-5.1.5 and 
-Fontconfig-2.3.1.</para></listitem>
+Fontconfig-2.3.1; added a note the the Tk instructions about running the 
+test suite.</para></listitem>
 
 <listitem><para>March 23rd, 2005 [randy]: Updated to Shadow-4.0.7; added 
Index: x/installing/xorg.xml
===================================================================
--- x/installing/xorg.xml	(revision 19bf3801687ff9268e8364c9dd6bdf3a1f8e34ee)
+++ x/installing/xorg.xml	(revision b1fc792b59cec53f132a2ac65c4579acf38f8f45)
@@ -9,6 +9,6 @@
   <!ENTITY xorg-md5sum        "8131cd7ea1e4566e6e05c438a93fcfe1">
   <!ENTITY xorg-size          "43 MB">
-  <!ENTITY xorg-buildsize     "655 MB">
-  <!ENTITY xorg-time          "17.8 SBU">
+  <!ENTITY xorg-buildsize     "839 MB">
+  <!ENTITY xorg-time          "10.34 SBU">
 ]>
 
