Index: multimedia/libdriv/gst-plugins-good.xml
===================================================================
--- multimedia/libdriv/gst-plugins-good.xml	(revision ee122615c5562e82f64540f3aa297490efa98fd9)
+++ multimedia/libdriv/gst-plugins-good.xml	(revision e173f329ed67d3d7f35ba5bdf8ba041c13156a01)
@@ -5,6 +5,8 @@
   %general-entities;
 
-  <!ENTITY gst-plugins-good-download-http "&gnome-download-http;/gst-plugins-good/0.10/gst-plugins-good-&gst-plugins-good-version;.tar.xz">
-  <!ENTITY gst-plugins-good-download-ftp "&gnome-download-ftp;/gst-plugins-good/0.10/gst-plugins-good-&gst-plugins-good-version;.tar.xz">
+  <!ENTITY gst-plugins-good-download-http
+    "&gnome-download-http;/gst-plugins-good/0.10/gst-plugins-good-&gst-plugins-good-version;.tar.xz">
+  <!ENTITY gst-plugins-good-download-ftp
+    "&gnome-download-ftp;/gst-plugins-good/0.10/gst-plugins-good-&gst-plugins-good-version;.tar.xz">
   <!ENTITY gst-plugins-good-md5sum        "555845ceab722e517040bab57f9ace95">
   <!ENTITY gst-plugins-good-size          "2.6 MB">
@@ -31,34 +33,48 @@
     <title>Introduction to GStreamer Good Plug-ins</title>
 
-    <para>The <application>GStreamer Good Plug-ins</application> is a set of
-    plug-ins considered by the <application>GStreamer</application> developers
-    to have good quality code, correct functionality, and the preferred license
-    (LGPL for the plug-in code, LGPL or LGPL-compatible for the supporting
-    library). A wide range of video and audio decoders, encoders, and filters
-    are included. Also see the <xref linkend="gst-plugins-ugly"/>, <xref
-    linkend="gst-plugins-bad"/>  and <xref linkend="gst-ffmpeg"/> packages.
-    </para>
-
-    &lfs70_checked;
+    <para>
+      The <application>GStreamer Good Plug-ins</application> is a set of
+      plug-ins considered by the <application>GStreamer</application> developers
+      to have good quality code, correct functionality, and the preferred
+      license (LGPL for the plug-in code, LGPL or LGPL-compatible for the
+      supporting library). A wide range of video and audio decoders, encoders,
+      and filters are included. Also see the <xref linkend="gst-plugins-ugly"/>,
+      <xref linkend="gst-plugins-bad"/>  and <xref linkend="gst-ffmpeg"/>
+      packages.
+    </para>
+
+    &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&gst-plugins-good-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gst-plugins-good-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gst-plugins-good-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gst-plugins-good-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gst-plugins-good-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gst-plugins-good-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&gst-plugins-good-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gst-plugins-good-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gst-plugins-good-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gst-plugins-good-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gst-plugins-good-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gst-plugins-good-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -67,52 +83,54 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gst-plugins-base"/></para>
-
-    <bridgehead renderas="sect4">Recommended (Required for <xref
-    linkend="totem"/>, and Can be Used by Many Other GNOME
-    Applications)</bridgehead>
-    <para role="recommended"><xref linkend="GConf"/> and
-    <xref linkend="libsoup"/></para>
+    <para role="required">
+      <xref linkend="gst-plugins-base"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="aalib"/>,
-    <xref linkend="cairo"/>,
-    <xref linkend="flac"/>,
-    <xref linkend="gtk3"/> (required to build the examples),
-    <ulink url="http://www.jackaudio.org">JACK</ulink>,
-    <ulink url="http://sourceforge.net/projects/libavc1394/">libavc1394</ulink>
-    (requires <ulink url="http://www.kernel.org/pub/linux/libs/ieee1394/">
-    libraw1394</ulink>),
-    <ulink url="http://sam.zoy.org/projects/libcaca/">libcaca</ulink>,
-    <ulink url="http://www.gnu.org/software/libcdio/">libcdio</ulink>,
-    <xref linkend="libdv"/>,
-    <ulink url="http://www.kernel.org/pub/linux/libs/ieee1394/">
-    libiec61883</ulink>,
-    <xref linkend="libjpeg"/>,
-    <xref linkend="libpng"/>,
-    <ulink url="http://downloads.us.xiph.org/releases/libshout/">
-    libshout</ulink>,
-    <ulink url="http://code.entropywave.com/projects/orc/">ORC</ulink>,
-    <xref linkend="pulseaudio"/>,
-    <xref linkend="speex"/>,
-    <xref linkend="taglib"/>,
-    <ulink url="http://linuxtv.org/downloads/v4l-utils/">Video4Linux</ulink>,
-    <xref linkend="x-window-system"/> and
-    <ulink url="http://www.wavpack.com/">WavPack</ulink></para>
+    <para role="optional">
+      <xref linkend="aalib"/>,
+      <xref linkend="cairo"/>,
+      <xref linkend="flac"/>,
+      <xref linkend="GConf"/> (Required for <xref linkend="totem"/>),
+      <xref linkend="gtk3"/> (required to build the examples),
+      <ulink url="http://www.jackaudio.org">JACK</ulink>,
+      <ulink url="http://sourceforge.net/projects/libavc1394/">libavc1394</ulink>
+      (requires
+      <ulink url="http://www.kernel.org/pub/linux/libs/ieee1394/"> libraw1394</ulink>),
+      <ulink url="http://sam.zoy.org/projects/libcaca/">libcaca</ulink>,
+      <ulink url="http://www.gnu.org/software/libcdio/">libcdio</ulink>,
+      <xref linkend="libdv"/>,
+      <ulink url="http://www.kernel.org/pub/linux/libs/ieee1394/">libiec61883</ulink>,
+      <xref linkend="libjpeg"/>,
+      <xref linkend="libpng"/>,
+      <ulink url="http://downloads.us.xiph.org/releases/libshout/">libshout</ulink>,
+      <xref linkend="libsoup"/> (Required for <xref linkend="totem"/>),
+      <ulink url="http://code.entropywave.com/projects/orc/">ORC</ulink>,
+      <xref linkend="pulseaudio"/>,
+      <xref linkend="speex"/>,
+      <xref linkend="taglib"/>,
+      <ulink url="http://linuxtv.org/downloads/v4l-utils/">Video4Linux</ulink>,
+      <xref linkend="x-window-system"/> and
+      <ulink url="http://www.wavpack.com/">WavPack</ulink>.
+    </para>
 
     <bridgehead renderas="sect4">Optional, for the unit regression tests</bridgehead>
