Index: archive/appdata-tools.xml
===================================================================
--- archive/appdata-tools.xml	(revision dfd51cd72f8542fb7893c1af775a582638224e1e)
+++ archive/appdata-tools.xml	(revision dfd51cd72f8542fb7893c1af775a582638224e1e)
@@ -0,0 +1,165 @@
+<?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 appdata-tools-download-http "http://people.freedesktop.org/~hughsient/releases/appdata-tools-&appdata-tools-version;.tar.xz">
+  <!ENTITY appdata-tools-download-ftp  " ">
+  <!ENTITY appdata-tools-md5sum        "47d8500b7b96fac6667c3173c77c1e66">
+  <!ENTITY appdata-tools-size          "248 KB">
+  <!ENTITY appdata-tools-buildsize     "2.3 MB">
+  <!ENTITY appdata-tools-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="appdata-tools" xreflabel="appdata-tools-&appdata-tools-version;">
+  <?dbhtml filename="appdata-tools.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>appdata-tools-&appdata-tools-version;</title>
+
+  <indexterm zone="appdata-tools">
+    <primary sortas="a-appdata-tools">appdata-tools</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to appdata-tools</title>
+
+    <para>
+      The <application>appdata-tools</application> is used to validate AppData
+      files to conform to standard specification.
+    </para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&appdata-tools-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&appdata-tools-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &appdata-tools-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &appdata-tools-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &appdata-tools-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &appdata-tools-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">appdata-tools Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="appstream-glib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="libxml2"/>,
+      <xref linkend="libxslt"/>,
+      <xref linkend="DocBook"/>,
+      <xref linkend="docbook-xsl"/>,
+      <ulink url="http://www.thaiopensource.com/download/old/relaxng/20030619/trang.html">trang</ulink>, and
+      <ulink url="http://lxml.de/index.html">lxml</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/appdata-tools"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of appdata-tools</title>
+
+    <para>
+      Install <application>appdata-tools</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>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          appdata-validate
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="appdata-validate">
+        <term><command>appdata-validate</command></term>
+        <listitem>
+          <para>
+            validates AppData metadata.
+          </para>
+          <indexterm zone="appdata-tools appdata-validate">
+            <primary sortas="b-appdata-validate">appdata-validate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/appstream-glib.xml
===================================================================
--- archive/appstream-glib.xml	(revision dfd51cd72f8542fb7893c1af775a582638224e1e)
+++ archive/appstream-glib.xml	(revision dfd51cd72f8542fb7893c1af775a582638224e1e)
@@ -0,0 +1,266 @@
+<?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;
+
+  <!-- Place this in the packages.ent file
+  <!ENTITY TEMPLATE-version "">
+  -->
+  
+  <!ENTITY appstream-glib-download-http 
+   "http://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-&appstream-glib-version;.tar.xz">
+  <!ENTITY appstream-glib-download-ftp  " ">
+  <!ENTITY appstream-glib-md5sum        "25f261265b71a4a9944028d4304ebc0d">
+  <!ENTITY appstream-glib-size          "1.8 MB">
+  <!ENTITY appstream-glib-buildsize     "17 MB (with tests)">
+  <!ENTITY appstream-glib-time          "0.1 SBU (with tests)">
+]>
+
+<!-- Try to keep the indentation used in this file-->
+<sect1 id="appstream-glib" xreflabel="appstream-glib-&appstream-glib-version;">
+  <?dbhtml filename="appstream-glib.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <!-- No other tags inside any title.
+       Use Title Case in All Titles -->
+  <title>appstream-glib-&appstream-glib-version;</title>
+
+  <indexterm zone="appstream-glib">
+    <primary sortas="a-appstream-glib">appstream-glib</primary>
+  </indexterm>
+
+  <!--Required section-->
+  <sect2 role="package">
+    <title>Introduction to appstream-glib</title>
+
+    <para>
+      The <application>appstream-glib</application> provides GObjects and 
+      helper methods to make it easy to read and write AppStream metadata. 
+      It also provides a simple DOM implementation that makes it easy to 
+      edit nodes and convert to and from the standardized XML representation.
+    </para>
+    
+    &lfs77_checked; 
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&appstream-glib-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&appstream-glib-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &appstream-glib-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &appstream-glib-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &appstream-glib-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &appstream-glib-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">appstream-glib Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gdk-pixbuf"/>,
+      <xref linkend="libarchive"/>
+      <xref linkend="libsoup"/>, and
+      <xref linkend="pango"/> 
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="DocBook"/>,
+      <xref linkend="docbook-xsl"/>,
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="libxslt"/>,
+      <ulink url="http://ftp.gnome.org/pub/GNOME/sources/gcab/">gcab</ulink>, and
+      <ulink url="http://pyyaml.org/download/libyaml/">yaml</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/appstream-glib"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of appstream-glib</title>
+
+    <para>
+      Install <application>appstream-glib</application> by running the following
+      commands:
+    </para>
+
+
+<screen><userinput>./configure --prefix=/usr     \
+            --disable-dep11   \
+            --disable-builder \
+            --disable-static  &amp;&amp;
+
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make -k check</command>. One test
+      fails, if <ulink url="http://pyyaml.org/download/libyaml/">yaml</ulink>
+      is not installed.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+  </sect2>
+
+  <!--Optional section-->
+  <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"/>
+
+    <para>
+      <parameter>--disable-builder</parameter>: Remove this switch, if you have
+       <ulink url="http://ftp.gnome.org/pub/GNOME/sources/gcab/">gcab</ulink> installed.
+    </para>
+
+    <para>
+      <parameter>--disable-dep11</parameter>: Remove this switch, if you have
+      <ulink url="http://pyyaml.org/download/libyaml/">yaml</ulink> installed.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <!-- If there were no programs, libraries, or directories created, then
+           we would list the section as "None". However, a decision must have
+           been made to change the "None" to just removing the whole section
+           because I've noticed that many packages have had the "None"
+           removed and the section completely removed as well. The reasoning
+           was that by putting "None", it appears as we know there are none.
+           Without anything it appears as we are not sure. -->
+
+      <seglistitem>
+        <seg>
+          appdata-validate and appstream-util
+        </seg>
+        <seg>
+          libappstream-glib.so
+        </seg>
+        <seg>
+          /usr/include/libappstream-glib,
+          /usr/share/gtk-doc/html/appstream-glib and
+          /usr/share/installed-tests/appstream-glib
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <!-- If the program or library name conflicts (is the same) as the
+      package name, add -prog or -lib to the varlistentry entity id
+      and the 2nd entry of the indexterm zone entity -->
+
+<!--      <varlistentry id="appstream-builder">
+        <term><command>appstream-builder</command></term>
+        <listitem>
+          <para>
+            Is a developers tool to build metadata.
+          </para>
+          <indexterm zone="appstream-glib appstream-builder">
+            <primary sortas="b-appstream-builder">appstream-builder</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>-->
+
+      <varlistentry id="appdata-validate">
+        <term><command>appdata-validate</command></term>
+        <listitem>
+          <para>
+            validates AppData metadata.
+          </para>
+          <indexterm zone="appstream-glib appdata-validate">
+            <primary sortas="b-appdata-validate">appdata-validate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="appstream-util">
+        <term><command>appstream-util</command></term>
+        <listitem>
+          <para>
+            Is a management tool for appstream-builder.
+          </para>
+          <indexterm zone="appstream-glib appstream-util">
+            <primary sortas="b-appstream-util">appstream-util</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+<!--      <varlistentry id="libappstream-builder">
+        <term><filename class="libraryfile">libappstream-builder.so</filename></term>
+        <listitem>
+          <para>
+            contains functions that aid the developers tool appstream-builder.
+          </para>
+          <indexterm zone="appstream-glib libappstream-builder">
+            <primary sortas="c-libappstream-builder">libappstream-builder.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>-->
+
+      <varlistentry id="libappstream-glib">
+        <term><filename class="libraryfile">libappstream-glib.so</filename></term>
+        <listitem>
+          <para>
+            contains the api functions.
+          </para>
+          <indexterm zone="appstream-glib libappstream-glib">
+            <primary sortas="c-libappstream-glib">libappstream-glib.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+</sect1>
Index: neral/genutils/appdata-tools.xml
===================================================================
--- general/genutils/appdata-tools.xml	(revision 0a76c133b9c980d333b44f945aa9e8495509683c)
+++ 	(revision )
@@ -1,165 +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 appdata-tools-download-http "http://people.freedesktop.org/~hughsient/releases/appdata-tools-&appdata-tools-version;.tar.xz">
-  <!ENTITY appdata-tools-download-ftp  " ">
-  <!ENTITY appdata-tools-md5sum        "47d8500b7b96fac6667c3173c77c1e66">
-  <!ENTITY appdata-tools-size          "248 KB">
-  <!ENTITY appdata-tools-buildsize     "2.3 MB">
-  <!ENTITY appdata-tools-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="appdata-tools" xreflabel="appdata-tools-&appdata-tools-version;">
-  <?dbhtml filename="appdata-tools.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>appdata-tools-&appdata-tools-version;</title>
-
-  <indexterm zone="appdata-tools">
-    <primary sortas="a-appdata-tools">appdata-tools</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to appdata-tools</title>
-
-    <para>
-      The <application>appdata-tools</application> is used to validate AppData
-      files to conform to standard specification.
-    </para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&appdata-tools-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&appdata-tools-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &appdata-tools-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &appdata-tools-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &appdata-tools-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &appdata-tools-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">appdata-tools Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="appstream-glib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libxml2"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/>,
-      <ulink url="http://www.thaiopensource.com/download/old/relaxng/20030619/trang.html">trang</ulink>, and
-      <ulink url="http://lxml.de/index.html">lxml</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/appdata-tools"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of appdata-tools</title>
-
-    <para>
-      Install <application>appdata-tools</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>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          appdata-validate
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="appdata-validate">
-        <term><command>appdata-validate</command></term>
-        <listitem>
-          <para>
-            validates AppData metadata.
-          </para>
-          <indexterm zone="appdata-tools appdata-validate">
-            <primary sortas="b-appdata-validate">appdata-validate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genutils/appstream-glib.xml
===================================================================
--- general/genutils/appstream-glib.xml	(revision 0a76c133b9c980d333b44f945aa9e8495509683c)
+++ 	(revision )
@@ -1,266 +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;
-
-  <!-- Place this in the packages.ent file
-  <!ENTITY TEMPLATE-version "">
-  -->
-  
-  <!ENTITY appstream-glib-download-http 
-   "http://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-&appstream-glib-version;.tar.xz">
-  <!ENTITY appstream-glib-download-ftp  " ">
-  <!ENTITY appstream-glib-md5sum        "25f261265b71a4a9944028d4304ebc0d">
-  <!ENTITY appstream-glib-size          "1.8 MB">
-  <!ENTITY appstream-glib-buildsize     "17 MB (with tests)">
-  <!ENTITY appstream-glib-time          "0.1 SBU (with tests)">
-]>
-
-<!-- Try to keep the indentation used in this file-->
-<sect1 id="appstream-glib" xreflabel="appstream-glib-&appstream-glib-version;">
-  <?dbhtml filename="appstream-glib.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <!-- No other tags inside any title.
-       Use Title Case in All Titles -->
-  <title>appstream-glib-&appstream-glib-version;</title>
-
-  <indexterm zone="appstream-glib">
-    <primary sortas="a-appstream-glib">appstream-glib</primary>
-  </indexterm>
-
-  <!--Required section-->
-  <sect2 role="package">
-    <title>Introduction to appstream-glib</title>
-
-    <para>
-      The <application>appstream-glib</application> provides GObjects and 
-      helper methods to make it easy to read and write AppStream metadata. 
-      It also provides a simple DOM implementation that makes it easy to 
-      edit nodes and convert to and from the standardized XML representation.
-    </para>
-    
-    &lfs77_checked; 
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&appstream-glib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&appstream-glib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &appstream-glib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &appstream-glib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &appstream-glib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &appstream-glib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">appstream-glib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gdk-pixbuf"/>,
-      <xref linkend="libarchive"/>
-      <xref linkend="libsoup"/>, and
-      <xref linkend="pango"/> 
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libxslt"/>,
-      <ulink url="http://ftp.gnome.org/pub/GNOME/sources/gcab/">gcab</ulink>, and
-      <ulink url="http://pyyaml.org/download/libyaml/">yaml</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/appstream-glib"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of appstream-glib</title>
-
-    <para>
-      Install <application>appstream-glib</application> by running the following
-      commands:
-    </para>
-
-
-<screen><userinput>./configure --prefix=/usr     \
-            --disable-dep11   \
-            --disable-builder \
-            --disable-static  &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -k check</command>. One test
-      fails, if <ulink url="http://pyyaml.org/download/libyaml/">yaml</ulink>
-      is not installed.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <!--Optional section-->
-  <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"/>
-
-    <para>
-      <parameter>--disable-builder</parameter>: Remove this switch, if you have
-       <ulink url="http://ftp.gnome.org/pub/GNOME/sources/gcab/">gcab</ulink> installed.
-    </para>
-
-    <para>
-      <parameter>--disable-dep11</parameter>: Remove this switch, if you have
-      <ulink url="http://pyyaml.org/download/libyaml/">yaml</ulink> installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <!-- If there were no programs, libraries, or directories created, then
-           we would list the section as "None". However, a decision must have
-           been made to change the "None" to just removing the whole section
-           because I've noticed that many packages have had the "None"
-           removed and the section completely removed as well. The reasoning
-           was that by putting "None", it appears as we know there are none.
-           Without anything it appears as we are not sure. -->
-
-      <seglistitem>
-        <seg>
-          appdata-validate and appstream-util
-        </seg>
-        <seg>
-          libappstream-glib.so
-        </seg>
-        <seg>
-          /usr/include/libappstream-glib,
-          /usr/share/gtk-doc/html/appstream-glib and
-          /usr/share/installed-tests/appstream-glib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <!-- If the program or library name conflicts (is the same) as the
-      package name, add -prog or -lib to the varlistentry entity id
-      and the 2nd entry of the indexterm zone entity -->
-
-<!--      <varlistentry id="appstream-builder">
-        <term><command>appstream-builder</command></term>
-        <listitem>
-          <para>
-            Is a developers tool to build metadata.
-          </para>
-          <indexterm zone="appstream-glib appstream-builder">
-            <primary sortas="b-appstream-builder">appstream-builder</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
-      <varlistentry id="appdata-validate">
-        <term><command>appdata-validate</command></term>
-        <listitem>
-          <para>
-            validates AppData metadata.
-          </para>
-          <indexterm zone="appstream-glib appdata-validate">
-            <primary sortas="b-appdata-validate">appdata-validate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="appstream-util">
-        <term><command>appstream-util</command></term>
-        <listitem>
-          <para>
-            Is a management tool for appstream-builder.
-          </para>
-          <indexterm zone="appstream-glib appstream-util">
-            <primary sortas="b-appstream-util">appstream-util</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--      <varlistentry id="libappstream-builder">
-        <term><filename class="libraryfile">libappstream-builder.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that aid the developers tool appstream-builder.
-          </para>
-          <indexterm zone="appstream-glib libappstream-builder">
-            <primary sortas="c-libappstream-builder">libappstream-builder.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
-      <varlistentry id="libappstream-glib">
-        <term><filename class="libraryfile">libappstream-glib.so</filename></term>
-        <listitem>
-          <para>
-            contains the api functions.
-          </para>
-          <indexterm zone="appstream-glib libappstream-glib">
-            <primary sortas="c-libappstream-glib">libappstream-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/genutils/genutils.xml
===================================================================
--- general/genutils/genutils.xml	(revision 0a76c133b9c980d333b44f945aa9e8495509683c)
+++ general/genutils/genutils.xml	(revision dfd51cd72f8542fb7893c1af775a582638224e1e)
@@ -22,5 +22,5 @@
 
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appdata-tools.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appstream-glib.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appstream-glib.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chrpath.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="compface.xml"/>
Index: gnome/applications/gnome-system-monitor.xml
===================================================================
--- gnome/applications/gnome-system-monitor.xml	(revision 0a76c133b9c980d333b44f945aa9e8495509683c)
+++ gnome/applications/gnome-system-monitor.xml	(revision dfd51cd72f8542fb7893c1af775a582638224e1e)
@@ -92,6 +92,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="appstream-glib"/> and
-      <xref linkend="desktop-file-utils"/>
+      <xref linkend="desktop-file-utils"/> and
+      <ulink url="http://people.freedesktop.org/~hughsient/appstream-glib/releases">appstream-glib</ulink>
     </para>
 
