Index: content/web/apache/apache-desc.xml
===================================================================
--- content/web/apache/apache-desc.xml	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ content/web/apache/apache-desc.xml	(revision da23cf6a93bf681453c0978401a886a6136b331c)
@@ -14,4 +14,5 @@
 <command>htpasswd</command>,
 <command>httpd</command>,
+<command>instdso.sh</command>,
 <command>logresolve</command>,
 <command>rotatelogs</command>,
@@ -58,4 +59,8 @@
 server program.</para></sect3>
 
+<sect3><title>instdso.sh</title>
+<para><command>instdso.sh</command> is a script which installs Apache
+<acronym>DSO</acronym> modules.</para></sect3>
+
 <sect3><title>logresolve</title>
 <para><command>logresolve</command> is a post-processing program to
Index: content/web/apache/apache-inst.xml
===================================================================
--- content/web/apache/apache-inst.xml	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ content/web/apache/apache-inst.xml	(revision da23cf6a93bf681453c0978401a886a6136b331c)
@@ -7,13 +7,16 @@
 useradd -c apache -d /dev/null -g apache -s /bin/false apache</command></userinput></screen>
 
+<para>The following patch will define the layout of destination directories
+and among them the build directory at
+<filename class="directory">/usr/lib/apache/build</filename>. This 
+will enable the modules added to <application>Apache</application> to
+be configured without errors. Apply the patch:</para>
+
+<screen><userinput><command>patch -Np1 -i ../httpd-&apache-version;-config.patch</command>
+</userinput></screen>
+
 <para>Build and install <application>Apache</application> by running the following commands:</para>
 
-<screen><userinput><command>./configure --prefix=/usr \
-            --sbindir=/usr/sbin \
-            --libexecdir=/usr/lib/apache \
-            --datadir=/var/www \
-            --sysconfdir=/etc/apache \
-            --localstatedir=/var/www \
-            --includedir=/usr/include/apache \
+<screen><userinput><command>./configure --enable-layout=LFS \
             --enable-mods-shared=all &amp;&amp;
 make &amp;&amp;
Index: content/web/apache/apache-intro.xml
===================================================================
--- content/web/apache/apache-intro.xml	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ content/web/apache/apache-intro.xml	(revision da23cf6a93bf681453c0978401a886a6136b331c)
@@ -16,4 +16,10 @@
 </sect3>
 
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required Patch: <ulink
+url="&hfile-root;/httpd-&apache-version;-config.patch"/></para></listitem>
+</itemizedlist></sect3>
+
 <sect3><title><application>Apache</application> dependencies</title>
 <sect4><title>Optional</title>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ introduction/welcome/changelog.xml	(revision da23cf6a93bf681453c0978401a886a6136b331c)
@@ -10,4 +10,7 @@
 
 <itemizedlist>
+
+<listitem><para>September 19th, 2003 [igor] : updated ALSA packages
+intro, modified Apache instructions.</para></listitem>
 
 <listitem><para>September 19th, 2003 [larry]: updated to
Index: multimedia/libdriv/alsa/driver/alsa-driver-config.xml
===================================================================
--- multimedia/libdriv/alsa/driver/alsa-driver-config.xml	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ multimedia/libdriv/alsa/driver/alsa-driver-config.xml	(revision da23cf6a93bf681453c0978401a886a6136b331c)
@@ -13,5 +13,5 @@
 <filename>/etc/modules.conf</filename>:</para>
 
-<para><screen><userinput>cat &gt;&gt; /etc/modules.conf &lt;&lt; "EOF"</userinput>
+<screen><userinput><command>cat &gt;&gt; /etc/modules.conf &lt;&lt; "EOF"
 alias char-major-14 soundcore
 alias char-major-116 snd
@@ -25,5 +25,5 @@
 alias sound-service-0-3 snd-pcm-oss
 alias sound-service-0-8 snd-seq-midi
-<userinput>EOF</userinput></screen></para>
+EOF</command></userinput></screen>
 
 <para>&lt;soundcard-name&gt; needs to be replaced with the driver relevant
@@ -35,11 +35,11 @@
 <filename>depmod</filename>.  If the drivers you have compiled are for the
 version of the kernel you are currently running, simply run
-<screen><userinput>depmod</userinput></screen>  If you are compiling 
+<screen><userinput><command>depmod</command></userinput></screen>  If you are compiling 
 drivers for a different kernel version to that which you are running, you 
 will need to use a line along the lines of:
