Index: chive/gnome/gnome-contacts.xml
===================================================================
--- archive/gnome/gnome-contacts.xml	(revision 32ebb11754bfb2b16ef10a23661f04cee80215ce)
+++ 	(revision )
@@ -1,170 +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-contacts-download-http
-           "&gnome-download-http;/gnome-contacts/3.6/gnome-contacts-&gnome-contacts-version;.tar.xz">
-  <!ENTITY gnome-contacts-download-ftp
-           "&gnome-download-ftp;/gnome-contacts/3.6/gnome-contacts-&gnome-contacts-version;.tar.xz">
-  <!ENTITY gnome-contacts-md5sum        "6af361b582015287d57760d491dc6e34">
-  <!ENTITY gnome-contacts-size          "596 KB">
-  <!ENTITY gnome-contacts-buildsize     "25 MB">
-  <!ENTITY gnome-contacts-time          "0.2 SBU">
-]>
-
-<sect1 id="gnome-contacts" xreflabel="gnome-contacts-&gnome-contacts-version;">
-  <?dbhtml filename="gnome-contacts.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>gnome-contacts-&gnome-contacts-version;</title>
-
-  <indexterm zone="gnome-contacts">
-    <primary sortas="a-gnome-contacts">gnome-contacts</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Contacts</title>
-
-    <para>
-      <application>GNOME Contacts</application> is a simple contacts application
-      that allows you to view your contacts as well as edit their details and create
-      new contacts. Online integration is an important aspect of GNOME Contacts - it
-      will seamlessly synchronise with the contacts stored in online accounts. If you
-      have the same person in multiple online accounts, GNOME Contacts will
-      automatically link them together into the same contact.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-contacts-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-contacts-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-contacts-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-contacts-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-contacts-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-contacts-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Contacts Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="evolution-data-server"/>,
-      <xref linkend="folks"/> (built with e-d-s support),
-      <xref linkend="gnome-desktop"/>,
-      <xref linkend="gnome-online-accounts"/> and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cheese"/>
-    </para>
-
-    <bridgehead renderas="sect4">Additional Runtime Dependencies</bridgehead>
-    <para role="required">
-      <xref linkend="telepathy-mission-control"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gnome-contacts"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Contacts</title>
-
-    <para>
-      Install <application>GNOME Contacts</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib/gnome-contacts &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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-contacts
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/gnome-contacts
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-contacts-prog">
-        <term><command>gnome-contacts</command></term>
-        <listitem>
-          <para>
-            is a program for accessing and storing information about contacts.
-          </para>
-          <indexterm zone="gnome-contacts gnome-contacts-prog">
-            <primary sortas="b-gnome-contacts">gnome-contacts</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-dictionary.xml
===================================================================
--- archive/gnome/gnome-dictionary.xml	(revision 32ebb11754bfb2b16ef10a23661f04cee80215ce)
+++ 	(revision )
@@ -1,181 +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-dictionary-download-http
-           "&gnome-download-http;/gnome-dictionary/3.6/gnome-dictionary-&gnome-dictionary-version;.tar.xz">
-  <!ENTITY gnome-dictionary-download-ftp
-           "&gnome-download-ftp;/gnome-dictionary/3.6/gnome-dictionary-&gnome-dictionary-version;.tar.xz">
-  <!ENTITY gnome-dictionary-md5sum        "99ee031b6abfaddc42c195a7a4041e6e">
-  <!ENTITY gnome-dictionary-size          "2.1 MB">
-  <!ENTITY gnome-dictionary-buildsize     "23 MB">
-  <!ENTITY gnome-dictionary-time          "0.2 SBU">
-]>
-
-<sect1 id="gnome-dictionary" xreflabel="gnome-dictionary-&gnome-dictionary-version;">
-  <?dbhtml filename="gnome-dictionary.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>gnome-dictionary-&gnome-dictionary-version;</title>
-
-  <indexterm zone="gnome-dictionary">
-    <primary sortas="a-gnome-dictionary">gnome-dictionary</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Dictionary</title>
-
-    <para>
-      The <application>GNOME Dictionary</application> package contains
-      dictionary for the <application>GNOME</application> Desktop.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-dictionary-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-dictionary-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-dictionary-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-dictionary-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-dictionary-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-dictionary-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Dictionary Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/> and
-      <xref linkend="yelp-xsl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>.
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/gnome-dictionary"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Dictionary</title>
-
-    <para>
-      Install <application>GNOME Dictionary</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>
-
-<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/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-dictionary
-        </seg>
-        <seg>
-          libgdict.so
-        </seg>
-        <seg>
-          /usr/include/gdict-1.0,
-          /usr/share/gdict-1.0,
-          /usr/share/gnome-dictionary,
-          /usr/share/gtk-doc/html/gdict and
-          /usr/share/help/*/gnome-dictionary
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-dictionary-prog">
-        <term><command>gnome-dictionary</command></term>
-        <listitem>
-          <para>
-            is used to look up words on dictionaries.
-          </para>
-          <indexterm zone="gnome-dictionary gnome-dictionary-prog">
-            <primary sortas="b-gnome-dictionary">gnome-dictionary</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgdict">
-        <term><filename class="libraryfile">libgdict.so</filename></term>
-        <listitem>
-          <para>
-            is <application>GNOME Dictionary</application> client library.
-          </para>
-          <indexterm zone="gnome-dictionary libgdict">
-            <primary sortas="c-libgdict">libgdict.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-disk-utility.xml
===================================================================
--- archive/gnome/gnome-disk-utility.xml	(revision 32ebb11754bfb2b16ef10a23661f04cee80215ce)
+++ 	(revision )
@@ -1,169 +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-disk-utility-download-http
-           "&gnome-download-http;/gnome-disk-utility/3.6/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
-  <!ENTITY gnome-disk-utility-download-ftp
-           "&gnome-download-ftp;/gnome-disk-utility/3.6/gnome-disk-utility-&gnome-disk-utility-version;.tar.xz">
-  <!ENTITY gnome-disk-utility-md5sum        "ff6e0a50a3a6aa9a8d9aa8b19d304485">
-  <!ENTITY gnome-disk-utility-size          "1.2 MB">
-  <!ENTITY gnome-disk-utility-buildsize     "32 MB">
-  <!ENTITY gnome-disk-utility-time          "0.1 SBU">
-]>
-
-<sect1 id="gnome-disk-utility" xreflabel="gnome-disk-utility-&gnome-disk-utility-version;">
-  <?dbhtml filename="gnome-disk-utility.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>gnome-disk-utility-&gnome-disk-utility-version;</title>
-
-  <indexterm zone="gnome-disk-utility">
-    <primary sortas="a-gnome-disk-utility">gnome-disk-utility</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Disk Utility</title>
-
-    <para>
-      The <application>GNOME Disk Utility</application> package provides
-      applications used for dealing with storage devices.
-    </para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-disk-utility-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-disk-utility-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-disk-utility-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-disk-utility-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-disk-utility-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-disk-utility-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Disk Utility Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>,
-      <xref linkend="intltool"/>,
-      <xref linkend="libsecret"/>,
-      <xref linkend="libpwquality"/> and
-      <xref linkend="udisks2"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gnome-disk-utility"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Disk Utility</title>
-
-    <para>
-      Install <application>GNOME Disk Utility</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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-disk-image-mounter and gnome-disks
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/gnome-disk-utility
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-disk-image-mounter">
-        <term><command>gnome-disk-image-mounter</command></term>
-        <listitem>
-          <para>
-            is used to set up disk images.
-          </para>
-          <indexterm zone="gnome-disk-utility gnome-disk-image-mounter">
-            <primary sortas="b-gnome-disk-image-mounter">gnome-disk-image-mounter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gnome-disks">
-        <term><command>gnome-disks</command></term>
-        <listitem>
-          <para>
-            is used to to inspect, format, partition and configure disks
-            and block devices.
-          </para>
-          <indexterm zone="gnome-disk-utility gnome-disks">
-            <primary sortas="b-gnome-disks">gnome-disks</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chive/gnome/gnome-font-viewer.xml
===================================================================
--- archive/gnome/gnome-font-viewer.xml	(revision 32ebb11754bfb2b16ef10a23661f04cee80215ce)
+++ 	(revision )
@@ -1,143 +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-font-viewer-download-http
-           "&gnome-download-http;/gnome-font-viewer/3.4/gnome-font-viewer-&gnome-font-viewer-version;.tar.xz">
-  <!ENTITY gnome-font-viewer-download-ftp
-           "&gnome-download-ftp;/gnome-font-viewer/3.4/gnome-font-viewer-&gnome-font-viewer-version;.tar.xz">
-  <!ENTITY gnome-font-viewer-md5sum        "f21c9174c263bf0928d82ddf01d4e6a5">
-  <!ENTITY gnome-font-viewer-size          "284 KB">
-  <!ENTITY gnome-font-viewer-buildsize     "4.6 MB">
-  <!ENTITY gnome-font-viewer-time          "0.1 SBU">
-]>
-
-<sect1 id="gnome-font-viewer" xreflabel="gnome-font-viewer-&gnome-font-viewer-version;">
-  <?dbhtml filename="gnome-font-viewer.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>gnome-font-viewer-&gnome-font-viewer-version;</title>
-
-  <indexterm zone="gnome-font-viewer">
-    <primary sortas="a-gnome-font-viewer">gnome-font-viewer</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNOME Font Viewer</title>
-
-    <para>
-      The <application>GNOME Font Viewer</application> package contains
-      font viewer for the <application>GNOME</application> Desktop.
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gnome-font-viewer-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gnome-font-viewer-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gnome-font-viewer-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gnome-font-viewer-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gnome-font-viewer-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gnome-font-viewer-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GNOME Font Viewer Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/gnome-font-viewer"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GNOME Font Viewer</title>
-
-    <para>
-      Install <application>GNOME Font Viewer</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>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-
-      <seglistitem>
-        <seg>
-          gnome-font-viewer and gnome-thumbnail-font
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gnome-font-viewer-prog">
-        <term><command>gnome-font-viewer</command></term>
-        <listitem>
-          <para>
-            is the GNOME Font Viewer.
-          </para>
-          <indexterm zone="gnome-font-viewer gnome-font-viewer-prog">
-            <primary sortas="b-gnome-font-viewer">gnome-font-viewer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: gnome-systemd/applications/gnome-disk-utility.xml
===================================================================
--- gnome-systemd/applications/gnome-disk-utility.xml	(revision 32ebb11754bfb2b16ef10a23661f04cee80215ce)
+++ gnome-systemd/applications/gnome-disk-utility.xml	(revision 6dc7c956b1cc4eaa764721913fec8b9b108caf91)
@@ -133,5 +133,7 @@
         </seg>
         <seg>
-          None
+          libgdu-sd.so
+          (<application>GNOME Settings Daemon</application>
+          Plugin)
         </seg>
         <seg>
