Index: multimedia/libdriv/libdiscid.xml
===================================================================
--- multimedia/libdriv/libdiscid.xml	(revision 7a5857c08439b835809d248a1b7b1eae20350020)
+++ multimedia/libdriv/libdiscid.xml	(revision 3ff3b9bb87cd12d9d5615c575ac0914ff97ebf84)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY libdiscid-download-http "http://users.musicbrainz.org/~matt/libdiscid-&libdiscid-version;.tar.gz">
+  <!ENTITY libdiscid-download-http "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/libdiscid-&libdiscid-version;.tar.gz">
   <!ENTITY libdiscid-download-ftp  " ">
-  <!ENTITY libdiscid-md5sum        "ee21ddbe696a3c60e14827a75f3bcf5b">
+  <!ENTITY libdiscid-md5sum        "17e51260062b7583e5981c82cf618127">
   <!ENTITY libdiscid-size          "340 KB">
-  <!ENTITY libdiscid-buildsize     "1 MB">
+  <!ENTITY libdiscid-buildsize     "2.6 MB">
   <!ENTITY libdiscid-time          "less than 0.1 SBU">
 ]>
@@ -30,9 +30,11 @@
     <title>Introduction to libdiscid</title>
 
-    <para>The <application>libdiscid</application> package is a library for
-    creating MusicBrainz DiscIDs from audio CDs. It reads a CD's table of
-    contents (TOC) and generates an identifier which can be used to lookup the
-    CD at MusicBrainz (<ulink url="http://musicbrainz.org"/>). Additionally, it
-    provides a submission URL for adding the DiscID to the database.</para>
+    <para>
+      The <application>libdiscid</application> package contains a library for
+      creating MusicBrainz DiscIDs from audio CDs. It reads a CD's table of
+      contents (TOC) and generates an identifier which can be used to lookup the
+      CD at MusicBrainz (<ulink url="http://musicbrainz.org"/>). Additionally, it
+      provides a submission URL for adding the DiscID to the database.
+    </para>
 
     &lfs72_checked;
@@ -41,26 +43,43 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&libdiscid-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&libdiscid-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&libdiscid-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&libdiscid-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &libdiscid-md5sum;</para>
+        <para>
+          Download MD5 sum: &libdiscid-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &libdiscid-size;</para>
+        <para>
+          Download size: &libdiscid-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &libdiscid-buildsize;</para>
+        <para>
+          Estimated disk space required: &libdiscid-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &libdiscid-time;</para>
+        <para>
+          Estimated build time: &libdiscid-time;
+        </para>
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="doxygen"/>
+    </para>
+
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libdiscid"/></para>
-
+      <ulink url="&blfs-wiki;/libdiscid"/>
+    </para>
   </sect2>
 
@@ -68,8 +87,10 @@
     <title>Installation of libdiscid</title>
 
-    <para>Install <application>libdiscid</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>libdiscid</application> by running the following
+      commands:
+    </para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -82,16 +103,26 @@
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>libdiscid.{so,a}</seg>
-        <seg>/usr/include/discid</seg>
+        <seg>
+          libdiscid.so
+        </seg>
+        <seg>
+          /usr/include/discid
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -103,9 +134,11 @@
 
       <varlistentry id="libdiscid-lib">
-        <term><filename class='libraryfile'>libdiscid.{so,a}</filename></term>
+        <term><filename class="libraryfile">libdiscid.so</filename></term>
         <listitem>
-          <para>contains the DiscID API functions.</para>
+          <para>
+            contains the DiscID API functions.
+          </para>
           <indexterm zone="libdiscid libdiscid-lib">
-            <primary sortas="c-libdiscid">libdiscid.{so,a}</primary>
+            <primary sortas="c-libdiscid">libdiscid.so</primary>
           </indexterm>
         </listitem>