-<screen><userinput>depmod -a 2.4.19 -F /boot/System.map-2.4.19</userinput></screen></para>
+<screen><userinput><command>depmod -a 2.4.19 -F /boot/System.map-2.4.19</command>
+</userinput></screen></para>
 
 </sect3>
 
 </sect2>
-
Index: multimedia/libdriv/alsa/driver/alsa-driver-desc.xml
===================================================================
--- multimedia/libdriv/alsa/driver/alsa-driver-desc.xml	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ multimedia/libdriv/alsa/driver/alsa-driver-desc.xml	(revision da23cf6a93bf681453c0978401a886a6136b331c)
@@ -2,6 +2,6 @@
 <title>Contents</title>
 
-<para>The alsa-driver package contains the <userinput>alsa sound card
-drivers</userinput>and <userinput>include files</userinput></para>
+<para>The alsa-driver package contains the alsa sound card
+drivers and include files.</para>
 
 </sect2>
@@ -10,5 +10,6 @@
 
 <sect3><title>alsa sound card drivers</title>
-<para>These are kernel modules which provide audio and MIDI functionality
+<para>These are kernel modules which provide audio and
+<acronym>MIDI</acronym> functionality
 to the operating system.</para></sect3>
 
@@ -16,6 +17,5 @@
 <para>These are installed in <filename
 class="directory">/usr/include/sound</filename> and are required to compile
-certain packages such as <filename>alsa-lib</filename>.</para></sect3>
+certain packages such as alsa-lib.</para></sect3>
 
 </sect2>
-
Index: multimedia/libdriv/alsa/driver/alsa-driver-exp.xml
===================================================================
--- multimedia/libdriv/alsa/driver/alsa-driver-exp.xml	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ multimedia/libdriv/alsa/driver/alsa-driver-exp.xml	(revision da23cf6a93bf681453c0978401a886a6136b331c)
@@ -2,23 +2,24 @@
 <title>Command explanations</title>
 
-<para><userinput>--with-sequencer=yes </userinput>: This tells the
+<para><command>--with-sequencer=yes</command> : This tells the
 alsa-driver package to build the sequencer modules for whichever soundcards
-you are building for.  Most people want them so you will usually want to
+you are building for. Most people want them so you will usually want to
 leave it set to yes.</para>
 
-<para><userinput>--with-oss=yes </userinput>: This tells the package to
-build the OSS/Free emulation modules.  Again, most people want this so it's
+<para><command>--with-oss=yes</command> : This tells the package to
+build the <acronym>OSS</acronym>/Free emulation modules. Again, most people want this so it's
 probably best to stick with yes.</para>
 
-<para><userinput>--with-isapnp=no </userinput>: Most sound cards these days
-are PCI and so ISA Plug and Play support isn't needed.  If you are using an
-ISA soundcard, it's best to say yes here.</para>
+<para><command>--with-isapnp=no</command> : Most sound cards these days
+are <acronym>PCI</acronym> and so <acronym>ISA</acronym> Plug and Play 
+support isn't needed. If you are using an
+<acronym>ISA</acronym> soundcard, it's best to say yes here.</para>
 
-<para><userinput>--with-cards=all </userinput>: You can tell the script just
-to build the drivers for your particular sound card here.  For full information
-on which drivers are available see <userinput>./configure
---help</userinput>.  If you aren't sure which chipset your soundcard uses,
+<para><command>--with-cards=all</command> : You can tell the script just
+to build the drivers for your particular sound card here. For full information
+on which drivers are available see <command>./configure
+--help</command>. If you aren't sure which chipset your soundcard uses,
 have a look in <filename>CARDS-STATUS</filename> in the alsa-driver source
-tree.  the default specified here will build all drivers.</para>
+tree. The default specified here will build all drivers.</para>
 
 </sect2>
Index: multimedia/libdriv/alsa/driver/alsa-driver-inst.xml
===================================================================
--- multimedia/libdriv/alsa/driver/alsa-driver-inst.xml	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ multimedia/libdriv/alsa/driver/alsa-driver-inst.xml	(revision da23cf6a93bf681453c0978401a886a6136b331c)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Installation of alsa-driver</title>
+<title>Installation of <application>alsa-driver</application></title>
 
 <para>Before installing the alsa-drivers note that in your kernel
@@ -10,7 +10,12 @@
 alsa driver modules.</para>
 
-<para>Install alsa-driver using the following commands as a template:</para>
+<note><para>Because alsa drivers are kernel
+modules, they must be compiled with the same compiler the kernel has
+used.</para></note>
 
