Index: multimedia/cdwriteutils/cdrtools/cdrtools-desc.xml
===================================================================
--- multimedia/cdwriteutils/cdrtools/cdrtools-desc.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
+++ multimedia/cdwriteutils/cdrtools/cdrtools-desc.xml	(revision 32d36378ed896ea4236e8f3c001301812c12dbee)
@@ -2,10 +2,10 @@
 <title>Contents</title>
 
-<para>The cdrtools package contains <userinput>cdrecord</userinput>,
-<userinput>cdda2wav</userinput>, <userinput>mkisofs</userinput>,
-<userinput>readcd</userinput>, <userinput>scgcheck</userinput>,
-<userinput>isoinfo</userinput>, <userinput>isodump</userinput>,
-<userinput>isovfy</userinput>, <userinput>devdump</userinput>,
-<userinput>rscsi</userinput> and support libraries.</para>
+<para>The <application>cdrtools</application> package contains <command>cdrecord</command>,
+<command>cdda2wav</command>, <command>mkisofs</command>, <command>mkhybrid</command>,
+<command>readcd</command>, <command>scgcheck</command>,
+<command>isoinfo</command>, <command>isodump</command>,
+<command>isovfy</command>, <command>isodebug</command>, <command>devdump</command>,
+<command>rscsi</command> and support libraries.</para>
 
 </sect2>
@@ -14,33 +14,40 @@
 
 <sect3><title>cdrecord</title>
-<para>cdrecord records audio or data Compact Discs.</para></sect3>
+<para><command>cdrecord</command> records audio or data Compact Discs.</para></sect3>
 
 <sect3><title>cdda2wav</title>
-<para>cdda2wav dumps Compact Disc audio into wav sound files.</para></sect3>
+<para><command>cdda2wav</command> dumps Compact Disc audio into wav sound files.</para></sect3>
 
 <sect3><title>mkisofs</title>
-<para>mkisofs and mkhybrid generates an ISO9660/JOLIET/HFS hybrid
-filesystem.</para></sect3>
+<para><command>mkisofs</command> and <command>mkhybrid</command>
+generate an ISO9660/JOLIET/<acronym>HFS</acronym> hybrid filesystem.</para></sect3>
 
 <sect3><title>readcd</title>
-<para>readcd reads or writes Compact Discs.</para></sect3>
+<para><command>readcd</command> reads or writes Compact Discs.</para></sect3>
 
 <sect3><title>scgcheck</title>
-<para>scgcheck is used to check and verify the Application Binary
-Interface of libscg.</para></sect3>
+<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>isoinfo, isodump, isovfy and devdump are utility programs for
+<para><command>isoinfo</command>, <command>isodump</command>,
+<command>isovfy</command>, <command>isodebug</command> and
+<command>devdump</command> are utility programs for
 dumping and verifying iso9660 images.</para></sect3>
 
 <sect3><title>rscsi</title>
-<para>rscsi is a remote scsi manager.</para></sect3>
+<para><command>rscsi</command> is a remote <acronym>SCSI</acronym> manager.</para></sect3>
 
 <sect3><title>support libraries</title>
-<para>libdeflt, libfile, libhfs, librscg, libscg, libschily and libunls
+<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>
 
-
-
 </sect2>
-
Index: multimedia/cdwriteutils/cdrtools/cdrtools-exp.xml
===================================================================
--- multimedia/cdwriteutils/cdrtools/cdrtools-exp.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
+++ multimedia/cdwriteutils/cdrtools/cdrtools-exp.xml	(revision 32d36378ed896ea4236e8f3c001301812c12dbee)
@@ -2,11 +2,11 @@
 <title>Command explanations</title>
 
-<para><userinput>INS_BASE=/usr</userinput> : This command moves the
-install directory from <filename class="directory"> /opt/schily
-</filename> to <filename class="directory"> /usr </filename>.</para>
+<para><command>INS_BASE=/usr</command> : This command moves the
+install directory from <filename class="directory">/opt/schily
+</filename> to <filename class="directory">/usr</filename>.</para>
 
-<para><userinput>DEFINSUSR=root DEFINSGRP=root</userinput> : These
+<para><command>DEFINSUSR=root DEFINSGRP=root</command> : These
 commands install all programs with root.root ownership instead of the default
-bin.bin.</para>
+bin:bin.</para>
 
 </sect2>
Index: multimedia/cdwriteutils/cdrtools/cdrtools-inst.xml
===================================================================
--- multimedia/cdwriteutils/cdrtools/cdrtools-inst.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
+++ multimedia/cdwriteutils/cdrtools/cdrtools-inst.xml	(revision 32d36378ed896ea4236e8f3c001301812c12dbee)
@@ -1,9 +1,9 @@
 <sect2>
-<title>Installation of cdrtools</title>
+<title>Installation of <application>cdrtools</application></title>
 
-<para>Install cdrtools by running the following commands:</para>
+<para>Install <application>cdrtools</application> by running the following commands:</para>
 
-<para><screen><userinput>make INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root &amp;&amp;
-make INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root install</userinput></screen></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>
 
 </sect2>
Index: multimedia/cdwriteutils/cdrtools/cdrtools-intro.xml
===================================================================
--- multimedia/cdwriteutils/cdrtools/cdrtools-intro.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
+++ multimedia/cdwriteutils/cdrtools/cdrtools-intro.xml	(revision 32d36378ed896ea4236e8f3c001301812c12dbee)
@@ -1,13 +1,16 @@
 <sect2>
-<title>Introduction to cdrtools</title>
+<title>Introduction to <application>cdrtools</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&cdrtools-download-http;"/>
-Download location (FTP):        <ulink url="&cdrtools-download-ftp;"/>
-Version used:                   &cdrtools-version;
-Package size:                   &cdrtools-size;
-Estimated Disk space required:  &cdrtools-buildsize;</screen>
-
-<para>The cdrtools package contains cd recording utilities. These are
+<para>The <application>cdrtools</application> package contains cd recording utilities. These are
 useful for reading, creating or writing (burning) Compact Discs.</para>
 
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&cdrtools-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&cdrtools-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &cdrtools-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &cdrtools-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &cdrtools-time;</para></listitem></itemizedlist>
+</sect3>
+
 </sect2>
Index: multimedia/cdwriteutils/cdrtools/cdrtools.ent
===================================================================
--- multimedia/cdwriteutils/cdrtools/cdrtools.ent	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
+++ multimedia/cdwriteutils/cdrtools/cdrtools.ent	(revision 32d36378ed896ea4236e8f3c001301812c12dbee)
@@ -4,7 +4,9 @@
 <!ENTITY cdrtools-desc SYSTEM "cdrtools-desc.xml">
 <!ENTITY cdrtools-exp SYSTEM "cdrtools-exp.xml">
-<!ENTITY cdrtools-buildsize "15.5 MB">
-<!ENTITY cdrtools-version "2.0">
+<!ENTITY cdrtools-buildsize "19.1 MB">
+<!ENTITY cdrtools-version "2.00.3">
 <!ENTITY cdrtools-download-http "">
-<!ENTITY cdrtools-download-ftp "ftp://ftp.berlios.de/pub/cdrecord/cdrtools-2.0.tar.gz">
+<!ENTITY cdrtools-download-ftp
+"ftp://ftp.berlios.de/pub/cdrecord/cdrtools-&cdrtools-version;.tar.gz">
 <!ENTITY cdrtools-size "1.6 MB">
+<!ENTITY cdrtools-time "0.44 SBU">
