Index: general.ent
===================================================================
--- general.ent	(revision adcfe66f47e7189cf9d84f32e448d7f56be48a91)
+++ general.ent	(revision 2f6f8294f3d89bcd25c9ce0a4a7456aeb3ac76c2)
@@ -1,7 +1,7 @@
-<!ENTITY day          "20">
+<!ENTITY day          "21">
 <!ENTITY month        "01">
 <!ENTITY year         "2005">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "January &day;th, &year;">
+<!ENTITY releasedate  "January &day;st, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "cvs">                  <!-- cvs|[release #] -->
Index: multimedia/cdwriteutils/cdrtools.xml
===================================================================
--- multimedia/cdwriteutils/cdrtools.xml	(revision adcfe66f47e7189cf9d84f32e448d7f56be48a91)
+++ multimedia/cdwriteutils/cdrtools.xml	(revision 2f6f8294f3d89bcd25c9ce0a4a7456aeb3ac76c2)
@@ -18,4 +18,6 @@
 <?dbhtml filename="cdrtools.html"?>
 <title>Cdrtools-&cdrtools-version;</title>
+<indexterm zone="cdrtools">
+<primary sortas="a-Cdrtools">Cdrtools</primary></indexterm>
 
 <sect2>
@@ -47,6 +49,9 @@
 commands:</para>
 
-<screen><userinput><command>make INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root &amp;&amp;
-make INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root install</command></userinput></screen>
+<screen><userinput><command>make INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root install</command></userinput></screen>
 
 </sect2>
@@ -55,10 +60,10 @@
 <title>Command explanations</title>
 
-<para><parameter>INS_BASE=/usr</parameter>: This command moves the
-install directory from <filename class="directory">/opt/schily</filename> to 
+<para><parameter>INS_BASE=/usr</parameter>: This parameter moves the install 
+directory from <filename class="directory">/opt/schily</filename> to 
 <filename class="directory">/usr</filename>.</para>
 
-<para><parameter>DEFINSUSR=root DEFINSGRP=root</parameter>: These
-commands install all programs with root:root ownership instead of the default
+<para><parameter>DEFINSUSR=root DEFINSGRP=root</parameter>: These parameters 
+install all programs with root:root ownership instead of the default 
 bin:bin.</para>
 
@@ -68,66 +73,137 @@
 <title>Contents</title>
 