-<para><screen><userinput>./configure \
+<para>Install <application>alsa-driver</application> using the following 
+commands as a template:</para>
+
+<screen><userinput><command>./configure \
    --with-moddir=/lib/modules/`uname -r`/kernel/drivers/sound \
    --with-kernel=/lib/modules/`uname -r`/build \
@@ -20,11 +25,10 @@
    --with-cards=all &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 <para>If this is the first time you have installed the alsa drivers, you
 will need to create the <filename class="directory">/dev</filename> entries
 using the script provided in the alsa-driver source tree:
-<screen><userinput>./snddevices</userinput></screen></para>
+<screen><userinput><command>./snddevices</command></userinput></screen></para>
 
 </sect2>
-
Index: multimedia/libdriv/alsa/driver/alsa-driver-intro.xml
===================================================================
--- multimedia/libdriv/alsa/driver/alsa-driver-intro.xml	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ multimedia/libdriv/alsa/driver/alsa-driver-intro.xml	(revision da23cf6a93bf681453c0978401a886a6136b331c)
@@ -1,13 +1,16 @@
 <sect2>
-<title>Introduction to alsa-driver</title>
+<title>Introduction to <application>alsa-driver</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&alsa-driver-download-http;"/>
-Download location (FTP):        <ulink url="&alsa-driver-download-ftp;"/>
-Version used:                   &alsa-driver-version;
-Package size:                   &alsa-driver-size;
-Estimated Disk space required:  &alsa-driver-buildsize;</screen>
-
-<para>The alsa-driver package contains the alsa sound drivers.  These are
+<para>The <application>alsa-driver</application> package contains the alsa sound drivers. These are
 the next generation of sound drivers for Linux.</para>
 
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&alsa-driver-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&alsa-driver-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &alsa-driver-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &alsa-driver-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &alsa-driver-time;</para></listitem></itemizedlist>
+</sect3>
+
 </sect2>
Index: multimedia/libdriv/alsa/driver/alsa-driver.ent
===================================================================
--- multimedia/libdriv/alsa/driver/alsa-driver.ent	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ multimedia/libdriv/alsa/driver/alsa-driver.ent	(revision da23cf6a93bf681453c0978401a886a6136b331c)
@@ -10,2 +10,3 @@
 <!ENTITY alsa-driver-download-ftp "ftp://ftp.alsa-project.org/pub/driver/alsa-driver-&alsa-driver-version;.tar.bz2">
 <!ENTITY alsa-driver-size "1.5 MB">
+<!ENTITY alsa-driver-time "0.55 SBU">
Index: multimedia/libdriv/alsa/lib/alsa-lib-desc.xml
===================================================================
--- multimedia/libdriv/alsa/lib/alsa-lib-desc.xml	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ multimedia/libdriv/alsa/lib/alsa-lib-desc.xml	(revision da23cf6a93bf681453c0978401a886a6136b331c)
@@ -2,6 +2,6 @@
 <title>Contents</title>
 
-<para>The alsa-lib package contains <userinput>aserver</userinput> and the
-<filename>alsa</filename> library.</para>
+<para>The alsa-lib package contains <command>aserver</command> and the
+<filename class="libraryfile">libasound</filename> library.</para>
 
 </sect2>
@@ -9,10 +9,7 @@
 <sect2><title>Description</title>
 
-<sect3><title>aserver</title>
-<para>No description is currently available.</para></sect3>
-
 <sect3><title>libasound (alsa library)</title>
-<para>libasound provides alsa functions for application programs.</para></sect3>
+<para><filename class="libraryfile">libasound</filename> provides alsa 
+functions for application programs.</para></sect3>
 
 </sect2>
-
Index: multimedia/libdriv/alsa/lib/alsa-lib-inst.xml
===================================================================
--- multimedia/libdriv/alsa/lib/alsa-lib-inst.xml	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ multimedia/libdriv/alsa/lib/alsa-lib-inst.xml	(revision da23cf6a93bf681453c0978401a886a6136b331c)
@@ -1,10 +1,10 @@
 <sect2>
-<title>Installation of alsa-lib</title>
+<title>Installation of <application>alsa-lib</application></title>
 
