Index: general.ent
===================================================================
--- general.ent	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
+++ general.ent	(revision d72fae5ad0127525bdba5ca158637115d0477174)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "26">                   <!-- Always 2 digits -->
+<!ENTITY day          "27">                   <!-- Always 2 digits -->
 <!ENTITY month        "10">                   <!-- Always 2 digits -->
 <!ENTITY year         "2014">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS systemd-ng Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "October 26th, &year;">
+<!ENTITY releasedate  "October 27th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "systemd-ng">                  <!-- svn|[release #] -->
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
+++ introduction/welcome/changelog.xml	(revision d72fae5ad0127525bdba5ca158637115d0477174)
@@ -44,11 +44,22 @@
 
 -->
+    <listitem>
+      <para>October 27th, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - .</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Added colord-gtk-0.2.25 and gtk-vnc-0.5.3.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Changed Cairo, Cogl, Clutter and GTK+ 3 instructions to work on Wayland setups.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
       <para>October 26th, 2014</para>
       <itemizedlist>
-        <listitem>
-          <para>[krejzi] - .</para>
-        </listitem>
         <listitem>
           <para>[krejzi] - Converted MesaLib, XKeyboard-Config, Xorg-Server, Xorg Wacom Driver and Xorg VMWare Driver instructions to work on systemd setups.</para>
Index: systemd.ent
===================================================================
--- systemd.ent	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
+++ systemd.ent	(revision d72fae5ad0127525bdba5ca158637115d0477174)
@@ -2,6 +2,8 @@
 
 <!ENTITY bogofilter-version           "1.2.4">
+<!ENTITY colord-gtk-version           "0.1.25">
 <!ENTITY cups-pk-helper-version       "0.2.5">
 <!ENTITY geoclue2-version             "2.1.10">
+<!ENTITY gtk-vnc-version              "0.5.3">
 <!ENTITY highlight-version            "3.19">
 <!ENTITY ibus-version                 "1.5.9">
Index: x/lib/at-spi2-core.xml
===================================================================
--- x/lib/at-spi2-core.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
+++ x/lib/at-spi2-core.xml	(revision d72fae5ad0127525bdba5ca158637115d0477174)
@@ -107,6 +107,5 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
 make</userinput></screen>
 
@@ -141,7 +140,4 @@
 
       <seglistitem>
-        <!-- <seg> Not user executable programs
-          at-spi-bus-launcher and at-spi2-registryd
-        </seg> -->
 	<seg>
 	  None
@@ -158,21 +154,8 @@
     </segmentedlist>
 
-    <!-- Not user executable programs
     <variablelist>
       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="at-spi2-registryd">
-        <term><command>at-spi2-registryd</command></term>
-        <listitem>
-          <para>
-            is the <application>At-Spi2</application> registry daemon.
-          </para>
-          <indexterm zone="at-spi2-core at-spi2-registryd">
-            <primary sortas="b-at-spi2-registryd">at-spi2-registryd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
 
       <varlistentry id="libatspi">
@@ -189,5 +172,4 @@
 
     </variablelist>
-    -->
 
   </sect2>
Index: x/lib/cairo-systemd.xml
===================================================================
--- x/lib/cairo-systemd.xml	(revision d72fae5ad0127525bdba5ca158637115d0477174)
+++ x/lib/cairo-systemd.xml	(revision d72fae5ad0127525bdba5ca158637115d0477174)
@@ -0,0 +1,260 @@
+<?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 cairo-download-http "http://cairographics.org/releases/cairo-&cairo-version;.tar.xz">
+  <!ENTITY cairo-download-ftp  " ">
+  <!ENTITY cairo-md5sum        "fc3a5edeba703f906f2241b394f0cced">
+  <!ENTITY cairo-size          "35 MB">
+  <!ENTITY cairo-buildsize     "145 MB">
+  <!ENTITY cairo-time          "0.9 SBU">
+]>
+
+<sect1 id="cairo" xreflabel="Cairo-&cairo-version;">
+  <?dbhtml filename="cairo.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Cairo-&cairo-version;</title>
+
+  <indexterm zone="cairo">
+    <primary sortas="a-Cairo">Cairo</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Cairo</title>
+
+    <para>
+      <application>Cairo</application> is a 2D graphics library with support for
+      multiple output devices. Currently supported output targets include the
+      <application>X</application> Window System, win32, image buffers,
+      PostScript, PDF and SVG. Experimental backends include OpenGL, Quartz and
+      XCB file output. <application>Cairo</application> is designed to produce
+      consistent output on all output media while taking advantage of display
+      hardware acceleration when available (e.g., through the X Render
+      Extension). The <application>Cairo</application> API provides operations
+      similar to the drawing operators of PostScript and PDF. Operations in
+      <application>Cairo</application> include stroking and filling cubic
+      B&eacute;zier splines, transforming and compositing translucent images,
+      and antialiased text rendering. All drawing operations can be transformed
+      by any
+      <ulink url="http://en.wikipedia.org/wiki/Affine_transformation">affine
+      transformation</ulink> (scale, rotation, shear, etc.).
+    </para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&cairo-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&cairo-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &cairo-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &cairo-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &cairo-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &cairo-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Cairo Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libpng"/>,
+      <xref linkend="glib2"/> and
+      <xref linkend="pixman"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="fontconfig"/>,
+      <xref linkend="mesalib"/> and
+      <xref linkend="xorg7-lib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="cogl"/>,
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="libdrm"/>,
+      <xref linkend="lzo"/>,
+      <xref linkend="qt4"/>,
+      <xref linkend="valgrind"/>,
+      <ulink url="http://www.directfb.org/">DirectFB</ulink>,
+      <ulink url="https://github.com/rillian/jbig2dec/">jbig2dec</ulink>, and
+      <ulink url="http://code.google.com/p/skia/">Skia</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/cairo"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Cairo</title>
+
+    <para>
+      Install <application>Cairo</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr    \
+            --enable-gl      \
+            --enable-tee     \
+            --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>
+      <parameter>--enable-gl</parameter>: This switch enables experimental
+      OpenGL surface backend which is required for
+      <application>Weston</application>. Remove it if you have not installed
+      <xref linkend="mesalib"/>.
+    </para>
+
+    <para>
+      <parameter>--enable-tee</parameter>: This switch enables experimental tee
+      surface backend which is required if using system-installed
+      <application>Cairo</application> with Mozilla applications.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <para>
+      <option>--enable-xlib-xcb</option>: This switch enables experimental
+      Xlib/XCB functions used by some window managers.
+    </para>
+
+    <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>
+          cairo-sphinx and cairo-trace
+        </seg>
+        <seg>
+          libcairo.so, libcairo-gobject.so and
+          libcairo-script-interpreter.so
+        </seg>
+        <seg>
+          /usr/include/cairo,
+          /usr/lib/cairo and
+          /usr/share/gtk-doc/html/cairo
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="cairo-trace">
+        <term><command>cairo-trace</command></term>
+        <listitem>
+          <para>
+            generates a log of all calls made by an application to
+            <application>Cairo</application>.
+          </para>
+          <indexterm zone="cairo cairo-trace">
+            <primary sortas="b-cairo-trace">cairo-trace</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcairo">
+        <term><filename class="libraryfile">libcairo.so</filename></term>
+        <listitem>
+          <para>
+            contains the 2D graphics functions required for rendering to the
+            various output targets.
+          </para>
+          <indexterm zone="cairo libcairo">
+            <primary sortas="c-libcairo">libcairo.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcairo-gobject">
+        <term><filename class="libraryfile">libcairo-gobject.so</filename></term>
+        <listitem>
+          <para>
+            contains functions that integrate
+            <application>Cairo</application> with <xref linkend="glib2"/>'s
+            GObject type system.
+          </para>
+          <indexterm zone="cairo libcairo-gobject">
+            <primary sortas="c-libcairo-gobject">libcairo-gobject.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcairo-script-interpreter">
+        <term><filename class="libraryfile">libcairo-script-interpreter.so</filename></term>
+        <listitem>
+          <para>
+            contains the script interpreter functions for executing and
+            manipulating <application>Cairo</application> execution traces.
+          </para>
+          <indexterm zone="cairo libcairo-script-interpreter">
+            <primary sortas="c-libcairo-script-interpreter">libcairo-script-interpreter.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: lib/cairo.xml
===================================================================
--- x/lib/cairo.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
+++ 	(revision )
@@ -1,261 +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 cairo-download-http "http://cairographics.org/releases/cairo-&cairo-version;.tar.xz">
-  <!ENTITY cairo-download-ftp  " ">
-  <!ENTITY cairo-md5sum        "fc3a5edeba703f906f2241b394f0cced">
-  <!ENTITY cairo-size          "35 MB">
-  <!ENTITY cairo-buildsize     "125 MB">
-  <!ENTITY cairo-time          "0.9 SBU">
-]>
-
-<sect1 id="cairo" xreflabel="Cairo-&cairo-version;">
-  <?dbhtml filename="cairo.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Cairo-&cairo-version;</title>
-
-  <indexterm zone="cairo">
-    <primary sortas="a-Cairo">Cairo</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Cairo</title>
-
-    <para>
-      <application>Cairo</application> is a 2D graphics library with support for
-      multiple output devices. Currently supported output targets include the
-      <application>X</application> Window System, win32, image buffers,
-      PostScript, PDF and SVG. Experimental backends include OpenGL, Quartz and
-      XCB file output. <application>Cairo</application> is designed to produce
-      consistent output on all output media while taking advantage of display
-      hardware acceleration when available (e.g., through the X Render
-      Extension). The <application>Cairo</application> API provides operations
-      similar to the drawing operators of PostScript and PDF. Operations in
-      <application>Cairo</application> include stroking and filling cubic
-      B&eacute;zier splines, transforming and compositing translucent images,
-      and antialiased text rendering. All drawing operations can be transformed
-      by any
-      <ulink url="http://en.wikipedia.org/wiki/Affine_transformation">affine
-      transformation</ulink> (scale, rotation, shear, etc.).
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cairo-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cairo-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cairo-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cairo-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cairo-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cairo-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Cairo Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libpng"/>,
-      <xref linkend="glib2"/> and
-      <xref linkend="pixman"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="fontconfig"/> and
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cogl"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libdrm"/>,
-      <xref linkend="lzo"/>,
-      <xref linkend="mesalib"/>,
-      <xref linkend="qt4"/>,
-      <xref linkend="valgrind"/>,
-      <ulink url="http://www.directfb.org/">DirectFB</ulink>,
-      <ulink url="https://github.com/rillian/jbig2dec/">jbig2dec</ulink>, and
-      <ulink url="http://code.google.com/p/skia/">Skia</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/cairo"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Cairo</title>
-
-    <para>
-      Install <application>Cairo</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --enable-tee &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>
-      <parameter>--enable-tee</parameter>: This switch enables experimental tee
-      surface backend which is required if using system-installed
-      <application>Cairo</application> with Mozilla applications.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--enable-xlib-xcb</option>: This switch enables experimental
-      Xlib/XCB functions used by some window managers.
-    </para>
-
-    <para>
-      <option>--enable-gl</option>: This switch enables
-      <application>Cairo</application>'s experimental
-      <application>OpenGL</application> surface which
-      is required for <application>Wayland</application>
-      compositor and some other packages that are not
-      part of BLFS.
-    </para>
-
-    <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>
-          cairo-sphinx and cairo-trace
-        </seg>
-        <seg>
-          libcairo.so, libcairo-gobject.so and
-          libcairo-script-interpreter.so
-        </seg>
-        <seg>
-          /usr/include/cairo,
-          /usr/lib/cairo and
-          /usr/share/gtk-doc/html/cairo
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cairo-trace">
-        <term><command>cairo-trace</command></term>
-        <listitem>
-          <para>
-            generates a log of all calls made by an application to
-            <application>Cairo</application>.
-          </para>
-          <indexterm zone="cairo cairo-trace">
-            <primary sortas="b-cairo-trace">cairo-trace</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcairo">
-        <term><filename class="libraryfile">libcairo.so</filename></term>
-        <listitem>
-          <para>
-            contains the 2D graphics functions required for rendering to the
-            various output targets.
-          </para>
-          <indexterm zone="cairo libcairo">
-            <primary sortas="c-libcairo">libcairo.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcairo-gobject">
-        <term><filename class="libraryfile">libcairo-gobject.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that integrate
-            <application>Cairo</application> with <xref linkend="glib2"/>'s
-            GObject type system.
-          </para>
-          <indexterm zone="cairo libcairo-gobject">
-            <primary sortas="c-libcairo-gobject">libcairo-gobject.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcairo-script-interpreter">
-        <term><filename class="libraryfile">libcairo-script-interpreter.so</filename></term>
-        <listitem>
-          <para>
-            contains the script interpreter functions for executing and
-            manipulating <application>Cairo</application> execution traces.
-          </para>
-          <indexterm zone="cairo libcairo-script-interpreter">
-            <primary sortas="c-libcairo-script-interpreter">libcairo-script-interpreter.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/clutter-gst2.xml
===================================================================
--- x/lib/clutter-gst2.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
+++ x/lib/clutter-gst2.xml	(revision d72fae5ad0127525bdba5ca158637115d0477174)
@@ -107,9 +107,4 @@
     </para>
 
