[blfs-book] r11300 - in branches/systemd: multimedia/audioutils multimedia/videoutils x/lib

krejzi at higgs.linuxfromscratch.org krejzi at higgs.linuxfromscratch.org
Sun Jun 16 06:51:15 PDT 2013


Author: krejzi
Date: Sun Jun 16 06:51:15 2013
New Revision: 11300

Log:
Update systemd branch.

Modified:
   branches/systemd/multimedia/audioutils/audacious.xml
   branches/systemd/multimedia/audioutils/audioutils.xml
   branches/systemd/multimedia/audioutils/cdparanoia.xml
   branches/systemd/multimedia/audioutils/freetts.xml
   branches/systemd/multimedia/audioutils/gvolwheel.xml
   branches/systemd/multimedia/audioutils/lame.xml
   branches/systemd/multimedia/audioutils/vorbistools.xml
   branches/systemd/multimedia/videoutils/ffmpeg.xml
   branches/systemd/multimedia/videoutils/mplayer.xml
   branches/systemd/multimedia/videoutils/transcode.xml
   branches/systemd/multimedia/videoutils/videoutils.xml
   branches/systemd/multimedia/videoutils/vlc.xml
   branches/systemd/multimedia/videoutils/xine-ui.xml
   branches/systemd/x/lib/qt4.xml

Modified: branches/systemd/multimedia/audioutils/audacious.xml
==============================================================================
--- branches/systemd/multimedia/audioutils/audacious.xml	Sun Jun 16 06:47:40 2013	(r11299)
+++ branches/systemd/multimedia/audioutils/audacious.xml	Sun Jun 16 06:51:15 2013	(r11300)
@@ -5,14 +5,15 @@
   %general-entities;
 
   <!ENTITY audacious-download-http
-    "http://distfiles.audacious-media-player.org/audacious-&audacious-version;.tar.bz2">
+           "http://distfiles.audacious-media-player.org/audacious-&audacious-version;.tar.bz2">
   <!ENTITY audacious-download-ftp         " ">
   <!ENTITY audacious-md5sum               "644ef7fa37319d261b933c86b5ab3a95">
   <!ENTITY audacious-size                 "470 KB">
   <!ENTITY audacious-buildsize            "13 MB">
   <!ENTITY audacious-time                 "0.3 SBU">
+
   <!ENTITY audacious-plugins-download
-    "http://distfiles.audacious-media-player.org/audacious-plugins-&audacious-plugins-version;.tar.bz2">
+           "http://distfiles.audacious-media-player.org/audacious-plugins-&audacious-plugins-version;.tar.bz2">
   <!ENTITY audacious-plugins-md5sum       "d77af4d5bff383cc7ab384da21f527f6">
   <!ENTITY audacious-plugins-size         "1.7 MB">
   <!ENTITY audacious-plugins-buildsize    "45 MB">
@@ -38,7 +39,7 @@
     <title>Introduction to Audacious</title>
 
     <para>
-      <application>Audacious</application> is a <application>Gtk+</application>
+      <application>Audacious</application> is a <application>GTK+</application>
       based audio player.
     </para>
 
@@ -110,10 +111,11 @@
 
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
-    <title>Required Patch (if you have libcdio >=v0.90 installed)</title>
       <listitem>
         <para>
+          Required Patch:
           <ulink url="&patch-root;/audacious-plugins-&audacious-plugins-version;-libcdio_v0.90_fixes-1.patch"/>
+          (needed if you have libcdio >=v0.90 installed)
         </para>
       </listitem>
     </itemizedlist>
@@ -135,12 +137,10 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="pcre"/> or
-      <ulink url="http://www.geocities.jp/kosako3/oniguruma/">Oniguruma</ulink>, and
-      <!-- <xref linkend='libsamplerate'/>,-->
+      <ulink url="http://www.geocities.jp/kosako3/oniguruma/">Oniguruma</ulink> and
       <ulink url="http://www.atheme.org/project/libguess">libguess</ulink>
     </para>
 
-
     <bridgehead renderas="sect4">Optional (for Plugins)</bridgehead>
     <para role="optional">
       <xref linkend="curl"/>,
@@ -156,17 +156,14 @@
       <xref linkend='pulseaudio'/>,
       <xref linkend="libsndfile"/>,
       <xref linkend='libsamplerate'/>,
-      <!-- <ulink url="http://adplug.sourceforge.net/">AdPlug</ulink>, -->
       <ulink url="http://www.lirc.org/">LIRC</ulink>,
       <ulink url="http://www.gnu.org/software/libcdio/">libcdio</ulink>,
       <ulink url="http://libcddb.sourceforge.net/">libcddb</ulink>,
       <ulink url="http://sourceforge.net/projects/modplug-xmms/">libmodplug</ulink>,
       <ulink url="http://sourceforge.net/projects/libmms">libmms</ulink>,
       <ulink url="http://jackit.sourceforge.net/">JACK</ulink>
-      (requires <xref linkend='libsamplerate'/>),
-      <!-- <ulink url="http://roaraudio.keep-cool.org/">libroar</ulink>, -->
+      (requires <xref linkend="libsamplerate"/>),
       <ulink url="http://sourceforge.net/apps/trac/fluidsynth/">FluidSynth</ulink>,
-      <!-- <ulink url="http://libmtp.sourceforge.net/">libmtp</ulink>, -->
       <ulink url="http://sourceforge.net/projects/libcue/">libcue</ulink>,
       <ulink url="http://sourceforge.net/projects/bs2b/">The Bauer
       stereophonic-to-binaural DSP (bs2b) library</ulink>,
@@ -219,11 +216,15 @@
   <sect2 role="installation">
     <title>Installation of Audacious Plugins</title>
 
-    <note><para>If <application>Xorg</application> is not installed in
-    <filename class='directory'>/usr</filename>, tell the linker
-    where to find it:</para>
+    <note>
+      <para>
+        If <application>Xorg</application> is not installed in
+        <filename class="directory">/usr</filename>, tell the linker
+        where to find it:
+      </para>
 
 <screen><userinput>export LIBRARY_PATH=$XORG_PREFIX/lib</userinput></screen>
+
     </note>
 
     <para>
@@ -248,6 +249,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/update-icons-and-desktop.xml"/>
+
   </sect2>
 
   <sect2 role="commands">
@@ -261,6 +263,7 @@
       characters used to color the text can make the logfile unreadable. This
       option stops it coloring the text.
     </para>
+
   </sect2>
 
   <sect2 role="configuration">
@@ -270,6 +273,7 @@
       If you prefer the old, smaller Winamp/XMMS interface, click on View>
       Interface> Winamp Classic Interface.
     </para>
+
   </sect2>
 
   <sect2 role="content">
@@ -281,21 +285,19 @@
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>audacious and audtool</seg>
         <seg>
-          libaudclient.so,
-          libaudcore.so,
-          libaudgui.so,
-          libaudtag and
-          numerous Container, Effect, General, Input, Output, Transport and
-          Visualization plugin modules (exactly what is installed depends on
-          the dependencies that are installed).</seg>
+          audacious and audtool
+        </seg>
+        <seg>
+          libaudclient.so, libaudcore.so, libaudgui.so and
+          libaudtag.so
+        </seg>
         <seg>
           /usr/include/audacious,
           /usr/include/libaudcore,
           /usr/include/libaudgui,
           /usr/lib/audacious and
-          /usr/share/audacious.
+          /usr/share/audacious
         </seg>
       </seglistitem>
     </segmentedlist>
@@ -309,7 +311,7 @@
         <term><command>audacious</command></term>
         <listitem>
           <para>
-            is a Gtk2 port of <application>XMMS</application> based on the
+            is a GTK+2 port of <application>XMMS</application> based on the
             <application>Beep Media Player</application>.
           </para>
           <indexterm zone="audacious audacious-prog">
@@ -332,7 +334,7 @@
       </varlistentry>
 
       <varlistentry id="libaudclient">
-        <term><filename class='libraryfile'>libaudclient.so</filename></term>
+        <term><filename class="libraryfile">libaudclient.so</filename></term>
         <listitem>
           <para>
             contains functions that are used by <command>audacious</command> to
@@ -344,31 +346,8 @@
         </listitem>
       </varlistentry>
 
-<!-- Who knows what they do?
-      <varlistentry id="libaudclient">
-        <term><filename class='libraryfile'>libaudclient.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that .....
-          </para>
-          <indexterm zone="audacious libaudclient">
-            <primary sortas="c-libaudclient">libaudclient.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libaudgui">
-        <term><filename class='libraryfile'>libaudgui.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that .....
-          </para>
-          <indexterm zone="audacious libaudgui">
-            <primary sortas="c-libaudgui">libaudgui.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
     </variablelist>
