Index: multimedia/audioutils/amarok.xml
===================================================================
--- multimedia/audioutils/amarok.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
+++ multimedia/audioutils/amarok.xml	(revision 3f0542127a21f2a371ef32aa236076120ce476ba)
@@ -78,5 +78,5 @@
     <para role="required">
       <xref linkend="kdelibs"/>,
-      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>, and
+      <xref linkend="mariadb"/>, and
       <xref linkend="taglib"/>
     </para>
@@ -93,7 +93,6 @@
       <xref linkend="openssl"/> (for MP3tunes integration),
       <xref linkend="qjson"/>,
-      <ulink url="&kde-download-http;&kde-version;/src/">nepomuk-core</ulink>,
-      <ulink url="http://kollide.net/~jefferai/">Taglib-extras</ulink>,
       <ulink url="http://code.google.com/p/clamz/">Clamz</ulink> (For Amazon integration),
+      <ulink url="http://code.google.com/p/googlemock/">Google Mock</ulink> (for tests),
       <ulink url="http://www.gtkpod.org/libgpod.html">libgpod</ulink> (for iPod support),
       <ulink url="https://github.com/lastfm/liblastfm">liblastfm</ulink> (for Last.fm integration),
@@ -102,6 +101,7 @@
       <ulink url="http://code.google.com/p/musicip-libofa">libofa</ulink> (for MusicDNS support),
       <ulink url="&gnome-download-http;/loudmouth">Loudmouth</ulink> (for MP3tunes integration),
+      <ulink url="&kde-download-http;&kde-version;/src/">Nepomuk-Core</ulink>,
       <ulink url="http://code.google.com/p/qtscriptgenerator/">qtscript-qt</ulink>, and
-      <ulink url="http://code.google.com/p/googlemock/">Google Mock</ulink> (for tests)
+      <ulink url="http://kollide.net/~jefferai/">Taglib-extras</ulink>
     </para>
 
Index: multimedia/audioutils/audacious.xml
===================================================================
--- multimedia/audioutils/audacious.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
+++ multimedia/audioutils/audacious.xml	(revision 3f0542127a21f2a371ef32aa236076120ce476ba)
@@ -179,6 +179,5 @@
     </para>
 
-<screen><userinput>TPUT=/bin/true ./configure --prefix=/usr \
-                           --with-buildstamp="BLFS" &amp;&amp;
+<screen><userinput>TPUT=/bin/true ./configure --prefix=/usr --with-buildstamp="BLFS" &amp;&amp;
 make</userinput></screen>
 <!--
Index: multimedia/cdwriteutils/cdrdao.xml
===================================================================
--- multimedia/cdwriteutils/cdrdao.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
+++ multimedia/cdwriteutils/cdrdao.xml	(revision 3f0542127a21f2a371ef32aa236076120ce476ba)
@@ -41,7 +41,7 @@
         <para>Download (HTTP): <ulink url="&cdrdao-download-http;"/></para>
       </listitem>
-<!--      <listitem>
+      <listitem>
         <para>Download (FTP): <ulink url="&cdrdao-download-ftp;"/></para>
-      </listitem>-->
+      </listitem>
       <listitem>
         <para>Download MD5 sum: &cdrdao-md5sum;</para>
@@ -86,12 +86,12 @@
       <ulink url="http://www.gtkmm.org/">libgnomeuimm</ulink>
     </para>
-
+-->
     <para>There are two additional optional dependencies that can be used by
     the <application>Cdrdao</application> build:
-    <ulink url="http://cdrecord.berlios.de/private/cdrecord.html">Cdrtools</ulink>
+    <ulink url="&sourceforge-repo;/cdrtools/files/alpha/">Cdrtools</ulink>
     and <ulink url="http://www.polhode.com/pccts133mr.html">PCCTS</ulink>.
     The pieces of these two packages required to build
     <application>Cdrdao</application> are also included in the source tree
-    and are used by default.</para>-->
+    and are used by default.</para>
 
     <para condition="html" role="usernotes">User Notes:
Index: multimedia/cdwriteutils/k3b.xml
===================================================================
--- multimedia/cdwriteutils/k3b.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
+++ multimedia/cdwriteutils/k3b.xml	(revision 3f0542127a21f2a371ef32aa236076120ce476ba)
@@ -111,5 +111,5 @@
       There are programs from three packages that
       <application>K3b</application> will look for at runtime:
