Index: general/genutils/genutils.xml
===================================================================
--- general/genutils/genutils.xml	(revision 47969a600348365dd8aa31f29014e715b95de6b8)
+++ general/genutils/genutils.xml	(revision 85efa683a393f07b14e7841137a0d3592ae1cb96)
@@ -37,6 +37,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libiodbc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="graphviz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcb-util.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xterm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rman.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="recode.xml"/>
Index: general/genutils/xcb-util.xml
===================================================================
--- general/genutils/xcb-util.xml	(revision 47969a600348365dd8aa31f29014e715b95de6b8)
+++ 	(revision )
@@ -1,124 +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 xcb-util-download-http "http://xcb.freedesktop.org/dist/xcb-util-&xcb-util-version;.tar.bz2">
-  <!ENTITY xcb-util-download-ftp  " ">
-  <!ENTITY xcb-util-md5sum        "dd8968b8ee613cb027a8ef1fcbdc8fc9">
-  <!ENTITY xcb-util-size          "292 KB">
-  <!ENTITY xcb-util-buildsize     "4.3 MB">
-  <!ENTITY xcb-util-time          "0.1 SBU">
-]>
-
-<sect1 id="xcb-util" xreflabel="xcb-util-&xcb-util-version;">
-  <?dbhtml filename="xcb-util.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>xcb-util-&xcb-util-version;</title>
-
-  <indexterm zone="xcb-util">
-    <primary sortas="a-xcb-util">xcb-util</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xcb-util</title>
-
-    <para>The <application>xcb-util</application> package provides additional
-    extensions to the <application>XCB</application> library, many that were
-    previously found in <application>Xlib</application>, but are not part of
-    core X protocol.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&xcb-util-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&xcb-util-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &xcb-util-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &xcb-util-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &xcb-util-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &xcb-util-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xcb-util Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libxcb"/> and
-    <xref linkend="gperf"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/xcb-util"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xcb-util</title>
-
-    <para>Install <application>xcb-util</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure $XORG_CONFIG &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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libxcb-atom.{a,so}, libxcb-aux.{a,so}, libxcb-event.{a,so},
-        libxcb-icccm.{a,so}, libxcb-image.{a,so}, libxcb-keysyms.{a,so},
-        libxcb-property.{a,so}, libxcb-render-util.{a,so}, and
-        libxcb-reply.{a,so}</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xcb-util-libs">
-        <term><filename class='libraryfile'>libxcb-*.{so,a}</filename></term>
-        <listitem>
-          <para>.</para>
-          <indexterm zone="xcb-util xcb-util-libs">
-            <primary sortas="c-xcb-util">libxcb-*.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: general/genutils/xterm.xml
===================================================================
--- general/genutils/xterm.xml	(revision 47969a600348365dd8aa31f29014e715b95de6b8)
+++ 	(revision )
@@ -1,198 +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 xterm-download-http " ">
-  <!ENTITY xterm-download-ftp  "ftp://invisible-island.net/xterm/xterm-&xterm-version;.tgz">
-  <!ENTITY xterm-md5sum        "3945ab70cfa2a9e95804157ee1b0f8e8">
-  <!ENTITY xterm-size          "932 KB">
-  <!ENTITY xterm-buildsize     "10.6 MB">
-  <!ENTITY xterm-time          "0.2 SBU">
-]>
-
-<sect1 id="xterm2" xreflabel="xterm-&xterm-version;">
-  <?dbhtml filename="xterm.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>xterm-&xterm-version;</title>
-
-  <indexterm zone="xterm2">
-    <primary sortas="a-xterm2">xterm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xterm</title>
-
-    <para><application>xterm</application> is a terminal emulator for
-    the X Window System.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&xterm-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&xterm-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &xterm-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &xterm-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &xterm-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &xterm-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xterm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="xorg7-app"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url='&blfs-wiki;/Xterm'/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xterm</title>
-
-    <para>Install <application>xterm</application> by running the
-    following commands:</para>
-
-<screen><userinput>sed -i '/v0/,+1s/new:/new:kb=^?:/' termcap &amp;&amp;
-echo -e '\tkbs=\\177,' &gt;&gt;terminfo &amp;&amp;
-TERMINFO=/usr/lib/terminfo ./configure $XORG_CONFIG \
-    --enable-luit --enable-wide-chars \
-    --with-app-defaults=/etc/X11/app-defaults &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-make install-ti</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i ... termcap</command>,
-    <command>echo ... >>terminfo</command>: these commands modify the terminal
-    description, so that the Backspace key is expected to send the character
-    with ASCII code 127, for consistency with the Linux console.</para>
-
-    <para><parameter>TERMINFO=/usr/lib/terminfo</parameter>: This ensures
-    that the <command>xterm</command> terminfo file is installed to the
-    system terminfo database when the installation prefix is not
-    <filename class="directory">/usr</filename>.</para>
-
-    <para><parameter>--with-app-defaults=...</parameter>: Sets the location
-    for the <filename class="directory">app-defaults</filename>
-    directory.</para>
-
-    <para><parameter>--enable-luit</parameter>: Enables the luit filter for
-    translation between Unicode (used by xterm internally in the configuration
-    below) and the locale encoding. If <command>luit</command> is not found
-    in the PATH, the default of
-    <filename>/usr/X11R6/bin/luit</filename> will be used.</para>
-
-    <para><parameter>--enable-wide-chars</parameter>: Adds support for wide
-    characters.</para>
-
-    <para><command>make install-ti</command>: This command installs corrected
-    terminfo description files for use with
-    <application>xterm</application>.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring xterm</title>
-
-    <para>There are two ways to configure xterm.  You can add X resource
-    definitions to the user's <filename>~/.Xresources</filename> file, or
-    add them to the system-wide
-    <filename>$XORG_PREFIX/share/X11/app-defaults/Xterm</filename> file.</para>
-
-    <para>In order for xterm to follow the locale settings in the environment,
-    use TrueType fonts, and follow the Linux convention about the code sent by
-    the Backspace key, add the following definitions as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/X11/app-defaults/XTerm &lt;&lt; "EOF"
-*VT100*locale: true
-*VT100*faceName: Monospace
-*VT100*faceSize: 10
-*backarrowKeyIsErase: true
-*ptyInitialErase: true
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-
-      <seglistitem>
-        <seg>resize, uxterm, and xterm</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="resize">
-        <term><filename>resize</filename></term>
-        <listitem>
-          <para>prints a shell command for setting the TERM and TERMCAP
-          environment  variables to indicate the current size of xterm
-          window.</para>
-          <indexterm zone="xterm2 resize">
-            <primary sortas="b-resize">resize</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uxterm">
-        <term><filename>uxterm</filename></term>
-        <listitem>
-          <para>is a wrapper script that modifies the current locale to use UTF-8
-          and starts xterm with the proper settings.</para>
-          <indexterm zone="xterm2 uxterm">
-            <primary sortas="b-uxterm">uxterm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xterm-bin">
-        <term><filename>xterm</filename></term>
-        <listitem>
-          <para>is a terminal emulator for the X Window System.</para>
-          <indexterm zone="xterm2 xterm2">
-            <primary sortas="b-xterm2">xterm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
