Index: general/general.ent
===================================================================
--- general/general.ent	(revision b2a9f854ce57247e2d0307fff24bc23f98810c9e)
+++ general/general.ent	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
@@ -107,4 +107,5 @@
 <!ENTITY % gnat SYSTEM "prog/gcc/gnat.ent">
 <!ENTITY % gcc2 SYSTEM "prog/gcc2/gcc2.ent">
+<!ENTITY % tcltk SYSTEM "prog/tcltk/tcltk.ent">
 <!ENTITY % nasm SYSTEM "prog/nasm/nasm.ent">
 %python;
@@ -116,3 +117,4 @@
 %gcc;
 %gcc2;
+%tcltk;
 %nasm;
Index: general/prog/jdk/j2sdk-inst.xml
===================================================================
--- general/prog/jdk/j2sdk-inst.xml	(revision b2a9f854ce57247e2d0307fff24bc23f98810c9e)
+++ general/prog/jdk/j2sdk-inst.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
@@ -55,4 +55,8 @@
 export ALT_CACERTS_FILE=${ALT_BOOTDIR}/jre/lib/security/cacerts</userinput></screen></para>
 
+<para>Additionally, if you would like to make in parallel, add the following (adjust
+<envar>MAKE_PARALLEL</envar> to your liking):</para>
+<para><screen><userinput>export HOTSPOT_BUILD_JOBS=$MAKE_PARALLEL</userinput></screen></para>
+
 <para>The included motif doesn't build properly with the current glibc/xfree86.
 A solution is to build the motif library before compiling the j2sdk. Note that
Index: general/prog/jdk/j2sdk-intro.xml
===================================================================
--- general/prog/jdk/j2sdk-intro.xml	(revision b2a9f854ce57247e2d0307fff24bc23f98810c9e)
+++ general/prog/jdk/j2sdk-intro.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
@@ -36,7 +36,9 @@
 </para>
 
+<!--
 <para>If you have difficulties in building the jdk, check out the javafromscratch
 hint at <ulink url="http://www.linuxfromscratch.org/~tushar/"/> for some workarounds.
 </para>
+-->
 
 <para>For users who cannot download the j2sdk source owing to license
Index: general/prog/prog.xml
===================================================================
--- general/prog/prog.xml	(revision b2a9f854ce57247e2d0307fff24bc23f98810c9e)
+++ general/prog/prog.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
@@ -9,4 +9,6 @@
 &ruby;
 &gcc;
+&tcl;
+&tk;
 &gcc2;
 &NASM;
Index: general/prog/tcl.xml
===================================================================
--- general/prog/tcl.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
+++ general/prog/tcl.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
@@ -0,0 +1,10 @@
+<sect1 id="tcl" xreflabel="tcl-&tcltk-version;">
+<?dbhtml filename="tcl.html" dir="general"?>
+<title>tcl-&tcltk-version;</title>
+
+&tcl-intro;
+&tcl-inst;
+&tcl-exp;
+
+</sect1>
+
Index: general/prog/tk.xml
===================================================================
--- general/prog/tk.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
+++ general/prog/tk.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
@@ -0,0 +1,10 @@
+<sect1 id="tk" xreflabel="tk-&tcltk-version;">
+<?dbhtml filename="tk.html" dir="general"?>
+<title>tk-&tcltk-version;</title>
+
+&tk-intro;
+&tk-inst;
+&tk-exp;
+
+</sect1>
+
Index: index.xml
===================================================================
--- index.xml	(revision b2a9f854ce57247e2d0307fff24bc23f98810c9e)
+++ index.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
@@ -3,6 +3,6 @@
 			"/usr/share/docbook/docbookx.dtd" [
 
-<!ENTITY version "20030920">
-<!ENTITY releasedate "September 20th, 2003">
+<!ENTITY version "20030921">
+<!ENTITY releasedate "September 21st, 2003">
 
 <!ENTITY % book SYSTEM "book/book.ent">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision b2a9f854ce57247e2d0307fff24bc23f98810c9e)
+++ introduction/welcome/changelog.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
@@ -10,4 +10,6 @@
 
 <itemizedlist>
+
+<listitem><para>September 21st, 2003 [tushar]: Added tcl-8.4.4 and tk-8.4.4.</para></listitem>
 
 <listitem><para>September 20th, 2003 [tushar]: Added nail-10.5.</para></listitem>
Index: introduction/welcome/credits.xml
===================================================================
--- introduction/welcome/credits.xml	(revision b2a9f854ce57247e2d0307fff24bc23f98810c9e)
+++ introduction/welcome/credits.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
@@ -156,5 +156,5 @@
 
 <listitem><para>fontconfig, gcc, gcc2, j2sdk, mozilla, nas, openoffice, ispell, nail,
-STLport, and bind-utils: <emphasis>Tushar Teredesai</emphasis></para></listitem>
+STLport, tcl, tk and bind-utils: <emphasis>Tushar Teredesai</emphasis></para></listitem>
 
 <listitem><para>ncpfs and RP-PPPoE: <emphasis>DJ Lucas</emphasis></para>
Index: xsoft/suites/openoffice/openoffice-intro.xml
===================================================================
--- xsoft/suites/openoffice/openoffice-intro.xml	(revision b2a9f854ce57247e2d0307fff24bc23f98810c9e)
+++ xsoft/suites/openoffice/openoffice-intro.xml	(revision c4f140172d9594d4d310ffde8a72285e72a9c31a)
@@ -16,6 +16,5 @@
 <xref linkend="freetype2"/>, <xref linkend="xfree86"/>, <xref linkend="j2sdk"/>,
 <xref linkend="zip"/>, <xref linkend="unzip"/>, <xref linkend="tcsh"/>,
-<xref linkend="db"/>, <xref linkend="STLport"/>, <xref linkend="which"/>
-and <ulink url="http://www.courtesan.com/mktemp">mktemp</ulink>
+<xref linkend="db"/>, <xref linkend="STLport"/>, and <xref linkend="which"/>.
 openoffice will utilize:
 ant
@@ -26,8 +25,5 @@
 
 <para>Also download the various patches from <userinput><ulink url="&hfile-root;"/></userinput>.
-The patches begin with openoffice-&openoffice-version;.
-You will need most of the patches
-except for the patches that activate the use the system installed versions
-of packages (you need to select those based on your installation).</para>
+The patches begin with openoffice-&openoffice-version;.</para>
 
 <para>The source tarball only contains English language help. A localized help
@@ -35,4 +31,5 @@
 url="http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/"/>.</para>
 
+<!--
 <para>If you have difficulties in building openoffice, check out the
 openoffice
@@ -41,5 +38,4 @@
 hint also discusses installation of auxiliary software.
 </para>
-<!--
 <note><para>There is a problem with the current version of OO on LFS.
 The build and installation appears to be successful but no files are installed.