-      <ulink url="http://freecode.com/projects/cdrecord">Cdrtools</ulink>
+      <ulink url="&sourceforge-repo;/cdrtools/files/alpha/">Cdrtools</ulink>
       (required to burn CD-ROM media), <xref linkend="dvd-rw-tools"/>
       (required to burn or format DVD media), and <xref linkend="cdrdao"/>
@@ -159,5 +159,5 @@
 
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DSYSCONF_INSTALL_DIR=/etc/kde     \
+      -DSYSCONF_INSTALL_DIR=/etc         \
       -Wno-dev ..  &amp;&amp;
 make</userinput></screen>
Index: multimedia/cdwriteutils/simpleburn.xml
===================================================================
--- multimedia/cdwriteutils/simpleburn.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
+++ multimedia/cdwriteutils/simpleburn.xml	(revision 3f0542127a21f2a371ef32aa236076120ce476ba)
@@ -134,5 +134,5 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>
+    <!-- <para>
       All optical devices are not accessible for any user except <systemitem
       class="username">root</systemitem> and members of the <systemitem
@@ -141,5 +141,5 @@
     </para>
 
-<screen role="root"><userinput>usermod -a -G cdrom <replaceable>&lt;username&gt;</replaceable></userinput></screen>
+<screen role="root"><userinput>usermod -a -G cdrom <replaceable>&lt;username&gt;</replaceable></userinput></screen> -->
 
   </sect2>
Index: multimedia/videoutils/ffmpeg.xml
===================================================================
--- multimedia/videoutils/ffmpeg.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
+++ multimedia/videoutils/ffmpeg.xml	(revision 3f0542127a21f2a371ef32aa236076120ce476ba)
@@ -82,11 +82,11 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="yasm"/>,
-      <xref linkend="libass"/>,
       <xref linkend="fdk-aac"/>,
       <xref linkend="lame"/>,
+      <xref linkend="libass"/>,
       <xref linkend="libtheora"/>,
       <xref linkend="libvorbis"/>,
-      <xref linkend="libvpx"/>, and
+      <xref linkend="libvpx"/>,
+      <xref linkend="yasm"/>, and
       <xref linkend="x264"/>
     </para>
@@ -94,9 +94,9 @@
     <bridgehead renderas="sect4">Recommended for desktop use</bridgehead>
     <para>
+      <xref linkend="alsa-lib"/>,
+      <xref linkend="libva"/>,
+      <xref linkend="libvdpau"/> (with the corresponding driver package),
+      <xref linkend="sdl"/>, and
       <xref linkend="x-window-system"/>,
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="sdl"/>,
-      <xref linkend="libva"/> and
-      <xref linkend="libvdpau"/> (with the corresponding driver package)
     </para>
 
@@ -105,35 +105,35 @@
       <xref linkend="faac"/>,
       <xref linkend="freetype2"/>,
+      <xref linkend="fontconfig"/>,
+      <xref linkend="gnutls"/>,
       <xref linkend="libwebp"/>,
       <xref linkend="openjpeg"/>,
+      <xref linkend="openssl"/>,
+      <xref linkend="opus"/>,
       <xref linkend="pulseaudio"/>,
       <xref linkend="speex"/>,
       <xref linkend="xvid"/>,
-      <xref linkend="openssl"/>,
-      <xref linkend="fontconfig"/>,
-      <xref linkend="gnutls"/>,
-      <xref linkend="opus"/>,
-<!--  <ulink url="http://www.piksel.org/frei0r">frei0r</ulink>,-->
+      <ulink url="http://www.speech.cs.cmu.edu/flite/">Flite</ulink>,
       <ulink url="https://files.dyne.org/frei0r/snapshots/">frei0r</ulink>,
-      <ulink url="http://xhevc.com/en/hevc/decoder/download.jsp">HEVC/H.265</ulink>,
+      <ulink url="http://www.quut.com/gsm/">GSM</ulink>,
       <ulink url="http://www.ladspa.org/">LADSPA</ulink>,
-      <ulink url="http://www.libssh.org/">libssh</ulink>,
-      <ulink url="http://zapping.sourceforge.net/ZVBI/">ZVBI</ulink>,
       <ulink url="http://tipok.org.ua/node/17">libaacplus</ulink>,
       <ulink url="http://www.videolan.org/developers/libbluray.html">libbluray</ulink>,
       <ulink url="http://caca.zoy.org/">libcaca</ulink>,