+
   </sect2>
+
 </sect1>

Modified: branches/systemd/multimedia/audioutils/audioutils.xml
==============================================================================
--- branches/systemd/multimedia/audioutils/audioutils.xml	Sun Jun 16 06:47:40 2013	(r11299)
+++ branches/systemd/multimedia/audioutils/audioutils.xml	Sun Jun 16 06:51:15 2013	(r11300)
@@ -15,12 +15,14 @@
 
   <title>Audio Utilities</title>
 
-  <para>This chapter contains programs involved with audio file
-  manipulation; that is to say playing, recording, ripping and the other
-  common things which people want to do. It also includes a package used
-  to render text to speech using your system's audio hardware. To use much
-  of this software, you will need to have the kernel sound drivers
-  installed.</para>
+  <para>
+    This chapter contains programs involved with audio file
+    manipulation; that is to say playing, recording, ripping and the other
+    common things which people want to do. It also includes a package used
+    to render text to speech using your system's audio hardware. To use much
+    of this software, you will need to have the kernel sound drivers
+    installed.
+  </para>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mpg123.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vorbistools.xml"/>

Modified: branches/systemd/multimedia/audioutils/cdparanoia.xml
==============================================================================
--- branches/systemd/multimedia/audioutils/cdparanoia.xml	Sun Jun 16 06:47:40 2013	(r11299)
+++ branches/systemd/multimedia/audioutils/cdparanoia.xml	Sun Jun 16 06:51:15 2013	(r11300)
@@ -29,77 +29,89 @@
   <sect2 role="package">
     <title>Introduction to CDParanoia</title>
 
-    <para>The <application>CDParanoia</application> package contains a CD
-    audio extraction tool. This is useful for extracting <filename>.wav</filename>
-    files from audio CDs.  A CDDA capable CDROM drive is needed.
-    Practically all drives supported by Linux can be used.</para>
+    <para>
+      The <application>CDParanoia</application> package contains a CD audio
+      extraction tool. This is useful for extracting <filename>.wav</filename>
+      files from audio CDs. A CDDA capable CDROM drive is needed.
+      Practically all drives supported by Linux can be used.
+    </para>
 
     &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&CDParanoia-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&CDParanoia-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&CDParanoia-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&CDParanoia-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &CDParanoia-md5sum;</para>
+        <para>
+          Download MD5 sum: &CDParanoia-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &CDParanoia-size;</para>
+        <para>
+          Download size: &CDParanoia-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &CDParanoia-buildsize;</para>
+        <para>
+          Estimated disk space required: &CDParanoia-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &CDParanoia-time;</para>
+        <para>
+          Estimated build time: &CDParanoia-time;
+        </para>
       </listitem>
     </itemizedlist>
 
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing='compact'>
       <listitem>
-        <para>Required Patch: <ulink
-        url="&patch-root;/cdparanoia-&CDParanoia-version;-gcc_fixes-1.patch"/></para>
+        <para>
+          Required Patch:
+          <ulink url="&patch-root;/cdparanoia-&CDParanoia-version;-gcc_fixes-1.patch"/>
+        </para>
       </listitem>
     </itemizedlist>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/cdparanoia"/></para>
-
+      <ulink url="&blfs-wiki;/cdparanoia"/>
+    </para>
   </sect2>
 
   <sect2 role="installation">
     <title>Installation of CDParanoia</title>
 
-    <para>Install <application>CDParanoia</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>CDParanoia</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>patch -Np1 -i ../cdparanoia-&CDParanoia-version;-gcc_fixes-1.patch &&
 ./configure --prefix=/usr &&
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install &&
 chmod -v 755 /usr/lib/libcdda_*.so.0.10.2</userinput></screen>
 
   </sect2>
 
-  <!--<sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i '/default:/a break;' interface/utils.h</command>:
-    This command enables the code to be compiled with a recent version of
-    <command>gcc</command>.</para>
-
-  </sect2>-->
-
-
   <sect2 role="configuration">
     <title>Configuring CDParanoia</title>
 
@@ -107,7 +119,7 @@
       <title>Configuration Information</title>
 
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/lib-config.xml"/>
+        href="../../xincludes/lib-config.xml"/>
 
     </sect3>
 
@@ -122,9 +134,15 @@
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>cdparanoia</seg>
-        <seg>libcdda_interface.{so,a} and libcdda_paranoia.{so,a}</seg>
-        <seg>None</seg>
+        <seg>
+          cdparanoia
+        </seg>
+        <seg>
+          libcdda_interface.{so,a} and libcdda_paranoia.{so,a}
+        </seg>
+        <seg>
+          None
+        </seg>
       </seglistitem>
     </segmentedlist>
 
@@ -136,8 +154,10 @@
       <varlistentry id="cdparanoia-prog">
         <term><command>cdparanoia</command></term>
         <listitem>
-          <para>is used for 'ripping' an audio-cd. Ripping is the process of
-          digitally extracting music from an audio-cd.</para>
+          <para>
+            is used for 'ripping' an audio-cd. Ripping is the process of
+            digitally extracting music from an audio CD.
+          </para>
           <indexterm zone="cdparanoia cdparanoia-prog">
             <primary sortas="b-cdparanoia">cdparanoia</primary>
           </indexterm>
@@ -145,11 +165,13 @@
       </varlistentry>
 
       <varlistentry id="libcdda_interface">
-        <term><filename class='libraryfile'>libcdda_interface.{so,a}</filename></term>
+        <term><filename class="libraryfile">libcdda_interface.{so,a}</filename></term>
         <listitem>
-          <para>contains functions used by <command>cdparanoia</command>, as
-          well as other packages, which can automatically identify if a
-          CD device is CDDA compatible.</para>
+          <para>
+            contains functions used by <command>cdparanoia</command>, as
+            well as other packages, which can automatically identify if a
+            CD device is CDDA compatible.
+          </para>
           <indexterm zone="cdparanoia libcdda_interface">
             <primary sortas="c-libcdda_interface">libcdda_interface.{so,a}</primary>
           </indexterm>
@@ -157,11 +179,13 @@
       </varlistentry>
 
       <varlistentry id="libcdda_paranoia">
-        <term><filename class='libraryfile'>libcdda_paranoia.{so,a}</filename></term>
+        <term><filename class="libraryfile">libcdda_paranoia.{so,a}</filename></term>
         <listitem>
-          <para>contains functions used by <command>cdparanoia</command>, as
-          well as other packages, which provide data verification, synchronization,
-          error handling and scratch reconstruction capability.</para>
+          <para>
+            contains functions used by <command>cdparanoia</command>, as
+            well as other packages, which provide data verification, synchronization,
+            error handling and scratch reconstruction capability.
+          </para>
           <indexterm zone="cdparanoia libcdda_paranoia">
             <primary sortas="c-libcdda_paranoia">libcdda_paranoia.{so,a}</primary>
           </indexterm>

Modified: branches/systemd/multimedia/audioutils/freetts.xml
==============================================================================
--- branches/systemd/multimedia/audioutils/freetts.xml	Sun Jun 16 06:47:40 2013	(r11299)
+++ branches/systemd/multimedia/audioutils/freetts.xml	Sun Jun 16 06:51:15 2013	(r11300)
@@ -34,95 +34,121 @@
   <sect2 role="package">
     <title>Introduction to FreeTTS</title>
 
-    <para>The <application>FreeTTS</application> package contains a speech
-    synthesis system written entirely in the <application>Java</application>
-    programming language. It is based upon
-    <ulink url="http://www.cmuflite.org/">Flite</ulink>: a small run-time
-    speech synthesis engine developed at Carnegie Mellon University.
-    <application>Flite</application> is derived from the
-    <ulink url="http://www.cstr.ed.ac.uk/projects/festival/">Festival</ulink>
-    Speech Synthesis System from the University of Edinburgh and the
-    <ulink url ="http://festvox.org/">FestVox</ulink> project from Carnegie
-    Mellon University. The <application>FreeTTS</application> package is used
-    to convert text to audible speech through the system audio hardware.</para>
+    <para>
+      The <application>FreeTTS</application> package contains a speech
+      synthesis system written entirely in the <application>Java</application>
+      programming language. It is based upon
+      <ulink url="http://www.cmuflite.org/">Flite</ulink>: a small run-time
+      speech synthesis engine developed at Carnegie Mellon University.
+      <application>Flite</application> is derived from the
+      <ulink url="http://www.cstr.ed.ac.uk/projects/festival/">Festival</ulink>
+      Speech Synthesis System from the University of Edinburgh and the
+      <ulink url ="http://festvox.org/">FestVox</ulink> project from Carnegie
+      Mellon University. The <application>FreeTTS</application> package is used
+      to convert text to audible speech through the system audio hardware.
+    </para>
 
     &lfs72_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&freetts-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&freetts-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&freetts-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&freetts-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &freetts-md5sum;</para>