Index: gnome/applications/gnome-terminal.xml
===================================================================
--- gnome/applications/gnome-terminal.xml	(revision 0a76c133b9c980d333b44f945aa9e8495509683c)
+++ gnome/applications/gnome-terminal.xml	(revision dfd51cd72f8542fb7893c1af775a582638224e1e)
@@ -85,6 +85,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="appstream-glib"/> and
-      <xref linkend="desktop-file-utils"/>
+      <xref linkend="desktop-file-utils"/> and
+      <ulink url="http://people.freedesktop.org/~hughsient/appstream-glib/releases">appstream-glib</ulink>
     </para>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 0a76c133b9c980d333b44f945aa9e8495509683c)
+++ introduction/welcome/changelog.xml	(revision dfd51cd72f8542fb7893c1af775a582638224e1e)
@@ -46,6 +46,10 @@
 
     <listitem>
-      <para>July 20th, 2015</para>
-      <itemizedlist>
+      <para>July 21st, 2015</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - Archive appstream-glib-0.4.2. Fixes
+          <ulink url="&blfs-ticket-root;6741">#6741</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[fernando] - Update to gdk-pixbuf-2.31.5. Fixes
Index: packages.ent
===================================================================
--- packages.ent	(revision 0a76c133b9c980d333b44f945aa9e8495509683c)
+++ packages.ent	(revision dfd51cd72f8542fb7893c1af775a582638224e1e)
@@ -186,5 +186,4 @@
 
 <!-- Chapter 11 -->
-<!ENTITY appstream-glib-version       "0.4.1">
 <!ENTITY chrpath-version              "0.16">
 <!ENTITY compface-version             "1.5.2">
