Index: general.ent
===================================================================
--- general.ent	(revision 16aa28690aa65ec344b503f0f76c207f6e02383a)
+++ general.ent	(revision bfa83aee216483ee5bda5d48e1be4c53259d3622)
@@ -279,5 +279,5 @@
 <!ENTITY libxslt-version              "1.1.27">
 <!ENTITY LZO-version                  "2.06">
-<!ENTITY mtdev-version                "1.1.2">
+<!ENTITY mtdev-version                "1.1.3">
 <!ENTITY nspr-version                 "4.9.2">
 <!ENTITY openobex-version             "1.6">
@@ -325,5 +325,5 @@
 <!ENTITY bc-version                   "1.06.95">
 <!ENTITY compface-version             "1.5.2">
-<!ENTITY desktop-file-utils-version   "0.20">
+<!ENTITY desktop-file-utils-version   "0.21">
 <!ENTITY gperf-version                "3.0.4">
 <!ENTITY graphviz-version             "2.28.0">
@@ -883,5 +883,5 @@
 <!ENTITY xine-ui-version              "0.99.7">
 <!ENTITY transcode-version            "1.1.7">
-<!ENTITY vlc-version                  "2.0.3">
+<!ENTITY vlc-version                  "2.0.4">
 
 <!-- Chapter 41 -->
Index: general/genlib/mtdev.xml
===================================================================
--- general/genlib/mtdev.xml	(revision 16aa28690aa65ec344b503f0f76c207f6e02383a)
+++ general/genlib/mtdev.xml	(revision bfa83aee216483ee5bda5d48e1be4c53259d3622)
@@ -7,7 +7,7 @@
   <!ENTITY mtdev-download-http "http://bitmath.org/code/mtdev/mtdev-&mtdev-version;.tar.bz2">
   <!ENTITY mtdev-download-ftp  " ">
-  <!ENTITY mtdev-md5sum        "d9c7700918fc392e29da7477ae20c5c2">
-  <!ENTITY mtdev-size          "260 KB">
-  <!ENTITY mtdev-buildsize     "2.3 MB">
+  <!ENTITY mtdev-md5sum        "8a236569ad3dd79eaeed45f1935359be">
+  <!ENTITY mtdev-size          "264 KB">
+  <!ENTITY mtdev-buildsize     "2.4 MB">
   <!ENTITY mtdev-time          "less than 0.1 SBU">
 ]>
Index: general/genutils/desktop-file-utils.xml
===================================================================
--- general/genutils/desktop-file-utils.xml	(revision 16aa28690aa65ec344b503f0f76c207f6e02383a)
+++ general/genutils/desktop-file-utils.xml	(revision bfa83aee216483ee5bda5d48e1be4c53259d3622)
@@ -5,14 +5,14 @@
   %general-entities;
 
-  <!ENTITY desktop-file-utils-download-http "http://freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-&desktop-file-utils-version;.tar.xz">
+  <!ENTITY desktop-file-utils-download-http
+           "http://freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-&desktop-file-utils-version;.tar.xz">
   <!ENTITY desktop-file-utils-download-ftp  " ">
-  <!ENTITY desktop-file-utils-md5sum        "8c85cbc13632ba69077c6bc41ce4d0ac">
-  <!ENTITY desktop-file-utils-size          "124 KB">
-  <!ENTITY desktop-file-utils-buildsize     "1.8 MB">
+  <!ENTITY desktop-file-utils-md5sum        "fda5c312c9fb3b8d818fb54f2c34db82">
+  <!ENTITY desktop-file-utils-size          "128 KB">
+  <!ENTITY desktop-file-utils-buildsize     "2.0 MB">
   <!ENTITY desktop-file-utils-time          "less than 0.1 SBU">
 ]>
 
-<sect1 id="desktop-file-utils"
-xreflabel="desktop-file-utils-&desktop-file-utils-version;">
+<sect1 id="desktop-file-utils" xreflabel="desktop-file-utils-&desktop-file-utils-version;">
   <?dbhtml filename="desktop-file-utils.html"?>
 