+        <para>
+          Download MD5 sum: &freetts-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &freetts-size;</para>
+        <para>
+          Download size: &freetts-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &freetts-buildsize;</para>
+        <para>
+          Estimated disk space required: &freetts-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &freetts-time;</para>
+        <para>
+          Estimated build time: &freetts-time;
+        </para>
       </listitem>
     </itemizedlist>
 
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Test suite: <ulink url="&freetts-testsuite-download;"/></para>
+        <para>
+          Test suite: <ulink url="&freetts-testsuite-download;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &freetts-testsuite-md5sum;</para>
+        <para>
+          Download MD5 sum: &freetts-testsuite-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &freetts-testsuite-size;</para>
+        <para>
+          Download size: &freetts-testsuite-size;
+        </para>
       </listitem>
     </itemizedlist>
 
     <bridgehead renderas="sect3">FreeTTS Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="apache-ant"/>,
-    <xref linkend='sharutils'/>
-    (for the <command>uudecode</command> program),
-    and working audio hardware/software.</para>
+    <para role="required">
+      <xref linkend="apache-ant"/> and
+      <xref linkend="sharutils"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/freetts"/></para>
-
+      <ulink url="&blfs-wiki;/freetts"/>
+    </para>
   </sect2>
 
   <sect2 role="installation">
     <title>Installation of FreeTTS</title>
 