-    <note><para>
-      This package<!--must be built from an Xterm.  It will--> fails to build
-      over an ssh session.
-    </para></note>
-
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
Index: x/lib/clutter-systemd.xml
===================================================================
--- x/lib/clutter-systemd.xml	(revision d72fae5ad0127525bdba5ca158637115d0477174)
+++ x/lib/clutter-systemd.xml	(revision d72fae5ad0127525bdba5ca158637115d0477174)
@@ -0,0 +1,213 @@
+<?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 clutter-download-http "&gnome-download-http;/clutter/1.20/clutter-&clutter-version;.tar.xz">
+  <!ENTITY clutter-download-ftp  "&gnome-download-ftp;/clutter/1.20/clutter-&clutter-version;.tar.xz">
+  <!ENTITY clutter-md5sum        "a8a33a57a944c6d7c7c013ce9aa3222b">
+  <!ENTITY clutter-size          "5.0 MB">
+  <!ENTITY clutter-buildsize     "95 MB">
+  <!ENTITY clutter-time          "0.8 SBU">
+]>
+
+<sect1 id="clutter" xreflabel="Clutter-&clutter-version;">
+  <?dbhtml filename="clutter.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Clutter-&clutter-version;</title>
+
+  <indexterm zone="clutter">
+    <primary sortas="a-Clutter">Clutter</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Clutter</title>
+
+    <para>
+      The <application>Clutter</application> package contains an open
+      source software library used for creating fast, visually rich
+      and animated graphical user interfaces.
+    </para>
+
+    &lfs76_checked;
+
+    <note>
+      <para>
+        Anything built with this toolkit needs hardware 3D acceleration from
+        the graphics driver at runtime. This is provided by
+        <application>MesaLib</application> (or by proprietary graphics drivers),
+        but is not available for every graphics card nor for all virtual
+        machines. You may wish to review <xref linkend="checking-dri"/>.
+      </para>
+    </note>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&clutter-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&clutter-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &clutter-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &clutter-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &clutter-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &clutter-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+
+    <bridgehead renderas="sect3">Clutter Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="atk"/>,
+      <xref linkend="cogl"/>, and
+      <xref linkend="json-glib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="libinput"/>,
+      <xref linkend="libxkbcommon"/>,
+      <xref linkend="systemd"/> (for GUdev), and
+      <xref linkend="wayland"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/> and
+      <ulink url="http://tslib.berlios.de/">Tslib</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/clutter"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Clutter</title>
+
+    <para>
+      Install <application>Clutter</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr               \
+            --sysconfdir=/etc           \
+            --enable-egl-backend        \
+            --enable-evdev-input        \
+            --enable-wayland-backend    \
+            --enable-wayland-compositor &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command> from an
+      X terminal emulator.
+    </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>
+      <parameter>--enable-egl-backend</parameter>: This switch enables
+      the experimental EGL windowing backend which is required for
+      <application>GNOME</application> Wayland support.
+    </para>
+
+    <para>
+      <parameter>--enable-evdev-input</parameter>: This switch enables
+      the experimental Evdev input backend which is required for
+      <application>GNOME</application> Wayland support.
+    </para>
+
+    <para>
+      <parameter>--enable-wayland-*</parameter>: These switches enable
+      experimental <application>Wayland</application> API in
+      <application>Clutter</application> which is required for
+      <application>GNOME</application> Wayland support.
+    </para>
+
+    <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>
+          None
+        </seg>
+        <seg>
+          libclutter-1.0.so and libclutter-glx-1.0.so
+        </seg>
+        <seg>
+          /usr/include/clutter-1.0 and
+          /usr/share/gtk-doc/html/{cally,clutter}
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libclutter-1">
+        <term><filename class="libraryfile">libclutter-1.0.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>Clutter</application> API functions.
+          </para>
+          <indexterm zone="clutter libclutter-1">
+            <primary sortas="c-libclutter-1">libclutter-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: lib/clutter.xml
===================================================================
--- x/lib/clutter.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
+++ 	(revision )
@@ -1,205 +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 clutter-download-http "&gnome-download-http;/clutter/1.20/clutter-&clutter-version;.tar.xz">
-  <!ENTITY clutter-download-ftp  "&gnome-download-ftp;/clutter/1.20/clutter-&clutter-version;.tar.xz">
-  <!ENTITY clutter-md5sum        "a8a33a57a944c6d7c7c013ce9aa3222b">
-  <!ENTITY clutter-size          "5.0 MB">
-  <!ENTITY clutter-buildsize     "83 MB (additional 8 MB for docs creation and 11 MB for tests)">
-  <!ENTITY clutter-time          "0.7 SBU (additional 2.2 SBU for docs creation and 0.6 SBU for tests)">
-]>
-
-<sect1 id="clutter" xreflabel="Clutter-&clutter-version;">
-  <?dbhtml filename="clutter.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Clutter-&clutter-version;</title>
-
-  <indexterm zone="clutter">
-    <primary sortas="a-Clutter">Clutter</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Clutter</title>
-
-    <para>
-      The <application>Clutter</application> package contains an open
-      source software library used for creating fast, visually rich
-      and animated graphical user interfaces.
-    </para>
-
-    &lfs76_checked;
-
-    <note>
-      <para>
-        Anything built with this toolkit needs hardware 3D acceleration from
-        the graphics driver at runtime. This is provided by
-        <application>MesaLib</application> (or by proprietary graphics drivers),
-        but is not available for every graphics card nor for all virtual
-        machines. You may wish to review <xref linkend="checking-dri"/>.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&clutter-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&clutter-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &clutter-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &clutter-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &clutter-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &clutter-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Clutter Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="atk"/>,
-      <xref linkend="cogl"/>, and
-      <xref linkend="json-glib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="systemd"/> (for GUdev),
-      <ulink url="http://www.freedesktop.org/wiki/Software/libevdev/">
-      libevdev</ulink>,
-      <ulink url="http://xkbcommon.org/">libxkbcommon</ulink>,
-      <ulink url="http://tslib.berlios.de/">Tslib</ulink>, and
-      <ulink url="http://wayland.freedesktop.org/">Wayland</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/clutter"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Clutter</title>
-<!--
-    <para>
-      If you wish to run the tests, the following commands disable two tests
-      that fail.
-    </para>
-
-<screen><userinput>sed -i '/actor-offscreen-redirect/d' \
-       tests/conform/Makefile.am tests/conform/Makefile.in &amp;&amp;
-autoreconf -f -i</userinput></screen>
--->
-    <para>
-      Install <application>Clutter</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc --enable-egl-backend &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command> (you must be
-      in an xterm or similar to do this, because it launches some windows). 
-      Two tests have been observed to fail.
-    </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>
-      <parameter>--enable-egl-backend</parameter>: This switch enables
-      the experimental EGL windowing backend.
-    </para>
-
-    <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>
-          libclutter-1.0.so and libclutter-glx-1.0.so
-        </seg>
-        <seg>
-          /usr/include/clutter-1.0 and
-          /usr/share/gtk-doc/html/{cally,clutter}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libclutter-1">
-        <term><filename class="libraryfile">libclutter-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Clutter</application> API functions.
-          </para>
-          <indexterm zone="clutter libclutter-1">
-            <primary sortas="c-libclutter-1">libclutter-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/cogl-systemd.xml
===================================================================
--- x/lib/cogl-systemd.xml	(revision d72fae5ad0127525bdba5ca158637115d0477174)
+++ x/lib/cogl-systemd.xml	(revision d72fae5ad0127525bdba5ca158637115d0477174)
@@ -0,0 +1,242 @@
+<?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 cogl-download-http "&gnome-download-http;/cogl/1.18/cogl-&cogl-version;.tar.xz">
+  <!ENTITY cogl-download-ftp  "&gnome-download-ftp;/cogl/1.18/cogl-&cogl-version;.tar.xz">
+  <!ENTITY cogl-md5sum        "952155d526d35f297737266408e842b5">
+  <!ENTITY cogl-size          "1.6 MB">
+  <!ENTITY cogl-buildsize     "50 MB">
+  <!ENTITY cogl-time          "0.7 SBU">
+]>
+
+<sect1 id="cogl" xreflabel="Cogl-&cogl-version;">
+  <?dbhtml filename="cogl.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Cogl-&cogl-version;</title>
+
+  <indexterm zone="cogl">
+    <primary sortas="a-Cogl">Cogl</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Cogl</title>
+
+    <para>
+      <application>Cogl</application> is a modern 3D graphics API with associated
+      utility APIs designed to expose the features of 3D graphics hardware using
+      a direct state access API design, as opposed to the state-machine style
+      of OpenGL.
+    </para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&cogl-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&cogl-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &cogl-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &cogl-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &cogl-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &cogl-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Cogl Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gdk-pixbuf"/>,
+      <xref linkend="mesalib"/>, and
+      <xref linkend="pango"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/> and
+      <xref linkend="wayland"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gst10-plugins-base"/>,
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="sdl"/>, and
+      <ulink url="http://www.libsdl.org/tmp/release/">SDL2</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/cogl"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Cogl</title>
+
+    <para>
+      Install <application>Cogl</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr                 \
+            --enable-gles1                \
+            --enable-gles2                \
+            --enable-kms-egl-platform     \
+            --enable-wayland-egl-platform \
+            --enable-xlib-egl-platform    \
+            --enable-wayland-egl-server   &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>. The
+      tests should be run from an X terminal on the hardware accelerated
+      Xorg Server.
+    </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>
+      <parameter>--enable-gles1</parameter>: This switch enables support
+      for OpenGL ES 1.1.
+    </para>
+
+    <para>
+      <parameter>--enable-gles2</parameter>: This switch enables support
+      for OpenGL ES 2.0.
+    </para>
+
+    <para>
+      <parameter>--enable-*-egl-platform</parameter>: This switch enables
+      support for KMS, Wayland and Xlib EGL platforms. They are required
+      for <application>GNOME</application> Wayland support.
+    </para>
+
+    <para>
+      <parameter>--enable-wayland-egl-server</parameter>: This switch
+      enables <application>Cogl</application>'s Wayland Server API
+      which is required for <application>GNOME</application> Wayland
+      support.
+    </para>
+
+    <para>
+      <option>--enable-cogl-gst</option>: This switch enables gstreamer support.
+    </para>
+
+    <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>
+          None
+        </seg>
+        <seg>
+          libcogl-gles2.so, 
+          libcogl-pango.so,
+          libcogl-path.so, and 
+          libcogl.so, and optional libraries
+          libcogl-gst.so and /usr/lib/gstreamer-1.0/libgstcogl.so
+       </seg>
+        <seg>
+         /usr/include/cogl and
+         /usr/share/cogl
+       </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libcogl-gles2">
+        <term><filename class="libraryfile">libcogl-gles2.so</filename></term>
+        <listitem>
+          <para>
+            is the OpenGL ES 2.0 integration library for
+            <application>Cogl</application>.
+          </para>
+          <indexterm zone="cogl libcogl-gles2">
+            <primary sortas="c-libcogl-gles2">libcogl-gles2.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcogl-pango">
+        <term><filename class="libraryfile">libcogl-pango.so</filename></term>
+        <listitem>
+          <para>
+            is the <application>Pango</application> integration library
+            for <application>Cogl</application>.
+          </para>
+          <indexterm zone="cogl libcogl-pango">
+            <primary sortas="c-libcogl-pango">libcogl-pango.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcogl">
+        <term><filename class="libraryfile">libcogl.so</filename></term>
+        <listitem>
+          <para>
+            is an object oriented GL/GLES Abstraction/Utility Layer library.
+          </para>
+          <indexterm zone="cogl libcogl">
+            <primary sortas="c-libcogl">libcogl.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: lib/cogl.xml
===================================================================
--- x/lib/cogl.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
+++ 	(revision )
@@ -1,223 +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 cogl-download-http "&gnome-download-http;/cogl/1.18/cogl-&cogl-version;.tar.xz">
-  <!ENTITY cogl-download-ftp  "&gnome-download-ftp;/cogl/1.18/cogl-&cogl-version;.tar.xz">
-  <!ENTITY cogl-md5sum        "952155d526d35f297737266408e842b5">
-  <!ENTITY cogl-size          "1.6 MB">
-  <!ENTITY cogl-buildsize     "50 MB">
-  <!ENTITY cogl-time          "0.7 SBU">
-]>
-
-<sect1 id="cogl" xreflabel="Cogl-&cogl-version;">
-  <?dbhtml filename="cogl.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Cogl-&cogl-version;</title>
-
-  <indexterm zone="cogl">
-    <primary sortas="a-Cogl">Cogl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Cogl</title>
-
-    <para>
-      <application>Cogl</application> is a modern 3D graphics API with associated
-      utility APIs designed to expose the features of 3D graphics hardware using
-      a direct state access API design, as opposed to the state-machine style
-      of OpenGL.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cogl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cogl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cogl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cogl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cogl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cogl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Cogl Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gdk-pixbuf"/>,
-      <xref linkend="mesalib"/>, 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="gst10-plugins-base"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="sdl"/>,
-      <ulink url="http://www.libsdl.org/tmp/release/">SDL2</ulink>, and
-      <ulink url="http://wayland.freedesktop.org/">Wayland</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/cogl"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Cogl</title>
-
-    <para>
-      Install <application>Cogl</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --enable-gles1 --enable-gles2 &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>. The
-      tests should be run from an X terminal on the hardware accelerated
-      Xorg Server.
-    </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>
-      <parameter>--enable-gles1</parameter>: This switch enables support
-      for OpenGL ES 1.1.
-    </para>
-
-    <para>
-      <parameter>--enable-gles2</parameter>: This switch enables support
-      for OpenGL ES 2.0.
-    </para>
-
-    <para>
-      <option>--enable-cogl-gst</option>: This switch enables gstreamer support.
-    </para>
-
-    <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>
-          None
-        </seg>
-        <seg>
-          libcogl-gles2.so, 
-          libcogl-pango.so,
-          libcogl-path.so, and 
-          libcogl.so, and optional libraries
-          libcogl-gst.so and /usr/lib/gstreamer-1.0/libgstcogl.so
-       </seg>
-        <seg>
-         /usr/include/cogl and
-         /usr/share/cogl
-       </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libcogl-gles2">
-        <term><filename class="libraryfile">libcogl-gles2.so</filename></term>
-        <listitem>
-          <para>
-            is the OpenGL ES 2.0 integration library for
-            <application>Cogl</application>.
-          </para>
-          <indexterm zone="cogl libcogl-gles2">
-            <primary sortas="c-libcogl-gles2">libcogl-gles2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcogl-pango">
-        <term><filename class="libraryfile">libcogl-pango.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Pango</application> integration library
-            for <application>Cogl</application>.
-          </para>
-          <indexterm zone="cogl libcogl-pango">
-            <primary sortas="c-libcogl-pango">libcogl-pango.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcogl">
-        <term><filename class="libraryfile">libcogl.so</filename></term>
-        <listitem>
-          <para>
-            is an object oriented GL/GLES Abstraction/Utility Layer library.
-          </para>
-          <indexterm zone="cogl libcogl">
-            <primary sortas="c-libcogl">libcogl.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/colord-gtk-systemd.xml
===================================================================
--- x/lib/colord-gtk-systemd.xml	(revision d72fae5ad0127525bdba5ca158637115d0477174)
+++ x/lib/colord-gtk-systemd.xml	(revision d72fae5ad0127525bdba5ca158637115d0477174)
@@ -0,0 +1,189 @@
+<?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 colord-gtk-download-http "http://www.freedesktop.org/software/colord/releases/colord-gtk-&colord-gtk-version;.tar.xz">
+  <!ENTITY colord-gtk-download-ftp  " ">
+  <!ENTITY colord-gtk-md5sum        "f3ad262c060fc50c10805b744be7479d">
+  <!ENTITY colord-gtk-size          "268 KB">
+  <!ENTITY colord-gtk-buildsize     "4.2 MB">
+  <!ENTITY colord-gtk-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="colord-gtk" xreflabel="colord-gtk-&colord-gtk-version;">
+  <?dbhtml filename="colord-gtk.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>colord-gtk-&colord-gtk-version;</title>
+
+  <indexterm zone="colord-gtk">
+    <primary sortas="a-colord-gtk">colord-gtk</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Colord GTK</title>
+
+    <para>
+      The <application>Colord GTK</application> package contains
+      <application>GTK+</application> bindings for
+      <application>Colord</application>.
+    </para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&colord-gtk-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&colord-gtk-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &colord-gtk-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &colord-gtk-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &colord-gtk-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &colord-gtk-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Colord GTK Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="colord"/>, and
+      <xref linkend="gtk3"/>
+    </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;/colord-gtk"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Colord GTK</title>
+
+    <warning>
+      <para>
+        If building the documentation <command>make -j1</command> must be used.
+      </para>
+    </warning>
+
+    <para>
+      Install <application>Colord GTK</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --enable-vala \
+            --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>
+
+    <para>
+      <option>--enable-vala</option>: This switch enables
+      building of the Vala bindings. Remove if you don't
+      have <xref linkend="vala"/> installed.
+    </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 Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libcolord-gtk.so
+        </seg>
+        <seg>
+          /usr/include/colord-1/colord-gtk and
+          /usr/share/gtk-doc/html/colord-gtk
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libcolord-gtk">
+        <term><filename class="libraryfile">libcolord-gtk.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>Colord</application>
+            <application>GTK+</application> bindings.
+          </para>
+          <indexterm zone="colord-gtk libcolord-gtk">
+            <primary sortas="c-libcolord-gtk">libcolord-gtk.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: x/lib/fltk.xml
===================================================================
--- x/lib/fltk.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
+++ x/lib/fltk.xml	(revision d72fae5ad0127525bdba5ca158637115d0477174)
@@ -94,6 +94,4 @@
     <para role="required">
       <xref linkend="glu"/>