-<para>Install alsa-lib by running the following commands:</para>
+<para>Install <application>alsa-lib</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure &amp;&amp;
+<screen><userinput><command>./configure &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: multimedia/libdriv/alsa/lib/alsa-lib-intro.xml
===================================================================
--- multimedia/libdriv/alsa/lib/alsa-lib-intro.xml	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ multimedia/libdriv/alsa/lib/alsa-lib-intro.xml	(revision da23cf6a93bf681453c0978401a886a6136b331c)
@@ -1,16 +1,22 @@
 <sect2>
-<title>Introduction to alsa-lib</title>
+<title>Introduction to <application>alsa-lib</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&alsa-lib-download-http;"/>
-Download location (FTP):        <ulink url="&alsa-lib-download-ftp;"/>
-Version used:                   &alsa-lib-version;
-Package size:                   &alsa-lib-size;
-Estimated Disk space required:  &alsa-lib-buildsize;</screen>
-
-<para>The alsa-lib package contains the alsa library.  This is used by
+<para>The <application>alsa-lib</application> package contains the alsa library.  This is used by
 programs (including alsa-utils) which wish to use the alsa sound interface.</para>
 
-<screen>alsa-lib depends on: 
-the header files from <xref linkend="alsa-driver"/></screen>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&alsa-lib-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&alsa-lib-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &alsa-lib-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &alsa-lib-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &alsa-lib-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>alsa-lib</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="alsa-driver"/>
+</para></sect4>
+</sect3>
 
 </sect2>
Index: multimedia/libdriv/alsa/lib/alsa-lib.ent
===================================================================
--- multimedia/libdriv/alsa/lib/alsa-lib.ent	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ multimedia/libdriv/alsa/lib/alsa-lib.ent	(revision da23cf6a93bf681453c0978401a886a6136b331c)
@@ -8,3 +8,4 @@
 <!ENTITY alsa-lib-download-http "http://www.alsa-project.org/alsa/ftp/lib/alsa-lib-&alsa-lib-version;.tar.bz2">
 <!ENTITY alsa-lib-download-ftp "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-&alsa-lib-version;.tar.bz2">
-<!ENTITY alsa-lib-size "486 KB">
+<!ENTITY alsa-lib-size "501 KB">
+<!ENTITY alsa-lib-time "0.41 SBU">
Index: multimedia/libdriv/alsa/oss/alsa-oss-desc.xml
===================================================================
--- multimedia/libdriv/alsa/oss/alsa-oss-desc.xml	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ multimedia/libdriv/alsa/oss/alsa-oss-desc.xml	(revision da23cf6a93bf681453c0978401a886a6136b331c)
@@ -2,17 +2,7 @@
 <title>Contents</title>
 
-<para>The alsa-oss package contains <userinput>aoss</userinput> and the
-<filename>alsa oss compatibility</filename> library.</para>
+<para>The alsa-oss package contains <command>aoss</command> and the
+<filename class="libraryfile">libaoss</filename> (alsa oss compatibility
+library) library.</para>
 
 </sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>aoss</title>
-<para>No description is currently available.</para></sect3>
-
-<sect3><title>libaoss (alsa oss compatibility library)</title>
-<para>No description is currently available</para></sect3>
-
-</sect2>
-
Index: ltimedia/libdriv/alsa/oss/alsa-oss-exp.xml
===================================================================
--- multimedia/libdriv/alsa/oss/alsa-oss-exp.xml	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ 	(revision )
@@ -1,7 +1,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><userinput>COMMAND:</userinput> This command does something.</para>
-
-</sect2>
-
Index: multimedia/libdriv/alsa/oss/alsa-oss-inst.xml
===================================================================
--- multimedia/libdriv/alsa/oss/alsa-oss-inst.xml	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ multimedia/libdriv/alsa/oss/alsa-oss-inst.xml	(revision da23cf6a93bf681453c0978401a886a6136b331c)
@@ -1,11 +1,10 @@
 <sect2>
-<title>Installation of alsa-oss</title>
+<title>Installation of <application>alsa-oss</application></title>
 
-<para>Install alsa-oss by running the following commands:</para>
+<para>Install <application>alsa-oss</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure &amp;&amp;
+<screen><userinput><command>./configure &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
-
Index: multimedia/libdriv/alsa/oss/alsa-oss-intro.xml
===================================================================
--- multimedia/libdriv/alsa/oss/alsa-oss-intro.xml	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ multimedia/libdriv/alsa/oss/alsa-oss-intro.xml	(revision da23cf6a93bf681453c0978401a886a6136b331c)
@@ -1,18 +1,22 @@
 <sect2>
