Index: general/genlib/appstream-glib.xml
===================================================================
--- general/genlib/appstream-glib.xml	(revision ce9b131bc1a4037a167edeae3be6c807cdcad376)
+++ general/genlib/appstream-glib.xml	(revision ce9b131bc1a4037a167edeae3be6c807cdcad376)
@@ -0,0 +1,236 @@
+<?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 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        "f3bf922874fe106b55dbb4c7dec0bc9c">
+  <!ENTITY appstream-glib-size          "1.8 MB">
+  <!ENTITY appstream-glib-buildsize     "21 MB">
+  <!ENTITY appstream-glib-time          "0.2 SBU ">
+]>
+
+<sect1 id="appstream-glib" xreflabel="Appstream-GLib-&appstream-glib-version;" revision="systemd">
+  <?dbhtml filename="appstream-glib.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Appstream-GLib-&appstream-glib-version;</title>
+
+  <indexterm zone="appstream-glib">
+    <primary sortas="a-Appstream-GLib">Appstream-GLib</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Appstream-GLib</title>
+
+    <para>
+      The <application>Appstream-GLib</application> package contains a library
+      that 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="gcab"/>,
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="gtk3"/> and
+      <xref linkend="yaml"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="DocBook"/>,
+      <xref linkend="docbook-xsl"/> and
+      <xref linkend="libxslt"/> (to build manual pages) and
+      <xref linkend="gtk-doc"/>
+    </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-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </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"/>
+
+    <para>
+      <option>--disable-builder</option>: Use this switch if
+      you have not installed <xref linkend="gcab"/> and
+      <xref linkend="gtk3"/>.
+    </para>
+
+    <para>
+      <option>--disable-dep11</option>: Use this switch if you
+      have not installed <xref linkend="yaml"/>.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          appdata-validate, appstream-builder and appstream-util
+        </seg>
+        <seg>
+          libappstream-builder.so and libappstream-glib.so
+        </seg>
+        <seg>
+          /usr/include/libappstream-builder,
+          /usr/include/libappstream-glib,
+          /usr/lib/asb-plugins-2,
+          /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"?>
+
+      <varlistentry id="appdata-validate">
+        <term><command>appdata-validate</command></term>
+        <listitem>
+          <para>
+            is used to validate AppData for formatting and style guidelines.
+          </para>
+          <indexterm zone="appstream-glib appdata-validate">
+            <primary sortas="b-appdata-validate">appdata-validate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <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="appstream-util">
+        <term><command>appstream-util</command></term>
+        <listitem>
+          <para>
+            is a management tool for <command>appstream-builder</command>.
+          </para>
+          <indexterm zone="appstream-glib appstream-util">
+            <primary sortas="b-appstream-util">appstream-util</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libappstream-glib">
+        <term><filename class="libraryfile">libappstream-glib.so</filename></term>
+        <listitem>
+          <para>
+            contains objects and helper methods to help reading and writing
+            AppStream metadata.
+          </para>
+          <indexterm zone="appstream-glib libappstream-glib">
+            <primary sortas="c-libappstream-glib">libappstream-glib.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+ 
+   </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/genlib/gcab.xml
===================================================================
--- general/genlib/gcab.xml	(revision ce9b131bc1a4037a167edeae3be6c807cdcad376)
+++ general/genlib/gcab.xml	(revision ce9b131bc1a4037a167edeae3be6c807cdcad376)
@@ -0,0 +1,188 @@
+<?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 gcab-download-http
+           "&gnome-download-http;/gcab/0.7/gcab-&gcab-version;.tar.xz">
+  <!ENTITY gcab-download-ftp
+           "&gnome-download-ftp;/gcab/0.7/gcab-&gcab-version;.tar.xz">
+  <!ENTITY gcab-md5sum        "d8c54c340e56d0b6a8fe082fd04d8090">
+  <!ENTITY gcab-size          "328 KB">
+  <!ENTITY gcab-buildsize     "5.2 MB (with tests)">
+  <!ENTITY gcab-time          "0.1 SBU (with tests)">
+]>
+
+<sect1 id="gcab" xreflabel="gcab-&gcab-version;" revision="systemd">
+  <?dbhtml filename="gcab.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>gcab-&gcab-version;</title>
+
+  <indexterm zone="gcab">
+    <primary sortas="a-gcab">gcab</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Gcab</title>
+
+    <para>
+      The <application>Gcab</application> package contains a
+      program and a library used to create Microsoft cabinet
+      (.cab) archives.
+    </para>
+
+    &lfs79_checked;&gcc6_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&gcab-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gcab-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gcab-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gcab-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gcab-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gcab-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="glib2"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/> and
+      <xref linkend="vala"/>
+    </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;/gcab"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Gcab</title>
+
+    <para>
+      Install <application>Gcab</application> by running
+      the following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </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 Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          gcab
+        </seg>
+        <seg>
+          libgcab-1.0.so
+        </seg>
+        <seg>
+          /usr/include/libgcab-1.0 and
+          /usr/share/gtk-doc/html/gcab
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gcab-prog">
+        <term><command>gcab</command></term>
+        <listitem>
+          <para>
+            is a program used to create Microsoft cabinet
+            (.cab) archives.
+          </para>
+          <indexterm zone="gcab gcab-prog">
+            <primary sortas="b-gcab">gcab</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgcab-1.0">
+        <term><filename class="libraryfile">libgcab-1.0.so</filename></term>
+        <listitem>
+          <para>
+            contains API functions for creating Microsoft
+            cabinet (.cab) archives.
+          </para>
+          <indexterm zone="gcab libgcab-1.0">
+            <primary sortas="c-libgcab-1.0">libgcab-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision f1ce80b098908521093ea35b4a35a9f1e4771411)
+++ general/genlib/genlib.xml	(revision ce9b131bc1a4037a167edeae3be6c807cdcad376)
@@ -44,4 +44,7 @@
   it is explained why you may want to install them.</para>
 
