Index: archive/dejagnu.xml
===================================================================
--- archive/dejagnu.xml	(revision f4002c52076f3ee5a0b5677d70453f9624d6ffa7)
+++ archive/dejagnu.xml	(revision f4002c52076f3ee5a0b5677d70453f9624d6ffa7)
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY dejagnu-download-http "&gnu-http;/dejagnu/dejagnu-&dejagnu-version;.tar.gz">
+  <!ENTITY dejagnu-download-ftp  "&gnu-ftp;/dejagnu/dejagnu-&dejagnu-version;.tar.gz">
+  <!ENTITY dejagnu-md5sum        "e1b07516533f351b3aba3423fafeffd6">
+  <!ENTITY dejagnu-size          "516 KB">
+  <!ENTITY dejagnu-buildsize     "3.4 MB (with tests)">
+  <!ENTITY dejagnu-time          "less than 0.1 SBU (with tests)">
+]>
+
+<sect1 id="dejagnu" xreflabel="DejaGnu-&dejagnu-version;">
+  <?dbhtml filename="dejagnu.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>DejaGnu-&dejagnu-version;</title>
+
+  <indexterm zone="dejagnu">
+    <primary sortas="a-DejaGnu">DejaGnu</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to DejaGnu</title>
+
+    <para>
+      <application>DejaGnu</application> is a framework for running test
+      suites on GNU tools. It is written in <command>expect</command>, which
+      uses <application>Tcl</application> (Tool command language). It was installed
+      by LFS in the temporary <filename class="directory">/tools</filename>
+      directory. These instructions install it permanently.
+    </para>
+
+    &lfs91_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&dejagnu-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&dejagnu-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &dejagnu-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &dejagnu-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &dejagnu-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &dejagnu-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">DejaGnu Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="expect"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="docbook-utils"/> and
+      <ulink url="http://sourceforge.net/projects/docbook2x/">docbook2X</ulink>
+      (both looked for by the <command>configure</command> script but not used
+      in the build)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/dejagnu"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of DejaGnu</title>
+
+    <para>
+      Install <application>DejaGnu</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+makeinfo --html --no-split -o doc/dejagnu.html doc/dejagnu.texi &amp;&amp;
+makeinfo --plaintext       -o doc/dejagnu.txt  doc/dejagnu.texi</userinput></screen>
+
+    <para>
+      To test the results, issue <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+install -v -dm755   /usr/share/doc/dejagnu-&dejagnu-version; &amp;&amp;
+install -v -m644    doc/dejagnu.{html,txt} \
+                    /usr/share/doc/dejagnu-&dejagnu-version;</userinput></screen>
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>
+          runtest
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/share/dejagnu
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="runtest">
+        <term><command>runtest</command></term>
+        <listitem>
+          <para>
+            is the <application>DejaGnu</application> test driver program. It is
+            used to control what tests to run, and variations on how to run them.
+          </para>
+          <indexterm zone="dejagnu runtest">
+            <primary sortas="b-runtest">runtest</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/expect.xml
===================================================================
--- archive/expect.xml	(revision f4002c52076f3ee5a0b5677d70453f9624d6ffa7)
+++ archive/expect.xml	(revision f4002c52076f3ee5a0b5677d70453f9624d6ffa7)
@@ -0,0 +1,511 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY expect-download-http "&sourceforge-dl;/expect/expect&expect-version;.tar.gz">
+  <!ENTITY expect-download-ftp  " ">
+  <!ENTITY expect-md5sum        "00fce8de158422f5ccd2666512329bd2">
+  <!ENTITY expect-size          "624 KB">
+  <!ENTITY expect-buildsize     "3.2 MB (with tests)">
+  <!ENTITY expect-time          "0.2 SBU (with tests)">
+]>
+
+<sect1 id="expect" xreflabel="Expect-&expect-version;">
+  <?dbhtml filename="expect.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Expect-&expect-version;</title>
+
+  <indexterm zone="expect">
+    <primary sortas="a-Expect">Expect</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Expect</title>
+
+    <para>
+      The <application>Expect</application> package was installed in the
+      LFS temporary tools directory for testing other packages.  These
+      procedures install it in a permanent location.  It contains tools for
+      automating interactive applications such as <command>telnet</command>,
+      <command>ftp</command>, <command>passwd</command>,
+      <command>fsck</command>, <command>rlogin</command>,
+      <command>tip</command>, etc. <application>Expect</application> is also
+      useful for testing these same applications as well as easing all sorts of
+      tasks that are prohibitively difficult with anything else.
+    </para>
+
+    &lfs91_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&expect-download-http;"/>
+        </para>
+      </listitem>
+      <!-- <listitem>
+        <para>
+          Download (FTP): <ulink url="&expect-download-ftp;"/>
+        </para>
+      </listitem> -->
+      <listitem>
+        <para>
+          Download MD5 sum: &expect-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &expect-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &expect-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &expect-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Expect Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="tcl"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="tk"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/expect"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Expect</title>
+
+    <para>
+      Install <application>Expect</application> by running the following
+      commands:
+    </para>
+
+    <!-- Not sure if we need a static library as it does not build by default
+         any longer. Only a .so library is installed when passing
+         'enable-shared'. -->
+<screen><userinput>./configure --prefix=/usr           \
+            --with-tcl=/usr/lib     \
+            --enable-shared         \
+            --mandir=/usr/share/man \
+            --with-tclinclude=/usr/include &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make test</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+ln -svf expect&expect-version;/libexpect&expect-version;.so /usr/lib</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>-with-tcl=/usr/lib</parameter>: This parameter is used to
+      tell the <command>configure</command> script where the
+      <command>tclConfig.sh</command> is located.
+    </para>
+
+    <para>
+      <parameter>--enable-shared</parameter>: This option enables
+      building the shared library.
+    </para>
+
+    <!-- Not really sure if this is required any longer as the library is now
+         installed directly in /usr/lib/expect5.45/. -->
+    <para>
+      <command>ln -sf ...</command>: This command creates a required link
+      to the shared library.
+    </para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Expect</title>
+
+    <sect3 id="expect-config">
+      <title>Config Files</title>
+
+      <para>
+        <filename>$exp_library/expect.rc</filename> and
+        <filename>~/.expect.rc</filename>
+      </para>
+
+      <indexterm zone="expect expect-config">
+        <primary sortas="e-AA.expect.rc">~/.expect.rc</primary>
+      </indexterm>
+
+      <indexterm zone="expect expect-config">
+        <primary sortas="e-A.exp_library-expect.rc">$exp_library/expect.rc</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>
+        Reference the <command>expect</command> man page for information about
+        utilizing the <filename>expect.rc</filename> configuration files.
+        Additionally, many of the tools contained in the
+        <application>Expect</application> package will use their own
+        configuration files. Reference the respective man page, or
+        examine the script directly for configuration file information.
+      </para>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>autoexpect, autopasswd, cryptdir, decryptdir, dislocate, expect, ftp-rfc,
+        kibitz, lpunlock, mkpasswd, passmass, rftp, rlogin-cwd, timed-read, timed-run,
+        unbuffer, weather, and optionally (if <application>Expect</application> was
+        linked against <application>Tk</application>), multixterm,
+        tknewsbiff, tkpasswd, xkibitz, and xpstat</seg>
+        <seg>libexpect&expect-version;.so</seg>
+        <seg>/usr/lib/expect&expect-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="autoexpect">
+        <term><command>autoexpect</command></term>
+        <listitem>
+          <para>
+            generates an <application>Expect</application> script from
+            watching a session.
+          </para>
+          <indexterm zone="expect autoexpect">
+            <primary sortas="b-autoexpect">autoexpect</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="autopasswd">
+        <term><command>autopasswd</command></term>
+        <listitem>
+          <para>
+            is a wrapper to make <command>passwd</command>(1) be
+            non-interactive.
+          </para>
+          <indexterm zone="expect autopasswd">
+            <primary sortas="b-autopasswd">autopasswd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cryptdir">
+        <term><command>cryptdir</command></term>
+        <listitem>
+          <para>
+            encrypts all files in a directory.
+          </para>
+          <indexterm zone="expect cryptdir">
+            <primary sortas="b-cryptdir">cryptdir</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="decryptdir">
+        <term><command>decryptdir</command></term>
+        <listitem>
+          <para>
+            decrypts all files in a directory.
+          </para>
+          <indexterm zone="expect decryptdir">
+            <primary sortas="b-decryptdir">decryptdir</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dislocate">
+        <term><command>dislocate</command></term>
+        <listitem>
+          <para>
+            allows processes to be disconnected and reconnected to a
+            terminal.
+          </para>
+          <indexterm zone="expect dislocate">
+            <primary sortas="b-dislocate">dislocate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="expect-prog">
+        <term><command>expect</command></term>
+        <listitem>
+          <para>
+            is a program that <quote>talks</quote> to other interactive
+            programs according to a script.
+          </para>
+          <indexterm zone="expect expect-prog">
+            <primary sortas="b-expect">expect</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ftp-rfc">
+        <term><command>ftp-rfc</command></term>
+        <listitem>
+          <para>
+            retrieves an RFC (or the index) from UUNET.
+          </para>
+          <indexterm zone="expect ftp-rfc">
+            <primary sortas="b-ftp-rfc">ftp-rfc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kibitz">
+        <term><command>kibitz</command></term>
+        <listitem>
+          <para>
+            allows two (or more) people to interact with one shell
+            (or any arbitrary program).
+          </para>
+          <indexterm zone="expect kibitz">
+            <primary sortas="b-kibitz">kibitz</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lpunlock">
+        <term><command>lpunlock</command></term>
+        <listitem>
+          <para>
+            unhangs a printer which claims it is <quote>waiting for
+            lock</quote>.
+          </para>
+          <indexterm zone="expect lpunlock">
+            <primary sortas="b-lpunlock">lpunlock</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mkpasswd">
+        <term><command>mkpasswd</command></term>
+        <listitem>
+          <para>
+            generates passwords and can apply them automatically to users.
+          </para>
+          <indexterm zone="expect mkpasswd">
+            <primary sortas="b-mkpasswd">mkpasswd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="passmass">
+        <term><command>passmass</command></term>
+        <listitem>
+          <para>
+            changes a password on multiple machines.
+          </para>
+          <indexterm zone="expect passmass">
+            <primary sortas="b-passmass">passmass</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rftp">
+        <term><command>rftp</command></term>
+        <listitem>
+          <para>
+            is much like <command>ftp</command> except it uses
+            <option>~g</option> and <option>~p</option> instead of
+            <option>mget</option> and <option>mput</option>.
+          </para>
+          <indexterm zone="expect rftp">
+            <primary sortas="b-rftp">rftp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rlogin-cwd">
+        <term><command>rlogin-cwd</command></term>
+        <listitem>
+          <para>
+            is <command>rlogin</command> except it uses the local current
+            directory as the current working directory on the remote machine.
+          </para>
+          <indexterm zone="expect rlogin-cwd">
+            <primary sortas="b-rlogin-cwd">rlogin-cwd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="timed-read">
+        <term><command>timed-read</command></term>
+        <listitem>
+          <para>
+            reads a complete line from stdin and aborts after a given
+            number of seconds.
+          </para>
+          <indexterm zone="expect timed-read">
+            <primary sortas="b-timed-read">timed-read</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="timed-run">
+        <term><command>timed-run</command></term>
+        <listitem>
+          <para>
+            runs a program for a given amount of time.
+          </para>
+          <indexterm zone="expect timed-run">
+            <primary sortas="b-timed-run">timed-run</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="unbuffer">
+        <term><command>unbuffer</command></term>
+        <listitem>
+          <para>
+            disables the output buffering that occurs when program output
+            is redirected.
+          </para>
+          <indexterm zone="expect unbuffer">
+            <primary sortas="b-unbuffer">unbuffer</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="weather">
+        <term><command>weather</command></term>
+        <listitem>
+          <para>
+            retrieves a weather report (courtesy University of Michigan)
+            for a given city or geographical area.
+          </para>
+          <indexterm zone="expect weather">
+            <primary sortas="b-weather">weather</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="multixterm">
+        <term><command>multixterm</command></term>
+        <listitem>
+          <para>
+            creates multiple <command>xterm</command>s that can be driven
+            together or separately.
+          </para>
+          <indexterm zone="expect multixterm">
+            <primary sortas="b-multixterm">multixterm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tknewsbiff">
+        <term><command>tknewsbiff</command></term>
+        <listitem>
+          <para>
+            pops up a window when there is unread news in your favorite
+            newsgroups and removes the window after you've read the news.
+          </para>
+          <indexterm zone="expect tknewsbiff">
+            <primary sortas="b-tknewsbiff">tknewsbiff</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tkpasswd">
+        <term><command>tkpasswd</command></term>
+        <listitem>
+          <para>
+            is a script to change passwords using
+            <command>expect</command> and <application>Tk</application>.
+          </para>
+          <indexterm zone="expect tkpasswd">
+            <primary sortas="b-tkpasswd">tkpasswd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xkibitz">
+        <term><command>xkibitz</command></term>
+        <listitem>
+          <para>
+            allows users in separate <command>xterm</command>s to share one
+            shell (or any program that runs in an <command>xterm</command>).
+          </para>
+          <indexterm zone="expect xkibitz">
+            <primary sortas="b-xkibitz">xkibitz</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xpstat">
+        <term><command>xpstat</command></term>
+        <listitem>
+          <para>
+            is a script that acts as a front-end for <command>xpilot</command>.
+          </para>
+          <indexterm zone="expect xpstat">
+            <primary sortas="b-xpstat">xpstat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libexpect">
+        <term><filename class='libraryfile'>libexpect&expect-version;.so</filename></term>
+        <listitem>
+          <para>
+            contains functions that allow <application>Expect</application> to
+            be used as a <application>Tcl</application> extension or to be
+            used directly from C or C++ (without
+            <application>Tcl</application>).
+          </para>
+          <indexterm zone="expect libexpect">
+            <primary sortas="c-libexpect&expect-version;">libexpect&expect-version;.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/tcl.xml
===================================================================
--- archive/tcl.xml	(revision f4002c52076f3ee5a0b5677d70453f9624d6ffa7)
+++ archive/tcl.xml	(revision f4002c52076f3ee5a0b5677d70453f9624d6ffa7)
@@ -0,0 +1,309 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY tcl-download-http "&sourceforge-dl;/tcl/tcl&tcl-version;-src.tar.gz">
+  <!ENTITY tcl-download-ftp  " ">
+  <!ENTITY tcl-md5sum        "97c55573f8520bcab74e21bfd8d0aadc">
+  <!ENTITY tcl-size          "9.7 MB">
+  <!ENTITY tcl-buildsize     "67 MB (including html documentation)">
+  <!ENTITY tcl-time          "0.7 SBU (add 2.7 SBU for tests)">
+
+  <!ENTITY tcl-doc-download  "&sourceforge-dl;/tcl/tcl&tcl-version;-html.tar.gz">
+  <!ENTITY tcl-doc-md5sum    "a012711241ba3a5bd4a04e833001d489">
+  <!ENTITY tcl-doc-size      "1.2 MB">
+
+  <!-- Ensure this is updated when Tcl moves from the 8.6.x branch -->
+  <!ENTITY tcl-ver           "8.6">
+  <!ENTITY tdbc-ver          "1.1.1">
+  <!ENTITY itcl-ver          "4.2.0">
+  <!ENTITY thread-ver        "2.8.5">
+  <!ENTITY sqlite3-ver       "3.30.1.2">
+]>
+
+<sect1 id="tcl" xreflabel="Tcl-&tcl-version;">
+  <?dbhtml filename="tcl.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Tcl-&tcl-version;</title>
+
+  <indexterm zone="tcl">
+    <primary sortas="a-Tcl">Tcl</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Tcl</title>
+
+    <para>
+      The <application>Tcl</application> package contains the Tool Command
+      Language, a robust general-purpose scripting language.
+    </para>
+
+    &lfs91_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&tcl-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&tcl-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &tcl-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &tcl-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &tcl-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &tcl-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+   <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <title>Optional Documentation</title>
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&tcl-doc-download;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &tcl-doc-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &tcl-doc-size;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/tcl"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Tcl</title>
+
+    <para>
+      This package is also installed in LFS during the bootstrap phase.
+      As it is not installed during Chapter 6 of LFS, installation instructions
+      are included here in BLFS.
+    </para>
+
+    <para>
+      If you downloaded the optional documentation, unpack the tarball
+      by issuing the following command:
+    </para>
+
+<screen><userinput>tar -xf ../tcl&tcl-version;-html.tar.gz --strip-components=1</userinput></screen>
+
+    <para>
+      Install <application>Tcl</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>export SRCDIR=`pwd` &amp;&amp;
+
+cd unix &amp;&amp;
+
+./configure --prefix=/usr           \
+            --mandir=/usr/share/man \
+            $([ $(uname -m) = x86_64 ] &amp;&amp; echo --enable-64bit) &amp;&amp;
+make &amp;&amp;
+
+sed -e "s#$SRCDIR/unix#/usr/lib#" \
+    -e "s#$SRCDIR#/usr/include#"  \
+    -i tclConfig.sh               &amp;&amp;
+
+sed -e "s#$SRCDIR/unix/pkgs/tdbc&tdbc-ver;#/usr/lib/tdbc&tdbc-ver;#" \
+    -e "s#$SRCDIR/pkgs/tdbc&tdbc-ver;/generic#/usr/include#"    \
+    -e "s#$SRCDIR/pkgs/tdbc&tdbc-ver;/library#/usr/lib/tcl8.6#" \
+    -e "s#$SRCDIR/pkgs/tdbc&tdbc-ver;#/usr/include#"            \
+    -i pkgs/tdbc&tdbc-ver;/tdbcConfig.sh                        &amp;&amp;
+
+sed -e "s#$SRCDIR/unix/pkgs/itcl&itcl-ver;#/usr/lib/itcl&itcl-ver;#" \
+    -e "s#$SRCDIR/pkgs/itcl&itcl-ver;/generic#/usr/include#"    \
+    -e "s#$SRCDIR/pkgs/itcl&itcl-ver;#/usr/include#"            \
+    -i pkgs/itcl&itcl-ver;/itclConfig.sh                        &amp;&amp;
+
+unset SRCDIR</userinput></screen>
+
+
+    <para>
+      To test the results, issue: <command>make test</command>.
+      <!-- Tests known to fail: cmdAH.test and tdbcodbc.test. 8.6.9: No
+      failures -->
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+make install-private-headers &amp;&amp;
+ln -v -sf tclsh&tcl-ver; /usr/bin/tclsh &amp;&amp;
+chmod -v 755 /usr/lib/libtcl&tcl-ver;.so</userinput></screen>
+
+    <para>
+      If you downloaded the optional documentation, install it by issuing
+      the following commands as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>mkdir -v -p /usr/share/doc/tcl-&tcl-version; &amp;&amp;
+cp -v -r  ../html/* /usr/share/doc/tcl-&tcl-version;</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>$([ $(uname -m) = x86_64 ] &amp;&amp; echo
+      --enable-64bit)</parameter>: This switch is used to enable 64 bit
+      support in <application>Tcl</application> on 64 bit operating
+      systems.
+    </para>
+
+    <para>
+      <command>make install-private-headers</command>: This command is
+      used to install the <application>Tcl</application> library interface
+      headers used by other packages if they link to the
+      <application>Tcl</application> library.
+    </para>
+
+    <para>
+      <command>ln -v -sf tclsh&tcl-ver; /usr/bin/tclsh</command>: This
+      command is used to create a compatibility symbolic link to the
+      <command>tclsh&tcl-ver;</command> file as many packages expect a file
+      named <command>tclsh</command>.
+    </para>
+
+    <para>
+      <command>sed -e ...</command>: The <application>Tcl</application> package
+      expects that its source tree is preserved so that packages depending on
+      it for their compilation can utilize it. These <command>sed</command>
+      remove the references to the build directory and replace them with saner
+      system-wide locations.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          sqlite3_analyzer, tclsh, and tclsh&tcl-ver;
+        </seg>
+        <seg>
+          libtcl&tcl-ver;.so and libtclstub&tcl-ver;.a
+        </seg>
+        <seg>
+          /usr/lib/itcl&itcl-ver;,
+          /usr/lib/sqlite&sqlite3-ver;
+          /usr/lib/tcl8,
+          /usr/lib/tcl&tcl-ver;,
+          /usr/lib/tdbc&tdbc-ver;,
+          /usr/lib/tdbcmysql&tdbc-ver;,
+          /usr/lib/tdbcodbc&tdbc-ver;,
+          /usr/lib/tdbcpostgres&tdbc-ver;,
+          /usr/lib/thread&thread-ver;,
+          /usr/share/doc/tcl-&tcl-version;, and
+          /usr/share/man/mann
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="sqlite3_analyzer">
+        <term><command>sqlite3_analyzer</command></term>
+        <listitem>
+          <para>
+            is a program to analyze sqlite3 database files and output a report
+            that gives information on size and storage efficiency for the
+            database and it's tables and indexes.
+          </para>
+          <indexterm zone="tcl sqlite3_analyzer">
+            <primary sortas="b-sqlite3_analyzer">sqlite3_analyzer</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tclsh">
+        <term><command>tclsh</command></term>
+        <listitem>
+          <para>
+            is a symlink to the <command>tclsh&tcl-ver;</command> program.
+          </para>
+          <indexterm zone="tcl tclsh">
+            <primary sortas="b-tclsh">tclsh</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tclsh-eight">
+        <term><command>tclsh&tcl-ver;</command></term>
+        <listitem>
+          <para>
+            is a simple shell containing the
+            <application>Tcl</application> interpreter.
+          </para>
+          <indexterm zone="tcl tclsh-eight">
+            <primary sortas="b-tclsh&tcl-ver;">tclsh&tcl-ver;</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libtcl">
+        <term><filename class="libraryfile">libtcl&tcl-ver;.so</filename></term>
+        <listitem>
+          <para>
+            contains the API functions required by
+            <application>Tcl</application>.
+          </para>
+          <indexterm zone="tcl libtcl">
+            <primary sortas="c-libtcl">libtcl&tcl-ver;.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/genutils/graphviz.xml
===================================================================
--- general/genutils/graphviz.xml	(revision 6df48a73cb6f8d8015a212f8190ab701202d8287)
+++ general/genutils/graphviz.xml	(revision f4002c52076f3ee5a0b5677d70453f9624d6ffa7)
@@ -187,5 +187,5 @@
       <xref linkend="python2"/>,
       <xref linkend="ruby"/>,
-      <xref linkend="tcl"/>,
+      <!-- <xref linkend="tcl"/>, -->
       <xref linkend="tk"/>,
       <ulink url="http://iolanguage.org/">Io</ulink>,
Index: general/graphlib/newt.xml
===================================================================
--- general/graphlib/newt.xml	(revision 6df48a73cb6f8d8015a212f8190ab701202d8287)
+++ general/graphlib/newt.xml	(revision f4002c52076f3ee5a0b5677d70453f9624d6ffa7)
@@ -84,5 +84,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="tcl"/> and
+      <!-- <xref linkend="tcl"/> and -->
       <xref role="runtime" linkend="gpm"/> (runtime)
     </para>
Index: general/prog/autoconf213.xml
===================================================================
--- general/prog/autoconf213.xml	(revision 6df48a73cb6f8d8015a212f8190ab701202d8287)
+++ general/prog/autoconf213.xml	(revision f4002c52076f3ee5a0b5677d70453f9624d6ffa7)
@@ -86,10 +86,10 @@
 
     <bridgehead renderas="sect3">Autoconf2.13 Dependencies</bridgehead>
-
+<!--
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="dejagnu"/> (Required for the tests)
     </para>
-
+-->
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/autoconf213"/>
@@ -112,5 +112,5 @@
 
     <para>
-      To test the installation, if you have installed <xref linkend="dejagnu"/>,
+      To test the installation <!--, if you have installed <xref linkend="dejagnu"/>,-->
       issue <command>make check</command> (all 253 tests should pass).
     </para>
Index: neral/prog/dejagnu.xml
===================================================================
--- general/prog/dejagnu.xml	(revision 6df48a73cb6f8d8015a212f8190ab701202d8287)
+++ 	(revision )
@@ -1,165 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY dejagnu-download-http "&gnu-http;/dejagnu/dejagnu-&dejagnu-version;.tar.gz">
-  <!ENTITY dejagnu-download-ftp  "&gnu-ftp;/dejagnu/dejagnu-&dejagnu-version;.tar.gz">
-  <!ENTITY dejagnu-md5sum        "e1b07516533f351b3aba3423fafeffd6">
-  <!ENTITY dejagnu-size          "516 KB">
-  <!ENTITY dejagnu-buildsize     "3.4 MB (with tests)">
-  <!ENTITY dejagnu-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="dejagnu" xreflabel="DejaGnu-&dejagnu-version;">
-  <?dbhtml filename="dejagnu.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>DejaGnu-&dejagnu-version;</title>
-
-  <indexterm zone="dejagnu">
-    <primary sortas="a-DejaGnu">DejaGnu</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to DejaGnu</title>
-
-    <para>
-      <application>DejaGnu</application> is a framework for running test
-      suites on GNU tools. It is written in <command>expect</command>, which
-      uses <application>Tcl</application> (Tool command language). It was installed
-      by LFS in the temporary <filename class="directory">/tools</filename>
-      directory. These instructions install it permanently.
-    </para>
-
-    &lfs91_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&dejagnu-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&dejagnu-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &dejagnu-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &dejagnu-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &dejagnu-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &dejagnu-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">DejaGnu Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="expect"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docbook-utils"/> and
-      <ulink url="http://sourceforge.net/projects/docbook2x/">docbook2X</ulink>
-      (both looked for by the <command>configure</command> script but not used
-      in the build)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/dejagnu"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of DejaGnu</title>
-
-    <para>
-      Install <application>DejaGnu</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-makeinfo --html --no-split -o doc/dejagnu.html doc/dejagnu.texi &amp;&amp;
-makeinfo --plaintext       -o doc/dejagnu.txt  doc/dejagnu.texi</userinput></screen>
-
-    <para>
-      To test the results, issue <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -dm755   /usr/share/doc/dejagnu-&dejagnu-version; &amp;&amp;
-install -v -m644    doc/dejagnu.{html,txt} \
-                    /usr/share/doc/dejagnu-&dejagnu-version;</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          runtest
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/dejagnu
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="runtest">
-        <term><command>runtest</command></term>
-        <listitem>
-          <para>
-            is the <application>DejaGnu</application> test driver program. It is
-            used to control what tests to run, and variations on how to run them.
-          </para>
-          <indexterm zone="dejagnu runtest">
-            <primary sortas="b-runtest">runtest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/expect.xml
===================================================================
--- general/prog/expect.xml	(revision 6df48a73cb6f8d8015a212f8190ab701202d8287)
+++ 	(revision )
@@ -1,511 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY expect-download-http "&sourceforge-dl;/expect/expect&expect-version;.tar.gz">
-  <!ENTITY expect-download-ftp  " ">
-  <!ENTITY expect-md5sum        "00fce8de158422f5ccd2666512329bd2">
-  <!ENTITY expect-size          "624 KB">
-  <!ENTITY expect-buildsize     "3.2 MB (with tests)">
-  <!ENTITY expect-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="expect" xreflabel="Expect-&expect-version;">
-  <?dbhtml filename="expect.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Expect-&expect-version;</title>
-
-  <indexterm zone="expect">
-    <primary sortas="a-Expect">Expect</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Expect</title>
-
-    <para>
-      The <application>Expect</application> package was installed in the
-      LFS temporary tools directory for testing other packages.  These
-      procedures install it in a permanent location.  It contains tools for
-      automating interactive applications such as <command>telnet</command>,
-      <command>ftp</command>, <command>passwd</command>,
-      <command>fsck</command>, <command>rlogin</command>,
-      <command>tip</command>, etc. <application>Expect</application> is also
-      useful for testing these same applications as well as easing all sorts of
-      tasks that are prohibitively difficult with anything else.
-    </para>
-
-    &lfs91_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&expect-download-http;"/>
-        </para>
-      </listitem>
-      <!-- <listitem>
-        <para>
-          Download (FTP): <ulink url="&expect-download-ftp;"/>
-        </para>
-      </listitem> -->
-      <listitem>
-        <para>
-          Download MD5 sum: &expect-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &expect-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &expect-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &expect-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Expect Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="tcl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="tk"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/expect"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Expect</title>
-
-    <para>
-      Install <application>Expect</application> by running the following
-      commands:
-    </para>
-
-    <!-- Not sure if we need a static library as it does not build by default
-         any longer. Only a .so library is installed when passing
-         'enable-shared'. -->
-<screen><userinput>./configure --prefix=/usr           \
-            --with-tcl=/usr/lib     \
-            --enable-shared         \
-            --mandir=/usr/share/man \
-            --with-tclinclude=/usr/include &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-ln -svf expect&expect-version;/libexpect&expect-version;.so /usr/lib</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-with-tcl=/usr/lib</parameter>: This parameter is used to
-      tell the <command>configure</command> script where the
-      <command>tclConfig.sh</command> is located.
-    </para>
-
-    <para>
-      <parameter>--enable-shared</parameter>: This option enables
-      building the shared library.
-    </para>
-
-    <!-- Not really sure if this is required any longer as the library is now
-         installed directly in /usr/lib/expect5.45/. -->
-    <para>
-      <command>ln -sf ...</command>: This command creates a required link
-      to the shared library.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Expect</title>
-
-    <sect3 id="expect-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>$exp_library/expect.rc</filename> and
-        <filename>~/.expect.rc</filename>
-      </para>
-
-      <indexterm zone="expect expect-config">
-        <primary sortas="e-AA.expect.rc">~/.expect.rc</primary>
-      </indexterm>
-
-      <indexterm zone="expect expect-config">
-        <primary sortas="e-A.exp_library-expect.rc">$exp_library/expect.rc</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Reference the <command>expect</command> man page for information about
-        utilizing the <filename>expect.rc</filename> configuration files.
-        Additionally, many of the tools contained in the
-        <application>Expect</application> package will use their own
-        configuration files. Reference the respective man page, or
-        examine the script directly for configuration file information.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>autoexpect, autopasswd, cryptdir, decryptdir, dislocate, expect, ftp-rfc,
-        kibitz, lpunlock, mkpasswd, passmass, rftp, rlogin-cwd, timed-read, timed-run,
-        unbuffer, weather, and optionally (if <application>Expect</application> was
-        linked against <application>Tk</application>), multixterm,
-        tknewsbiff, tkpasswd, xkibitz, and xpstat</seg>
-        <seg>libexpect&expect-version;.so</seg>
-        <seg>/usr/lib/expect&expect-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="autoexpect">
-        <term><command>autoexpect</command></term>
-        <listitem>
-          <para>
-            generates an <application>Expect</application> script from
-            watching a session.
-          </para>
-          <indexterm zone="expect autoexpect">
-            <primary sortas="b-autoexpect">autoexpect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="autopasswd">
-        <term><command>autopasswd</command></term>
-        <listitem>
-          <para>
-            is a wrapper to make <command>passwd</command>(1) be
-            non-interactive.
-          </para>
-          <indexterm zone="expect autopasswd">
-            <primary sortas="b-autopasswd">autopasswd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cryptdir">
-        <term><command>cryptdir</command></term>
-        <listitem>
-          <para>
-            encrypts all files in a directory.
-          </para>
-          <indexterm zone="expect cryptdir">
-            <primary sortas="b-cryptdir">cryptdir</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="decryptdir">
-        <term><command>decryptdir</command></term>
-        <listitem>
-          <para>
-            decrypts all files in a directory.
-          </para>
-          <indexterm zone="expect decryptdir">
-            <primary sortas="b-decryptdir">decryptdir</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dislocate">
-        <term><command>dislocate</command></term>
-        <listitem>
-          <para>
-            allows processes to be disconnected and reconnected to a
-            terminal.
-          </para>
-          <indexterm zone="expect dislocate">
-            <primary sortas="b-dislocate">dislocate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="expect-prog">
-        <term><command>expect</command></term>
-        <listitem>
-          <para>
-            is a program that <quote>talks</quote> to other interactive
-            programs according to a script.
-          </para>
-          <indexterm zone="expect expect-prog">
-            <primary sortas="b-expect">expect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ftp-rfc">
-        <term><command>ftp-rfc</command></term>
-        <listitem>
-          <para>
-            retrieves an RFC (or the index) from UUNET.
-          </para>
-          <indexterm zone="expect ftp-rfc">
-            <primary sortas="b-ftp-rfc">ftp-rfc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kibitz">
-        <term><command>kibitz</command></term>
-        <listitem>
-          <para>
-            allows two (or more) people to interact with one shell
-            (or any arbitrary program).
-          </para>
-          <indexterm zone="expect kibitz">
-            <primary sortas="b-kibitz">kibitz</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpunlock">
-        <term><command>lpunlock</command></term>
-        <listitem>
-          <para>
-            unhangs a printer which claims it is <quote>waiting for
-            lock</quote>.
-          </para>
-          <indexterm zone="expect lpunlock">
-            <primary sortas="b-lpunlock">lpunlock</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkpasswd">
-        <term><command>mkpasswd</command></term>
-        <listitem>
-          <para>
-            generates passwords and can apply them automatically to users.
-          </para>
-          <indexterm zone="expect mkpasswd">
-            <primary sortas="b-mkpasswd">mkpasswd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="passmass">
-        <term><command>passmass</command></term>
-        <listitem>
-          <para>
-            changes a password on multiple machines.
-          </para>
-          <indexterm zone="expect passmass">
-            <primary sortas="b-passmass">passmass</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rftp">
-        <term><command>rftp</command></term>
-        <listitem>
-          <para>
-            is much like <command>ftp</command> except it uses
-            <option>~g</option> and <option>~p</option> instead of
-            <option>mget</option> and <option>mput</option>.
-          </para>
-          <indexterm zone="expect rftp">
-            <primary sortas="b-rftp">rftp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rlogin-cwd">
-        <term><command>rlogin-cwd</command></term>
-        <listitem>
-          <para>
-            is <command>rlogin</command> except it uses the local current
-            directory as the current working directory on the remote machine.
-          </para>
-          <indexterm zone="expect rlogin-cwd">
-            <primary sortas="b-rlogin-cwd">rlogin-cwd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="timed-read">
-        <term><command>timed-read</command></term>
-        <listitem>
-          <para>
-            reads a complete line from stdin and aborts after a given
-            number of seconds.
-          </para>
-          <indexterm zone="expect timed-read">
-            <primary sortas="b-timed-read">timed-read</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="timed-run">
-        <term><command>timed-run</command></term>
-        <listitem>
-          <para>
-            runs a program for a given amount of time.
-          </para>
-          <indexterm zone="expect timed-run">
-            <primary sortas="b-timed-run">timed-run</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unbuffer">
-        <term><command>unbuffer</command></term>
-        <listitem>
-          <para>
-            disables the output buffering that occurs when program output
-            is redirected.
-          </para>
-          <indexterm zone="expect unbuffer">
-            <primary sortas="b-unbuffer">unbuffer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="weather">
-        <term><command>weather</command></term>
-        <listitem>
-          <para>
-            retrieves a weather report (courtesy University of Michigan)
-            for a given city or geographical area.
-          </para>
-          <indexterm zone="expect weather">
-            <primary sortas="b-weather">weather</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="multixterm">
-        <term><command>multixterm</command></term>
-        <listitem>
-          <para>
-            creates multiple <command>xterm</command>s that can be driven
-            together or separately.
-          </para>
-          <indexterm zone="expect multixterm">
-            <primary sortas="b-multixterm">multixterm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tknewsbiff">
-        <term><command>tknewsbiff</command></term>
-        <listitem>
-          <para>
-            pops up a window when there is unread news in your favorite
-            newsgroups and removes the window after you've read the news.
-          </para>
-          <indexterm zone="expect tknewsbiff">
-            <primary sortas="b-tknewsbiff">tknewsbiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tkpasswd">
-        <term><command>tkpasswd</command></term>
-        <listitem>
-          <para>
-            is a script to change passwords using
-            <command>expect</command> and <application>Tk</application>.
-          </para>
-          <indexterm zone="expect tkpasswd">
-            <primary sortas="b-tkpasswd">tkpasswd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xkibitz">
-        <term><command>xkibitz</command></term>
-        <listitem>
-          <para>
-            allows users in separate <command>xterm</command>s to share one
-            shell (or any program that runs in an <command>xterm</command>).
-          </para>
-          <indexterm zone="expect xkibitz">
-            <primary sortas="b-xkibitz">xkibitz</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xpstat">
-        <term><command>xpstat</command></term>
-        <listitem>
-          <para>
-            is a script that acts as a front-end for <command>xpilot</command>.
-          </para>
-          <indexterm zone="expect xpstat">
-            <primary sortas="b-xpstat">xpstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libexpect">
-        <term><filename class='libraryfile'>libexpect&expect-version;.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that allow <application>Expect</application> to
-            be used as a <application>Tcl</application> extension or to be
-            used directly from C or C++ (without
-            <application>Tcl</application>).
-          </para>
-          <indexterm zone="expect libexpect">
-            <primary sortas="c-libexpect&expect-version;">libexpect&expect-version;.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/gcc.xml
===================================================================
--- general/prog/gcc.xml	(revision 6df48a73cb6f8d8015a212f8190ab701202d8287)
+++ general/prog/gcc.xml	(revision f4002c52076f3ee5a0b5677d70453f9624d6ffa7)
@@ -124,10 +124,10 @@
 
     <bridgehead renderas="sect3">GCC Dependencies</bridgehead>
-
+<!--
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="dejagnu"/>, for tests
     </para>
-
+-->
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
Index: general/prog/gdb.xml
===================================================================
--- general/prog/gdb.xml	(revision 6df48a73cb6f8d8015a212f8190ab701202d8287)
+++ general/prog/gdb.xml	(revision f4002c52076f3ee5a0b5677d70453f9624d6ffa7)
@@ -88,5 +88,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="dejagnu"/> (required for tests),
+      <!-- <xref linkend="dejagnu"/> (required for tests), -->
       <xref linkend="doxygen"/>,
       <xref linkend="gcc"/> (ada and gfortran are used for tests),
Index: general/prog/prog.xml
===================================================================
--- general/prog/prog.xml	(revision 6df48a73cb6f8d8015a212f8190ab701202d8287)
+++ general/prog/prog.xml	(revision f4002c52076f3ee5a0b5677d70453f9624d6ffa7)
@@ -30,7 +30,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clisp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cmake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dejagnu.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dejagnu.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="doxygen.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expect.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expect.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc.xml"/>
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc-ada.xml"/> -->
@@ -58,5 +58,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="svnserver.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="swig.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcl.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcl.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vala.xml"/>
Index: neral/prog/tcl.xml
===================================================================
--- general/prog/tcl.xml	(revision 6df48a73cb6f8d8015a212f8190ab701202d8287)
+++ 	(revision )
@@ -1,309 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY tcl-download-http "&sourceforge-dl;/tcl/tcl&tcl-version;-src.tar.gz">
-  <!ENTITY tcl-download-ftp  " ">
-  <!ENTITY tcl-md5sum        "97c55573f8520bcab74e21bfd8d0aadc">
-  <!ENTITY tcl-size          "9.7 MB">
-  <!ENTITY tcl-buildsize     "67 MB (including html documentation)">
-  <!ENTITY tcl-time          "0.7 SBU (add 2.7 SBU for tests)">
-
-  <!ENTITY tcl-doc-download  "&sourceforge-dl;/tcl/tcl&tcl-version;-html.tar.gz">
-  <!ENTITY tcl-doc-md5sum    "a012711241ba3a5bd4a04e833001d489">
-  <!ENTITY tcl-doc-size      "1.2 MB">
-
-  <!-- Ensure this is updated when Tcl moves from the 8.6.x branch -->
-  <!ENTITY tcl-ver           "8.6">
-  <!ENTITY tdbc-ver          "1.1.1">
-  <!ENTITY itcl-ver          "4.2.0">
-  <!ENTITY thread-ver        "2.8.5">
-  <!ENTITY sqlite3-ver       "3.30.1.2">
-]>
-
-<sect1 id="tcl" xreflabel="Tcl-&tcl-version;">
-  <?dbhtml filename="tcl.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Tcl-&tcl-version;</title>
-
-  <indexterm zone="tcl">
-    <primary sortas="a-Tcl">Tcl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Tcl</title>
-
-    <para>
-      The <application>Tcl</application> package contains the Tool Command
-      Language, a robust general-purpose scripting language.
-    </para>
-
-    &lfs91_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&tcl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&tcl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &tcl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &tcl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &tcl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &tcl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-   <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <title>Optional Documentation</title>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&tcl-doc-download;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &tcl-doc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &tcl-doc-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/tcl"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Tcl</title>
-
-    <para>
-      This package is also installed in LFS during the bootstrap phase.
-      As it is not installed during Chapter 6 of LFS, installation instructions
-      are included here in BLFS.
-    </para>
-
-    <para>
-      If you downloaded the optional documentation, unpack the tarball
-      by issuing the following command:
-    </para>
-
-<screen><userinput>tar -xf ../tcl&tcl-version;-html.tar.gz --strip-components=1</userinput></screen>
-
-    <para>
-      Install <application>Tcl</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>export SRCDIR=`pwd` &amp;&amp;
-
-cd unix &amp;&amp;
-
-./configure --prefix=/usr           \
-            --mandir=/usr/share/man \
-            $([ $(uname -m) = x86_64 ] &amp;&amp; echo --enable-64bit) &amp;&amp;
-make &amp;&amp;
-
-sed -e "s#$SRCDIR/unix#/usr/lib#" \
-    -e "s#$SRCDIR#/usr/include#"  \
-    -i tclConfig.sh               &amp;&amp;
-
-sed -e "s#$SRCDIR/unix/pkgs/tdbc&tdbc-ver;#/usr/lib/tdbc&tdbc-ver;#" \
-    -e "s#$SRCDIR/pkgs/tdbc&tdbc-ver;/generic#/usr/include#"    \
-    -e "s#$SRCDIR/pkgs/tdbc&tdbc-ver;/library#/usr/lib/tcl8.6#" \
-    -e "s#$SRCDIR/pkgs/tdbc&tdbc-ver;#/usr/include#"            \
-    -i pkgs/tdbc&tdbc-ver;/tdbcConfig.sh                        &amp;&amp;
-
-sed -e "s#$SRCDIR/unix/pkgs/itcl&itcl-ver;#/usr/lib/itcl&itcl-ver;#" \
-    -e "s#$SRCDIR/pkgs/itcl&itcl-ver;/generic#/usr/include#"    \
-    -e "s#$SRCDIR/pkgs/itcl&itcl-ver;#/usr/include#"            \
-    -i pkgs/itcl&itcl-ver;/itclConfig.sh                        &amp;&amp;
-
-unset SRCDIR</userinput></screen>
-
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-      <!-- Tests known to fail: cmdAH.test and tdbcodbc.test. 8.6.9: No
-      failures -->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-make install-private-headers &amp;&amp;
-ln -v -sf tclsh&tcl-ver; /usr/bin/tclsh &amp;&amp;
-chmod -v 755 /usr/lib/libtcl&tcl-ver;.so</userinput></screen>
-
-    <para>
-      If you downloaded the optional documentation, install it by issuing
-      the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>mkdir -v -p /usr/share/doc/tcl-&tcl-version; &amp;&amp;
-cp -v -r  ../html/* /usr/share/doc/tcl-&tcl-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>$([ $(uname -m) = x86_64 ] &amp;&amp; echo
-      --enable-64bit)</parameter>: This switch is used to enable 64 bit
-      support in <application>Tcl</application> on 64 bit operating
-      systems.
-    </para>
-
-    <para>
-      <command>make install-private-headers</command>: This command is
-      used to install the <application>Tcl</application> library interface
-      headers used by other packages if they link to the
-      <application>Tcl</application> library.
-    </para>
-
-    <para>
-      <command>ln -v -sf tclsh&tcl-ver; /usr/bin/tclsh</command>: This
-      command is used to create a compatibility symbolic link to the
-      <command>tclsh&tcl-ver;</command> file as many packages expect a file
-      named <command>tclsh</command>.
-    </para>
-
-    <para>
-      <command>sed -e ...</command>: The <application>Tcl</application> package
-      expects that its source tree is preserved so that packages depending on
-      it for their compilation can utilize it. These <command>sed</command>
-      remove the references to the build directory and replace them with saner
-      system-wide locations.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          sqlite3_analyzer, tclsh, and tclsh&tcl-ver;
-        </seg>
-        <seg>
-          libtcl&tcl-ver;.so and libtclstub&tcl-ver;.a
-        </seg>
-        <seg>
-          /usr/lib/itcl&itcl-ver;,
-          /usr/lib/sqlite&sqlite3-ver;
-          /usr/lib/tcl8,
-          /usr/lib/tcl&tcl-ver;,
-          /usr/lib/tdbc&tdbc-ver;,
-          /usr/lib/tdbcmysql&tdbc-ver;,
-          /usr/lib/tdbcodbc&tdbc-ver;,
-          /usr/lib/tdbcpostgres&tdbc-ver;,
-          /usr/lib/thread&thread-ver;,
-          /usr/share/doc/tcl-&tcl-version;, and
-          /usr/share/man/mann
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="sqlite3_analyzer">
-        <term><command>sqlite3_analyzer</command></term>
-        <listitem>
-          <para>
-            is a program to analyze sqlite3 database files and output a report
-            that gives information on size and storage efficiency for the
-            database and it's tables and indexes.
-          </para>
-          <indexterm zone="tcl sqlite3_analyzer">
-            <primary sortas="b-sqlite3_analyzer">sqlite3_analyzer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tclsh">
-        <term><command>tclsh</command></term>
-        <listitem>
-          <para>
-            is a symlink to the <command>tclsh&tcl-ver;</command> program.
-          </para>
-          <indexterm zone="tcl tclsh">
-            <primary sortas="b-tclsh">tclsh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tclsh-eight">
-        <term><command>tclsh&tcl-ver;</command></term>
-        <listitem>
-          <para>
-            is a simple shell containing the
-            <application>Tcl</application> interpreter.
-          </para>
-          <indexterm zone="tcl tclsh-eight">
-            <primary sortas="b-tclsh&tcl-ver;">tclsh&tcl-ver;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtcl">
-        <term><filename class="libraryfile">libtcl&tcl-ver;.so</filename></term>
-        <listitem>
-          <para>
-            contains the API functions required by
-            <application>Tcl</application>.
-          </para>
-          <indexterm zone="tcl libtcl">
-            <primary sortas="c-libtcl">libtcl&tcl-ver;.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/tk.xml
===================================================================
--- general/prog/tk.xml	(revision 6df48a73cb6f8d8015a212f8190ab701202d8287)
+++ general/prog/tk.xml	(revision f4002c52076f3ee5a0b5677d70453f9624d6ffa7)
@@ -78,5 +78,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="tcl"/> and
+      <!-- <xref linkend="tcl"/> and -->
       <xref linkend="xorg7-lib"/>
     </para>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 6df48a73cb6f8d8015a212f8190ab701202d8287)
+++ introduction/welcome/changelog.xml	(revision f4002c52076f3ee5a0b5677d70453f9624d6ffa7)
@@ -46,5 +46,10 @@
       <itemizedlist>
         <listitem>
-          <para>[renodr] - Update to nfs-utils-2.5.1. Fixes
+          <para>[bdubbs] - Archive expect, dejagnu, and tcl which are 
+          now included in LFS. Fixes
+          <ulink url="&blfs-ticket-root;13704">#13697</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to nfs-utils-2.5.1. Fixes
           <ulink url="&blfs-ticket-root;13704">#13704</ulink>.</para>
         </listitem>
Index: multimedia/cdwriteutils/libisoburn.xml
===================================================================
--- multimedia/cdwriteutils/libisoburn.xml	(revision 6df48a73cb6f8d8015a212f8190ab701202d8287)
+++ multimedia/cdwriteutils/libisoburn.xml	(revision f4002c52076f3ee5a0b5677d70453f9624d6ffa7)
@@ -86,6 +86,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para>
-      <xref linkend="doxygen"/> (to generate HTML documentation) and
-      <xref linkend="tk"/> (for <command>xorriso-tcltk</command>)
+      <xref linkend="doxygen"/> (to generate HTML documentation) <!-- and
+      <xref linkend="tk"/> (for <command>xorriso-tcltk</command>) -->
     </para>
 
Index: networking/netutils/whois.xml
===================================================================
--- networking/netutils/whois.xml	(revision 6df48a73cb6f8d8015a212f8190ab701202d8287)
+++ networking/netutils/whois.xml	(revision f4002c52076f3ee5a0b5677d70453f9624d6ffa7)
@@ -36,5 +36,5 @@
       <command>whois</command> and <command>mkpasswd</command>. The
       <command>mkpasswd</command> command is also installed by the
-      <xref linkend="expect"/> package.
+      expect package in LFS.
     </para>
 
@@ -107,5 +107,5 @@
       <para>
         Installing this version of <command>mkpasswd</command> will
-        overwrite the same command installed by <xref linkend="expect"/>.
+        overwrite the same command installed in LFS.
       </para>
     </note>
Index: postlfs/editors/vim.xml
===================================================================
--- postlfs/editors/vim.xml	(revision 6df48a73cb6f8d8015a212f8190ab701202d8287)
+++ postlfs/editors/vim.xml	(revision f4002c52076f3ee5a0b5677d70453f9624d6ffa7)
@@ -105,7 +105,7 @@
       <xref linkend="lua"/>,
       <xref linkend="python2"/>,
-      <xref linkend="rsync"/>,
-      <xref linkend="ruby"/>, and
-      <xref linkend="tcl"/>
+      <xref linkend="rsync"/> and
+      <xref linkend="ruby"/><!-- , and
+      <xref linkend="tcl"/> -->
     </para>
 
Index: postlfs/security/mitkrb.xml
===================================================================
--- postlfs/security/mitkrb.xml	(revision 6df48a73cb6f8d8015a212f8190ab701202d8287)
+++ postlfs/security/mitkrb.xml	(revision f4002c52076f3ee5a0b5677d70453f9624d6ffa7)
@@ -79,5 +79,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="dejagnu"/> (for full test coverage),
+      <!-- <xref linkend="dejagnu"/> (for full test coverage), -->
       <xref linkend="gnupg2"/> (to authenticate the package),
       <xref linkend="keyutils"/>,
@@ -131,8 +131,8 @@
       To test the build, issue as the <systemitem
       class="username">root</systemitem> user: <command>make -k check</command>.
-      You need at least <xref linkend="tcl"/>, which is used to drive the
-      testsuite.  Furthermore, <xref linkend="dejagnu"/> must be available for
-      some of the tests to run. If you have a former version of MIT Kerberos V5
-      installed, it may happen that the test suite pick up the installed
+      <!-- You need at least <xref link end="tcl"/>, which is used to drive the
+      testsuite.  Furthermore, <xref link end="dejagnu"/> must be available for
+      some of the tests to run.--> If you have a former version of MIT Kerberos V5
+      installed, it may happen that the test suite may pick up the installed
       versions of the libraries, rather than the newly built ones. If so, it is
       better to run the tests after the installation.
Index: server/databases/db.xml
===================================================================
--- server/databases/db.xml	(revision 6df48a73cb6f8d8015a212f8190ab701202d8287)
+++ server/databases/db.xml	(revision f4002c52076f3ee5a0b5677d70453f9624d6ffa7)
@@ -75,5 +75,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="tcl"/> and
+      <!-- <xref linkend="tcl"/> and -->
       <xref linkend="sharutils"/> (for the <command>uudecode</command> command)
 
Index: server/databases/postgresql.xml
===================================================================
--- server/databases/postgresql.xml	(revision 6df48a73cb6f8d8015a212f8190ab701202d8287)
+++ server/databases/postgresql.xml	(revision f4002c52076f3ee5a0b5677d70453f9624d6ffa7)
@@ -78,5 +78,5 @@
     <para role="optional">
       <xref linkend="python2"/>,
-      <xref linkend="tcl"/>,
+      <!-- <xref linkend="tcl"/>, -->
       <xref linkend="libxml2"/>,
       <xref linkend="libxslt"/>,
Index: xsoft/other/pidgin.xml
===================================================================
--- xsoft/other/pidgin.xml	(revision 6df48a73cb6f8d8015a212f8190ab701202d8287)
+++ xsoft/other/pidgin.xml	(revision f4002c52076f3ee5a0b5677d70453f9624d6ffa7)
@@ -106,5 +106,5 @@
       plugin),
       <xref linkend="startup-notification"/>,
-      <xref linkend="tcl"/>,
+      <!-- <xref linkend="tcl"/>, -->
       <xref linkend="tk"/>,
       <ulink url="http://www.freedesktop.org/wiki/Software/Farstream">
@@ -156,6 +156,5 @@
             --disable-idn        \
             --disable-nm         \
-            --disable-vv         \
-            --disable-tcl        &amp;&amp;
+            --disable-vv         &amp;&amp;
 make</userinput></screen>
 
@@ -250,10 +249,10 @@
       flag.
     </para>
-
-    <para>
-      <parameter>--disable-tcl</parameter>: Remove this switch if you've
+<!--
+    <para>
+      <parameter>- -disable-tcl</parameter>: Remove this switch if you've
       installed <xref linkend="tcl"/>.
     </para>
-
+i-->
     <para>
       <option>--enable-cyrus-sasl</option>: Use this switch if you've installed