-<title>Introduction to alsa-oss</title>
-
-<screen>Download location (HTTP):       <ulink url="&alsa-oss-download-http;"/>
-Download location (FTP):        <ulink url="&alsa-oss-download-ftp;"/>
-Version used:                   &alsa-oss-version;
-Package size:                   &alsa-oss-size;
-Estimated Disk space required:  &alsa-oss-buildsize;</screen>
+<title>Introduction to <application>alsa-oss</application></title>
 
 <para>The alsa-oss package contains the alsa oss compatibility library.
 This is used by programs which wish to use the alsa oss sound interface</para>
 
-<!--
-<screen>alsa-oss depends on:
-DEPENDENCY LIST (if any)</screen>
--->
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&alsa-oss-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&alsa-oss-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &alsa-oss-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &alsa-oss-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &alsa-oss-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>alsa-oss</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="alsa-lib"/>
+</para></sect4>
+</sect3>
 
 </sect2>
Index: multimedia/libdriv/alsa/oss/alsa-oss.ent
===================================================================
--- multimedia/libdriv/alsa/oss/alsa-oss.ent	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ multimedia/libdriv/alsa/oss/alsa-oss.ent	(revision da23cf6a93bf681453c0978401a886a6136b331c)
@@ -9,2 +9,3 @@
 <!ENTITY alsa-oss-download-ftp "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-&alsa-oss-version;.tar.bz2">
 <!ENTITY alsa-oss-size "131 KB">
+<!ENTITY alsa-oss-time "0.04 SBU">
Index: multimedia/libdriv/alsa/tools/alsa-tools-desc.xml
===================================================================
--- multimedia/libdriv/alsa/tools/alsa-tools-desc.xml	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ multimedia/libdriv/alsa/tools/alsa-tools-desc.xml	(revision da23cf6a93bf681453c0978401a886a6136b331c)
@@ -2,7 +2,7 @@
 <title>Contents</title>
 
-<para>The tools available in this package are <userinput>ac3dec</userinput>,
-<userinput>as10k1</userinput>, <userinput>envy24control</userinput>,
-<userinput>sb16_csp</userinput> and <userinput>sbiload</userinput>.</para>
+<para>The tools available in this package are <command>ac3dec</command>,
+<command>as10k1</command>, <command>envy24control</command>,
+<command>sb16_csp</command> and <command>sbiload</command>.</para>
 
 </sect2>
@@ -11,22 +11,22 @@
 
 <sect3><title>ac3dec</title>
-<para>ac3dec is a free AC-3 stream decoder.</para></sect3>
+<para><command>ac3dec</command> is a free AC-3 stream decoder.</para></sect3>
 
 <sect3><title>as10k1</title>
-<para>as10k1 is an assembler for the emu10k1 DSP chip present in the
+<para><command>as10k1</command> is an assembler for the emu10k1 DSP chip present in the
 Creative SB Live, PCI 512, and emu APS sound cards. It is used to make 
 audio effects such as a flanger, chorus or reverb.</para></sect3>
 
 <sect3><title>envy24control</title>
-<para>envy24control is a control tool for Envy24 (ice1712) based 
+<para><command>envy24control</command> is a control tool for Envy24 (ice1712) based 
 soundcards</para></sect3>
 
 <sect3><title>sb16_csp</title>
-<para>sb16_csp is an SB16/AWE32 Creative Signal Processor (ASP/CSP) control
+<para><command>sb16_csp</command> is an SB16/AWE32 Creative Signal Processor (ASP/CSP) control
 program.</para></sect3>
 
 <sect3><title>sbiload</title>
-<para>sbiload is an OPL2/3 FM instrument loader for the ALSA sequencer.</para></sect3>
+<para><command>sbiload</command>is an OPL2/3 FM instrument loader for
+the <acronym>ALSA</acronym> sequencer.</para></sect3>
 
 </sect2>
-
Index: multimedia/libdriv/alsa/tools/alsa-tools-inst.xml
===================================================================
--- multimedia/libdriv/alsa/tools/alsa-tools-inst.xml	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ multimedia/libdriv/alsa/tools/alsa-tools-inst.xml	(revision da23cf6a93bf681453c0978401a886a6136b331c)
@@ -1,14 +1,13 @@
 <sect2>
-<title>Installation of alsa-tools</title>
+<title>Installation of <application>alsa-tools</application></title>
 
-<para>The alsa-tools package is only needed by those with advanced
+<para>The <application>alsa-tools</application> package is only needed by those with advanced
 requirements for their sound card.  The tools are not all built together,