+      <ulink url="http://ftp.gnu.org/pub/gnu/libcdio/">libcdio</ulink>,
       <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://www.speech.cs.cmu.edu/flite/">Flite</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>,
       <ulink url="https://github.com/Distrotech/libnut">libnut</ulink> (Git checkout),
+      <ulink url="http://rtmpdump.mplayerhq.hu/">librtmp</ulink>,
+      <ulink url="http://www.libssh.org/">libssh</ulink>,
+      <ulink url="http://xavs.sourceforge.net/">libxavs</ulink> (SVN checkout),
+      <ulink url="http://kcat.strangesoft.net/openal-releases/">OpenAL</ulink>,
       <ulink url="http://sourceforge.net/projects/opencore-amr">OpenCore AMR</ulink>,
       <ulink url="http://opencv.org/">OpenCV</ulink>,
-      <ulink url="http://rtmpdump.mplayerhq.hu/">librtmp</ulink>,
       <ulink url="http://diracvideo.org/">Schroedinger</ulink>,
+      <ulink url="http://www.nongnu.org/texi2html">texi2html</ulink> (to build HTML documentation),
       <ulink url="http://www.twolame.org/">TwoLAME</ulink>,
       <ulink url="http://linuxtv.org/downloads/v4l-utils/">Video4Linux</ulink>,
@@ -153,12 +153,4 @@
     <title>Installation of FFmpeg</title>
 
-<!--<para>
-      If <application>Xorg</application> is installed in a prefix other
-      than <filename class='directory'>/usr</filename>, the build will fail. Fix
-      this by issuing the following command:
-    </para>
-
-<screen><userinput>export LIBRARY_PATH=$XORG_PREFIX/lib</userinput></screen>
--->
     <para>
       Install <application>FFmpeg</application> by running the following
@@ -185,6 +177,4 @@
 make &amp;&amp;
 gcc tools/qt-faststart.c -o tools/qt-faststart</userinput></screen>
-<!--
-unset LIBRARY_PATH</userinput></screen>-->
 
     <para>
Index: multimedia/videoutils/mplayer.xml
===================================================================
--- multimedia/videoutils/mplayer.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
+++ multimedia/videoutils/mplayer.xml	(revision 3f0542127a21f2a371ef32aa236076120ce476ba)
@@ -14,10 +14,10 @@
   <!ENTITY mplayer-time          "4 SBU (1.5 SBU using system-installed FFMpeg)">
 
-  <!ENTITY mplayer-skin          "Clearlooks-1.5">
+  <!ENTITY mplayer-skin          "Clearlooks-1.6">
   <!ENTITY mplayer-skin-download-http
            "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">
-  <!ENTITY mplayer-skin-md5sum   "6b046a78fb15b243dc1eb5884276a750">
+  <!ENTITY mplayer-skin-md5sum   "f52b7592b8881021ec7ccb56ec455fba">
   <!ENTITY mplayer-skin-size     "40 KB">
 ]>
@@ -134,5 +134,5 @@
     <note>
       <para>
-        Skins are only required to use the <application>Gtk+ 2</application>
+        Skins are only required to use the <application>GTK+ 2</application>
         user interface.
       </para>
@@ -265,5 +265,5 @@
       </para>
 
-<screen><userinput> patch -Np1 -i ../MPlayer-&mplayer-version;-giflib_fixes-1.patch &amp;&amp;
+<screen><userinput>patch -Np1 -i ../MPlayer-&mplayer-version;-giflib_fixes-1.patch &amp;&amp;
 patch -Np1 -i ../MPlayer-&mplayer-version;-live_fixes-1.patch   &amp;&amp;
 