-<para>The <application>Cdrtools</application> package contains 
-<command>cdda2wav</command>, 
-<command>cdrecord</command>,
-<command>devdump</command>,
-<command>isodebug</command>, 
-<command>isodump</command>, 
-<command>isoinfo</command>,
-<command>isovfy</command>,
-<command>mkhybrid</command>, 
-<command>mkisofs</command>,
-<command>readcd</command>,
-<command>rscsi</command>,
-<command>scgcheck</command>, 
-<command>skel</command>
-and support libraries.</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>cdrecord</title>
-<para><command>cdrecord</command> records audio or data Compact Discs.</para>
-</sect3>
-
-<sect3><title>cdda2wav</title>
-<para><command>cdda2wav</command> dumps Compact Disc audio into
-<filename>WAV</filename> sound files.</para></sect3>
-
-<sect3><title>mkisofs, mkhybrid</title>
-<para><command>mkisofs</command> and <command>mkhybrid</command>
-generate an <acronym>ISO</acronym>9660/JOLIET/<acronym>HFS</acronym> hybrid 
-file system.</para></sect3>
-
-<sect3><title>readcd</title>
-<para><command>readcd</command> reads or writes Compact Discs.</para></sect3>
-
-<sect3><title>scgcheck</title>
-<para><command>scgcheck</command> is used to check and verify the Application 
-Binary Interface of <filename class="libraryfile">libscg.</filename></para>
-</sect3>
-
-<sect3><title>support utilities</title>
-<para><command>isoinfo</command>, <command>isodump</command>,
-<command>isovfy</command>, <command>isodebug</command> and
-<command>devdump</command> are utility programs for
-dumping and verifying <acronym>ISO</acronym>9660 images.</para></sect3>
-
-<sect3><title>rscsi</title>
-<para><command>rscsi</command> is a remote <acronym>SCSI</acronym> 
-manager.</para></sect3>
-
-<sect3><title>support libraries</title>
-<para><filename class="libraryfile">libdeflt</filename>, 
-<filename class="libraryfile">libedc_ecc</filename>, 
-<filename class="libraryfile">libfile</filename>, 
-<filename class="libraryfile">libhfs</filename>, 
-<filename class="libraryfile">libparanoia</filename>, 
-<filename class="libraryfile">librscg</filename>, 
-<filename class="libraryfile">libscg</filename>, 
-<filename class="libraryfile">libschily</filename> and 
-<filename class="libraryfile">libunls</filename>
-are the support libraries for this package.</para></sect3>
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Libraries</segtitle>
+<segtitle>Installed Directories</segtitle>
+<seglistitem>
+<seg>cdda2wav, cdrecord, devdump, isodebug, isodump, isoinfo, isovfy, 
+mkhybrid, mkisofs, readcd, rscsi, scgcheck, skel</seg>
+<seg>libdeflt.a, libedc_ecc.a, libfile.a, libhfs.a, libparanoia.a, librscg.a, 
+libscg.a, libschily.a, libunls.a</seg>
+<seg>None</seg>
+</seglistitem>
+</segmentedlist>
+
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<varlistentry id="cdda2wav">
+<term><command>cdda2wav</command></term>
+<listitem><para>converts Compact Disc audio into <filename>WAV</filename> 
+sound files.</para>
+<indexterm zone="cdrtools cdda2wav">
+<primary sortas="b-cdda2wav">cdda2wav</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="cdrecord">
+<term><command>cdrecord</command></term>
+<listitem><para>records audio or data Compact Discs.</para>
+<indexterm zone="cdrtools cdrecord">
+<primary sortas="b-cdrecord">cdrecord</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="devdump">
+<term><command>devdump</command></term>
+<listitem><para>is a diagnostic program used to dump an 
+<acronym>ISO</acronym>-9660 device or file in hex.</para>
+<indexterm zone="cdrtools devdump">
+<primary sortas="b-devdump">devdump</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="isodebug">
+<term><command>isodebug</command></term>
+<listitem><para>is used to display the command-line parameters used to create 
+an <acronym>ISO</acronym>-9660 image.</para>
+<indexterm zone="cdrtools isodebug">
+<primary sortas="b-isodebug">isodebug</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="isodump">
+<term><command>isodump</command></term>
+<listitem><para>is a diagnostic program used to dump a device or file based on 
+<acronym>ISO</acronym>-9660.</para>
+<indexterm zone="cdrtools isodump">
+<primary sortas="b-isodump">isodump</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="isoinfo">
+<term><command>isoinfo</command></term>
+<listitem><para>is used to analyze or list an <acronym>ISO</acronym>-9660 
+image.</para>
+<indexterm zone="cdrtools isoinfo">
+<primary sortas="b-isoinfo">isoinfo</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="isovfy">
+<term><command>isovfy</command></term>
+<listitem><para>is used to verify an <acronym>ISO</acronym>-9660 image.</para>
+<indexterm zone="cdrtools isovfy">
+<primary sortas="b-isovfy">isovfy</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="mkhybrid">
+<term><command>mkhybrid</command></term>
+<listitem><para>is a symbolic link to <command>mkisofs</command> used to 
+create <acronym>ISO</acronym>-9660/<acronym>HFS</acronym> hybrid filesystem 
+images.</para>
+<indexterm zone="cdrtools mkhybrid">
+<primary sortas="b-mkhybrid">mkhybrid</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="mkisofs">
+<term><command>mkisofs</command></term>
+<listitem><para>is used to create 
+<acronym>ISO</acronym>-9660/JOLIET/HFS filesystem images, optionally with 
+Rock Ridge attributes.</para>
+<indexterm zone="cdrtools mkisofs">
+<primary sortas="b-mkisofs">mkisofs</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="readcd">
+<term><command>readcd</command></term>
+<listitem><para>reads or writes Compact Discs.</para>
+<indexterm zone="cdrtools readcd">
+<primary sortas="b-readcd">readcd</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="rscsi">
+<term><command>rscsi</command></term>
+<listitem><para>is a remote <acronym>SCSI</acronym> manager.</para>
+<indexterm zone="cdrtools rscsi">
+<primary sortas="b-rscsi">rscsi</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="scgcheck">
+<term><command>scgcheck</command></term>
+<listitem><para>is used to check and verify the Application Binary Interface 
+of <filename class="libraryfile">libscg</filename>.</para>
+<indexterm zone="cdrtools scgcheck">
+<primary sortas="b-scgcheck">scgcheck</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="libscg">
+<term><filename class='libraryfile'>libscg.a</filename></term>
+<listitem><para>is a highly portable <acronym>SCSI</acronym> transport 
+library.</para>
+<indexterm zone="cdrtools libscg">
+<primary sortas="c-libscg">libscg.a</primary></indexterm>
+</listitem>
+</varlistentry>
+
+</variablelist>
 
 </sect2>