@@ -25,17 +25,19 @@
 
   <indexterm zone="desktop-file-utils">
-    <primary sortas="a-Desktop-file-utils">Desktop-file-utils</primary>
+    <primary sortas="a-desktop-file-utils">desktop-file-utils</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to desktop-file-utils</title>
-
-    <para>The <application>desktop-file-utils</application> package contains
-    command line utilities for working with <ulink
-    url="http://www.freedesktop.org/Standards/desktop-entry-spec">desktop
-    entries</ulink>. These utilities are used by Desktop Environments
-    and other applications
-    to manipulate the MIME-types application databases and help
-    adhere to the Desktop Entry Specification.</para>
+    <title>Introduction to Desktop File Utils</title>
+
+    <para>
+      The <application>Desktop File Utils</application> package contains
+      command line utilities for working with <ulink
+      url="http://www.freedesktop.org/Standards/desktop-entry-spec">
+      Desktop entries</ulink>. These utilities are used by Desktop
+      Environments and other applications to manipulate the MIME-types
+      application databases and help adhere to the Desktop Entry
+      Specification.
+    </para>
 
     &lfs72_checked;
@@ -44,48 +46,70 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&desktop-file-utils-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&desktop-file-utils-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &desktop-file-utils-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &desktop-file-utils-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &desktop-file-utils-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &desktop-file-utils-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&desktop-file-utils-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&desktop-file-utils-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &desktop-file-utils-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &desktop-file-utils-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &desktop-file-utils-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &desktop-file-utils-time;
+        </para>
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">desktop-file-utils Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Desktop File Utils Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="glib2"/></para>
+    <para role="required">
+      <xref linkend="glib2"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="emacs"/></para>
+    <para role="optional">
+      <xref linkend="emacs"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/desktop-file-utils"/></para>
-
+      <ulink url="&blfs-wiki;/desktop-file-utils"/>
+    </para>
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of desktop-file-utils</title>
-
-    <para>Install <application>desktop-file-utils</application> by running the
-    following commands:</para>
+    <title>Installation of Desktop File Utils</title>
+
+    <para>
+      Install <application>Desktop File Utils</application> by
+      running the following commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
 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</userinput></screen>
@@ -94,67 +118,40 @@
 
   <sect2 role="configuration">
-    <title>Configuring desktop-file-utils</title>
+    <title>Configuring Desktop File Utils</title>
 
     <sect3>
       <title>Configuration Information</title>
 
