Index: general/prog/php.xml
===================================================================
--- general/prog/php.xml	(revision 16f3afb37b2e62193314b40e56ab42c696417dd8)
+++ general/prog/php.xml	(revision 5cc1126aa7c9e0293c2d0d7577648d7993b4f1b8)
@@ -163,5 +163,5 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-cp php.ini-recommended /etc/php.ini</userinput></screen>
+cp -v php.ini-recommended /etc/php.ini</userinput></screen>
 
     <para>Remove the <option>--disable-libxml</option> switch if you
Index: general/prog/tcl.xml
===================================================================
--- general/prog/tcl.xml	(revision 16f3afb37b2e62193314b40e56ab42c696417dd8)
+++ general/prog/tcl.xml	(revision 5cc1126aa7c9e0293c2d0d7577648d7993b4f1b8)
@@ -5,57 +5,71 @@
   %general-entities;
 
-<!ENTITY tcl-download-http "http://prdownloads.sourceforge.net/tcl/tcl&tcl-version;-src.tar.gz">
-<!ENTITY tcl-download-ftp "ftp://ftp.us.xemacs.org/pub/tcl/tcl8_4/tcl&tcl-version;-src.tar.gz">
-<!ENTITY tcl-md5sum "7e01b409925e4eb59ad44a4c12b9c681">
-<!ENTITY tcl-size "3.4 MB">
-<!ENTITY tcl-buildsize "24.2 MB">
-<!ENTITY tcl-time "0.28 SBU (additional 0.73 SBU to run the test suite)">
+  <!ENTITY tcl-download-http "http://prdownloads.sourceforge.net/tcl/tcl&tcl-version;-src.tar.gz">
+  <!ENTITY tcl-download-ftp "ftp://ftp.us.xemacs.org/pub/tcl/tcl8_4/tcl&tcl-version;-src.tar.gz">
+  <!ENTITY tcl-md5sum "7e01b409925e4eb59ad44a4c12b9c681">
+  <!ENTITY tcl-size "3.4 MB">
+  <!ENTITY tcl-buildsize "24.2 MB">
+  <!ENTITY tcl-time "0.28 SBU (additional 0.73 SBU to run the test suite)">
 ]>
 
 <sect1 id="tcl" xreflabel="Tcl-&tcl-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="tcl.html"?>
-<title>Tcl-&tcl-version;</title>
-<indexterm zone="tcl">
-<primary sortas="a-Tcl">Tcl</primary></indexterm>
+  <?dbhtml filename="tcl.html"?>
 
-<sect2>
-<title>Introduction to <application>Tcl</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para>The <application>Tcl</application> package contains the Tool Command 
-Language, a robust general-purpose scripting language.</para>
+  <title>Tcl-&tcl-version;</title>
 
-<sect3><title>Package information</title>
-<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>
-</sect3>
+  <indexterm zone="tcl">
+    <primary sortas="a-Tcl">Tcl</primary>
+  </indexterm>
 
-</sect2>
+  <sect2 role="package">
+    <title>Introduction to Tcl</title>
 
-<sect2>
-<title>Installation of <application>Tcl</application></title>
+    <para>The <application>Tcl</application> package contains the Tool Command 
+    Language, a robust general-purpose scripting language.</para>
 
-<note><para>This package is also installed in <acronym>LFS</acronym> during 
-the bootstrap phase. The significant difference between the two installations 
-(other than installing to <filename class="directory">/usr</filename>) is the 
-package is installed in such a way that there is no need to keep the build
-directory around after installation.</para></note>
+    <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>
 
-<para>Install <application>Tcl</application> by running the following 
-commands:</para>
+  </sect2>
 
-<screen><userinput><command>export VERSION=&tcl-version; &amp;&amp;
+  <sect2 role="installation">
+    <title>Installation of Tcl</title>
+
+    <note>
+      <para>This package is also installed in LFS during 
+      the bootstrap phase. The significant difference between the two installations 
+      (other than installing to <filename class="directory">/usr</filename>) is that
+      the package is installed in such a way that there is no need to keep the build
+      directory around after installation.</para>
+    </note>
+
+    <para>Install <application>Tcl</application> by running the following 
+    commands:</para>
+
+<screen><userinput>export VERSION=&tcl-version; &amp;&amp;
 export V=`echo $VERSION | cut -d "." -f 1,2` &amp;&amp;
 export DIR=$PWD &amp;&amp;
@@ -66,104 +80,115 @@
 sed -i "s:${DIR}:/usr/include/tcl${V}:" tclConfig.sh &amp;&amp;
 sed -i "s,^TCL_LIB_FILE='libtcl${V}..TCL_DBGX..so',\
-TCL_LIB_FILE=\"libtcl${V}\$\{TCL_DBGX\}.so\"," tclConfig.sh</command></userinput></screen>
+TCL_LIB_FILE=\"libtcl${V}\$\{TCL_DBGX\}.so\"," tclConfig.sh</userinput></screen>
 
-<para>To test the results, issue: <command>make test</command>.</para>
+    <para>To test the results, issue: <command>make test</command>.</para>
 