-instead you need to <userinput>cd</userinput> into the directory of each
+instead you need to <command>cd</command> into the directory of each
 tool you wish to compile and run the following commands:</para>
 
-<para><screen><userinput>./configure &amp;&amp;
+<screen><userinput><command>./configure &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
-
Index: multimedia/libdriv/alsa/tools/alsa-tools-intro.xml
===================================================================
--- multimedia/libdriv/alsa/tools/alsa-tools-intro.xml	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ multimedia/libdriv/alsa/tools/alsa-tools-intro.xml	(revision da23cf6a93bf681453c0978401a886a6136b331c)
@@ -1,15 +1,22 @@
 <sect2>
-<title>Introduction to alsa-tools</title>
+<title>Introduction to <application>alsa-tools</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&alsa-tools-download-http;"/>
-Download location (FTP):        <ulink url="&alsa-tools-download-ftp;"/>
-Version used:                   &alsa-tools-version;
-Package size:                   &alsa-tools-size;
-Estimated Disk space required:  &alsa-tools-buildsize;</screen>
+<para>The <application>alsa-tools</application> package contains 
+advanced tools for certain soundcards.</para>
 
-<para>The alsa-tools package contains advanced tools for certain soundcards.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&alsa-tools-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&alsa-tools-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &alsa-tools-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &alsa-tools-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &alsa-tools-time;</para></listitem></itemizedlist>
+</sect3>
 
-<screen>alsa-tools depends on: 
-<xref linkend="alsa-lib"/></screen>
+<sect3><title><application>alsa-tools</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="alsa-lib"/>
+</para></sect4>
+</sect3>
 
 </sect2>
Index: multimedia/libdriv/alsa/tools/alsa-tools.ent
===================================================================
--- multimedia/libdriv/alsa/tools/alsa-tools.ent	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ multimedia/libdriv/alsa/tools/alsa-tools.ent	(revision da23cf6a93bf681453c0978401a886a6136b331c)
@@ -7,3 +7,4 @@
 <!ENTITY alsa-tools-download-http "http://www.alsa-project.org/alsa/ftp/tools/alsa-tools-&alsa-tools-version;.tar.bz2">
 <!ENTITY alsa-tools-download-ftp "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-&alsa-tools-version;.tar.bz2">
-<!ENTITY alsa-tools-size "661 KB">
+<!ENTITY alsa-tools-size "1.3 MB">
+<!ENTITY alsa-tools-time "">
Index: multimedia/libdriv/alsa/utils/alsa-utils-config.xml
===================================================================
--- multimedia/libdriv/alsa/utils/alsa-utils-config.xml	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ multimedia/libdriv/alsa/utils/alsa-utils-config.xml	(revision da23cf6a93bf681453c0978401a886a6136b331c)
@@ -24,5 +24,5 @@
 <para>To create the alsa script, do the following:</para>
 
-<para><screen><userinput>cat &gt; /etc/rc.d/init.d/alsa &lt;&lt; "EOF"</userinput>
+<screen><userinput><command>cat &gt; /etc/rc.d/init.d/alsa &lt;&lt; "EOF"
 #!/bin/sh
 # Begin $rc_base/init.d/alsa
@@ -65,9 +65,9 @@
 
 # End $rc_base/init.d/alsa
-<userinput>EOF
-chmod 755 /etc/rc.d/init.d/alsa</userinput></screen></para>
+EOF
+chmod 755 /etc/rc.d/init.d/alsa</command></userinput></screen>
 
 <para>You can then create the appropriate symlinks:
-<screen><userinput>cd /etc/rc.d/init.d &amp;&amp;
+<screen><userinput><command>cd /etc/rc.d/init.d &amp;&amp;
 ln -sf ../init.d/alsa ../rc0.d/K35alsa &amp;&amp;
 ln -sf ../init.d/alsa ../rc1.d/K35alsa &amp;&amp;
@@ -76,15 +76,15 @@
 ln -sf ../init.d/alsa ../rc4.d/S40alsa &amp;&amp;
 ln -sf ../init.d/alsa ../rc5.d/S40alsa &amp;&amp;
-ln -sf ../init.d/alsa ../rc6.d/K35alsa</userinput></screen></para>
+ln -sf ../init.d/alsa ../rc6.d/K35alsa</command></userinput></screen></para>
 
 <para>Note that all channels of your soundcard are muted by default. You can
