Index: chive/gnome-media.xml
===================================================================
--- archive/gnome-media.xml	(revision ab6a3f30a9922a0cd5838a0d88d6bb05ebdd3445)
+++ 	(revision )
@@ -1,211 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gnome-media-download-http "&gnome-download-http;/gnome-media/2.32/gnome-media-&gnome-media-version;.tar.bz2">
-  <!ENTITY gnome-media-download-ftp  "&gnome-download-ftp;/gnome-media/2.32/gnome-media-&gnome-media-version;.tar.bz2">
-  <!ENTITY gnome-media-md5sum        "06fc8c67add34c98bc484e0dbc404d41">
-  <!ENTITY gnome-media-size          "2.7 MB">
-  <!ENTITY gnome-media-buildsize     "38 MB">
-  <!ENTITY gnome-media-time          "0.5 SBU">
-]>
-
-<sect1 id="gnome-media" xreflabel="gnome-media-&gnome-media-version;">
-  <?dbhtml filename="gnome-media.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>gnome-media-&gnome-media-version;</title>
-
-  <indexterm zone="gnome-media">
-    <primary sortas="a-GNOME Media">GNOME Media</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Media</title>
-
-    <para>The <application>GNOME Media</application> package contains
-    <application>GNOME</application>'s media applications.</para>
-
-    &lfs70_checked;
-
-    <para>This is a legacy GNOME-2 package which has been deprecated by the
-    GNOME developers and will be removed from the book in due course. If you
-    are not building a GNOME desktop, this can provide a volume control / mixer
-    application, but you may wish to consider simpler alternatives:</para>
-
-    <para><ulink url="http://volumecontrol.sourceforge.net/">volumecontrol</ulink>,
-    is a simple volume control and mixer which requires
-    <xref linkend="gtk2"/>, and
-    <xref linkend="alsa-utils"/>. Use ./autogen.sh to configure it.</para>
-
-    <para><ulink url="http://gvolwheel.sourceforge.net/">gvolwheel</ulink>
-    provides a volume control in a tray icon, for minimalist desktops. It uses
-    <xref linkend="intltool"/>, <xref linkend="perl-xml-parser"/>, and there are
-    different versions for <xref linkend="gtk2"/> (0.7) or
-    <xref linkend="gtk3"/> (0.9).</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gnome-media-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gnome-media-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gnome-media-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gnome-media-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gnome-media-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gnome-media-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Media Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libcanberra"/>,
-      <xref linkend="GConf"/>,
-      <xref linkend="gnome-doc-utils"/>
-      <xref linkend="gstreamer"/>,
-      <xref linkend="gtk2"/>, and
-      <xref linkend="which"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gst-plugins-base"/> (required to build the sound mixer and
-         recorder),
-      <xref linkend="libglade"/>,
-      <!-- libunique in the book will be updated to 3.0 during the gnome-3 changes,
-      that version is too new -->
-      <xref linkend="pulseaudio"/> (with
-      <ulink url="&gnome-download-http;/libunique/1.1/libunique-1.1.6.tar.bz2">libunique-1</ulink>),
-      and <xref linkend="rarian"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnome-media"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Media</title>
-
-    <para>Install <application>GNOME Media</application> by
-    running the following commands:</para>
-
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-old-etc-dir; \
-            --localstatedir=/var/lib \
-            --libexecdir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/lib/gnome-media &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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-old-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-old-sysconfdir.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/scrollkeeper-dir.xml"/>
-
-    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib/gnome-media</parameter>: This parameter causes the libexec
-    files to be installed in the preferred location of
-    <filename class="directory">$GNOME_PREFIX/lib/gnome-media</filename> instead
-    of <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
-
-    <para><option>--disable-scrollkeeper</option>: Use this parameter if you
-    wish to disable the updates to the scrollkeeper database.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gnome-audio-profiles-properties, gnome-sound-recorder,
-        gnome-volume-control, and gstreamer-properties</seg>
-        <seg>libgnome-media-profiles.{so,a}</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/gnome-media/profiles,
-        share/{gnome-media/{pixmaps,sounds},gnome-sound-recorder/ui,
-        gnome/help/{gnome-audio-profiles/*,gnome-sound-recorder/*,
-        gnome-volume-control/*,gstreamer-properties/*},
-        gstreamer-properties/icons,omf/{gnome-audio-profiles,
-        gnome-sound-recorder,gnome-volume-control,gstreamer-properties},
-        sounds/gnome/default/alerts}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-sound-recorder">
-        <term><command>gnome-sound-recorder</command></term>
-        <listitem>
-          <para>is <application>GNOME</application>'s recorder.</para>
-          <indexterm zone="gnome-media gnome-sound-recorder">
-            <primary sortas="b-gnome-sound-recorder">gnome-sound-recorder</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnome-volume-control">
-        <term><command>gnome-volume-control</command></term>
-        <listitem>
-          <para>is <application>GNOME</application>'s mixer with volume
-          applet.</para>
-          <indexterm zone="gnome-media gnome-volume-control">
-            <primary sortas="b-gnome-volume-control">gnome-volume-control</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gstreamer-properties">
-        <term><command>gstreamer-properties</command></term>
-        <listitem>
-          <para>is a GUI front-end to <application>GStreamer</application>'s
-          audio/video input/output parameters.</para>
-          <indexterm zone="gnome-media gstreamer-properties">
-            <primary sortas="b-gstreamer-properties">gstreamer-properties</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: archive/gnome/gnome-media.xml
===================================================================
--- archive/gnome/gnome-media.xml	(revision 25c5f53e3cc2509ba4edaec0049dd8dd2811c55a)
+++ archive/gnome/gnome-media.xml	(revision 25c5f53e3cc2509ba4edaec0049dd8dd2811c55a)
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY gnome-media-download-http "&gnome-download-http;/gnome-media/2.32/gnome-media-&gnome-media-version;.tar.bz2">
+  <!ENTITY gnome-media-download-ftp  "&gnome-download-ftp;/gnome-media/2.32/gnome-media-&gnome-media-version;.tar.bz2">
+  <!ENTITY gnome-media-md5sum        "06fc8c67add34c98bc484e0dbc404d41">
+  <!ENTITY gnome-media-size          "2.7 MB">
+  <!ENTITY gnome-media-buildsize     "38 MB">
+  <!ENTITY gnome-media-time          "0.5 SBU">
+]>
+
+<sect1 id="gnome-media" xreflabel="gnome-media-&gnome-media-version;">
+  <?dbhtml filename="gnome-media.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>gnome-media-&gnome-media-version;</title>
+
+  <indexterm zone="gnome-media">
+    <primary sortas="a-GNOME Media">GNOME Media</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to GNOME Media</title>
+
+    <para>The <application>GNOME Media</application> package contains
+    <application>GNOME</application>'s media applications.</para>
+
+    &lfs70_checked;
+
+    <para>This is a legacy GNOME-2 package which has been deprecated by the
+    GNOME developers and will be removed from the book in due course. If you
+    are not building a GNOME desktop, this can provide a volume control / mixer
+    application, but you may wish to consider simpler alternatives:</para>
+
+    <para><ulink url="http://volumecontrol.sourceforge.net/">volumecontrol</ulink>,
+    is a simple volume control and mixer which requires
+    <xref linkend="gtk2"/>, and
+    <xref linkend="alsa-utils"/>. Use ./autogen.sh to configure it.</para>
+
+    <para><ulink url="http://gvolwheel.sourceforge.net/">gvolwheel</ulink>
+    provides a volume control in a tray icon, for minimalist desktops. It uses
+    <xref linkend="intltool"/>, <xref linkend="perl-xml-parser"/>, and there are
+    different versions for <xref linkend="gtk2"/> (0.7) or
+    <xref linkend="gtk3"/> (0.9).</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&gnome-media-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&gnome-media-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &gnome-media-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &gnome-media-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &gnome-media-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &gnome-media-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">GNOME Media Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libcanberra"/>,
+      <xref linkend="GConf"/>,
+      <xref linkend="gnome-doc-utils"/>
+      <xref linkend="gstreamer"/>,
+      <xref linkend="gtk2"/>, and
+      <xref linkend="which"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gst-plugins-base"/> (required to build the sound mixer and
+         recorder),
+      <xref linkend="libglade"/>,
+      <!-- libunique in the book will be updated to 3.0 during the gnome-3 changes,
+      that version is too new -->
+      <xref linkend="pulseaudio"/> (with
+      <ulink url="&gnome-download-http;/libunique/1.1/libunique-1.1.6.tar.bz2">libunique-1</ulink>),
+      and <xref linkend="rarian"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnome-media"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GNOME Media</title>
+
+    <para>Install <application>GNOME Media</application> by
+    running the following commands:</para>
+
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
+            --sysconfdir=&gnome-old-etc-dir; \
+            --localstatedir=/var/lib \
+            --libexecdir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/lib/gnome-media &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>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-old-prefix.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-old-sysconfdir.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/scrollkeeper-dir.xml"/>
+
+    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
+    ORBit-2.0)/lib/gnome-media</parameter>: This parameter causes the libexec
+    files to be installed in the preferred location of
+    <filename class="directory">$GNOME_PREFIX/lib/gnome-media</filename> instead
+    of <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
+
+    <para><option>--disable-scrollkeeper</option>: Use this parameter if you
+    wish to disable the updates to the scrollkeeper database.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>gnome-audio-profiles-properties, gnome-sound-recorder,
+        gnome-volume-control, and gstreamer-properties</seg>
+        <seg>libgnome-media-profiles.{so,a}</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/{include/gnome-media/profiles,
+        share/{gnome-media/{pixmaps,sounds},gnome-sound-recorder/ui,
+        gnome/help/{gnome-audio-profiles/*,gnome-sound-recorder/*,
+        gnome-volume-control/*,gstreamer-properties/*},
+        gstreamer-properties/icons,omf/{gnome-audio-profiles,
+        gnome-sound-recorder,gnome-volume-control,gstreamer-properties},
+        sounds/gnome/default/alerts}}</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gnome-sound-recorder">
+        <term><command>gnome-sound-recorder</command></term>
+        <listitem>
+          <para>is <application>GNOME</application>'s recorder.</para>
+          <indexterm zone="gnome-media gnome-sound-recorder">
+            <primary sortas="b-gnome-sound-recorder">gnome-sound-recorder</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gnome-volume-control">
+        <term><command>gnome-volume-control</command></term>
+        <listitem>
+          <para>is <application>GNOME</application>'s mixer with volume
+          applet.</para>
+          <indexterm zone="gnome-media gnome-volume-control">
+            <primary sortas="b-gnome-volume-control">gnome-volume-control</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gstreamer-properties">
+        <term><command>gstreamer-properties</command></term>
+        <listitem>
+          <para>is a GUI front-end to <application>GStreamer</application>'s
+          audio/video input/output parameters.</para>
+          <indexterm zone="gnome-media gstreamer-properties">
+            <primary sortas="b-gstreamer-properties">gstreamer-properties</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/gnome/grilo-plugins.xml
===================================================================
--- archive/gnome/grilo-plugins.xml	(revision 25c5f53e3cc2509ba4edaec0049dd8dd2811c55a)
+++ archive/gnome/grilo-plugins.xml	(revision 25c5f53e3cc2509ba4edaec0049dd8dd2811c55a)
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY grilo-plugins-download-http "&gnome-download-http;/grilo-plugins/0.2/grilo-plugins-&grilo-plugins-version;.tar.xz">
+  <!ENTITY grilo-plugins-download-ftp  "&gnome-download-ftp;/grilo-plugins/0.2/grilo-plugins-&grilo-plugins-version;.tar.xz">
+  <!ENTITY grilo-plugins-md5sum       "184163b248efc064d8b6558cf297fb73">
+  <!ENTITY grilo-plugins-size         "1016 KB">
+  <!ENTITY grilo-plugins-buildsize    "24 MB (all plugins)">
+  <!ENTITY grilo-plugins-time         "0.3 SBU">
+]>
+
+<sect1 id="grilo-plugins" xreflabel="Grilo-Plugins-&grilo-plugins-version;">
+  <?dbhtml filename="grilo-plugins.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy: bdubbs $</othername>
+    <date>$Date: 2013-10-21 18:39:03 -0300 (Seg, 21 Out 2013) $</date>
+  </sect1info>
+
+  <title>Grilo-Plugins-&grilo-plugins-version;</title>
+
+  <indexterm zone="grilo-plugins">
+    <primary sortas="a-Grilo-Plugins">Grilo-Plugins</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Grilo-Plugins</title>
+
+    <para><application>Grilo-Plugins</application> is a collection of plugins
+    (Apple Trailers, Blip.tv, Bookmarks, Filesystem, Flickr, Jamendo, Magnatune,
+    Rai.tv, Tracker, Youtube, between others) to make media discovery and
+    browsing easy for applications that support <application>Grilo</application>
+    framework, such as <application>Totem</application> (some plugins are
+    disabled in <application>Totem</application>).</para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&grilo-plugins-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&grilo-plugins-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &grilo-plugins-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &grilo-plugins-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &grilo-plugins-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &grilo-plugins-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Grilo-Plugins Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="grilo"/> and
+      <xref linkend="sqlite"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libsoup"/>,
+      <xref linkend="gobject-introspection"/> and
+      <xref linkend="totem-pl-parser"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="avahi"/>,
+      <xref linkend="gmime"/> (Podcasts),
+      <xref linkend="json-glib"/> (TMDB),
+      <xref linkend="lua"/> (Lua Factory),
+      <ulink url="http://ftp.acc.umu.se/pub/gnome/sources/gnome-online-accounts/">gnome-online-accounts</ulink> (Flickr, Pocket),
+      <ulink url="http://ftp.gnome.org/pub/gnome/sources/gom">gom</ulink> (Bookmarks),
+      <ulink url="https://www.flyn.org/projects/libdmapsharing/">libdmapsharing</ulink> (DMAP),
+      <ulink url="http://ftp.acc.umu.se/pub/gnome/sources/libgdata/">libgdata</ulink> (YouTube),
+      <ulink url="http://sourceforge.net/projects/quvi">libquvi (version 0.9)</ulink> (YouTube),
+      <ulink url="http://sourceforge.net/projects/liboauth/files/">liboauth</ulink>
+      (to configure Flickr personal accounts),
+      <ulink url="http://ftp.acc.umu.se/pub/gnome/sources/libmediaart/">MEDIAART</ulink> (local-art),
+      <ulink url="https://launchpad.net/python-dbusmock/trunk">python-dbusmock</ulink> (dLeyna runtime tests), and
+      <ulink url="https://download.gnome.org/sources/tracker/">tracker</ulink> (Tracker)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/grilo-plugins"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Grilo-Plugins</title>
+
+    <para>Install <application>Grilo-Plugins</application> by running the
+    following commands:</para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue:
+      <command>make check 2&gt;&amp;1 | tee check.log</command>.
+      A summary can be obtained with
+      <command>grep -E 'PASS|FAIL' check.log</command>.
+    </para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      To test which plugins are installed and that <xref linkend="grilo"/> is
+      working, issue  <command>grl-inspect-0.2</command> or 
+      <command>grilo-test-ui-0.2</command> (the latter, from an X terminal).
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>
+          Several under /usr/lib/grilo-0.2, with names related to the
+          respective plugins.
+        </seg>
+
+        <seg>
+          /usr/lib/grilo-0.2,
+          /usr/share/grilo-plugins and
+          /usr/share/help/C/{examples,grilo-plugins}
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
Index: archive/gnome/grilo.xml
===================================================================
--- archive/gnome/grilo.xml	(revision 25c5f53e3cc2509ba4edaec0049dd8dd2811c55a)
+++ archive/gnome/grilo.xml	(revision 25c5f53e3cc2509ba4edaec0049dd8dd2811c55a)
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY grilo-download-http "&gnome-download-http;/grilo/0.2/grilo-&grilo-version;.tar.xz">
+  <!ENTITY grilo-download-ftp  "&gnome-download-ftp;/grilo/0.2/grilo-&grilo-version;.tar.xz">
+  <!ENTITY grilo-md5sum       "7e124e3dc1350c2576a84fd18a901d21">
+  <!ENTITY grilo-size         "604 KB">
+  <!ENTITY grilo-buildsize    "14 MB">
+  <!ENTITY grilo-time         "0.2 SBU">
+]>
+
+<sect1 id="grilo" xreflabel="Grilo-&grilo-version;">
+  <?dbhtml filename="grilo.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Grilo-&grilo-version;</title>
+
+  <indexterm zone="grilo">
+    <primary sortas="a-Grilo">Grilo</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Grilo</title>
+
+    <para><application>Grilo</application> is a framework focused on making
+    media discovery and browsing easy for applications and application
+    developers.</para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&grilo-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&grilo-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &grilo-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &grilo-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &grilo-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &grilo-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Grilo Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gtk3"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libsoup"/>,
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="grilo-plugins"/> (runtime), and
+      <xref linkend="vala"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="avahi"/> (if installed at build time, make sure
+      avahi-daemon is running as a system daemon, started by
+      bootscript/systemd unit),
+      <xref linkend="docbook-utils"/>, and
+      <ulink url="http://sourceforge.net/projects/liboauth/files/">liboauth</ulink>
+      (to configure flickr personal accounts)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/grilo"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Grilo</title>
+
+    <para>Install <application>Grilo</application> by running the
+    following commands:</para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <!-- testsuite exists, but does nothing -->
+    <para>This package does not have a testsuite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>grilo-test-ui-0.2, grl-inspect-0.2 and grl-launch-0.2</seg>
+        <seg>libgrilo-0.2.so, libgrlnet-0.2.so and libgrlpls-0.2.so</seg>
+        <seg>/usr/include/grilo-0.2</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="grilo-test-ui">
+        <term><command>grilo-test-ui-0.2</command></term>
+        <listitem>
+          <para>is a simple playground application that you can use to test the
+          framework and its plugins.</para>
+          <indexterm zone="grilo grilo-test-ui">
+            <primary sortas="b-grilo-test-ui">grilo-test-ui</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="grl-inspect">
+        <term><command>grl-inspect-0.2</command></term>
+        <listitem>
+          <para>is a tool that prints out information on available Grilo
+          sources.</para>
+          <indexterm zone="grilo grl-inspect">
+            <primary sortas="b-grl-inspect">grl-inspect</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="grl-launch">
+        <term><command>grl-launch-0.2</command></term>
+        <listitem>
+          <para>is a tool to run <application>Grilo</application> operations
+          from command line.</para>
+          <indexterm zone="grilo grl-launch">
+            <primary sortas="b-grl-launch">grl-launch</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgrilo">
+        <term><filename class='libraryfile'>libgrilo.so</filename></term>
+        <listitem>
+          <para>provides the Grilo framework.</para>
+          <indexterm zone="grilo libgrilo">
+            <primary sortas="c-libgrilo">libgrilo.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgrlnet">
+        <term><filename class='libraryfile'>libgrlnet.so</filename></term>
+        <listitem>
+          <para>provides Grilo networking helpers for plug-ins.</para>
+          <indexterm zone="grilo libgrilo">
+            <primary sortas="c-libgrlnet">libgrlnet.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgrlpls">
+        <term><filename class='libraryfile'>libgrlpls.so</filename></term>
+        <listitem>
+          <para>provides playlist handling functions.</para>
+          <indexterm zone="grilo libgrilo">
+            <primary sortas="c-libgrlpls">libgrlpls.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/gnome/totem.xml
===================================================================
--- archive/gnome/totem.xml	(revision 25c5f53e3cc2509ba4edaec0049dd8dd2811c55a)
+++ archive/gnome/totem.xml	(revision 25c5f53e3cc2509ba4edaec0049dd8dd2811c55a)
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY totem-download-http 
+     "&gnome-download-http;/totem/&gnome-minor-16;/totem-&totem-version;.tar.xz">
+  <!ENTITY totem-download-ftp  
+     "&gnome-download-ftp;/totem/&gnome-minor-16;/totem-&totem-version;.tar.xz">
+  <!ENTITY totem-md5sum        "e475febf5f4b709fcd1e90b47fae99d6">
+  <!ENTITY totem-size          "3.1 MB">
+  <!ENTITY totem-buildsize     "55 MB">
+  <!ENTITY totem-time          "0.6 SBU">
+]>
+
+<sect1 id="totem" xreflabel="Totem-&totem-version;">
+  <?dbhtml filename="totem.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Totem-&totem-version;</title>
+
+  <indexterm zone="totem">
+    <primary sortas="a-Totem">Totem</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Totem</title>
+
+    <para>
+      <application>Totem</application> package contains the official
+      movie player of the <application>GNOME</application> Desktop based on
+      <application>GStreamer</application>. It features a playlist, a full-screen
+      mode, seek and volume controls, as well as keyboard navigation. This is
+      useful for playing any <application>GStreamer</application> supported file,
+      DVD, VCD or digital CD.
+    </para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&totem-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&totem-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &totem-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &totem-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &totem-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &totem-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Totem Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="adwaita-icon-theme"/>,
+      <xref linkend="clutter-gst"/>,
+      <xref linkend="clutter-gtk"/>,
+      <xref linkend="gst10-plugins-bad"/>,
+      <xref linkend="gst10-plugins-good"/>,
+      <xref linkend="itstool"/>,
+      <xref linkend="libpeas"/>, and
+      <xref linkend="totem-pl-parser"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="appstream-glib"/>,
+      <xref linkend="dbus-glib"/>,
+      <xref linkend="grilo-plugins"/> (Channels),
+      <xref linkend="nautilus"/>,
+      <xref linkend="pygobject3"/>, and
+      <xref linkend="vala"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="avahi"/> (if installed at build time, make sure
+      avahi-daemon is running as a system daemon, started by
+      bootscript/systemd unit),
+      <xref linkend="brasero"/>,
+      <xref linkend="gtk-doc"/>,
+      <ulink url="http://www.lirc.org">LIRC</ulink>,
+      <ulink url="http://pypi.python.org/pypi/pylint">pylint</ulink>, and
+      <ulink url="http://launchpad.net/zeitgeist">zeitgeist</ulink>,
+    </para>
+
+    <bridgehead renderas="sect4">Recommended (Runtime)</bridgehead>
+    <para role="recommended">
+      <xref linkend="gst10-libav"/>,
+      <xref linkend="gst10-plugins-ugly"/>, and
+      <xref linkend="libdvdcss"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/totem"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Totem</title>
+
+    <para>
+      Install <application>Totem</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a testsuite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <note><para>Unlike other video players like <xref linkend="vlc"/>,
+    <application>Totem</application> requires a DVD to be mounted in order to
+    be recognized.  Not all window managers do this automatically.  In this
+    case the <command>mount</command> command must normally be used.  One
+    alternative to manual mounting is to use <xref linkend="autofs"/>.  For
+    instance, if following the configuration instructions in that package, the
+    command <command>totem /media/auto/cd</command> can be used to play a
+    DVD.</para></note>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          totem, totem-audio-preview, and totem-video-thumbnailer
+        </seg>
+        <seg>
+          libtotem.so
+        </seg>
+        <seg>
+          /usr/include/totem,
+          /usr/lib/totem,
+          /usr/libexec/totem,
+          /usr/share/gtk-doc/html/totem,
+          /usr/share/help/*/totem, and
+          /usr/share/totem
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="totem-prog">
+        <term><command>totem</command></term>
+        <listitem>
+          <para>
+            is a <application>GNOME</application> Desktop movie player based
+            on <application>GStreamer</application>.
+          </para>
+          <indexterm zone="totem totem-prog">
+            <primary sortas="b-totem">totem</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="totem-video-thumbnailer">
+        <term><command>totem-video-thumbnailer</command></term>
+        <listitem>
+          <para>
+            is a video thumbnailer for the <application>GNOME</application>
+            Desktop used internally by <application>GNOME</application>
+            applications such as <application>Nautilus</application> to
+            generate PNG thumbnails of video files. While it is possible to
+            invoke it manually, it is usually done automatically by
+            <application>Nautilus</application>.
+          </para>
+          <indexterm zone="totem totem-video-thumbnailer">
+            <primary sortas="b-totem-video-thumbnailer">totem-video-thumbnailer</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libtotem">
+        <term><filename class="libraryfile">libtotem.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>Totem</application> API functions.
+          </para>
+          <indexterm zone="totem libtotem">
+            <primary sortas="c-libtotem">libtotem.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: gnome.ent
===================================================================
--- gnome.ent	(revision ab6a3f30a9922a0cd5838a0d88d6bb05ebdd3445)
+++ gnome.ent	(revision 25c5f53e3cc2509ba4edaec0049dd8dd2811c55a)
@@ -51,3 +51,2 @@
 <!ENTITY network-manager-applet-version "1.0.0">
 <!ENTITY seahorse-version             "3.15.92">
-<!ENTITY totem-version                "3.16.0">
Index: gnome/applications/applications.xml
===================================================================
--- gnome/applications/applications.xml	(revision ab6a3f30a9922a0cd5838a0d88d6bb05ebdd3445)
+++ gnome/applications/applications.xml	(revision 25c5f53e3cc2509ba4edaec0049dd8dd2811c55a)
@@ -39,5 +39,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network-manager-applet.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="seahorse.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="totem.xml"/>
 
 </chapter>
Index: ome/applications/totem.xml
===================================================================
--- gnome/applications/totem.xml	(revision ab6a3f30a9922a0cd5838a0d88d6bb05ebdd3445)
+++ 	(revision )
@@ -1,247 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY totem-download-http 
-     "&gnome-download-http;/totem/&gnome-minor-16;/totem-&totem-version;.tar.xz">
-  <!ENTITY totem-download-ftp  
-     "&gnome-download-ftp;/totem/&gnome-minor-16;/totem-&totem-version;.tar.xz">
-  <!ENTITY totem-md5sum        "e475febf5f4b709fcd1e90b47fae99d6">
-  <!ENTITY totem-size          "3.1 MB">
-  <!ENTITY totem-buildsize     "55 MB">
-  <!ENTITY totem-time          "0.6 SBU">
-]>
-
-<sect1 id="totem" xreflabel="Totem-&totem-version;">
-  <?dbhtml filename="totem.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Totem-&totem-version;</title>
-
-  <indexterm zone="totem">
-    <primary sortas="a-Totem">Totem</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Totem</title>
-
-    <para>
-      <application>Totem</application> package contains the official
-      movie player of the <application>GNOME</application> Desktop based on
-      <application>GStreamer</application>. It features a playlist, a full-screen
-      mode, seek and volume controls, as well as keyboard navigation. This is
-      useful for playing any <application>GStreamer</application> supported file,
-      DVD, VCD or digital CD.
-    </para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&totem-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&totem-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &totem-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &totem-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &totem-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &totem-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Totem Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="adwaita-icon-theme"/>,
-      <xref linkend="clutter-gst"/>,
-      <xref linkend="clutter-gtk"/>,
-      <xref linkend="gst10-plugins-bad"/>,
-      <xref linkend="gst10-plugins-good"/>,
-      <xref linkend="itstool"/>,
-      <xref linkend="libpeas"/>, and
-      <xref linkend="totem-pl-parser"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="appstream-glib"/>,
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="grilo-plugins"/> (Channels),
-      <xref linkend="nautilus"/>,
-      <xref linkend="pygobject3"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/> (if installed at build time, make sure
-      avahi-daemon is running as a system daemon, started by
-      bootscript/systemd unit),
-      <xref linkend="brasero"/>,
-      <xref linkend="gtk-doc"/>,
-      <ulink url="http://www.lirc.org">LIRC</ulink>,
-      <ulink url="http://pypi.python.org/pypi/pylint">pylint</ulink>, and
-      <ulink url="http://launchpad.net/zeitgeist">zeitgeist</ulink>,
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (Runtime)</bridgehead>
-    <para role="recommended">
-      <xref linkend="gst10-libav"/>,
-      <xref linkend="gst10-plugins-ugly"/>, and
-      <xref linkend="libdvdcss"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/totem"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Totem</title>
-
-    <para>
-      Install <application>Totem</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a testsuite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <note><para>Unlike other video players like <xref linkend="vlc"/>,
-    <application>Totem</application> requires a DVD to be mounted in order to
-    be recognized.  Not all window managers do this automatically.  In this
-    case the <command>mount</command> command must normally be used.  One
-    alternative to manual mounting is to use <xref linkend="autofs"/>.  For
-    instance, if following the configuration instructions in that package, the
-    command <command>totem /media/auto/cd</command> can be used to play a
-    DVD.</para></note>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          totem, totem-audio-preview, and totem-video-thumbnailer
-        </seg>
-        <seg>
-          libtotem.so
-        </seg>
-        <seg>
-          /usr/include/totem,
-          /usr/lib/totem,
-          /usr/libexec/totem,
-          /usr/share/gtk-doc/html/totem,
-          /usr/share/help/*/totem, and
-          /usr/share/totem
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="totem-prog">
-        <term><command>totem</command></term>
-        <listitem>
-          <para>
-            is a <application>GNOME</application> Desktop movie player based
-            on <application>GStreamer</application>.
-          </para>
-          <indexterm zone="totem totem-prog">
-            <primary sortas="b-totem">totem</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="totem-video-thumbnailer">
-        <term><command>totem-video-thumbnailer</command></term>
-        <listitem>
-          <para>
-            is a video thumbnailer for the <application>GNOME</application>
-            Desktop used internally by <application>GNOME</application>
-            applications such as <application>Nautilus</application> to
-            generate PNG thumbnails of video files. While it is possible to
-            invoke it manually, it is usually done automatically by
-            <application>Nautilus</application>.
-          </para>
-          <indexterm zone="totem totem-video-thumbnailer">
-            <primary sortas="b-totem-video-thumbnailer">totem-video-thumbnailer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtotem">
-        <term><filename class="libraryfile">libtotem.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Totem</application> API functions.
-          </para>
-          <indexterm zone="totem libtotem">
-            <primary sortas="c-libtotem">libtotem.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision ab6a3f30a9922a0cd5838a0d88d6bb05ebdd3445)
+++ introduction/welcome/changelog.xml	(revision 25c5f53e3cc2509ba4edaec0049dd8dd2811c55a)
@@ -49,4 +49,9 @@
       <itemizedlist>
         <listitem>
+          <para>[fernando] - Archive Totem-3.16.0, Grilo-0.2.12 and
+          Grilo-Plugins-0.2.14. Fixes
+          <ulink url="&blfs-ticket-root;6378">#6378</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[fernando] - Update to ntp-4.2.8p2. Fixes
           <ulink url="&blfs-ticket-root;6379">#6379</ulink>.</para>
Index: ltimedia/libdriv/grilo-plugins.xml
===================================================================
--- multimedia/libdriv/grilo-plugins.xml	(revision ab6a3f30a9922a0cd5838a0d88d6bb05ebdd3445)
+++ 	(revision )
@@ -1,154 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY grilo-plugins-download-http "&gnome-download-http;/grilo-plugins/0.2/grilo-plugins-&grilo-plugins-version;.tar.xz">
-  <!ENTITY grilo-plugins-download-ftp  "&gnome-download-ftp;/grilo-plugins/0.2/grilo-plugins-&grilo-plugins-version;.tar.xz">
-  <!ENTITY grilo-plugins-md5sum       "184163b248efc064d8b6558cf297fb73">
-  <!ENTITY grilo-plugins-size         "1016 KB">
-  <!ENTITY grilo-plugins-buildsize    "24 MB (all plugins)">
-  <!ENTITY grilo-plugins-time         "0.3 SBU">
-]>
-
-<sect1 id="grilo-plugins" xreflabel="Grilo-Plugins-&grilo-plugins-version;">
-  <?dbhtml filename="grilo-plugins.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy: bdubbs $</othername>
-    <date>$Date: 2013-10-21 18:39:03 -0300 (Seg, 21 Out 2013) $</date>
-  </sect1info>
-
-  <title>Grilo-Plugins-&grilo-plugins-version;</title>
-
-  <indexterm zone="grilo-plugins">
-    <primary sortas="a-Grilo-Plugins">Grilo-Plugins</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Grilo-Plugins</title>
-
-    <para><application>Grilo-Plugins</application> is a collection of plugins
-    (Apple Trailers, Blip.tv, Bookmarks, Filesystem, Flickr, Jamendo, Magnatune,
-    Rai.tv, Tracker, Youtube, between others) to make media discovery and
-    browsing easy for applications that support <application>Grilo</application>
-    framework, such as <application>Totem</application> (some plugins are
-    disabled in <application>Totem</application>).</para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&grilo-plugins-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&grilo-plugins-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &grilo-plugins-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &grilo-plugins-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &grilo-plugins-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &grilo-plugins-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Grilo-Plugins Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="grilo"/> and
-      <xref linkend="sqlite"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libsoup"/>,
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="totem-pl-parser"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/>,
-      <xref linkend="gmime"/> (Podcasts),
-      <xref linkend="json-glib"/> (TMDB),
-      <xref linkend="lua"/> (Lua Factory),
-      <ulink url="http://ftp.acc.umu.se/pub/gnome/sources/gnome-online-accounts/">gnome-online-accounts</ulink> (Flickr, Pocket),
-      <ulink url="http://ftp.gnome.org/pub/gnome/sources/gom">gom</ulink> (Bookmarks),
-      <ulink url="https://www.flyn.org/projects/libdmapsharing/">libdmapsharing</ulink> (DMAP),
-      <ulink url="http://ftp.acc.umu.se/pub/gnome/sources/libgdata/">libgdata</ulink> (YouTube),
-      <ulink url="http://sourceforge.net/projects/quvi">libquvi (version 0.9)</ulink> (YouTube),
-      <ulink url="http://sourceforge.net/projects/liboauth/files/">liboauth</ulink>
-      (to configure Flickr personal accounts),
-      <ulink url="http://ftp.acc.umu.se/pub/gnome/sources/libmediaart/">MEDIAART</ulink> (local-art),
-      <ulink url="https://launchpad.net/python-dbusmock/trunk">python-dbusmock</ulink> (dLeyna runtime tests), and
-      <ulink url="https://download.gnome.org/sources/tracker/">tracker</ulink> (Tracker)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/grilo-plugins"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Grilo-Plugins</title>
-
-    <para>Install <application>Grilo-Plugins</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue:
-      <command>make check 2&gt;&amp;1 | tee check.log</command>.
-      A summary can be obtained with
-      <command>grep -E 'PASS|FAIL' check.log</command>.
-    </para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      To test which plugins are installed and that <xref linkend="grilo"/> is
-      working, issue  <command>grl-inspect-0.2</command> or 
-      <command>grilo-test-ui-0.2</command> (the latter, from an X terminal).
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>
-          Several under /usr/lib/grilo-0.2, with names related to the
-          respective plugins.
-        </seg>
-
-        <seg>
-          /usr/lib/grilo-0.2,
-          /usr/share/grilo-plugins and
-          /usr/share/help/C/{examples,grilo-plugins}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/grilo.xml
===================================================================
--- multimedia/libdriv/grilo.xml	(revision ab6a3f30a9922a0cd5838a0d88d6bb05ebdd3445)
+++ 	(revision )
@@ -1,207 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY grilo-download-http "&gnome-download-http;/grilo/0.2/grilo-&grilo-version;.tar.xz">
-  <!ENTITY grilo-download-ftp  "&gnome-download-ftp;/grilo/0.2/grilo-&grilo-version;.tar.xz">
-  <!ENTITY grilo-md5sum       "7e124e3dc1350c2576a84fd18a901d21">
-  <!ENTITY grilo-size         "604 KB">
-  <!ENTITY grilo-buildsize    "14 MB">
-  <!ENTITY grilo-time         "0.2 SBU">
-]>
-
-<sect1 id="grilo" xreflabel="Grilo-&grilo-version;">
-  <?dbhtml filename="grilo.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Grilo-&grilo-version;</title>
-
-  <indexterm zone="grilo">
-    <primary sortas="a-Grilo">Grilo</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Grilo</title>
-
-    <para><application>Grilo</application> is a framework focused on making
-    media discovery and browsing easy for applications and application
-    developers.</para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&grilo-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&grilo-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &grilo-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &grilo-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &grilo-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &grilo-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Grilo Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libsoup"/>,
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="grilo-plugins"/> (runtime), and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/> (if installed at build time, make sure
-      avahi-daemon is running as a system daemon, started by
-      bootscript/systemd unit),
-      <xref linkend="docbook-utils"/>, and
-      <ulink url="http://sourceforge.net/projects/liboauth/files/">liboauth</ulink>
-      (to configure flickr personal accounts)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/grilo"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Grilo</title>
-
-    <para>Install <application>Grilo</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <!-- testsuite exists, but does nothing -->
-    <para>This package does not have a testsuite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>grilo-test-ui-0.2, grl-inspect-0.2 and grl-launch-0.2</seg>
-        <seg>libgrilo-0.2.so, libgrlnet-0.2.so and libgrlpls-0.2.so</seg>
-        <seg>/usr/include/grilo-0.2</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="grilo-test-ui">
-        <term><command>grilo-test-ui-0.2</command></term>
-        <listitem>
-          <para>is a simple playground application that you can use to test the
-          framework and its plugins.</para>
-          <indexterm zone="grilo grilo-test-ui">
-            <primary sortas="b-grilo-test-ui">grilo-test-ui</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grl-inspect">
-        <term><command>grl-inspect-0.2</command></term>
-        <listitem>
-          <para>is a tool that prints out information on available Grilo
-          sources.</para>
-          <indexterm zone="grilo grl-inspect">
-            <primary sortas="b-grl-inspect">grl-inspect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grl-launch">
-        <term><command>grl-launch-0.2</command></term>
-        <listitem>
-          <para>is a tool to run <application>Grilo</application> operations
-          from command line.</para>
-          <indexterm zone="grilo grl-launch">
-            <primary sortas="b-grl-launch">grl-launch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgrilo">
-        <term><filename class='libraryfile'>libgrilo.so</filename></term>
-        <listitem>
-          <para>provides the Grilo framework.</para>
-          <indexterm zone="grilo libgrilo">
-            <primary sortas="c-libgrilo">libgrilo.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgrlnet">
-        <term><filename class='libraryfile'>libgrlnet.so</filename></term>
-        <listitem>
-          <para>provides Grilo networking helpers for plug-ins.</para>
-          <indexterm zone="grilo libgrilo">
-            <primary sortas="c-libgrlnet">libgrlnet.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgrlpls">
-        <term><filename class='libraryfile'>libgrlpls.so</filename></term>
-        <listitem>
-          <para>provides playlist handling functions.</para>
-          <indexterm zone="grilo libgrilo">
-            <primary sortas="c-libgrlpls">libgrlpls.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/libdriv/libdriv.xml
===================================================================
--- multimedia/libdriv/libdriv.xml	(revision ab6a3f30a9922a0cd5838a0d88d6bb05ebdd3445)
+++ multimedia/libdriv/libdriv.xml	(revision 25c5f53e3cc2509ba4edaec0049dd8dd2811c55a)
@@ -34,6 +34,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fdk-aac.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flac.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grilo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grilo-plugins.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gstreamer.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gst-plugins-base.xml"/>
Index: packages.ent
===================================================================
--- packages.ent	(revision ab6a3f30a9922a0cd5838a0d88d6bb05ebdd3445)
+++ packages.ent	(revision 25c5f53e3cc2509ba4edaec0049dd8dd2811c55a)
@@ -634,6 +634,4 @@
 <!ENTITY fdk-aac-version              "0.1.4">
 <!ENTITY flac-version                 "1.3.1">
-<!ENTITY grilo-version                "0.2.12">
-<!ENTITY grilo-plugins-version        "0.2.14">
 <!ENTITY gstreamer-version            "0.10.36">
 <!ENTITY gst-plugins-base-version     "0.10.36">