-      <xref linkend="mesalib"/>, and
-      <xref linkend="xorg7-lib"/>,
     </para>
 
@@ -102,5 +100,5 @@
       <xref linkend="desktop-file-utils"/>,
       <xref linkend="hicolor-icon-theme"/>, and
-      <xref linkend="libjpeg"/>,
+      <xref linkend="libjpeg"/>
     </para>
 
@@ -109,5 +107,5 @@
       <xref linkend="alsa-lib"/>,
       <xref linkend="doxygen"/>, and
-      <xref linkend="texlive"/>,
+      <xref linkend="texlive"/>
     </para>
 
@@ -135,8 +133,5 @@
 sed -i -e '/cat./d' documentation/Makefile       &amp;&amp;
 
-./configure --prefix=/usr    \
-            --enable-threads \
-            --enable-xft     \
-            --enable-shared  &amp;&amp;
+./configure --prefix=/usr --enable-shared &amp;&amp;
 make</userinput></screen>
 
@@ -169,14 +164,4 @@
 
     <para>
-      <command>patch ...tigervnc-1.patch</command>: Install patches to make
-      the libraries compatible with <application>tigervnc</application>.
-    </para>
-
-    <para>
-      <command>patch ...dynamic_libs-1.patch</command>: Allow building
-      dynamic libraries.
-    </para>
-
-    <para>
       <command>sed ... configure</command>: configure: Fix output of
       <command>fltk-config --version</command>.
