* Merged newxml into HEAD

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3435 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

1 files changed, 42 insertions, 21 deletions

diff --git a/chapter05/tcl.xml b/chapter05/tcl.xml
index e8b066b93..4322835e7 100644
--- a/chapter05/tcl.xml
+++ b/chapter05/tcl.xml
@@ -1,26 +1,33 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
 <sect1 id="ch-tools-tcl" xreflabel="Tcl">
-<title>Installing Tcl-&tcl-version;</title>
-<?dbhtml filename="tcl.html" dir="chapter05"?>
+<title>Tcl-&tcl-version;</title>
+<?dbhtml filename="tcl.html"?>
+
+<indexterm zone="ch-tools-tcl"><primary sortas="a-Tcl">Tcl</primary></indexterm>
 
 <para>The Tcl package contains the Tool Command Language.</para>
 
-<screen>&buildtime; &tcl-time-tools; 
-&diskspace; &tcl-compsize-tools;</screen>
+<screen>&buildtime; 0.9 SBU
+&diskspace; 23 MB</screen>
+
+<para>Tcl installation depends on: Bash, Binutils, Coreutils, Diffutils,
+GCC, Glibc, Grep, Make, Sed.</para>
 
-&aa-tcl-down;
-&aa-tcl-dep;
 
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
 <sect2>
 <title>Installation of Tcl</title>
 
-<para>This package and the next two are only installed to be able to run the
+<para>This package and the next two are only installed to support running the
 test suites for GCC and Binutils. Installing three packages just for testing
 purposes may seem like overkill, but it is very reassuring, if not essential,
-to know that our most important tools are working properly. Even if you are
-not running the test suites here in this chapter as per our recommendation,
-these packages are still required for running the test suites in the next
+to know that our most important tools are working properly. Even if the
+the test suites are not run in this chapter (we recommend not running them),
+these packages are still required to run the test suites in the next
 chapter.</para>
 
 <para>Prepare Tcl for compilation:</para>
@@ -32,7 +39,7 @@ chapter.</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>(If you insist on testing the results, then issue:
+<para>If you want to test the results, then issue:
 <userinput>TZ=UTC make test</userinput>. However, the Tcl test suite is known
 to experience failures under certain host conditions that are not fully
 understood. Therefore, test suite failures here are not surprising, and are not
@@ -40,30 +47,44 @@ considered critical. The <emphasis>TZ=UTC</emphasis> parameter sets the time
 zone to Coordinated Universal Time (UTC) also known as Greenwich Mean Time
 (GMT), but only for the duration of the test suite run. This ensures the clock
 tests are exercised correctly. More information on the TZ environment variable
-will be given later on in <xref linkend="chapter-bootscripts"/>.)</para>
+will be given later on in <xref linkend="chapter-bootscripts"/>.</para>
 
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-<!-- HACK - Force some whitespace to appease tidy -->
-<literallayout></literallayout>
 
 <warning><para><emphasis>Do not remove</emphasis> the
 <filename>tcl&tcl-version;</filename> source directory yet, as the next package
 will need its internal headers.</para></warning>
 
-<!-- HACK - Force some whitespace to appease tidy -->
-<literallayout></literallayout>
 
-<para>And make a necessary symbolic link:</para>
+<para>Now make a necessary symbolic link:</para>
 
 <screen><userinput>ln -s tclsh8.4 /tools/bin/tclsh</userinput></screen>
 
 </sect2>
 
-&aa-tcl-shortdesc;
-&aa-tcl-desc;
 
-</sect1>
+<sect2 id="contents-tcl"><title>Contents of Tcl</title>
+
+<para><emphasis>Installed programs</emphasis>: tclsh (link to tclsh8.4),
+tclsh8.4</para>
+
+<para><emphasis>Installed library</emphasis>: libtcl8.4.so</para>
+
+</sect2>
+
 
+<sect2><title>Short descriptions</title>
+
+<indexterm zone="ch-tools-tcl tclsh8.4"><primary sortas="b-tclsh8.4">tclsh8.4</primary></indexterm>
+<para id="tclsh8.4"><command>tclsh8.4</command> is the Tcl command shell.</para>
+
+<indexterm zone="ch-tools-tcl libtcl8.4.so"><primary sortas="c-libtcl8.4.so">libtcl8.4.so</primary></indexterm>
+<para id="libtcl8.4.so"><command>libtcl8.4.so</command> is the Tcl library.</para>
+
+</sect2>
+
+
+</sect1>