-      <!-- Background for the XDG_* settings can be found in #2172 -->
-
-      <para>The <ulink
-      url="http://freedesktop.org/wiki/Standards/basedir-spec">XDG Base
-      Directory</ulink> specification defines the standard locations for
-      applications to place data and configuration files. These files can
-      be used, for instance, to define the menu structure and menu items
-      in a desktop environment.</para>
-
-      <para>The default location for configuration files to be installed
-      is <filename class="directory">/etc/xdg</filename>, and the default
-      locations for data files are <filename
-      class="directory">/usr/local/share</filename> and <filename
-      class="directory">/usr/share</filename>. These locations can be
-      extended with the environment variables <envar>XDG_CONFIG_DIRS</envar>
-      and <envar>XDG_DATA_DIRS</envar>, respectively. The
-      <application>GNOME</application>, <application>KDE</application> and
-      <application>XFCE</application> environments respect these
-      settings. Update the <envar>XDG_DATA_DIRS</envar> (if necessary) and
-      <envar>XDG_CONFIG_DIRS</envar> environment variables so that the
-      additional MIME-types application databases and desktop menu files are
-      properly maintained and discovered by adding the following to the
-      system-wide or personal profile:</para>
-
-      <para>For <application>GNOME</application>:</para>
-
-<screen><literal>XDG_DATA_DIRS=$GNOME_PREFIX/share:/usr/local/share:/usr/share
-XDG_CONFIG_DIRS=$GNOME_SYSCONFDIR/xdg:/etc/xdg
-export XDG_DATA_DIRS XDG_CONFIG_DIRS</literal></screen>
-
-      <para>For <application>KDE</application>:</para>
-
-<screen><literal>XDG_DATA_DIRS=&kde-dir;/share:/usr/local/share:/usr/share
-XDG_CONFIG_DIRS=/etc/kde/xdg:/etc/xdg
-export XDG_DATA_DIRS XDG_CONFIG_DIRS</literal></screen>
-
-      <para>For <application>XFCE</application>, the default locations
-      should be appropriate if the instructions in the BLFS book were
-      followed.</para>
-
-<!-- This ends up messing up the menus and the GNOME and KDE stuff is simply
-     not yet interchangeable
-
-      <para>If you're installing both <application>GNOME</application> and
-      <application>KDE</application>:</para>
-
-<screen><literal>XDG_DATA_DIRS=$XDG_DATA_DIRS:$GNOME_PREFIX/share:&kde-dir;/share
-export XDG_DATA_DIRS</literal></screen>
-
--->
-
-      <para>When a package installs a <filename>.desktop</filename> file
-      to a location in one of the base data directories, the database
-      that maps MIME-types to available applications can be updated. For
-      instance, the cache file at
-      <filename>/usr/share/applications/mimeinfo.cache</filename> can
-      be rebuilt by executing the following command as the <systemitem
-      class="username">root</systemitem> user:</para>
+      <para>
+        The <ulink
+        url="http://freedesktop.org/wiki/Standards/basedir-spec">XDG Base
+        Directory</ulink> specification defines the standard locations for
+        applications to place data and configuration files. These files can
+        be used, for instance, to define the menu structure and menu items
+        in a desktop environment.
+      </para>
+
+      <para>
+        The default location for configuration files to be installed
+        is <filename class="directory">/etc/xdg</filename>, and the default
+        locations for data files are <filename
+        class="directory">/usr/local/share</filename> and <filename
+        class="directory">/usr/share</filename>. These locations can be
+        extended with the environment variables <envar>XDG_CONFIG_DIRS</envar>
+        and <envar>XDG_DATA_DIRS</envar>, respectively. The
+        <application>GNOME</application>, <application>KDE</application> and
+        <application>XFCE</application> environments respect these
+        settings.
+      </para>
+
+      <para>
+        When a package installs a <filename>.desktop</filename> file
+        to a location in one of the base data directories, the database
+        that maps MIME-types to available applications can be updated. For
+        instance, the cache file at
+        <filename>/usr/share/applications/mimeinfo.cache</filename> can
+        be rebuilt by executing the following command as the <systemitem
+        class="username">root</systemitem> user:
+      </para>
 
 <screen role="root"><userinput>update-desktop-database /usr/share/applications</userinput></screen>
@@ -169,13 +166,11 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>desktop-file-edit, desktop-file-install, 
-        desktop-file-validate, and update-desktop-database
+        <seg>
+          desktop-file-edit, desktop-file-install, 
+          desktop-file-validate and
+          update-desktop-database
         </seg>
-        <seg>None</seg>
-        <seg>None</seg>
       </seglistitem>
     </segmentedlist>
@@ -189,5 +184,7 @@
         <term><command>desktop-file-edit</command></term>
         <listitem>
-          <para>is used to modify an existing desktop file entry.</para>
+          <para>
+            is used to modify an existing desktop file entry.
+          </para>
           <indexterm zone="desktop-file-utils desktop-file-edit">
             <primary sortas="b-desktop-file-edit">desktop-file-edit</primary>
@@ -199,7 +196,9 @@
         <term><command>desktop-file-install</command></term>
         <listitem>