@@ -185,5 +170,10 @@
     <para>
       <command>sed ... documentation/Makefile</command>: Avoid installing
-      pages in <filename class='directory'>/usr/share/man/cat*</filename>.
+      pages in <filename class="directory">/usr/share/man/cat*</filename>.
+    </para>
+
+    <para>
+      <parameter>--enable-shared</parameter>: This switch enables building
+      of the shared libraries in addition to static ones.
     </para>
 
@@ -207,6 +197,6 @@
         </seg>
         <seg>
-          libfltk.{a,so}, 
-          libfltk_forms.{a,so}, 
+          libfltk.{a,so},
+          libfltk_forms.{a,so},
           libfltk_gl.{a,so}, and 
           libfltk_images.{a,so}
Index: x/lib/gdk-pixbuf.xml
===================================================================
--- x/lib/gdk-pixbuf.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
+++ x/lib/gdk-pixbuf.xml	(revision d72fae5ad0127525bdba5ca158637115d0477174)
@@ -11,6 +11,6 @@
   <!ENTITY gdk-pixbuf-md5sum        "74cde211f5b7ac1015d1a7c9feee037c">
   <!ENTITY gdk-pixbuf-size          "1.3 MB">
-  <!ENTITY gdk-pixbuf-buildsize     "25 MB (additional 1 MB for the tests and 1 MB to rebuild and install the API documentation)">
-  <!ENTITY gdk-pixbuf-time          "0.3 SBU (additional 0.4 SBU to run the test suite and less than 0.1 SBU to rebuild and install the API documentation)">
+  <!ENTITY gdk-pixbuf-buildsize     "22 MB (including the tests and API documentation)">
+  <!ENTITY gdk-pixbuf-time          "0.7 SBU (including the tests and rebuilding the API documentation)">
 ]>
 