-    <para>To run the tests you need to have compiled gstreamer against libcheck,
-    and you can optionally use
-    <ulink url="http://www.valgrind.org/">Valgrind</ulink></para>
+    <para>
+      To run the tests you need to have compiled gstreamer against libcheck, and
+      you can optionally use
+      <ulink url="http://www.valgrind.org/">Valgrind</ulink>
+    </para>
 
     <bridgehead renderas="sect4">Optional (Required to Rebuild the API
     Documentation)</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/> and
-    <xref linkend="python2"/> (compiled against an XML parser such as
-    <xref linkend=" expat"/>).</para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gst-plugins-good"/></para>
-
+    <para role="optional">
+      <xref linkend="gtk-doc"/> and
+      <xref linkend="python2"/> (compiled against an XML parser such as
+      <xref linkend=" expat"/>).
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/gst-plugins-good"/>
+    </para>
   </sect2>
 
@@ -120,28 +138,35 @@
     <title>Installation of GStreamer Good Plug-ins</title>
 
-    <para>Install <application>GStreamer Good Plug-ins</application> by running
-    the following commands:</para>
+    <para>
+      Install <application>GStreamer Good Plug-ins</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc --with-gtk=3.0 &amp;&amp;
+  --disable-static --sysconfdir=/etc --with-gtk=3.0 &amp;&amp;
 make</userinput></screen>
 
-    <para>To run the unit regression tests, issue: <command>make check</command>.
-    There are many other <filename>Makefile</filename> targets you can specify
-    for running the tests, issue <command>make -C tests/check help</command>
-    to see the complete list.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      To run the unit regression tests, issue: <command>make check</command>.
+      There are many other <filename>Makefile</filename> targets you can specify
+      for running the tests, issue <command>make -C tests/check help</command>
+      to see the complete list.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>If you did not rebuild the API documentation by passing
-    <option>--enable-gtk-doc</option> to the <command>configure</command>
-    script and you wish to install the pre-built documentation, issue the
-    following command as the <systemitem class="username">root</systemitem>
-    user:</para>
+    <para>
+      If you did not rebuild the API documentation by passing
+      <option>--enable-gtk-doc</option> to the <command>configure</command>
+      script and you wish to install the pre-built documentation, issue the
+      following command as the <systemitem class="username">root</systemitem>
+      user:
+    </para>
 
 <screen role="root"><userinput>make -C docs/plugins install-data</userinput></screen>
-
   </sect2>
 
@@ -149,16 +174,16 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--sysconfdir=$GNOME_SYSCONFDIR</parameter>: This parameter
-    is used so that the <application>GConf</application> configuration files
-    are installed in the system-wide GNOME <application>GConf</application>
-    database located in
-    <filename class="directory">$GNOME_SYSCONFDIR/gconf</filename>
-    instead of <filename class="directory">/usr/etc</filename>. You may omit
-    this parameter if you don't have <application>GConf</application>
-    installed.</para>
-
-    <para><option>--disable-static</option>: This switch prevents the static
-    libraries from being built.</para>
-
+    <para>
+      <parameter>--sysconfdir=/etc</parameter>: This parameter is
+      used so that the <application>GConf</application> configuration files
+      are installed in the system-wide GNOME <application>GConf</application>
+      database located in <filename class="directory">/etc/gconf</filename>
+      instead of <filename class="directory">/usr/etc</filename>. You may omit
+      this parameter if you don't have <application>GConf</application>
+      installed.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
   </sect2>
 
@@ -177,6 +202,4 @@
       </seglistitem>
     </segmentedlist>
-
-  </sect2>
-
+  </sect2>
 </sect1>