-          <para>is used to install a new desktop file entry. It is 
-          also used to rebuild or modify the MIME-types application 
-          database.</para>
+          <para>
+            is used to install a new desktop file entry. It is 
+            also used to rebuild or modify the MIME-types application 
+            database.
+          </para>
           <indexterm zone="desktop-file-utils desktop-file-install">
             <primary sortas="b-desktop-file-install">desktop-file-install</primary>
@@ -211,5 +210,7 @@
         <term><command>desktop-file-validate</command></term>
         <listitem>
-          <para>is used to verify the integrity of a desktop file.</para>
+          <para>
+            is used to verify the integrity of a desktop file.
+          </para>
           <indexterm zone="desktop-file-utils desktop-file-validate">
             <primary sortas="b-desktop-file-validate">desktop-file-validate</primary>
@@ -221,6 +222,7 @@
         <term><command>update-desktop-database</command></term>
         <listitem>
-          <para>is used to update the MIME-types
-          application database.</para>
+          <para>
+            is used to update the MIME-types application database.
+          </para>
           <indexterm zone="desktop-file-utils update-desktop-database">
             <primary sortas="b-update-desktop-database">update-desktop-database</primary>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 16aa28690aa65ec344b503f0f76c207f6e02383a)
+++ introduction/welcome/changelog.xml	(revision bfa83aee216483ee5bda5d48e1be4c53259d3622)
@@ -48,4 +48,7 @@
       <itemizedlist>
         <listitem>
+          <para>[krejzi] - Desktop File Utils 0.21.</para>
+        </listitem>
+        <listitem>
           <para>[krejzi] - Farstream 0.2.1.</para>
         </listitem>
@@ -54,5 +57,11 @@
         </listitem>
         <listitem>
+          <para>[krejzi] - mtdev 1.1.3.</para>
+        </listitem>
+        <listitem>
           <para>[krejzi] - GNOME Applications 3.6.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - VLC 2.0.4.</para>
         </listitem>
       </itemizedlist>
Index: multimedia/videoutils/vlc.xml
===================================================================
--- multimedia/videoutils/vlc.xml	(revision 16aa28690aa65ec344b503f0f76c207f6e02383a)
+++ multimedia/videoutils/vlc.xml	(revision bfa83aee216483ee5bda5d48e1be4c53259d3622)
@@ -9,5 +9,5 @@
   <!ENTITY vlc-download-ftp
            "ftp://ftp.videolan.org/pub/videolan/vlc/&vlc-version;/vlc-&vlc-version;.tar.xz">
-  <!ENTITY vlc-md5sum        "a7e79565e3df07dcf9abc6cad3ac26bb">
+  <!ENTITY vlc-md5sum        "f36dab8f126922c56b372388b7fade47">
   <!ENTITY vlc-size          "18 MB">
   <!ENTITY vlc-buildsize     "500 MB">
@@ -203,6 +203,5 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr \
-            --disable-lua &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-lua &amp;&amp;
 make</userinput></screen>
 
@@ -252,9 +251,17 @@
 
       <seglistitem>
-        <seg>cvlc, qvlc, rvlc, svlc, vlc and vlc-wrapper</seg>
-        <seg>libvlccore.so, libvlc.so and several libraries in
-        /usr/lib/vlc/plugins.</seg>
-        <seg>/usr/lib/vlc, /usr/include/vlc, /usr/share/vlc and
-        /usr/share/doc/vlc.</seg>
+        <seg>
+          cvlc, qvlc, rvlc, svlc, vlc and vlc-wrapper
+        </seg>
+        <seg>
+          libvlccore.so, libvlc.so and several libraries in
+          /usr/lib/vlc/plugins
+        </seg>
+        <seg>
+          /usr/lib/vlc,
+          /usr/include/vlc,
+          /usr/share/vlc and
+          /usr/share/doc/vlc 
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -332,5 +339,5 @@
         <listitem>
           <para>
-            is a wrapper to drop privileges with <application>VLC</application>
+            is a wrapper to drop privileges with <application>VLC</application>.
           </para>
           <indexterm zone="vlc vlc-wrapper">
@@ -339,5 +346,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>