Index: x/lib/glu.xml
===================================================================
--- x/lib/glu.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
+++ x/lib/glu.xml	(revision d72fae5ad0127525bdba5ca158637115d0477174)
@@ -91,5 +91,5 @@
     </para>
 
-<screen><userinput>./configure --prefix=$XORG_PREFIX --disable-static &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
Index: x/lib/gtk+2.xml
===================================================================
--- x/lib/gtk+2.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
+++ x/lib/gtk+2.xml	(revision d72fae5ad0127525bdba5ca158637115d0477174)
@@ -196,5 +196,6 @@
     </sect3>
 
-    <sect3><title>Configuration Information</title>
+    <sect3>
+      <title>Configuration Information</title>
 
       <para>
@@ -203,15 +204,14 @@
         <application>GTK+ 2</application> icon theme can be used to change the
         icons that appear on the application's toolbar. If you have installed a
-        <application>GTK+ 2</application> theme (such as <ulink
-        url="http://ftp.gnome.org/pub/gnome/sources/gnome-themes/2.32/">gnome-themes</ulink>
-        (requires <xref linkend="gtk-engines"/>)) or a
-        <application>GTK+</application> icon theme (such as <xref
-        linkend="adwaita-icon-theme"/>) you can set your preferences in
+        <application>GTK+ 2</application> theme (such as <xref
+        linkend="gnome-themes-standard"/>) or a
+        <application>GTK+ 2</application> icon theme (such as
+        <xref linkend="adwaita-icon-theme"/>) you can set your preferences in
         <filename>~/.gtkrc-2.0</filename>:
       </para>
 
 <screen><userinput>cat &gt; ~/.gtkrc-2.0 &lt;&lt; "EOF"
-include "/usr/share/themes/<replaceable>Glider</replaceable>/gtk-2.0/gtkrc"
-gtk-icon-theme-name = "<replaceable>hicolor</replaceable>"
+include "/usr/share/themes/<replaceable>Adwaita</replaceable>/gtk-2.0/gtkrc"
+gtk-icon-theme-name = "<replaceable>Adwaita</replaceable>"
 EOF</userinput></screen>
 