-    <para>The <application>FreeTTS</application> package is distributed in
-    ZIP format and the <command>unzip</command> command will default to
-    creating an unused source directory. Additionally,
-    unzipping the test suite file will prompt for questions
-    about overwriting existing files. Use the following commands to
-    <command>unzip</command> the source files:</para>
+    <para>
+      The <application>FreeTTS</application> package is distributed in
+      ZIP format and the <command>unzip</command> command will default to
+      creating an unused source directory. Additionally,
+      unzipping the test suite file will prompt for questions
+      about overwriting existing files. Use the following commands to
+      <command>unzip</command> the source files:
+    </para>
 
 <screen><userinput>unzip -q freetts-&freetts-version;-src.zip -x META-INF/* &&
 unzip -q freetts-&freetts-version;-tst.zip -x META-INF/*</userinput></screen>
 
     <tip>
-      <para>The <command>sh jsapi.sh</command> command below installs the Java
-      Speech API components into the <application>FreeTTS</application> source
-      tree. You will be required to view, and then accept (by entering a
-      <keycap>y</keycap> keypress), a license agreement before the installation
-      will continue. If you are scripting (automating) the build, you'll need
-      to account for this. There is information about automating build commands
-      in the <xref linkend="automating-builds"/> section of Chapter 2. Towards
-      the end of this section, specific information for automating this type of
-      installation is discussed.</para>
+      <para>
+        The <command>sh jsapi.sh</command> command below installs the Java
+        Speech API components into the <application>FreeTTS</application> source
+        tree. You will be required to view, and then accept (by entering a
+        <keycap>y</keycap> keypress), a license agreement before the installation
+        will continue. If you are scripting (automating) the build, you'll need
+        to account for this. There is information about automating build commands
+        in the <xref linkend="automating-builds"/> section of Chapter 2. Towards
+        the end of this section, specific information for automating this type of
+        installation is discussed.
+      </para>
     </tip>
 
-    <para>Install <application>FreeTTS</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>FreeTTS</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>sed -i 's/value="src/value="./' build.xml &&
 cd lib      &&
@@ -130,14 +156,18 @@
 cd ..       &&
 ant</userinput></screen>
 
-    <para>To test the results, issue:</para>
+    <para>
+      To test the results, issue:
+    </para>
 
 <screen><userinput>ant junit &&
 cd tests &&
 sh regression.sh &&
 cd ..</userinput></screen>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>
 install -v -m755 -d /opt/freetts-&freetts-version;/{lib,docs/{audio,images}} &&
@@ -149,10 +179,12 @@
 cp -v -R javadoc               /opt/freetts-&freetts-version;                &&
 ln -v -s freetts-&freetts-version; /opt/freetts</userinput></screen>
 
-    <para>Optionally, install any or all of the additional
-    <application>FreeTTS</application> components using the following
-    commands as the <systemitem class="username">root</systemitem> user
-    (see the Command Explanations section for details):</para>
+    <para>
+      Optionally, install any or all of the additional
+      <application>FreeTTS</application> components using the following
+      commands as the <systemitem class="username">root</systemitem> user
+      (see the Command Explanations section for details):
+    </para>
 
 <screen role="root"><userinput>cp -v -R bin    /opt/freetts-&freetts-version;        &&
 install -v -m644 speech.properties $JAVA_HOME/jre/lib &&
@@ -165,56 +197,76 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><command>sed -i 's/value="src/value="./' build.xml</command>: Fix an
-    error in the build file to allow the program to find the source.</para>
-
-    <para><command>sh jsapi.sh</command>: This command installs the
-    <application>Java Speech API</application> components into the
-    <application>FreeTTS</application> source tree.</para>
-
-    <para><command>ant</command>: <application>FreeTTS</application> uses the
-    <application>Apache Ant</application> build system instead of the GNU
-    <application>autotools</application>. This commands builds everything,
-    including the class libraries, tools and demos.</para>
-
-    <para><command>cp -v -R bin ...</command>;
-    <command>install -v -m644 speech.properties</command>: These two commands
-    install the demonstration programs. Optionally copy the
-    <filename>speech.properties</filename> file to
-    <filename>~/speech.properties</filename> if you don't want to make it
-    available system-wide.</para>
-
-    <para><command>cp -v -R tools ...</command>: This installs the voice data
-    import utilities. See the <filename>README.html</filename> files in the
-    <filename class='directory'>tools/</filename> subdirectories for
-    information and instructions about using the tools.</para>
-
-    <para><command>cp -v -R mbrola ...</command>: This installs the
-    <filename class='libraryfile'>mbrola.jar</filename> file, required if you
-    use the <ulink
-    url="http://freetts.sourceforge.net/mbrola/README.html">MBROLA</ulink>
-    voices.</para>
-
-    <para><command>cp -v -R demo ...</command>: This installs the sources
-    and documentation for the demonstration programs.</para>
-
-    <para>For additional information and documentation about the
-    <application>FreeTTS</application> project, visit the main web page at
-    <ulink url="http://freetts.sourceforge.net"/>.</para>
+    <para>
+      <command>sed -i 's/value="src/value="./' build.xml</command>: Fix an
+      error in the build file to allow the program to find the source.
+    </para>
+
+    <para>
+      <command>sh jsapi.sh</command>: This command installs the
+      <application>Java Speech API</application> components into the
+      <application>FreeTTS</application> source tree.
+    </para>
+
+    <para>
+      <command>ant</command>: <application>FreeTTS</application> uses the
+      <application>Apache Ant</application> build system instead of the GNU
+      <application>autotools</application>. This commands builds everything,
+      including the class libraries, tools and demos.
+    </para>
+
+    <para>
+      <command>cp -v -R bin ...</command>;
+      <command>install -v -m644 speech.properties</command>: These two commands
+      install the demonstration programs. Optionally copy the
+      <filename>speech.properties</filename> file to
+      <filename>~/speech.properties</filename> if you don't want to make it
+      available system-wide.
+    </para>
+
+    <para>
+      <command>cp -v -R tools ...</command>: This installs the voice data
+      import utilities. See the <filename>README.html</filename> files in the
+      <filename class="directory">tools/</filename> subdirectories for
+      information and instructions about using the tools.
+    </para>
+
+    <para>
+      <command>cp -v -R mbrola ...</command>: This installs the
+      <filename class="libraryfile">mbrola.jar</filename> file, required if you
+      use the <ulink
+      url="http://freetts.sourceforge.net/mbrola/README.html">MBROLA</ulink>
+      voices.
+    </para>
+
+    <para>
+      <command>cp -v -R demo ...</command>: This installs the sources
+      and documentation for the demonstration programs.
+    </para>
+
+    <para>
+      For additional information and documentation about the
+      <application>FreeTTS</application> project, visit the main web
+      page at <ulink url="http://freetts.sourceforge.net"/>.
+    </para>
 
   </sect2>
 
   <sect2 role="testing">
     <title>Testing the Installation</title>
 
-    <para>Test the installation using the following command:</para>
+    <para>
+      Test the installation using the following command:
+    </para>
 
 <screen><userinput>java -jar /opt/freetts/lib/freetts.jar \
     -text "This is a test of the FreeTTS speech synthesis system"</userinput></screen>
 
-    <para>Depending on the setup of your audio drivers and software, you
-    may have to add the <option>-streaming</option> switch to the command
-    as shown below:</para>
+    <para>
+      Depending on the setup of your audio drivers and software, you
+      may have to add the <option>-streaming</option> switch to the command
+      as shown below:
+    </para>
 
 <screen><userinput>java -jar /opt/freetts/lib/freetts.jar -streaming \
     -text "This is a test of the FreeTTS speech synthesis system"</userinput></screen>
@@ -230,9 +282,15 @@
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>/opt/freetts-&freetts-version;/lib/*.jar</seg>
-        <seg>/opt/freetts-&freetts-version;</seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /opt/freetts-&freetts-version;/lib/*.jar
+        </seg>
+        <seg>
+          /opt/freetts-&freetts-version;
+        </seg>
       </seglistitem>
     </segmentedlist>
 
@@ -242,10 +300,12 @@
       <?dbhtml list-presentation="table"?>
 
       <varlistentry>
-        <term><filename class='libraryfile'>*.jar </filename></term>
+        <term><filename class="libraryfile">*.jar </filename></term>
         <listitem>
-          <para>contains the class libraries which make up the
-          <application>FreeTTS</application> speech synthesis system.</para>
+          <para>
+            contains the class libraries which make up the
+            <application>FreeTTS</application> speech synthesis system.
+          </para>
         </listitem>
       </varlistentry>
     </variablelist>

Modified: branches/systemd/multimedia/audioutils/gvolwheel.xml
==============================================================================
--- branches/systemd/multimedia/audioutils/gvolwheel.xml	Sun Jun 16 06:47:40 2013	(r11299)
+++ branches/systemd/multimedia/audioutils/gvolwheel.xml	Sun Jun 16 06:51:15 2013	(r11300)
@@ -4,7 +4,7 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY gvolwheel-download-http "&sourceforge-repo2;/projects/gvolwheel/files/gvolwheel-&gvolwheel-version;.tar.gz">
+  <!ENTITY gvolwheel-download-http "&sourceforge-repo;/gvolwheel/gvolwheel-&gvolwheel-version;.tar.gz">
   <!ENTITY gvolwheel-download-ftp  "">
   <!ENTITY gvolwheel-md5sum        "4f04f00cdb875894c96b8a3ff8a9edb9">
   <!ENTITY gvolwheel-size          "340 KB">
@@ -29,30 +29,44 @@
   <sect2 role="package">
     <title>Introduction to Gvolwheel</title>
 
-    <para>The <application>gvolwheel</application> package provides a lightweight
-    volume control with a tray icon.</para>
+    <para>
+      The <application>Gvolwheel</application> package provides a lightweight
+      volume control with a tray icon.
+    </para>
 
     &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&gvolwheel-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&gvolwheel-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&gvolwheel-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&gvolwheel-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &gvolwheel-md5sum;</para>
+        <para>
+          Download MD5 sum: &gvolwheel-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &gvolwheel-size;</para>
+        <para>
+          Download size: &gvolwheel-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &gvolwheel-buildsize;</para>
+        <para>
+          Estimated disk space required: &gvolwheel-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &gvolwheel-time;</para>
+        <para>
+          Estimated build time: &gvolwheel-time;
+        </para>
       </listitem>
     </itemizedlist>
 
@@ -62,22 +76,24 @@
     <para role="required">
       <xref linkend="alsa-utils"/>,
       <xref linkend="gtk3"/>,
-      <xref linkend="intltool"/>, and
+      <xref linkend="intltool"/> and
       <xref linkend="perl-xml-parser"/>
     </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gvolwheel"/></para>
-
+      <ulink url="&blfs-wiki;/gvolwheel"/>
+    </para>
   </sect2>
 
   <sect2 role="kernel"  id="gvolwheel-kernel">
     <title>Kernel Configuration</title>
 
-    <para>In the Device Drivers ⇒ Sound card support ⇒ Advanced Linux
-    Sound Architecture section of the kernel configuration, ensure that OSS Mixer
-    API (CONFIG_SND_MIXER_OSS) is selected.  If necessary, recompile and install
-    your new kernel.</para>
+    <para>
+      In the Device Drivers ⇒ Sound card support ⇒ Advanced Linux
+      Sound Architecture section of the kernel configuration, ensure that OSS Mixer
+      API (CONFIG_SND_MIXER_OSS) is selected. If necessary, recompile and install
+      your new kernel.
+    </para>
 
     <indexterm zone="gvolwheel gvolwheel-kernel">
       <primary sortas="d-gvolwheel">gvolwheel</primary>
@@ -88,16 +104,22 @@
   <sect2 role="installation">
     <title>Installation of Gvolwheel</title>
 
-    <para>Install <application>gvolwheel</application> by
-    running the following commands:</para>
+    <para>
+      Install <application>Gvolwheel</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>sed -i 's%doc/gvolwheel%share/doc/gvolwheel-&gvolwheel-version;%' Makefile.in &&
 ./configure --prefix=/usr --enable-oss &&
 make</userinput></screen>
 
-    <para>This package does not come with a working test suite.</para>
+    <para>
+      This package does not come with a working test suite.
+    </para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
 
@@ -106,28 +128,36 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><parameter>sed -i 's%doc/gvolwheel%share/doc/gvolwheel-&gvolwheel-version;%' ...</parameter>:
-    this puts the documentation into a versioned directory.</para>
+    <para>
+      <command>sed -i 's%doc/gvolwheel%share/doc/gvolwheel-&gvolwheel-version;%' ...</command>:
+      This ensures that the documentation into a versioned directory.
+    </para>
 
-    <para><parameter>--enable-oss</parameter>: without this, the program will not
-    run unless <command>alsamixer</command> has been run.</para>
+    <para>
+      <parameter>--enable-oss</parameter>: without this, the program will not
+      run unless <command>alsamixer</command> has been run.
+    </para>
 
   </sect2>
 
   <sect2 role="configuring gvolwheel">
-    <title>Configuring gvolwheel</title>
+    <title>Configuring Gvolwheel</title>
 
-    <para>Before using this application, use <command>alsamixer</command> to
-    ensure the channels are not muted, and are set to suitable levels so that the
-    master volume control will provide suitable levels. Once
-    <command>gvolwheel</command> is running you can, if you wish. right-click on
-    its icon in the tray to change it to control the PCM volume instead of the
-    master volume. Depending on your theme settings, you may also wish to tick
-    "Use Gnome Icons".</para>
-
-    <para>If you middle-click on the icon, it will mute the volume, that is, it
-    will set it to zero : do not confuse this with the mute/unmute controls in
-    e.g. <command>alsamixer</command>.</para>
+    <para>
+      Before using this application, use <command>alsamixer</command> to
+      ensure the channels are not muted, and are set to suitable levels so
+      that the master volume control will provide suitable levels. Once
+      <command>gvolwheel</command> is running you can, if you wish,
+      right-click on its icon in the tray to change it to control the PCM
+      volume instead of the  master volume. Depending on your theme settings,
+      you may also wish to tick "Use Gnome Icons".
+    </para>
+
+    <para>
+      If you middle-click on the icon, it will mute the volume, that is, it
+      will set it to zero : do not confuse this with the mute/unmute controls in
+      e.g. <command>alsamixer</command>.
+    </para>
 
   </sect2>
 
@@ -135,15 +165,21 @@
     <title>Contents</title>
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Program</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>gvolwheel</seg>
-        <seg>none</seg>
-        <seg>/usr/share/doc/gvolwheel-&gvolwheel-version;
-        /usr/share/pixmaps/gvolwheel</seg>
+        <seg>
+          gvolwheel
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/share/doc/gvolwheel-&gvolwheel-version; and
+          /usr/share/pixmaps/gvolwheel
+        </seg>
       </seglistitem>
     </segmentedlist>
 
@@ -155,7 +191,9 @@
       <varlistentry id="gvolwheel-prog">
         <term><command>gvolwheel</command></term>
         <listitem>
-          <para>is a lightweight volume control that sits in a tray.</para>
+          <para>
+            is a lightweight volume control that sits in a tray.
+          </para>
           <indexterm zone="gvolwheel gvolwheel">
             <primary sortas="b-gvolwheel">gvolwheel</primary>
           </indexterm>

Modified: branches/systemd/multimedia/audioutils/lame.xml
==============================================================================
--- branches/systemd/multimedia/audioutils/lame.xml	Sun Jun 16 06:47:40 2013	(r11299)
+++ branches/systemd/multimedia/audioutils/lame.xml	Sun Jun 16 06:51:15 2013	(r11300)
@@ -143,7 +143,8 @@
           libmp3lame.so
         </seg>
         <seg>
-          /usr/include/lame and /usr/share/doc/lame-&lame-version;
+          /usr/include/lame and
+          /usr/share/doc/lame-&lame-version;
         </seg>
       </seglistitem>
     </segmentedlist>
@@ -179,7 +180,7 @@
       </varlistentry>
 
       <varlistentry id="libmp3lame">
-        <term><filename class='libraryfile'>libmp3lame.so</filename></term>
+        <term><filename class="libraryfile">libmp3lame.so</filename></term>
         <listitem>
           <para>
             libraries provide the functions necessary to convert

Modified: branches/systemd/multimedia/audioutils/vorbistools.xml
==============================================================================
--- branches/systemd/multimedia/audioutils/vorbistools.xml	Sun Jun 16 06:47:40 2013	(r11299)
+++ branches/systemd/multimedia/audioutils/vorbistools.xml	Sun Jun 16 06:51:15 2013	(r11300)
@@ -29,38 +29,54 @@
   <sect2 role="package">
     <title>Introduction to Vorbis Tools</title>
 
-    <para>The <application>Vorbis Tools</application> package contains
-    command-line tools for Ogg audio files.  This is useful for encoding,
-    playing or editing files using the Ogg CODEC.</para>
+    <para>
+      The <application>Vorbis Tools</application> package contains
+      command-line tools useful for encoding, playing or editing
+      files using the Ogg CODEC.
+    </para>
 
     &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&vorbistools-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&vorbistools-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&vorbistools-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&vorbistools-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &vorbistools-md5sum;</para>
+        <para>
+          Download MD5 sum: &vorbistools-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &vorbistools-size;</para>
+        <para>
+          Download size: &vorbistools-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &vorbistools-buildsize;</para>
+        <para>
+          Estimated disk space required: &vorbistools-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &vorbistools-time;</para>
+        <para>
+          Estimated build time: &vorbistools-time;
+        </para>
       </listitem>
     </itemizedlist>
 
     <bridgehead renderas="sect3">Vorbis Tools Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libvorbis"/></para>
+    <para role="required">
+      <xref linkend="libvorbis"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional (required to build the
     <command>ogg123</command> program)</bridgehead>
@@ -77,24 +93,30 @@
     </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/vorbistools"/></para>
-
+      <ulink url="&blfs-wiki;/vorbistools"/>
+    </para>
   </sect2>
 
   <sect2 role="installation">
     <title>Installation of Vorbis Tools</title>
 
-    <para>Install <application>Vorbis Tools</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>Vorbis Tools</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr \
             --enable-vcut \
             --without-curl &&
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>
+      This package does not come with a test suite.
+    </para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
 
@@ -103,34 +125,16 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <!-- <para><command>sed -i '/MUTE/d' ogg123/http_transport.c </command>: This
-    command fixes a build problem with new versions of
-    <application>cURL</application>.</para>
-
-    <para><command>patch -Np1 -i
-    ../vorbis-tools-&vorbistools-version;-utf8-1.patch</command>: This patch
-    fixes a bug in <command>vorbiscomment</command> in UTF-8 locales.</para>
-
-    <para><command>patch -Np1 -i
-    ../vorbis-tools-&vorbistools-version;-flac-1.patch</command>: This patch
-    allows <application>Vorbis-Tools</application> to link against new
-    versions of <application>FLAC</application>.</para>
-
-    <para><command>autoconf</command>: This command is used to regenerate the
-    <command>configure</command> script as the <application>FLAC</application>
-    patch modifies the <filename>configure.ac</filename> file.</para> -->
-
-    <para><parameter>--enable-vcut</parameter>: This parameter is used so that
-    the <command>vcut</command> program is built as it is not by
-    default.</para>
-
-    <!-- <para><parameter>-mandir=/usr/share/man</parameter>: This parameter
-    ensures that the man pages are installed under
-    <filename class="directory">/usr/share/man</filename>.</para> -->
-
-    <para><parameter>--without-curl</parameter>: This parameter disables HTTP
-    streaming in <command>ogg123</command>. Remove this parameter if you have
-    <application>cURL</application> installed.</para>
+    <para>
+      <parameter>--enable-vcut</parameter>: This parameter is used so that
+      the <command>vcut</command> program is built as it is not by default.
+    </para>
+
+    <para>
+      <parameter>--without-curl</parameter>: This parameter disables HTTP
+      streaming in <command>ogg123</command>. Remove this parameter if you have
+      <application>cURL</application> installed.
+    </para>
 
  </sect2>
 
@@ -140,9 +144,11 @@
     <sect3 id="vorbistools-config">
       <title>Config Files</title>
 
-      <para><filename>/etc/libao.conf</filename>,
-      <filename>~/.libao</filename>, and
-      <filename>~/.ogg123rc</filename></para>
+      <para>
+        <filename>/etc/libao.conf</filename>,
+        <filename>~/.libao</filename> and
+        <filename>~/.ogg123rc</filename>
+      </para>
 
       <indexterm zone="vorbistools vorbistools-config">
         <primary sortas="e-AA.libao">~/.libao</primary>
@@ -161,9 +167,12 @@
     <sect3>
       <title>Configuration Information</title>
 
-      <para>Issue <command>man libao.conf</command> for information
-      about setting the default output device. Also see
-      <filename>/usr/share/doc/vorbis-tools-1.1.1/ogg123rc-example</filename>.</para>
+      <para>
+        Issue <command>man libao.conf</command> for information
+        about setting the default output device. Also see
+        <filename>/usr/share/doc/vorbis-tools-&vorbistools-version;/ogg123rc-example
+        </filename>.
+      </para>
 
     </sect3>
 
@@ -178,9 +187,15 @@
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>ogg123, oggdec, oggenc, ogginfo, vcut, and vorbiscomment</seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/vorbis-tools-&vorbistools-version;</seg>
+        <seg>
+          ogg123, oggdec, oggenc, ogginfo, vcut and vorbiscomment
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/share/doc/vorbis-tools-&vorbistools-version;
+        </seg>
       </seglistitem>
     </segmentedlist>
 
@@ -192,7 +207,9 @@
       <varlistentry id="ogg123">
         <term><command>ogg123</command></term>
         <listitem>
-          <para>is a command-line audio player for Ogg Vorbis streams.</para>
+          <para>
+            is a command-line audio player for Ogg Vorbis streams.
+          </para>
           <indexterm zone="vorbistools ogg123">
             <primary sortas="b-ogg123">ogg123</primary>
           </indexterm>
@@ -202,8 +219,10 @@
       <varlistentry id="oggdec">
         <term><command>oggdec</command></term>
         <listitem>
-          <para>is a simple decoder which converts Ogg Vorbis files into
-          PCM audio files (WAV or raw).</para>
+          <para>
+            is a simple decoder which converts Ogg Vorbis files into
+            PCM audio files (WAV or raw).
+          </para>
           <indexterm zone="vorbistools oggdec">
             <primary sortas="b-oggdec">oggdec</primary>
           </indexterm>
@@ -213,8 +232,10 @@
       <varlistentry id="oggenc">
         <term><command>oggenc</command></term>
         <listitem>
-          <para>is an encoder that turns raw, WAV or
-          AIFF files into an Ogg Vorbis stream.</para>
+          <para>
+            is an encoder that turns raw, WAV or
+            AIFF files into an Ogg Vorbis stream.
+          </para>
           <indexterm zone="vorbistools oggenc">
             <primary sortas="b-oggenc">oggenc</primary>
           </indexterm>
@@ -224,7 +245,9 @@
       <varlistentry id="ogginfo">
         <term><command>ogginfo</command></term>
         <listitem>
-          <para>prints information stored in an audio file.</para>
+          <para>
+            prints information stored in an audio file.
+          </para>
           <indexterm zone="vorbistools ogginfo">
             <primary sortas="b-ogginfo">ogginfo</primary>
           </indexterm>
@@ -234,7 +257,9 @@
       <varlistentry id="vcut">
         <term><command>vcut</command></term>
         <listitem>
-          <para>will split a file into two files at a designated cut point.</para>
+          <para>
+            splits a file into two files at a designated cut point.
+          </para>
           <indexterm zone="vorbistools vcut">
             <primary sortas="b-vcut">vcut</primary>
           </indexterm>
@@ -244,8 +269,10 @@
       <varlistentry id="vorbiscomment">
         <term><command>vorbiscomment</command></term>
         <listitem>
-          <para>is an editor that changes information in the audio file
-          metadata tags.</para>
+          <para>
+            is an editor that changes information in the audio file
+            metadata tags.
+          </para>
           <indexterm zone="vorbistools vorbiscomment">
             <primary sortas="b-vorbiscomment">vorbiscomment</primary>
           </indexterm>

Modified: branches/systemd/multimedia/videoutils/ffmpeg.xml
==============================================================================
--- branches/systemd/multimedia/videoutils/ffmpeg.xml	Sun Jun 16 06:47:40 2013	(r11299)
+++ branches/systemd/multimedia/videoutils/ffmpeg.xml	Sun Jun 16 06:51:15 2013	(r11300)
@@ -114,9 +114,9 @@
       <ulink url="http://www.celt-codec.org/">libcelt</ulink>,
       <ulink url="http://ftp.gnu.org/pub/gnu/libcdio/">libcdio</ulink>,
       <ulink url="http://sourceforge.net/projects/libdc1394">libdc1394</ulink>,
-      <ulink url="http://sourceforge.net/projects/opencore-amr/files/fdk-aac/">fdk-aac</ulink>,
+      <ulink url="http://sourceforge.net/projects/opencore-amr/">fdk-aac</ulink>,
       <ulink url="http://www.speech.cs.cmu.edu/flite/">Flite</ulink>,
-      <ulink url="http://libgsm.sourcearchive.com/">GSM</ulink>,
+      <ulink url="http://www.quut.com/gsm/">GSM</ulink>,
       <ulink url="https://ieee1394.wiki.kernel.org/index.php/Libraries">libiec61883</ulink>,
       <ulink url="https://github.com/dekkers/libilbc">libilbc</ulink>,
       <ulink url="http://sourceforge.net/projects/modplug-xmms/">libmodplug</ulink>,
@@ -399,8 +399,10 @@
     <sect3 id="ffmpeg-config">
       <title>Config Files</title>
 
-      <para><filename>/etc/ffserver.conf</filename> and
-      <filename>~/.ffmpeg/ffserver-config</filename></para>
+      <para>
+        <filename>/etc/ffserver.conf</filename> and
+        <filename>~/.ffmpeg/ffserver-config</filename>
+      </para>
 
       <indexterm zone="ffmpeg ffmpeg-config">
         <primary

Modified: branches/systemd/multimedia/videoutils/mplayer.xml
==============================================================================
--- branches/systemd/multimedia/videoutils/mplayer.xml	Sun Jun 16 06:47:40 2013	(r11299)
+++ branches/systemd/multimedia/videoutils/mplayer.xml	Sun Jun 16 06:51:15 2013	(r11300)
@@ -5,9 +5,9 @@
   %general-entities;
 
   <!ENTITY mplayer-download-http
-    "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-&mplayer-version;.tar.xz">
+           "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-&mplayer-version;.tar.xz">
   <!ENTITY mplayer-download-ftp
-    "ftp://ftp.mplayerhq.hu/MPlayer/releases/MPlayer-&mplayer-version;.tar.xz">
+           "ftp://ftp.mplayerhq.hu/MPlayer/releases/MPlayer-&mplayer-version;.tar.xz">
   <!ENTITY mplayer-md5sum        "39dd55f30eb5403f219a606e79a6648a">
   <!ENTITY mplayer-size          "11 MB">
   <!ENTITY mplayer-buildsize     "183 MB (120 MB using system-installed FFMpeg)">
@@ -15,9 +15,9 @@
 
   <!ENTITY mplayer-skin          "Clearlooks-1.5">
   <!ENTITY mplayer-skin-download-http
-    "http://www.mplayerhq.hu/MPlayer/skins/&mplayer-skin;.tar.bz2">
+           "http://www.mplayerhq.hu/MPlayer/skins/&mplayer-skin;.tar.bz2">
   <!ENTITY mplayer-skin-download-ftp
-    "ftp://ftp.mplayerhq.hu/MPlayer/skins/&mplayer-skin;.tar.bz2">
+           "ftp://ftp.mplayerhq.hu/MPlayer/skins/&mplayer-skin;.tar.bz2">
   <!ENTITY mplayer-skin-md5sum   "6b046a78fb15b243dc1eb5884276a750">
   <!ENTITY mplayer-skin-size     "40 KB">
 ]>
@@ -53,22 +53,34 @@
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&mplayer-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&mplayer-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&mplayer-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&mplayer-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &mplayer-md5sum;</para>
+        <para>
+          Download MD5 sum: &mplayer-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &mplayer-size;</para>
+        <para>
+          Download size: &mplayer-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &mplayer-buildsize;</para>
+        <para>
+          Estimated disk space required: &mplayer-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &mplayer-time;</para>
+        <para>
+          Estimated build time: &mplayer-time;
+        </para>
       </listitem>
     </itemizedlist>
 
@@ -82,13 +94,19 @@
         </para>
       </listitem>
       <listitem>
-        <para>GUI skin (FTP): <ulink url="&mplayer-skin-download-ftp;"/></para>
+        <para>
+          GUI skin (FTP): <ulink url="&mplayer-skin-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Skin MD5 sum: &mplayer-skin-md5sum;</para>
+        <para>
+          Skin MD5 sum: &mplayer-skin-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Skin size: &mplayer-skin-size;</para>
+        <para>
+          Skin size: &mplayer-skin-size;
+        </para>
       </listitem>
       <listitem>
         <para>
@@ -108,10 +126,14 @@
     <bridgehead renderas="sect3">MPlayer Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="yasm"/></para>
+    <para role="required">
+      <xref linkend="yasm"/>
+    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="gtk2"/></para>
+    <para role="recommended">
+      <xref linkend="gtk2"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional Input Drivers and Libraries</bridgehead>
     <para role="optional">
@@ -122,17 +144,15 @@
       <xref linkend="libdvdcss"/>,
       <ulink url="http://www.videolan.org/developers/libbluray.html">libbluray</ulink>,
       <ulink url="http://www.gnu.org/software/libcdio/">libcdio</ulink>,
-      <ulink url="http://www.live555.com/mplayer/">LIVE555 Streaming Media</ulink>,
+      <ulink url="http://www.live555.com/">LIVE555 Streaming Media</ulink>,
       <ulink url="http://rtmpdump.mplayerhq.hu/">RTMPDump</ulink>,
-      <ulink url="http://code.google.com/p/vstream-client/">TiVo vstream client</ulink>
-      and
+      <ulink url="http://code.google.com/p/vstream-client/">TiVo vstream client</ulink> and
       <ulink url="http://www.xmms.org/">XMMS</ulink>
     </para>
 
     <bridgehead renderas="sect4">Optional Audio Output Drivers and Libraries</bridgehead>
     <para role="optional">
       <xref linkend="alsa"/>,
-      <!-- <xref linkend="arts"/>, -->
       <xref linkend="esound"/>,
       <xref linkend="pulseaudio"/>,
       <xref linkend="sdl"/>,
@@ -170,11 +190,11 @@
       <xref linkend="libvpx"/>,
       <xref linkend="lame"/>,
       <ulink url="http://sourceforge.net/projects/twolame/">TwoLAME</ulink>,
-      <ulink url="https://launchpad.net/libgsm">libgsm</ulink>,
+      <ulink url="http://www.quut.com/gsm/">GSM</ulink>,
       <ulink url="http://www.videolan.org/developers/libdca.html">libdca</ulink>,
       <ulink url="http://www.musepack.net/">libmpcdec</ulink>,
       <ulink url="http://sourceforge.net/projects/opencore-amr/">OpenCore
-        Adaptive Multi Rate</ulink>,
+      Adaptive Multi Rate</ulink>,
       <ulink url="http://www.broadcom.com/support/crystal_hd/">CrystalHD</ulink>,
       <ulink url="http://www.videolan.org/developers/x264.html">x264</ulink>,
       <ulink url="http://diracvideo.org/download/dirac-research/">Dirac</ulink>,
@@ -211,8 +231,10 @@
       <title>Main MPlayer Installation</title>
 
       <note>
-        <para>The package maintainers recommend building without any
-        optimizations.</para>
+        <para>
+          The package maintainers recommend building without any
+          optimizations.
+        </para>
       </note>
 
       <para>
@@ -234,12 +256,16 @@
             --enable-gui             &&
 make</userinput></screen>
 
-      <para>If you wish to rebuild the chunked HTML documentation and build
-      a non-chunked HTML version of the docs, issue the following command:</para>
+      <para>
+        If you wish to rebuild the chunked HTML documentation and build
+        a non-chunked HTML version of the docs, issue the following command:
+      </para>
 
 <screen><userinput>make doc</userinput></screen>
 
-      <para>This package does not come with a test suite.</para>
+      <para>
+        This package does not come with a test suite.
+      </para>
 
       <para>
         Now, as the <systemitem class="username">root</systemitem> user:
@@ -279,6 +305,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/update-icons-and-desktop.xml"/>
+
     </sect3>
 
     <sect3>
@@ -320,6 +347,7 @@
       without this option (it is always more thoroughly tested with the included
       FFmpeg).
     </para>
+
   </sect2>
 
   <sect2 role="configuration">
@@ -328,8 +356,10 @@
     <sect3 id="mplayer-config">
       <title>Config Files</title>
 
-      <para><filename>/etc/mplayer/*</filename> and
-      <filename>~/.mplayer/*</filename></para>
+      <para>
+        <filename>/etc/mplayer/*</filename> and
+        <filename>~/.mplayer/*</filename>
+      </para>
 
       <indexterm zone="mplayer mplayer-config">
         <primary sortas="e-AA.mplayer">~/.mplayer/*</primary>
@@ -352,7 +382,9 @@
         configuration changes made in the GUI will be saved in the user's
         <filename class='directory'>~/.mplayer</filename> directory.
       </para>
+
     </sect3>
+
   </sect2>
 
   <sect2 role="content">
@@ -364,8 +396,12 @@
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>gmplayer, mplayer and mencoder</seg>
-        <seg>none</seg>
+        <seg>
+          gmplayer, mplayer and mencoder
+        </seg>
+        <seg>
+          None
+        </seg>
         <seg>
           /etc/mplayer,
           /usr/lib/mplayer,
@@ -385,7 +421,7 @@
         <listitem>
           <para>
             is a symlink to <command>mplayer</command> which brings up the
-            Gtk+ 2 frontend of <application>MPlayer</application>.
+            GTK+ 2 frontend of <application>MPlayer</application>.
           </para>
           <indexterm zone="mplayer gmplayer">
             <primary sortas="b-gmplayer">gmplayer</primary>
@@ -417,6 +453,9 @@
           </indexterm>
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>

Modified: branches/systemd/multimedia/videoutils/transcode.xml
==============================================================================
--- branches/systemd/multimedia/videoutils/transcode.xml	Sun Jun 16 06:47:40 2013	(r11299)
+++ branches/systemd/multimedia/videoutils/transcode.xml	Sun Jun 16 06:51:15 2013	(r11300)
@@ -113,7 +113,7 @@
       <xref linkend="libvorbis"/>,
       <xref linkend="libxml2"/>,
       <xref linkend="LZO"/>,
-      <ulink url="http://mjpeg.sourceforge.net/">MJPEG Tools</ulink>,
+      <ulink url="http://sourceforge.net/projects/mjpeg/">MJPEG Tools</ulink>,
       <ulink url="http://www.netlib.org/pvm3/">PVM3</ulink>,
       <xref linkend="sdl"/>,
       <ulink url="http://linuxtv.org/downloads/v4l-utils/">Video4Linux</ulink>,
@@ -208,7 +208,8 @@
           None
         </seg>
         <seg>
-          /usr/lib/transcode and /usr/share/doc/transcode-&transcode-version;
+          /usr/lib/transcode and
+          /usr/share/doc/transcode-&transcode-version;
         </seg>
       </seglistitem>
     </segmentedlist>

Modified: branches/systemd/multimedia/videoutils/videoutils.xml
==============================================================================
--- branches/systemd/multimedia/videoutils/videoutils.xml	Sun Jun 16 06:47:40 2013	(r11299)
+++ branches/systemd/multimedia/videoutils/videoutils.xml	Sun Jun 16 06:51:15 2013	(r11300)
@@ -15,14 +15,15 @@
 
   <title>Video Utilities</title>
 
-  <para>This chapter always seems to be the favorite chapter.  It's
-  probably because there is a lot of satisfaction in playing your first
-  video when you have spent so much time getting to that point. All those
-  libraries, all the configurations and your reward is that you finally get to
-  watch a movie. Not to worry though, there is always one more
-  CODEC to install.</para>
+  <para>
+    This chapter always seems to be the favorite chapter. It's
+    probably because there is a lot of satisfaction in playing your first
+    video when you have spent so much time getting to that point. All those
+    libraries, all the configurations and your reward is that you finally get to
+    watch a movie. Not to worry though, there is always one more
+    CODEC to install.
+  </para>
 
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dvb-apps.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ffmpeg.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mplayer.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="transcode.xml"/>

Modified: branches/systemd/multimedia/videoutils/vlc.xml
==============================================================================
--- branches/systemd/multimedia/videoutils/vlc.xml	Sun Jun 16 06:47:40 2013	(r11299)
+++ branches/systemd/multimedia/videoutils/vlc.xml	Sun Jun 16 06:51:15 2013	(r11300)
@@ -88,14 +88,10 @@
 
     <bridgehead renderas="sect3">VLC Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus"/>
-    </para>
-
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="alsa-lib"/>,
+      <xref linkend="dbus"/>,
       <xref linkend="ffmpeg"/>,
       <xref linkend="gnutls"/>,
       <xref linkend="liba52"/>,
@@ -109,41 +105,37 @@
 
     <bridgehead renderas="sect4">Optional input drivers and libraries</bridgehead>
     <para role="optional">
-      <ulink url="http://www.mcmurchy.com/minizip/minizip-1.2.7.tar.gz">Minizip</ulink>,
-      <ulink url="http://code.google.com/p/libproxy/">Libproxy</ulink>,
+      <ulink url="http://code.google.com/p/libproxy/">libproxy</ulink>,
       <ulink url="http://www.live555.com/">Live555</ulink>,
-      <ulink url="http://sourceforge.net/projects/libdc1394/">DC1394</ulink>,
+      <ulink url="http://sourceforge.net/projects/libdc1394/">libdc1394</ulink>,
       <xref linkend="libdv"/>,
       <xref linkend="libdvdread"/>,
       <xref linkend="libdvdnav"/>,
       <ulink url="http://www.videolan.org/developers/libbluray.html">libbluray</ulink>,
       <ulink url="http://opencv.willowgarage.com/wiki/">OpenCV</ulink>,
       <xref linkend="samba3"/>,
-      <!-- <xref linkend="gvfs"/>, -->
       <ulink url="http://linuxtv.org/downloads/v4l-utils/">Video4Linux</ulink>,
       <ulink url="http://www.gnu.org/software/vcdimager/">VCDImager</ulink>
       (requires <ulink url="http://www.gnu.org/software/libcdio/">libcdio</ulink>)
-      and <ulink url="http://libcddb.sourceforge.net/">libcddb</ulink>
+      and <ulink url="http://sourceforge.net/projects/libcddb/">libcddb</ulink>
     </para>
 
     <bridgehead renderas="sect4">Optional mux/demux plugins</bridgehead>
     <para role="optional">
       <ulink url="http://www.videolan.org/developers/libdvbpsi.html">libdvbpsi</ulink>,
       <ulink url="http://code.google.com/p/game-music-emu/">Game Music Emu</ulink>,
-      <ulink url="http://sourceforge.net/projects/sidplay2/files/sidplay2/">sidplay-libs</ulink>
-      (with patches located in contrib/src/sidplay2 subdirectory),
+      <ulink url="http://sourceforge.net/projects/sidplay2/">sidplay-libs</ulink>,
       <xref linkend="libogg"/>,
-      <ulink url="http://directory.fsf.org/wiki/Libshout">libshout</ulink>,
-      <ulink url="http://matroska.org/">libmatroska</ulink>
-      (requires <ulink url="http://matroska.org/">libebml</ulink>),
-      <ulink url="http://modplug-xmms.sourceforge.net/">libmodplug</ulink> and
-      <ulink url="http://www.musepack.net/index.php?pg=home">Musepack</ulink>
+      <ulink url="http://downloads.xiph.org/releases/libshout/">libshout</ulink>,
+      <ulink url="http://dl.matroska.org/downloads/libmatroska/">libmatroska</ulink>
+      (requires <ulink url="http://dl.matroska.org/downloads/libebml/">libebml</ulink>),
+      <ulink url="http://sourceforge.net/projects/modplug-xmms/">libmodplug</ulink> and
+      <ulink url="http://www.musepack.net/">Musepack</ulink>
     </para>
 
     <bridgehead renderas="sect4">Optional codec plugins</bridgehead>
     <para role="optional">
       <ulink url="http://www.freedesktop.org/wiki/Software/vaapi">libva</ulink>,
-      <!-- <ulink url="http://sourceforge.net/projects/libshine-fxp/">Shine</ulink>, -->
       <ulink url="http://www.khronos.org/openmax/">OpenMAX</ulink>,
       <xref linkend="faad2"/>,
       <ulink url="http://www.twolame.org/">Twolame</ulink>,
@@ -153,14 +145,14 @@
       <xref linkend="libvorbis"/>,
       <ulink url="http://wiki.xiph.org/Tremor">Tremor</ulink>,
       <xref linkend="speex"/>,
-      <ulink url="http://www.opus-codec.org/">Opus</ulink>,
+      <ulink url="http://downloads.xiph.org/releases/opus/">Opus</ulink>,
       <xref linkend="libtheora"/>,
       <ulink url="http://diracvideo.org/download/dirac-research/">Dirac</ulink>,
       <ulink url="http://diracvideo.org/download/schroedinger/">Schroedinger</ulink>,
       <xref linkend="libpng"/>,
       <ulink url="http://www.videolan.org/developers/x264.html">libx264</ulink>,
-      <ulink url="http://sourceforge.net/apps/trac/fluidsynth/">FluidSynth</ulink>,
-      <ulink url="http://zapping.sourceforge.net/ZVBI/index.html">Zapping VBI</ulink>,
+      <ulink url="http://sourceforge.net/projects/fluidsynth/">FluidSynth</ulink>,
+      <ulink url="http://sourceforge.net/projects/zapping/">Zapping VBI</ulink>,
       <ulink url="http://code.google.com/p/libass/">libass</ulink>,
       <ulink url="http://code.google.com/p/libkate/">libkate</ulink> and
       <ulink url="http://code.google.com/p/libtiger/">libtiger</ulink>
@@ -183,12 +175,12 @@
       <xref linkend="pulseaudio"/>,
       <ulink url="http://www.portaudio.com/">PortAudio</ulink>,
       <ulink url="http://jackaudio.org/">JACK</ulink> and
-      <ulink url="http://www.mega-nerd.com/SRC/">libsamplerate</ulink>
+      <xref linkend="libsamplerate"/>
     </para>
 
     <bridgehead renderas="sect4">Optional interface plugins</bridgehead>
     <para role="optional">
-      <ulink url="http://xcb.freedesktop.org/dist/">xcb-util-keysyms</ulink>,
+      <xref linkend="xcb-util-keysyms"/>,
       <ulink url="http://www.lirc.org/">LIRC</ulink> and
       <ulink url="http://www.feep.net/libtar/">libtar</ulink>
     </para>
@@ -196,14 +188,14 @@
     <bridgehead renderas="sect4">Optional visualization plugins</bridgehead>
     <para role="optional">
       <ulink url="http://sourceforge.net/projects/goom/">Goom</ulink> and
-      <ulink url="http://projectm.sourceforge.net/">projectM</ulink>
+      <ulink url="http://sourceforge.net/projects/projectm/">projectM</ulink>
     </para>
 
     <bridgehead renderas="sect4">Optional service discovery plugins</bridgehead>
     <para role="optional">
       <xref linkend="avahi"/>,
-      <ulink url="http://libmtp.sourceforge.net/">MTP</ulink> and
-      <ulink url="http://pupnp.sourceforge.net/">UPnP</ulink>
+      <ulink url="http://sourceforge.net/projects/libmtp/">libmtp</ulink> and
+      <ulink url="http://sourceforge.net/projects/pupnp/">libupnp</ulink>
     </para>
 
     <bridgehead renderas="sect4">Optional miscellaneous dependencies</bridgehead>
@@ -211,9 +203,9 @@
       <xref linkend="libxml2"/>,
       <xref linkend="taglib"/>,
       <xref linkend="libnotify"/>,
-      <ulink url="http://medialibrary.sourceforge.net/">MediaLibrary</ulink>
+      <ulink url="http://sourceforge.net/projects/medialibrary/">MediaLibrary</ulink>
       (requires <xref linkend="sqlite"/>) and
-      <ulink url="http://www.lua.org/">Lua</ulink>
+      <ulink url="http://www.lua.org/">Lua (version 5.1)</ulink>
     </para>
 
     <para condition="html" role="usernotes">
@@ -264,6 +256,12 @@
     </para>
 
     <para>
+      <parameter>--disable-dbus</parameter>: The package fails to install if
+      <application>D-Bus</application> is missing. Use this switch if you don't
+      have <application>D-Bus</application> installed.
+    </para>
+
+    <para>
       <option>--disable-avcodec</option>: Use this switch if you don't
       have <application>FFmpeg</application> installed.
     </para>

Modified: branches/systemd/multimedia/videoutils/xine-ui.xml
==============================================================================
--- branches/systemd/multimedia/videoutils/xine-ui.xml	Sun Jun 16 06:47:40 2013	(r11299)
+++ branches/systemd/multimedia/videoutils/xine-ui.xml	Sun Jun 16 06:51:15 2013	(r11300)
@@ -43,22 +43,34 @@
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&xine-ui-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&xine-ui-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&xine-ui-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&xine-ui-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &xine-ui-md5sum;</para>
+        <para>
+          Download MD5 sum: &xine-ui-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &xine-ui-size;</para>
+        <para>
+          Download size: &xine-ui-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &xine-ui-buildsize;</para>
+        <para>
+          Estimated disk space required: &xine-ui-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &xine-ui-time;</para>
+        <para>
+          Estimated build time: &xine-ui-time;
+        </para>
       </listitem>
     </itemizedlist>
 
@@ -112,7 +124,9 @@
 <screen><userinput>./configure --prefix=/usr &&
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>
+      This package does not come with a test suite.
+    </para>
 
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:
@@ -122,6 +136,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/update-icons-and-desktop.xml"/>
+
   </sect2>
 
   <sect2 role="commands">
@@ -135,6 +150,7 @@
       rather that the default
       <filename class="directory">/usr/share/doc/xine-ui</filename>.
     </para>
+
   </sect2>
 
   <sect2 role="configuration">
@@ -143,11 +159,14 @@
     <sect3 id="xine-ui-config">
       <title>Config Files</title>
 
-      <para><filename>~/.xine/config</filename></para>
+      <para>
+        <filename>~/.xine/config</filename>
+      </para>
 
       <indexterm zone="xine-ui xine-ui-config">
         <primary sortas="e-AA.xine-config">~/.xine/config</primary>
       </indexterm>
+
     </sect3>
 
     <sect3>
@@ -165,7 +184,9 @@
         <command>xine dvb://</command> and change channels with the scroll wheel
         on your mouse.
       </para>
+
     </sect3>
+
   </sect2>
 
   <sect2 role="content">
@@ -178,12 +199,8 @@
 
       <seglistitem>
         <seg>
-          aaxine,
-          cacaxine,
-          fbxine,
-          xine,
-          xine-bugreport,
-          xine-check and
+          aaxine, cacaxine, fbxine, xine,
+          xine-bugreport, xine-check and
           xine-remote
         </seg>
         <seg>
@@ -296,6 +313,9 @@
           </indexterm>
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>

Modified: branches/systemd/x/lib/qt4.xml
==============================================================================
--- branches/systemd/x/lib/qt4.xml	Sun Jun 16 06:47:40 2013	(r11299)
+++ branches/systemd/x/lib/qt4.xml	Sun Jun 16 06:51:15 2013	(r11300)
@@ -283,6 +283,11 @@
       ibase, mysql, psql, sqlite and odbc.
     </para>
 
+    <para>
+      <parameter>-no-dbus</parameter>: Use this switch if you don't have
+      <application>D-Bus</application> installed.
+    </para>
+
   </sect2>
 
   <sect2 role="configuration">



More information about the blfs-book mailing list