-use the <filename>alsamixer</filename> program from alsa-utils (or any other
-OSS mixer) to change this.</para>
+use the <command>alsamixer</command> program from alsa-utils (or any other
+<acronym>OSS</acronym> mixer) to change this.</para>
 
 <para>Also, the first time the above script is run, it will complain that
 there is no state in <filename>/etc/asound.state</filename>.  You can
 prevent this by running the following commands after installing alsa-utils:
-<screen><userinput>touch /etc/asound.state &amp;&amp;
-alsactl store</userinput></screen></para>
+<screen><userinput><command>touch /etc/asound.state &amp;&amp;
+alsactl store</command></userinput></screen></para>
 
 <para>A final note is that the lines loading <filename>sfxload</filename>
@@ -99,3 +99,2 @@
 
 </sect2>
-
Index: multimedia/libdriv/alsa/utils/alsa-utils-desc.xml
===================================================================
--- multimedia/libdriv/alsa/utils/alsa-utils-desc.xml	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ multimedia/libdriv/alsa/utils/alsa-utils-desc.xml	(revision da23cf6a93bf681453c0978401a886a6136b331c)
@@ -2,8 +2,8 @@
 <title>Contents</title>
 
-<para>The alsa-utils package contains <userinput>aconnect</userinput>, 
-<userinput>alsactl</userinput>, <userinput>alsamixer</userinput>,
-<userinput>amixer</userinput>, <userinput>aplay</userinput>,
-<userinput>arecord</userinput> and <userinput>aseqnet</userinput>.</para>
+<para>The alsa-utils package contains <command>aconnect</command>, 
+<command>alsactl</command>, <command>alsamixer</command>,
+<command>amixer</command>, <command>aplay</command>,
+<command>arecord</command> and <command>aseqnet</command>.</para>
 
 </sect2>
@@ -12,31 +12,30 @@
 
 <sect3><title>aconnect</title>
-<para>aconnect is a utility for connecting and disconnecting two existing
-ports in the ALSA sequencer system.</para></sect3>
+<para><command>aconnect</command> is a utility for connecting and disconnecting two existing
+ports in the <acronym>ALSA</acronym> sequencer system.</para></sect3>
 
 <sect3><title>alsactl</title>
-<para>alsactl is used to control advanced settings for the ALSA
-soundcard drivers.</para></sect3>
+<para><command>alsactl</command> is used to control advanced settings
+for the <acronym>ALSA</acronym> soundcard drivers.</para></sect3>
 
 <sect3><title>alsamixer</title>
-<para>alsamixer is an ncurses-based mixer program for use with the ALSA
-soundcard drivers.</para></sect3>
+<para><command>alsamixer</command> is an ncurses-based mixer program for
+use with the <acronym>ALSA</acronym> soundcard drivers.</para></sect3>
 
 <sect3><title>amixer</title>
-<para>amixer allows command-line control of the mixers for the ALSA soundcard
-drivers.</para></sect3>
+<para><command>amixer</command> allows command-line control of the
+mixers for the <acronym>ALSA</acronym> soundcard drivers.</para></sect3>
 
 <sect3><title>aplay</title>
-<para>aplay is a command-line soundfile player for the ALSA soundcard
-drivers.</para></sect3>
+<para><command>aplay</command> is a command-line soundfile player for
+the <acronym>ALSA</acronym> soundcard drivers.</para></sect3>
 
 <sect3><title>arecord</title>
-<para>arecord is a command-line soundfile recorder for the ALSA soundcard
-drivers.</para></sect3>
+<para><command>arecord</command> is a command-line soundfile recorder
+for the <acronym>ALSA</acronym> soundcard drivers.</para></sect3>
 
 <sect3><title>aseqnet</title>
-<para>aseqnet is an ALSA sequencer client which sends and receives event
-packets over a network.</para></sect3>
+<para><command>aseqnet</command> is an <acronym>ALSA</acronym> sequencer 
+client which sends and receives event packets over a network.</para></sect3>
 
 </sect2>
-
Index: multimedia/libdriv/alsa/utils/alsa-utils-inst.xml
===================================================================
--- multimedia/libdriv/alsa/utils/alsa-utils-inst.xml	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ multimedia/libdriv/alsa/utils/alsa-utils-inst.xml	(revision da23cf6a93bf681453c0978401a886a6136b331c)
@@ -1,11 +1,10 @@
 <sect2>
-<title>Installation of alsa-utils</title>
+<title>Installation of <application>alsa-utils</application></title>
 