+  <!-- systemd only -->
+  <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="apr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apr-util.xml"/>
@@ -52,9 +55,16 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="enchant.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="exempi.xml"/>
+
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcab.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glib2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glibmm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmime.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gobject-introspection.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grantlee.xml"/> -->
+
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grantlee.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gsl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="icu.xml"/>
@@ -70,7 +80,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcroco.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdaemon.xml"/>
-  <!--
+<!--
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdbusmenuqt.xml"/>
-  -->
+-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libesmtp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libffi.xml"/>
@@ -85,5 +95,12 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libksba.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="liblinear.xml"/>
+
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmbim.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnfsidmap.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpaper.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libqmi.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsigc++.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsigsegv.xml"/>
@@ -97,4 +114,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxml2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxslt.xml"/>
+
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libzeitgeist.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lzo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mtdev.xml"/>
@@ -113,3 +134,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xapian.xml"/>
 
+  <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="yaml.xml"/>
 </chapter>
Index: general/genlib/grantlee.xml
===================================================================
--- general/genlib/grantlee.xml	(revision ce9b131bc1a4037a167edeae3be6c807cdcad376)
+++ general/genlib/grantlee.xml	(revision ce9b131bc1a4037a167edeae3be6c807cdcad376)
@@ -0,0 +1,123 @@
+<?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 grantlee-download-http
+           "http://downloads.grantlee.org/grantlee-&grantlee-version;.tar.gz">
+  <!ENTITY grantlee-download-ftp  " ">
+  <!ENTITY grantlee-md5sum        "775f22dac0953029b414ed3b7379098c">
+  <!ENTITY grantlee-size          "1.1 MB">
+  <!ENTITY grantlee-buildsize     "21 MB">
+  <!ENTITY grantlee-time          "0.8 SBU">
+]>
+
+<sect1 id="grantlee" xreflabel="grantlee-&grantlee-version;" revision="systemd">
+  <?dbhtml filename="grantlee.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Grantlee-&grantlee-version;</title>
+
+  <indexterm zone="grantlee">
+    <primary sortas="a-grantlee">grantlee</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to grantlee</title>
+
+    <para>
+       Grantlee is a set of free software libraries written using the Qt
+       framework. Currently two libraries are shipped with Grantlee: Grantlee
+       Templates and Grantlee TextDocument. The goal of Grantlee Templates is
+       to make it easier for application developers to separate the structure
+       of documents from the data they contain, opening the door for theming.
+    </para>
+
+    <!-- &lfs78_checked; -->
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&grantlee-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&grantlee-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &grantlee-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &grantlee-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &grantlee-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &grantlee-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Grantlee Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="cmake"/> and <xref linkend="qt4"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/grantlee"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Grantlee</title>
+
+    <para>Install <application>Grantlee</application> by
+    running the following commands:</para>
+
+<screen><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_BUILD_TYPE=Release  \
+      .. &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>none</seg>
+        <seg>
+           libgrantlee_core.so and
+           libgrantlee_gui.so
+        </seg>
+        <seg>
+           /usr/lib/cmake/grantlee,
+           /usr/lib/grantlee/0.4, and
+           /usr/include/grantlee</seg>
+      </seglistitem>
+    </segmentedlist>
+  </sect2>
+
+</sect1>
Index: general/genlib/libmbim.xml
===================================================================
--- general/genlib/libmbim.xml	(revision ce9b131bc1a4037a167edeae3be6c807cdcad376)
+++ general/genlib/libmbim.xml	(revision ce9b131bc1a4037a167edeae3be6c807cdcad376)
@@ -0,0 +1,196 @@
+<?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 libmbim-download-http "http://www.freedesktop.org/software/libmbim/libmbim-&libmbim-version;.tar.xz">
+  <!ENTITY libmbim-download-ftp  " ">
+  <!ENTITY libmbim-md5sum        "921fb5ab3f13f1e00833e009d8f3b4f6">
+  <!ENTITY libmbim-size          "388 KB">
+  <!ENTITY libmbim-buildsize     "17 MB">
+  <!ENTITY libmbim-time          "0.2 SBU">
+]>
+
+<sect1 id="libmbim" xreflabel="libmbim-&libmbim-version;" revision="systemd">
+  <?dbhtml filename="libmbim.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libmbim-&libmbim-version;</title>
+
+  <indexterm zone="libmbim">
+    <primary sortas="a-libmbim">libmbim</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libmbim</title>
+
+    <para>
+      The <application>libmbim</application> package contains a GLib-based library
+      for talking to WWAN modems and devices which speak the Mobile Interface
+      Broadband Model (MBIM) protocol.
+    </para>
+
+    <!-- &lfs77_checked; -->
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libmbim-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libmbim-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libmbim-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libmbim-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libmbim-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libmbim-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libmbim Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libgudev"/>
+    </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;/libmbim"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libmbim</title>
+
+    <para>
+      Install <application>libmbim</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </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>
+          mbimcli and mbim-network
+        </seg>
+        <seg>
+          libmbim-glib.so
+        </seg>
+        <seg>
+          /usr/include/libmbim-glib and
+          /usr/share/gtk-doc/html/libmbim-glib
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="mbimcli">
+        <term><command>mbimcli</command></term>
+        <listitem>
+          <para>
+            is an utility used to control MBIM devices.
+          </para>
+          <indexterm zone="libmbim mbimcli">
+            <primary sortas="b-mbimcli">mbimcli</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mbim-network">
+        <term><command>mbim-network</command></term>
+        <listitem>
+          <para>
+            is an utility used for simple network management
+            of MBIM devices.
+          </para>
+          <indexterm zone="libmbim mbim-network">
+            <primary sortas="b-mbim-network">mbim-network</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libmbim-glib">
+        <term><filename class="libraryfile">libmbim-glib.so</filename></term>
+        <listitem>
+          <para>
+            contains API functions for talking to WWAN modems and devices
+            which speak the Mobile Interface Broadband Model (MBIM)
+            protocol.
+          </para>
+          <indexterm zone="libmbim libmbim-glib">
+            <primary sortas="c-libmbim-glib">libmbim-glib.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/genlib/libnfsidmap.xml
===================================================================
--- general/genlib/libnfsidmap.xml	(revision ce9b131bc1a4037a167edeae3be6c807cdcad376)
+++ general/genlib/libnfsidmap.xml	(revision ce9b131bc1a4037a167edeae3be6c807cdcad376)
@@ -0,0 +1,171 @@
+<?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;
+
+  <!-- official upstream is at http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/
+       but doesn't contain 0.26. -->
+  <!ENTITY libnfsidmap-download-http "https://fedorapeople.org/~steved/libnfsidmap/&libnfsidmap-version;/libnfsidmap-&libnfsidmap-version;.tar.bz2">
+  <!ENTITY libnfsidmap-download-ftp  " ">
+  <!ENTITY libnfsidmap-md5sum        "2c0cf0e2b1665d51fa9a783679494888">
+  <!ENTITY libnfsidmap-size          "260 KB">
+  <!ENTITY libnfsidmap-buildsize     "3.3 MB">
+  <!ENTITY libnfsidmap-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="libnfsidmap" xreflabel="libnfsidmap-&libnfsidmap-version;" revision="systemd">
+  <?dbhtml filename="libnfsidmap.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libnfsidmap-&libnfsidmap-version;</title>
+
+  <indexterm zone="libnfsidmap">
+    <primary sortas="a-libnfsidmap">libnfsidmap</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libnfsidmap</title>
+
+    <para>
+      The <application>libnfsidmap</application> package contains a
+      library to help mapping id's, mainly for NFSv4.
+    </para>
+
+    <!-- &lfs77_checked; -->
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libnfsidmap-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libnfsidmap-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libnfsidmap-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libnfsidmap-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libnfsidmap-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libnfsidmap-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libnfsidmap Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="openldap"/> (client only)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/libnfsidmap"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libnfsidmap</title>
+
+    <para>
+      Install <application>libnfsidmap</application> by running the following
+      commands:
+    </para>
+
+<!-- sysconfdir=/etc is used because the config file /etc/idmapd.conf
+     is installed by nfs-utils -->
+<screen><userinput>./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --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                         &amp;&amp;
+mv -v /usr/lib/libnfsidmap.so.* /lib &amp;&amp;
+ln -sfv ../../lib/$(readlink /usr/lib/libnfsidmap.so) /usr/lib/libnfsidmap.so</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"/>
+
+    <para>
+      <command>mv -v /usr/lib/libnfsidmap.so.* ...</command>: Move shared
+      libraries into /lib so they are available before /usr is mounted.
+    </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>
+          libnfsidmap.so
+        </seg>
+        <seg>
+          /usr/lib/libnfsidmap
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libnfsidmap-lib">
+        <term><filename class="libraryfile">libnfsidmap.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>libnfsidmap</application> API functions.
+          </para>
+          <indexterm zone="libnfsidmap libnfsidmap-lib">
+            <primary sortas="c-libnfsidmap">libnfsidmap.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/genlib/libqmi.xml
===================================================================
--- general/genlib/libqmi.xml	(revision ce9b131bc1a4037a167edeae3be6c807cdcad376)
+++ general/genlib/libqmi.xml	(revision ce9b131bc1a4037a167edeae3be6c807cdcad376)
@@ -0,0 +1,195 @@
+<?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 libqmi-download-http "http://www.freedesktop.org/software/libqmi/libqmi-&libqmi-version;.tar.xz">
+  <!ENTITY libqmi-download-ftp  " ">
+  <!ENTITY libqmi-md5sum        "24c9eb300662ba6cff0152de89bd9ec0">
+  <!ENTITY libqmi-size          "696 KB">
+  <!ENTITY libqmi-buildsize     "64 MB">
+  <!ENTITY libqmi-time          "0.3 SBU">
+]>
+
+<sect1 id="libqmi" xreflabel="libqmi-&libqmi-version;" revision="systemd">
+  <?dbhtml filename="libqmi.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libqmi-&libqmi-version;</title>
+
+  <indexterm zone="libqmi">
+    <primary sortas="a-libqmi">libqmi</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libqmi</title>
+
+    <para>
+      The <application>libqmi</application> package contains a GLib-based library
+      for talking to WWAN modems and devices which speak the Qualcomm MSM Interface
+      (QMI) protocol.
+    </para>
+
+    <!-- &lfs77_checked; -->
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libqmi-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libqmi-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libqmi-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libqmi-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libqmi-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libqmi-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libqmi Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="glib2"/>
+    </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;/libqmi"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libqmi</title>
+
+    <para>
+      Install <application>libqmi</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </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>
+          qmicli and qmi-network
+        </seg>
+        <seg>
+          libqmi-glib.so
+        </seg>
+        <seg>
+          /usr/include/libqmi-glib and
+          /usr/share/gtk-doc/html/libqmi-glib
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="qmicli">
+        <term><command>qmicli</command></term>
+        <listitem>
+          <para>
+            is an utility used to control QMI devices.
+          </para>
+          <indexterm zone="libqmi qmicli">
+            <primary sortas="b-qmicli">qmicli</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qmi-network">
+        <term><command>qmi-network</command></term>
+        <listitem>
+          <para>
+            is an utility used for simple network management
+            of QMI devices.
+          </para>
+          <indexterm zone="libqmi qmi-network">
+            <primary sortas="b-qmi-network">qmi-network</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libqmi-glib">
+        <term><filename class="libraryfile">libqmi-glib.so</filename></term>
+        <listitem>
+          <para>
+            contains API functions for talking to WWAN modems and devices
+            which speak the Qualcomm MSM Interface (QMI) protocol.
+          </para>
+          <indexterm zone="libqmi libqmi-glib">
+            <primary sortas="c-libqmi-glib">libqmi-glib.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/genlib/libzeitgeist.xml
===================================================================
--- general/genlib/libzeitgeist.xml	(revision ce9b131bc1a4037a167edeae3be6c807cdcad376)
+++ general/genlib/libzeitgeist.xml	(revision ce9b131bc1a4037a167edeae3be6c807cdcad376)
@@ -0,0 +1,178 @@
+<?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 libzeitgeist-download-http
+           "https://launchpad.net/libzeitgeist/0.3/&libzeitgeist-version;/+download/libzeitgeist-&libzeitgeist-version;.tar.gz">
+  <!ENTITY libzeitgeist-download-ftp  " ">
+  <!ENTITY libzeitgeist-md5sum        "d63a37295d01a58086d0d4ae26e604c2">
+  <!ENTITY libzeitgeist-size          "516 KB">
+  <!ENTITY libzeitgeist-buildsize     "7.0 MB">
+  <!ENTITY libzeitgeist-time          "0.1 SBU">
+]>
+
+<sect1 id="libzeitgeist" xreflabel="libzeitgeist-&libzeitgeist-version;" revision="systemd">
+  <?dbhtml filename="libzeitgeist.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libzeitgeist-&libzeitgeist-version;</title>
+
+  <indexterm zone="libzeitgeist">
+    <primary sortas="a-libzeitgeist">libzeitgeist</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libzeitgeist</title>
+
+    <para>
+      The <application>libzeitgeist</application> package contains a client
+      library used to access and manage the Zeitgeist event log from
+      languages such as C and Vala. Zeitgeist is a service which logs
+      the user's activities and events (files opened, websites visited,
+      conversations hold with other people, etc.) and makes the relevant
+      information available to other applications.
+    </para>
+
+    <!-- &lfs77_checked; -->
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libzeitgeist-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libzeitgeist-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libzeitgeist-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libzeitgeist-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libzeitgeist-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libzeitgeist-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libzeitgeist Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="glib2"/>
+    </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;/libzeitgeist"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libzeitgeist</title>
+
+    <para>
+      Install <application>libzeitgeist</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>sed -i  "s|/doc/libzeitgeist|&amp;-&libzeitgeist-version;|" Makefile.in &amp;&amp;
+
+./configure --prefix=/usr --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not have a working 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>
+
+    <para>
+      <command>sed ... Makefile.in</command>:  PLace the documentation in 
+      a versioned directory.
+    </para>
+
+    <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>
+          None
+        </seg>
+        <seg>
+          libzeitgeist-1.0.so
+        </seg>
+        <seg>
+          /usr/include/libzeitgeist-1.0 and
+          /usr/share/doc/libzeitgeist
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libzeitgeist-1">
+        <term><filename class="libraryfile">libzeitgeist-1.0.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>libzeitgeist</application> API functions.
+          </para>
+          <indexterm zone="libzeitgeist libzeitgeist-1">
+            <primary sortas="c-libzeitgeist-1">libzeitgeist-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/genlib/yaml.xml
===================================================================
--- general/genlib/yaml.xml	(revision ce9b131bc1a4037a167edeae3be6c807cdcad376)
+++ general/genlib/yaml.xml	(revision ce9b131bc1a4037a167edeae3be6c807cdcad376)
@@ -0,0 +1,159 @@
+<?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 yaml-download-http "http://pyyaml.org/download/libyaml/yaml-&yaml-version;.tar.gz">
+  <!ENTITY yaml-download-ftp  " ">
+  <!ENTITY yaml-md5sum        "5fe00cda18ca5daeb43762b80c38e06e">
+  <!ENTITY yaml-size          "492 KB">
+  <!ENTITY yaml-buildsize     "6.3 MB">
+  <!ENTITY yaml-time          "0.1 SBU">
+]>
+
+<sect1 id="yaml" xreflabel="YAML-&yaml-version;" revision="systemd">
+  <?dbhtml filename="yaml.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>YAML-&yaml-version;</title>
+
+  <indexterm zone="yaml">
+    <primary sortas="a-YAML">YAML</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to YAML</title>
+
+    <para>
+      The <application>YAML</application> package contains a C
+      library for parsing and emitting YAML (YAML Ain't Markup
+      Language).
+    </para>
+
+    <!-- &lfs77_checked; -->
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&yaml-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&yaml-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &yaml-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &yaml-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &yaml-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &yaml-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">YAML Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="doxygen"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/yaml"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of YAML</title>
+
+    <para>
+      Install <application>YAML</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </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"/>
+
+  </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>
+          libyaml.so
+        </seg>
+        <seg>
+          None
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libyaml">
+        <term><filename class="libraryfile">libyaml.so</filename></term>
+        <listitem>
+          <para>
+            contains API functions for parsing and emitting YAML.
+          </para>
+          <indexterm zone="yaml libyaml">
+            <primary sortas="c-libyaml">libyaml.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: packages.ent
===================================================================
--- packages.ent	(revision f1ce80b098908521093ea35b4a35a9f1e4771411)
+++ packages.ent	(revision ce9b131bc1a4037a167edeae3be6c807cdcad376)
@@ -76,4 +76,5 @@
 <!-- Part III -->
 <!-- Chapter 9 -->