Index: x/lib/gtk+3-systemd.xml
===================================================================
--- x/lib/gtk+3-systemd.xml	(revision d72fae5ad0127525bdba5ca158637115d0477174)
+++ x/lib/gtk+3-systemd.xml	(revision d72fae5ad0127525bdba5ca158637115d0477174)
@@ -0,0 +1,455 @@
+<?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 gtk3-download-http "&gnome-download-http;/gtk+/3.14/gtk+-&gtk3-version;.tar.xz">
+  <!ENTITY gtk3-download-ftp  "&gnome-download-ftp;/gtk+/3.14/gtk+-&gtk3-version;.tar.xz">
+  <!ENTITY gtk3-md5sum        "103a3521cf792f2ee12d0d1349d79288">
+  <!ENTITY gtk3-size          "15 MB">
+  <!ENTITY gtk3-buildsize     "465 MB">
+  <!ENTITY gtk3-time          "3.4 SBU">
+]>
+
+<sect1 id="gtk3" xreflabel="GTK+-&gtk3-version;">
+  <?dbhtml filename="gtk3.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>GTK+-&gtk3-version;</title>
+
+  <indexterm zone="gtk3">
+    <primary sortas="a-GTK+3">GTK+3</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to GTK+ 3</title>
+
+    <para>
+      The <application>GTK+ 3</application> package contains the
+      libraries used for creating graphical user interfaces for
+      applications.
+    </para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&gtk3-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gtk3-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gtk3-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gtk3-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gtk3-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gtk3-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">GTK+ 3 Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="at-spi2-atk"/>,
+      <xref linkend="gdk-pixbuf"/>, and
+      <xref linkend="pango"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libxkbcommon"/> and
+      <xref linkend="wayland"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
+    <para role="optional">
+      <xref linkend="gobject-introspection"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="colord"/>,
+      <xref linkend="cups"/>,
+      <xref linkend="docbook-utils"/>,
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="json-glib"/>, and
+      <xref linkend="librest"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/gtk3"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GTK+ 3</title>
+
+    <note>
+      <para>
+        <application>GTK+ 3</application> will overwrite
+        <command>gtk-update-icon-cache</command> from <xref linkend="gtk2"/> if
+        it is installed.  There is nothing wrong about that assuming that both
+        programs provide same functionality.  If you wish to keep one from
+        <application>GTK+ 2</application> you can add
+        <option>--enable-gtk2-dependency</option> to the
+        <command>configure</command> command.
+      </para>
+    </note>
+
+    <para>
+      Install <application>GTK+ 3</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr             \
+            --sysconfdir=/etc         \
+            --enable-broadway-backend \
+            --enable-wayland-backend  \
+            --enable-x11-backend      &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      Some tests may fail if
+      <filename>/usr/share/glib-2.0/schemas/gschemas.compiled</filename> is not
+      found. If you wish to run the test suite, create (or update) the file
+      using the following command as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>glib-compile-schemas /usr/share/glib-2.0/schemas</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>
+
+    <note>
+      <para>
+        If you installed the package on to your system using a
+        <quote>DESTDIR</quote> method, an important file was not installed and
+        must be copied and/or generated. Generate it using the following
+        command as the <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>gtk-query-immodules-3.0 --update-cache</userinput></screen>
+    </note>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gsettings-destdir.xml"/>
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>--enable-broadway-backend</parameter>: This switch enables the
+      Broadway HTML5 GDK backend.
+    </para>
+
+    <para>
+      <parameter>--enable-wayland-backend</parameter>: This switch enables the
+      Wayland GDK backend which is required for <application>GNOME</application>
+      Wayland support. Remove it if you have not installed the recommended
+      dependencies.      
+    </para>
+
+    <para>
+      <parameter>--enable-x11-backend</parameter>: This switch enables the
+      X11 GDK backend.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring GTK+ 3</title>
+
+    <sect3 id="gtk3-config">
+      <title>Config Files</title>
+      <para>
+        <filename>~/.config/gtk-3.0/settings.ini</filename> and
+        <filename>/etc/gtk-3.0/settings.ini</filename>
+      </para>
+
+      <indexterm zone="gtk3 gtk3-config">
+        <primary sortas="e-AA.home-settings.ini">~/.config/gtk-3.0/settings.ini</primary>
+      </indexterm>
+
+      <indexterm zone="gtk3 gtk3-config">
+        <primary sortas="e-etc-path-settings.ini">/etc/gtk-3.0/settings.ini</primary>
+      </indexterm>
+    </sect3>
+
+    <sect3><title>Configuration Information</title>
+
+      <para>
+        <application>GTK+ 3</application> themes change the way a
+        <application>GTK+ 3</application> application looks. An icon theme can
+        be used to change the icons that appear on the application's toolbar.
+        If you have installed a <application>GTK+ 3</application> theme (eg
+        <xref linkend="gnome-themes-standard"/> or an icon theme (such as
+        <xref linkend="adwaita-icon-theme"/>) you can set your prefences in
+        <filename>~/.config/gtk-3.0/settings.ini</filename>. Eg:
+      </para>
+
+<screen><userinput>mkdir -p ~/.config/gtk-3.0 &amp;&amp;
+cat &gt; ~/.config/gtk-3.0/settings.ini &lt;&lt; "EOF"
+[Settings]
+gtk-theme-name = <replaceable>Adwaita</replaceable>
+gtk-icon-theme-name = <replaceable>Adwaita</replaceable>
+EOF</userinput></screen>
+
+      <para>
+        There are many more themes available at
+        <ulink url="http://gnome-look.org/"/> and other places.
+      </para>
+
+      <para>
+        Once you've settled on themes you like, you can (as the
+        <systemitem class="username">root</systemitem> user) make them the
+        default system wide:
+      </para>
+
+<screen role="root"><userinput>cat &gt; /etc/gtk-3.0/settings.ini &lt;&lt; "EOF"
+[Settings]
+gtk-theme-name = <replaceable>Clearwaita</replaceable>
+gtk-fallback-icon-theme = <replaceable>elementary</replaceable>
+EOF</userinput></screen>
+    </sect3>
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          broadwayd, gtk3-demo, gtk3-demo-application,
+          gtk3-icon-browser, gtk3-widget-factory, 
+          gtk-encode-symbolic-svg, gtk-launch,
+          gtk-query-immodules-3.0, and
+          gtk-update-icon-cache
+        </seg>
+        <seg>
+          libgailutil-3.so, libgdk-3.so, and libgtk-3.so
+        </seg>
+        <seg>
+          /etc/gtk-3.0,
+          /usr/include/gail-3.0,
+          /usr/include/gtk-3.0,
+          /usr/lib/gtk-3.0,
+          /usr/share/gtk-3.0, 
+          /usr/share/gtk-doc/html/{gail-libgail-util3,gdk3,gtk3}, and
+          /usr/share/themes/{Default,Emacs}/gtk-3.0
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="broadwayd">
+        <term><command>broadwayd</command></term>
+        <listitem>
+          <para>
+            provides support for displaying
+            <application>GTK+ 3</application> applications in a web browser,
+            using HTML5 and web sockets.
+          </para>
+          <indexterm zone="gtk3 broadwayd">
+            <primary sortas="b-broadwayd">broadwayd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gtk-encode-symbolic-svg">
+        <term><command>gtk-encode-symbolic-svg</command></term>
+        <listitem>
+          <para>
+            converts symbolic svg icons into specially prepared png files.
+            <application>GTK+ 3</application> can load and recolor these pngs,
+            just like original svgs, but loading them is much faster.
+          </para>
+          <indexterm zone="gtk3 gtk-encode-symbolic-svg">
+            <primary sortas="b-gtk-encode-symbolic-svg">gtk-encode-symbolic-svg</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gtk-launch">
+        <term><command>gtk-launch</command></term>
+        <listitem>
+          <para>
+            launches an application using the given name. The name should match
+            application desktop file name, as residing in
+            <filename class="directory">/usr/share/application</filename>, with
+            or without the '.desktop' suffix.
+          </para>
+          <indexterm zone="gtk3 gtk-launch">
+            <primary sortas="b-gtk-launch">gtk-launch</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gtk-query-immodules-3.0">
+        <term><command>gtk-query-immodules-3.0</command></term>
+        <listitem>
+          <para>
+            collects information about loadable input method modules for
+            <application>GTK+ 3</application> and writes it to the default cache
+            file location, or to standard output.
+          </para>
+          <indexterm zone="gtk3 gtk-query-immodules-3.0">
+            <primary sortas="b-gtk-query-immodules-3.0">gtk-query-immodules-3.0</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gtk-update-icon-cache3">
+        <term><command>gtk-update-icon-cache</command></term>
+        <listitem>
+          <para>
+            is an icon theme caching utility that creates mmap()able cache files
+            for icon themes.
+          </para>
+          <indexterm zone="gtk3 gtk-update-icon-cache3">
+            <primary sortas="b-gtk-update-icon-cache3">gtk-update-icon-cache</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gtk3-demo">
+        <term><command>gtk3-demo</command></term>
+        <listitem>
+          <para>
+            is a simple program that demonstrates some of the things that can be
+            done with <application>GTK+ 3</application>
+          </para>
+          <indexterm zone="gtk3 gtk3-demo">
+            <primary sortas="b-gtk3-demo">gtk3-demo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gtk3-demo-application">
+        <term><command>gtk3-demo-application</command></term>
+        <listitem>
+          <para>
+            is a simple <application>GTK+ 3</application> application.
+          </para>
+          <indexterm zone="gtk3 gtk3-demo-application">
+            <primary sortas="b-gtk3-demo-application">gtk3-demo-application</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gtk3-icon-browser">
+        <term><command>gtk3-icon-browser</command></term>
+        <listitem>
+          <para>
+            is a utility to explore the icons in the current icon theme. It
+            shows icons in various sizes, their symbolic variants where
+            available, as well as a description of the icon and its context.
+          </para>
+          <indexterm zone="gtk3 gtk3-icon-browser">
+            <primary sortas="b-gtk3-icon-browser">gtk3-icon-browser</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gtk3-widget-factory">
+        <term><command>gtk3-widget-factory</command></term>
+        <listitem>
+          <para>
+            is a program to view <application>GTK+ 3</application> themes and widgets.
+          </para>
+          <indexterm zone="gtk3 gtk3-widget-factory">
+            <primary sortas="b-gtk3-widget-factory">gtk3-widget-factory</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgailutil-3">
+        <term><filename class="libraryfile">libgailutil-3.so</filename></term>
+        <listitem>
+          <para>
+            contains functions that implements the accessibility interfaces
+            defined by the <application>GNOME</application> Accessibility
+            Toolkit.
+          </para>
+          <indexterm zone="gtk3 libgailutil-3">
+            <primary sortas="c-libgailutil-3">libgailutil-3.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgdk-3">
+        <term><filename class="libraryfile">libgdk-3.so</filename></term>
+        <listitem>
+          <para>
+            contains functions that act as a wrapper around the low-level
+            drawing and windowing functions provided by the underlying graphics
+            system.
+          </para>
+          <indexterm zone="gtk3 libgdk-3">
+            <primary sortas="c-libgdk-3">libgdk-3.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgtk-3">
+        <term><filename class="libraryfile">libgtk-3.so</filename></term>
+        <listitem>
+          <para>
+            contains functions that provide an API to implement graphical user
+            interfaces.
+          </para>
+          <indexterm zone="gtk3 libgtk-3">
+            <primary sortas="c-libgtk-3">libgtk-3.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: lib/gtk+3.xml
===================================================================
--- x/lib/gtk+3.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
+++ 	(revision )
@@ -1,452 +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 gtk3-download-http "&gnome-download-http;/gtk+/&gnome-minor-14;/gtk+-&gtk3-version;.tar.xz">
-  <!ENTITY gtk3-download-ftp  "&gnome-download-ftp;/gtk+/&gnome-minor-14;/gtk+-&gtk3-version;.tar.xz">
-  <!ENTITY gtk3-md5sum        "103a3521cf792f2ee12d0d1349d79288">
-  <!ENTITY gtk3-size          "15 MB">
-  <!ENTITY gtk3-buildsize     "401 MB (additional 6 MB for the test suite and 19 MB to rebuild the docs)">
-  <!ENTITY gtk3-time          "4.8 SBU (additional 0.4 SBU for the test suite and 3.7 SBU to rebuild the docs)">
-]>
-
-<sect1 id="gtk3" xreflabel="GTK+-&gtk3-version;">
-  <?dbhtml filename="gtk3.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>GTK+-&gtk3-version;</title>
-
-  <indexterm zone="gtk3">
-    <primary sortas="a-GTK+3">GTK+3</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GTK+ 3</title>
-
-    <para>
-      The <application>GTK+ 3</application> package contains the
-      libraries used for creating graphical user interfaces for
-      applications.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtk3-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtk3-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtk3-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtk3-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtk3-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtk3-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GTK+ 3 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="at-spi2-atk"/>,
-      <xref linkend="gdk-pixbuf"/>, and
-      <xref linkend="pango"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
-    <para role="optional">
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="colord"/>,
-      <xref linkend="cups"/>,
-      <xref linkend="docbook-utils"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="json-glib"/>,
-      <ulink url="http://ftp.acc.umu.se/pub/gnome/sources/rest/">rest</ulink>,
-      <ulink url="http://xkbcommon.org/">libxkbcommon</ulink>, and
-      <ulink url="http://wayland.freedesktop.org/">Wayland</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/gtk3"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GTK+ 3</title>
-
-    <note>
-      <para>
-        <application>GTK+ 3</application> will overwrite
-        <command>gtk-update-icon-cache</command> from <xref linkend="gtk2"/> if
-        it is installed.  There is nothing wrong about that assuming that both
-        programs provide same functionality.  If you wish to keep one from
-        <application>GTK+ 2</application> you can add
-        <option>--enable-gtk2-dependency</option> to the
-        <command>configure</command> command.
-      </para>
-    </note>
-
-    <para>
-      Install <application>GTK+ 3</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr             \
-            --sysconfdir=/etc         \
-            --enable-broadway-backend \
-            --enable-x11-backend      \
-            --disable-wayland-backend &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Some tests fail if
-      <filename>/usr/share/glib-2.0/schemas/gschemas.compiled</filename> is not
-      found. If you wish to run the test suite, create (or update) the file
-      using the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>glib-compile-schemas /usr/share/glib-2.0/schemas</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>
-
-    <note>
-      <para>
-        If you installed the package on to your system using a
-        <quote>DESTDIR</quote> method, an important file was not installed and
-        must be copied and/or generated. Generate it using the following
-        command as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>gtk-query-immodules-3.0 --update-cache</userinput></screen>
-    </note>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gsettings-destdir.xml"/>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--enable-broadway-backend</option>: switch enables the HTML5 GTK backend.
-    </para>
-
-    <para>
-      <option>--enable-x11-backend</option>: switch enables the X11 GDK backend.
-    </para>
-
-    <para>
-      <option>--disable-wayland-backend</option>: switch disables the Wayland GDK backend
-      because Wayland isn't available in BLFS.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring GTK+ 3</title>
-
-    <sect3 id="gtk3-config">
-      <title>Config Files</title>
-      <para>
-        <filename>~/.config/gtk-3.0/settings.ini</filename> and
-        <filename>/etc/gtk-3.0/settings.ini</filename>
-      </para>
-
-      <indexterm zone="gtk3 gtk3-config">
-        <primary sortas="e-AA.home-settings.ini">~/.config/gtk-3.0/settings.ini</primary>
-      </indexterm>
-
-      <indexterm zone="gtk3 gtk3-config">
-        <primary sortas="e-etc-path-settings.ini">/etc/gtk-3.0/settings.ini</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        <application>GTK+ 3</application> themes change the way a
-        <application>GTK+ 3</application> application looks. An icon theme can
-        be used to change the icons that appear on the application's toolbar.
-        If you have installed a <application>GTK+ 3</application> theme (eg
-        <xref linkend="gnome-themes-standard"/> or an icon theme (such as <xref
-        linkend="adwaita-icon-theme"/>) you can set your prefences in
-        <filename>~/.config/gtk-3.0/settings.ini</filename>. Eg:
-      </para>
-
-<screen><userinput>mkdir -p ~/.config/gtk-3.0 &amp;&amp;
-cat &gt; ~/.config/gtk-3.0/settings.ini &lt;&lt; "EOF"
-[Settings]
-gtk-theme-name = <replaceable>Adwaita</replaceable>
-gtk-fallback-icon-theme = <replaceable>gnome</replaceable>
-EOF</userinput></screen>
-
-      <para>
-        There are many more themes available at
-        <ulink url="http://gnome-look.org/"/> and other places.
-      </para>
-
-      <para>
-        Once you've settled on themes you like, you can (as the
-        <systemitem class="username">root</systemitem> user) make them the
-        default system wide:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/gtk-3.0/settings.ini &lt;&lt; "EOF"
-[Settings]
-gtk-theme-name = <replaceable>Clearwaita</replaceable>
-gtk-fallback-icon-theme = <replaceable>elementary</replaceable>
-EOF</userinput></screen>
-    </sect3>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          broadwayd, 
-          gtk3-demo, 
-          gtk3-demo-application, 
-          gtk3-icon-browser, 
-          gtk3-widget-factory, 
-          gtk-encode-symbolic-svg, 
-          gtk-launch, 
-          gtk-query-immodules-3.0, and
-          gtk-update-icon-cache
-        </seg>
-        <seg>
-          libgailutil-3.so, libgdk-3.so, and libgtk-3.so
-
-        </seg>
-        <seg>
-          /etc/gtk-3.0,
-          /usr/include/gail-3.0,
-          /usr/include/gtk-3.0,
-          /usr/lib/gtk-3.0,
-          /usr/share/gtk-3.0, 
-          /usr/share/gtk-doc/html/{gail-libgail-util3,gdk3,gtk3}, and
-          /usr/share/themes/{Default,Emacs}/gtk-3.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="broadwayd">
-        <term><command>broadwayd</command></term>
-        <listitem>
-          <para>
-            provides support for displaying
-            <application>GTK+ 3</application> applications in a web browser,
-            using HTML5 and web sockets.
-          </para>
-          <indexterm zone="gtk3 broadwayd">
-            <primary sortas="b-broadwayd">broadwayd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk-encode-symbolic-svg">
-        <term><command>gtk-encode-symbolic-svg</command></term>
-        <listitem>
-          <para>
-            converts symbolic svg icons into specially prepared png files.
-            <application>GTK+ 3</application> can load and recolor these pngs,
-            just like original svgs, but loading them is much faster.
-          </para>
-          <indexterm zone="gtk3 gtk-encode-symbolic-svg">
-            <primary sortas="b-gtk-encode-symbolic-svg">gtk-encode-symbolic-svg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk-launch">
-        <term><command>gtk-launch</command></term>
-        <listitem>
-          <para>
-            launches an application using the given name. The name should match
-            application desktop file name, as residing in
-            <filename class="directory">/usr/share/application</filename>, with
-            or without the '.desktop' suffix.
-          </para>
-          <indexterm zone="gtk3 gtk-launch">
-            <primary sortas="b-gtk-launch">gtk-launch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk-query-immodules-3.0">
-        <term><command>gtk-query-immodules-3.0</command></term>
-        <listitem>
-          <para>
-            collects information about loadable input method modules for
-            <application>GTK+ 3</application> and writes it to the default cache
-            file location, or to standard output.
-          </para>
-          <indexterm zone="gtk3 gtk-query-immodules-3.0">
-            <primary sortas="b-gtk-query-immodules-3.0">gtk-query-immodules-3.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk-update-icon-cache3">
-        <term><command>gtk-update-icon-cache</command></term>
-        <listitem>
-          <para>
-            is an icon theme caching utility that creates mmap()able cache files
-            for icon themes.
-          </para>
-          <indexterm zone="gtk3 gtk-update-icon-cache3">
-            <primary sortas="b-gtk-update-icon-cache3">gtk-update-icon-cache</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk3-demo">
-        <term><command>gtk3-demo</command></term>
-        <listitem>
-          <para>
-            is a simple program that demonstrates some of the things that can be
-            done with <application>GTK+ 3</application>
-          </para>
-          <indexterm zone="gtk3 gtk3-demo">
-            <primary sortas="b-gtk3-demo">gtk3-demo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk3-demo-application">
-        <term><command>gtk3-demo-application</command></term>
-        <listitem>
-          <para>
-            is a simple <application>GTK+ 3</application> application.
-          </para>
-          <indexterm zone="gtk3 gtk3-demo-application">
-            <primary sortas="b-gtk3-demo-application">gtk3-demo-application</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk3-icon-browser">
-        <term><command>gtk3-icon-browser</command></term>
-        <listitem>
-          <para>
-            is a utility to explore the icons in the current icon theme. It
-            shows icons in various sizes, their symbolic variants where
-            available, as well as a description of the icon and its context.
-          </para>
-          <indexterm zone="gtk3 gtk3-icon-browser">
-            <primary sortas="b-gtk3-icon-browser">gtk3-icon-browser</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk3-widget-factory">
-        <term><command>gtk3-widget-factory</command></term>
-        <listitem>
-          <para>
-            is a program to view <application>GTK+ 3</application> themes and widgets.
-          </para>
-          <indexterm zone="gtk3 gtk3-widget-factory">
-            <primary sortas="b-gtk3-widget-factory">gtk3-widget-factory</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgailutil-3">
-        <term><filename class="libraryfile">libgailutil-3.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that implements the accessibility interfaces
-            defined by the <application>GNOME</application> Accessibility
-            Toolkit.
-          </para>
-          <indexterm zone="gtk3 libgailutil-3">
-            <primary sortas="c-libgailutil-3">libgailutil-3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgdk-3">
-        <term><filename class="libraryfile">libgdk-3.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that act as a wrapper around the low-level
-            drawing and windowing functions provided by the underlying graphics
-            system.
-          </para>
-          <indexterm zone="gtk3 libgdk-3">
-            <primary sortas="c-libgdk-3">libgdk-3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgtk-3">
-        <term><filename class="libraryfile">libgtk-3.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide an API to implement graphical user
-            interfaces.
-          </para>
-          <indexterm zone="gtk3 libgtk-3">
-            <primary sortas="c-libgtk-3">libgtk-3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/gtk-vnc-systemd.xml
===================================================================
--- x/lib/gtk-vnc-systemd.xml	(revision d72fae5ad0127525bdba5ca158637115d0477174)
+++ x/lib/gtk-vnc-systemd.xml	(revision d72fae5ad0127525bdba5ca158637115d0477174)
@@ -0,0 +1,238 @@
+<?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 gtk-vnc-download-http "&gnome-download-http;/gtk-vnc/0.5/gtk-vnc-&gtk-vnc-version;.tar.xz">
+  <!ENTITY gtk-vnc-download-ftp  "&gnome-download-ftp;/gtk-vnc/0.5/gtk-vnc-&gtk-vnc-version;.tar.xz">
+  <!ENTITY gtk-vnc-md5sum        "1dccd918a4d633020e4afaf6c9352cde">
+  <!ENTITY gtk-vnc-size          "400 KB">
+  <!ENTITY gtk-vnc-buildsize     "8.6 MB">
+  <!ENTITY gtk-vnc-time          "0.2 SBU">
+]>
+
+<sect1 id="gtk-vnc" xreflabel="gtk-vnc-&gtk-vnc-version;">
+  <?dbhtml filename="gtk-vnc.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>gtk-vnc-&gtk-vnc-version;</title>
+
+  <indexterm zone="gtk-vnc">
+    <primary sortas="a-gtk-vnc">gtk-vnc</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Gtk VNC</title>
+
+    <para>
+      The <application>Gtk VNC</application> package contains a VNC viewer widget
+      for <application>GTK+</application>. It is built using coroutines allowing
+      it to be completely asynchronous while remaining single threaded.
+    </para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&gtk-vnc-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gtk-vnc-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gtk-vnc-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gtk-vnc-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gtk-vnc-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gtk-vnc-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Gtk VNC Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gtk3"/>
+    </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="cyrus-sasl"/>,
+      <xref linkend="nspr"/>, and
+      <xref linkend="pulseaudio"/><!--, and
+      <xref linkend="xulrunner"/> -->
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/gtk-vnc"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Gtk VNC</title>
+
+    <para>
+      Install <application>Gtk VNC</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --with-gtk=3.0 \
+            --enable-vala \
+            --without-sasl &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a testsuite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>--with-gtk=3.0</parameter>: This switch enables
+      building of the <application>GTK+ 3</application> library
+      instead of the <application>GTK+ 2</application> one.
+    </para>
+
+    <para>
+      <parameter>--enable-vala</parameter>: This switch enables
+      building of the Vala bindings. Remove if you don't have
+      <xref linkend="vala"/> installed.
+    </para>
+
+    <para>
+      <parameter>--without-sasl</parameter>: This switch disables the
+      use of <application>Cyrus SASL</application> for authentication.
+      Remove it if you have installed
+      <application>Cyrus SASL</application> and wish to enable it for
+      authentication.
+    </para>
+
+    <para>
+      <option>--enable-plugin</option>: This switch enables building of
+      the browser plugin.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          gvnccapture
+        </seg>
+        <seg>
+          libgtk-vnc-2.0.so, libgvnc-1.0.so and libgvncpulse-1.0.so
+        </seg>
+        <seg>
+          /usr/include/gtk-vnc-2.0,
+          /usr/include/gvnc-1.0 and
+          /usr/include/gvncpulse-1.0
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gvnccapture">
+        <term><command>gvnccapture</command></term>
+        <listitem>
+          <para>
+            is used to capture image from VNC server.
+          </para>
+          <indexterm zone="gtk-vnc gvnccapture">
+            <primary sortas="b-gvnccapture">gvnccapture</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgtk-vnc-2">
+        <term><filename class="libraryfile">libgtk-vnc-2.0.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>GTK+ 3</application> bindings for
+            <application>Gtk VNC</application>.
+          </para>
+          <indexterm zone="gtk-vnc libgtk-vnc-2">
+            <primary sortas="c-libgtk-vnc-2.0">libgtk-vnc-2.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgvnc-1a">
+        <term><filename class="libraryfile">libgvnc-1.0.so</filename></term>
+        <listitem>
+          <para>
+            contains the GObject bindings for <application>Gtk VNC</application>.
+          </para>
+          <indexterm zone="gtk-vnc libgvnc-1a">
+            <primary sortas="c-libgvnc-1.0">libgvnc-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgvncpulse-1">
+        <term><filename class="libraryfile">libgvncpulse-1.0.so</filename></term>
+        <listitem>
+          <para>
+            is the <application>PulseAudio</application> bridge for
+            <application>Gtk VNC</application>.
+          </para>
+          <indexterm zone="gtk-vnc libgvncpulse-1">
+            <primary sortas="c-libgvncpulse-1.0">libgvncpulse-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
+++ x/lib/lib.xml	(revision d72fae5ad0127525bdba5ca158637115d0477174)
@@ -30,10 +30,11 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="at-spi2-core.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="at-spi2-atk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cairo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cairo-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cairomm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cogl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clutter.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cogl-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clutter-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clutter-gst2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clutter-gtk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="colord-gtk-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fltk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="freeglut.xml"/>
@@ -42,8 +43,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="goffice010.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk+2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk+3.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk+3-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk-engines.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtkmm2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtkmm3.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk-vnc-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="imlib2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdrm.xml"/>
Index: x/lib/libdrm.xml
===================================================================
--- x/lib/libdrm.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
+++ x/lib/libdrm.xml	(revision d72fae5ad0127525bdba5ca158637115d0477174)
@@ -83,4 +83,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="cairo"/> (for the testsuite),
       <xref linkend="DocBook"/>,
       <xref linkend="docbook-xsl"/> and
Index: x/lib/libepoxy.xml
===================================================================
--- x/lib/libepoxy.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
+++ x/lib/libepoxy.xml	(revision d72fae5ad0127525bdba5ca158637115d0477174)
@@ -78,4 +78,9 @@
     </para>
 
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="python3"/>
+    </para>
+
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/libepoxy"/>
Index: x/lib/libxklavier.xml
===================================================================
--- x/lib/libxklavier.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
+++ x/lib/libxklavier.xml	(revision d72fae5ad0127525bdba5ca158637115d0477174)
@@ -124,10 +124,4 @@
     <title>Command Explanations</title>
 
-    <para>
-      <parameter>--with-xkb-base=$XORG_PREFIX/share/X11/xkb</parameter>:
-      Use this swithc if the $XORG_PREFIX is anything other than
-      <filename class="directory">/usr</filename>.
-    </para>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