-<para>Install alsa-utils by running the following commands:</para>
+<para>Install <application>alsa-utils</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure &amp;&amp;
+<screen><userinput><command>./configure &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
-
Index: multimedia/libdriv/alsa/utils/alsa-utils-intro.xml
===================================================================
--- multimedia/libdriv/alsa/utils/alsa-utils-intro.xml	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ multimedia/libdriv/alsa/utils/alsa-utils-intro.xml	(revision da23cf6a93bf681453c0978401a886a6136b331c)
@@ -1,16 +1,22 @@
 <sect2>
-<title>Introduction to alsa-utils</title>
+<title>Introduction to <application>alsa-utils</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&alsa-utils-download-http;"/>
-Download location (FTP):        <ulink url="&alsa-utils-download-ftp;"/>
-Version used:                   &alsa-utils-version;
-Package size:                   &alsa-utils-size;
-Estimated Disk space required:  &alsa-utils-buildsize;</screen>
+<para>The <application>alsa-utils</application> package contains various 
+utilities which are useful for controlling your sound card.</para>
 
-<para>The alsa-utils package contains various utilities which are useful for
-controlling your sound card.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&alsa-utils-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&alsa-utils-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &alsa-utils-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &alsa-utils-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &alsa-utils-time;</para></listitem></itemizedlist>
+</sect3>
 
-<screen>alsa-utils depends on: 
-<xref linkend="alsa-lib"/></screen>
+<sect3><title><application>alsa-utils</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="alsa-lib"/>
+</para></sect4>
+</sect3>
 
 </sect2>
Index: multimedia/libdriv/alsa/utils/alsa-utils.ent
===================================================================
--- multimedia/libdriv/alsa/utils/alsa-utils.ent	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ multimedia/libdriv/alsa/utils/alsa-utils.ent	(revision da23cf6a93bf681453c0978401a886a6136b331c)
@@ -9,2 +9,3 @@
 <!ENTITY alsa-utils-download-ftp "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-&alsa-utils-version;.tar.bz2">
 <!ENTITY alsa-utils-size "106 KB">
+<!ENTITY alsa-utils-time "0.06 SBU">
Index: multimedia/videoutils/transcode/transcode-inst.xml
===================================================================
--- multimedia/videoutils/transcode/transcode-inst.xml	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ multimedia/videoutils/transcode/transcode-inst.xml	(revision da23cf6a93bf681453c0978401a886a6136b331c)
@@ -2,7 +2,7 @@
 <title>Installation of <application>transcode</application></title>
 
+<!--
 <para>Everything that can be utilized by
 <application>transcode</application> should be installed first.</para>
-<!--
 <sect3>
 <title>OpenDivX or Xvid?</title>
@@ -25,7 +25,7 @@
 
 </sect3>
--->
 <sect3>
 <title>Installing <application>transcode</application></title>
+-->
 
 <para>Install <application>transcode</application> by running the following 
@@ -40,6 +40,4 @@
 MPlayer Version number is appropriate.</para>
 -->
-</sect3>
 
 </sect2>
-
Index: multimedia/videoutils/transcode/transcode-intro.xml
===================================================================
--- multimedia/videoutils/transcode/transcode-intro.xml	(revision 7890d2bee9d1fcdd0ea5217a457eb062946f8a71)
+++ multimedia/videoutils/transcode/transcode-intro.xml	(revision da23cf6a93bf681453c0978401a886a6136b331c)
@@ -25,11 +25,9 @@
 url="http://libdv.sourceforge.net">libdv</ulink>,
 <xref linkend="SDL"/>, <xref linkend="qt"/>, <xref linkend="avifile"/>,
-<xref linkend="lame"/>, <ulink
-url="http://fame.sourceforge.net">FAME</ulink>,
-<!--<xref linkend="opendivx"/>,--> <xref linkend="xvid"/>, <ulink
-url="http://www.oberhumer.com/opensource/lzo">LZO</ulink>, <xref
-linkend="ffmpeg"/>, <ulink
+<xref linkend="lame"/>, <xref linkend="libfame"/>,
+<!--<xref linkend="opendivx"/>,--> <xref linkend="xvid"/>, <xref
+linkend="LZO"/>, <xref linkend="ffmpeg"/>, <ulink
 url="http://dvd.sourceforge.net">libdvdnav/read</ulink>,
-<ulink url="http://www.underbit.com/products/mad">MAD</ulink>, <xref
+<xref linkend="libmad"/>, <xref
 linkend="curl"/> and <xref linkend="libogg"/><!-- Preliminary Support
 for OpenQuicktime is under development --></para></sect4>
