Index: archive/grantlee.xml
===================================================================
--- archive/grantlee.xml	(revision 0cdedfa4495fc3bfea50d83460d6889cbaf68388)
+++ archive/grantlee.xml	(revision 0cdedfa4495fc3bfea50d83460d6889cbaf68388)
@@ -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;">
+  <?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>
+
+    &lfs79_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/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision f5f6ac26cf53c11bf12fd1f1a284e00d2e67973c)
+++ general/genlib/genlib.xml	(revision 0cdedfa4495fc3bfea50d83460d6889cbaf68388)
@@ -56,5 +56,5 @@
   <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"/>
+<!--  <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"/>
Index: neral/genlib/grantlee.xml
===================================================================
--- general/genlib/grantlee.xml	(revision f5f6ac26cf53c11bf12fd1f1a284e00d2e67973c)
+++ 	(revision )
@@ -1,123 +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 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;">
-  <?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>
-
-    &lfs79_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>