@@ -301,7 +301,7 @@
       </para>
 
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/mplayer-&mplayer-version; &amp;&amp;
-install -v -m644    DOCS/HTML/en/* \
-                    /usr/share/doc/mplayer-&mplayer-version;</userinput></screen>
+<screen role="root"><userinput>install -v -dm755 /usr/share/doc/mplayer-&mplayer-version; &amp;&amp;
+install -v -m644  DOCS/HTML/en/* \
+                  /usr/share/doc/mplayer-&mplayer-version;</userinput></screen>
 
       <para>
@@ -335,5 +335,5 @@
 
       <para>
-        To enable the Gtk+ 2 frontend of <application>MPlayer</application>,
+        To enable the GTK+ 2 frontend of <application>MPlayer</application>,
         you'll need to install at least one skin. Extract the desired skin and
         create the default location (as the
Index: multimedia/videoutils/transcode.xml
===================================================================
--- multimedia/videoutils/transcode.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
+++ multimedia/videoutils/transcode.xml	(revision 3f0542127a21f2a371ef32aa236076120ce476ba)
@@ -150,7 +150,7 @@
 
     <para>
-      If building with --enable-freetype2 configure switch, use the following
-      <command>sed</command> to fix building against
-      <application>FreeType-2.5.1</application> or newer versions:
+      When building with --enable-freetype2 configure switch, fix the code to
+      correctly find the header files for latest
+      <application>FreeType</application>:
     </para>
 
@@ -195,5 +195,5 @@
     <para>
       <command>sed ... import/probe_ffmpeg.c</command>: This sed fixes
-      compilation with <application>ffmpeg-2.4</application> or newer versions.
+      compilation with <application>FFMpeg</application> 2.4.
     </para>
 
Index: multimedia/videoutils/vlc.xml
===================================================================
--- multimedia/videoutils/vlc.xml	(revision 67f4e07989dc1218d998ffe8a29d471c1f91f7fa)
+++ multimedia/videoutils/vlc.xml	(revision 3f0542127a21f2a371ef32aa236076120ce476ba)
@@ -87,5 +87,5 @@
       <xref linkend="libmad"/>,
       <xref linkend="lua"/>, and
-      <xref linkend="x-window-system"/>,
+      <xref linkend="x-window-system"/>
     </para>
 
@@ -97,5 +97,4 @@
     <bridgehead renderas="sect4">Optional input plugins</bridgehead>
     <para role="optional">
-
       <xref linkend="libdv"/>,
       <xref linkend="libdvdcss"/>,
@@ -177,5 +176,4 @@
       <ulink url="http://pkgbuild.com/~giovanni/libtar/">libtar</ulink>, and
       <ulink url="http://www.lirc.org/">LIRC</ulink>
-      <!--<ulink url="http://www.feep.net/libtar/">libtar</ulink>-->
     </para>
 
@@ -214,8 +212,6 @@
     </para>
 
-<screen><userinput>sed -i 's:libsmbclient.h:samba-4.0/&amp;:' modules/access/smb.c &amp;&amp;
-./bootstrap                                                 &amp;&amp;
-sed "s:&lt; 56:&lt; 57:g" -i configure                            &amp;&amp;
-./configure --prefix=/usr                                   &amp;&amp;
+<screen><userinput>sed "s:&lt; 56:&lt; 57:g" -i configure &amp;&amp;
+./configure --prefix=/usr              &amp;&amp;
 make</userinput></screen>
 
@@ -227,12 +223,4 @@
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
-
-    <note>
-      <para>
-        If the XORG_PREFIX is not /usr, make sure the LIBRARY_PATH
-        environment variable is set properly when doing the install, For example:
-        <command>sudo make LIBRARY_PATH=$XORG_PREFIX/lib ... install</command>.
-      </para>
-    </note>
 
 <screen role="root"><userinput>make docdir=/usr/share/doc/vlc-&vlc-version; install</userinput></screen>
@@ -247,16 +235,6 @@
 
     <para>
-      <command>sed -i ...</command>: This sed fixes compilation with
-      <application>Samba</application> 4.
-    </para>
-
-    <para>
-      <command>./bootstrap</command>: This command calls autoreconf to generate
-      m4 macros and prepare Makefiles.
-    </para>
-
-    <para>
       <command>sed ... configure</command>: This sed fixes compilation with
-      <application>ffmpeg</application> 2.4.
+      <application>FFMpeg</application> 2.4.
     </para>
 
@@ -295,23 +273,4 @@
       have <application>libgcrypt</application> installed.
     </para>
-
-<!--
-    <para>
-      <option>- -enable-shine</option>: Use this option if you wish to build the
-      <application>Shine</application> plugin.
-    </para>
-
-    <para>
-      <option>- -enable-tremor</option>: Use this option if you have
-      <application>Tremor</application> installed and wish to build the
-      <application>Tremor</application> plugin.
-    </para>
-
-    <para>
-      <option>- -enable-aa</option>: Use this option if you have
-      <application>AAlib</application> installed and wish to build the
-      <application>AAlib</application> plugin.
-    </para>
--->
 
     <note>