-<para>Now, as the root user:</para>
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen><userinput role='root'><command>make install &amp;&amp;
-install -d /usr/include/tcl${V}/unix &amp;&amp;
-install -m644 *.h /usr/include/tcl${V}/unix/ &amp;&amp;
-install -d /usr/include/tcl${V}/generic &amp;&amp;
-install -c -m644 ../generic/*.h /usr/include/tcl${V}/generic/ &amp;&amp;
-rm -f /usr/include/tcl${V}/generic/{tcl,tclDecls,tclPlatDecls}.h &amp;&amp;
-ln -nsf ../../include/tcl${V} /usr/lib/tcl${V}/include &amp;&amp;
-ln -sf libtcl${V}.so /usr/lib/libtcl.so &amp;&amp;
-ln -sf tclsh${V} /usr/bin/tclsh</command></userinput></screen>
+<screen role="root"><userinput>make install &amp;&amp;
+install -v -d /usr/include/tcl${V}/unix &amp;&amp;
+install -v -m644 *.h /usr/include/tcl${V}/unix/ &amp;&amp;
+install -v -d /usr/include/tcl${V}/generic &amp;&amp;
+install -v -c -m644 ../generic/*.h /usr/include/tcl${V}/generic/ &amp;&amp;
+rm -v -f /usr/include/tcl${V}/generic/{tcl,tclDecls,tclPlatDecls}.h &amp;&amp;
+ln -v -nsf ../../include/tcl${V} /usr/lib/tcl${V}/include &amp;&amp;
+ln -v -sf libtcl${V}.so /usr/lib/libtcl.so &amp;&amp;
+ln -v -sf tclsh${V} /usr/bin/tclsh</userinput></screen>
 
-<para>Clean up the unprivileged user's environment using the following 
-commands:</para>
+    <para>Clean up the unprivileged user's environment using the following 
+    commands:</para>
 
-<screen><userinput><command>unset VERSION &amp;&amp;
+<screen><userinput>unset VERSION &amp;&amp;
 unset V &amp;&amp;
-unset DIR</command></userinput></screen>
+unset DIR</userinput></screen>
 
 <!--
-<caution><para>If you build the package as an ordinary user and then switch to 
-root to install the package, ensure you set the environment variables 
-<envar>V</envar> and <envar>VERSION</envar> before running the installation 
-commands.</para></caution>
+    <caution>
+      <para>If you build the package as an ordinary user and then switch to 
+      root to install the package, ensure you set the environment variables 
+      <envar>V</envar> and <envar>VERSION</envar> before running the installation 
+      commands.</para>
+    </caution>
 -->
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Command explanations</title>
+  <sect2 role="commands">
+    <title>Command Explanations</title>
 
-<para><parameter>--enable-threads</parameter>: This switch forces the package
-to build with thread support.</para>
+    <para><parameter>--enable-threads</parameter>: This switch forces the package
+    to build with thread support.</para>
 
-<para><command>sed -i ...</command>: The <application>Tcl</application>
-package assumes that the source that is used to build 
-<application>Tcl</application> is always kept around for compiling packages 
-that depend on <application>Tcl</application>. These <command>sed</command>s 
-remove the reference to the build directory and replace them by saner system 
-wide locations.</para>
+    <para><command>sed -i ...</command>: The <application>Tcl</application>
+    package assumes that the source that is used to build 
+    <application>Tcl</application> is always kept around for compiling packages 
+    that depend on <application>Tcl</application>. These <command>sed</command>s 
+    remove the reference to the build directory and replace them by saner system 
+    wide locations.</para>
 
-<para><command>install ...</command>: These commands install the internal
-headers into a system-wide location.</para>
+    <para><command>install ...</command>: These commands install the internal
+    headers into a system-wide location.</para>
 
-<para><command>ln -sf ...</command>: These commands create compatibility
-symbolic links.</para>
-</sect2>
+    <para><command>ln -v -sf ...</command>: These commands create compatibility
+    symbolic links.</para>
 
-<sect2>
-<title>Contents</title>
+  </sect2>
 
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directories</segtitle>
+  <sect2 role="content">
+    <title>Contents</title>
 
-<seglistitem>
-<seg>tclsh and tclsh8.4</seg>
-<seg>libtcl.so and libtclstub8.4.a</seg>
-<seg>/usr/include/tcl8.4 and /usr/lib/tcl8.4</seg>
-</seglistitem>
-</segmentedlist>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
+      <seglistitem>
+        <seg>tclsh and tclsh8.4</seg>
+        <seg>libtcl.so and libtclstub8.4.a</seg>
+        <seg>/usr/include/tcl8.4 and /usr/lib/tcl8.4</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<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>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
 
-<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 tclsh8.4">
-<primary sortas="b-tclsh8.4">tclsh8.4</primary></indexterm>
-</listitem>
-</varlistentry>
+      <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="libtcl">
-<term><filename role="library">libtcl.so</filename></term>
-<listitem><para>contains the <acronym>API</acronym> functions required
-by <application>Tcl</application>.</para>
-<indexterm zone="tcl libtcl">
-<primary sortas="c-libtcl">libtcl.so</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
+      <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 tclsh8.4">
+            <primary sortas="b-tclsh8.4">tclsh8.4</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-</sect2>
+      <varlistentry id="libtcl">
+        <term><filename role="library">libtcl.so</filename></term>
+        <listitem>
+          <para>contains the API functions required
+          by <application>Tcl</application>.</para>
+          <indexterm zone="tcl libtcl">
+            <primary sortas="c-libtcl">libtcl.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