+<!ENTITY appstream-glib-version       "0.5.0">
 <!ENTITY apr-version                  "1.5.2">
 <!ENTITY apr-util-version             "1.5.4">
@@ -91,8 +92,10 @@
 <!ENTITY exempi-version               "2.3.0">
 <!ENTITY expat-version                "2.1.0">
+<!ENTITY gcab-version                 "0.7">
 <!ENTITY glib2-version                "2.48.1">
 <!ENTITY glibmm-version               "2.48.1">
 <!ENTITY gmime-version                "2.6.20">
 <!ENTITY gobject-introspection-version "1.48.0">
+<!ENTITY grantlee-version             "0.5.1">
 <!ENTITY gsl-version                  "2.1">
 
@@ -130,5 +133,8 @@
 <!ENTITY libksba-version              "1.3.4">
 <!ENTITY liblinear-version            "210">
+<!ENTITY libmbim-version              "1.12.2">
+<!ENTITY libnfsidmap-version          "0.26">
 <!ENTITY libpaper-version             "1.1.24+nmu4">
+<!ENTITY libqmi-version               "1.12.6">
 <!ENTITY libsigc-version              "2.8.0">
 <!ENTITY libsigsegv-version           "2.10">
@@ -159,4 +165,5 @@
 <!ENTITY wv-version                   "1.2.9">
 <!ENTITY xapian-version               "1.2.23">
+<!ENTITY yaml-version                 "0.1.6">
 
 <!-- Chapter 10 -->
