Index: x/installing/installing.xml
===================================================================
--- x/installing/installing.xml	(revision 3ee626e299997cdb388f2646aa34b08038405722)
+++ x/installing/installing.xml	(revision e316715825a314d55b2c10189244df6eb1c5aa7a)
@@ -46,8 +46,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7additionaldrivers.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="xconfig-dummy.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x-setup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x-config.xml"/>
--->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg-config.xml"/>
 </chapter>
Index: x/installing/x-config.xml
===================================================================
--- x/installing/x-config.xml	(revision 3ee626e299997cdb388f2646aa34b08038405722)
+++ 	(revision )
@@ -1,200 +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;
-]>
-
-<sect1 id="x-config">
-  <?dbhtml filename="xconfig.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Additional X Window System Configuration</title>
-
-  <para>Below you will find information on fine tuning the components
-  of the <application>X Window System</application>. The documentation
-  links are specifically for <application>XFree86</application>,
-  which has been retired in BLFS, however, the
-  information contained in those documents usually pertains to
-  <application>Xorg</application> as well.  Detailed descriptions are also
-  located in the <filename>xorg.conf</filename> man page.</para>
-
-  <sect2 id='xinput'>
-    <title>Setting up X Input Devices</title>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/XInputDevices"/></para>
-
-    <sect3 id='xkeyboard'>
-      <title>Keyboards</title>
-
-      <para>The following external links provide a good introduction
-      to setting up various keyboards.</para>
-
-      <para><ulink url="http://www.xfree86.org/current/XKB-Config.html">The
-      <application>XKB</application> Configuration Guide</ulink></para>
-
-      <para><ulink url="http://www.xfree86.org/current/XKB-Enhancing.html">How
-      to further enhance <application>XKB</application>
-      configuration</ulink></para>
-
-    </sect3>
-
-    <sect3 id='xmice'>
-      <title>Mice</title>
-
-      <para>Multi-button mice can be used to their full potential by mapping
-      the additional buttons to X button events. Wheel mice are a common example.
-      The ordinary ones contain two buttons, and a scroll wheel that doubles as
-      a third button.  As far as <application>X</application> is concerned, there
-      are 5 buttons as it counts the 'scroll up' and 'scroll down' functions
-      (internally they are buttons). Here is an example 'InputDevice' section for
-      a typical PS/2 wheel mouse:</para>
-
-<screen><literal>Section "InputDevice"
-  Identifier  "Mouse 0"
-  Driver      "mouse"
-  Option      "Device"        "/dev/input/mice"
-  Option      "Protocol"      "IMPS/2"
-  Option      "ZAxisMapping"  "4 5"
-  Option      "Buttons"       "5"
-EndSection</literal></screen>
-
-      <para>Button assignments differ for every mouse type. On more exotic
-      mice, you may find that the rocker wheel buttons are 6 and 7. Simply
-      add those values to the <option>ZAxisMapping</option> option, and set
-      the <option>Buttons</option> option appropriately to enable side to
-      side scrolling. Additional information on button assignment can be
-      found in the following <application>XFree86</application>
-      document:</para>
-
-      <para><ulink url="http://www.xfree86.org/current/mouse.html">Mouse
-      Support in <application>XFree86</application></ulink></para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 id='xdisplay'>
-    <title>Fine Tuning Display Settings</title>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/xdisplay"/></para>
-
-    <sect3>
-      <title>The 'Monitor' Section</title>
-
-      <para>One or more monitor sections specify the characteristics of your
-      monitor(s).  Usually, the setup program can probe your monitor and setup
-      a monitor properly, however, this does not always work.  The most common
-      entries that need to be updated are <option>HorizSync</option> and
-      <option>VertRefresh</option>.  If the configuration program does not set
-      these properly, you will notice a resolution much lower than desired.
-      The default <option>HorizSync</option> setting is 28-33kHz which is very
-      conservative.  The default  <option>VertRefresh</option> is 43-72Hz.
-      Consult your monitor documentation or search online for the proper
-      settings for your monitor.</para>
-
-      <para>It is also possible to control many detailed timing characteristics
-      of a monitor with a <option>Modeline</option> setting.  Most users will
-      not need to do this, but details are in the man page referenced above.
-      </para>
-
-      <warning><para>Incorrect monitor settings can destroy your monitor or
-      even set it on fire!  For most newer monitors, the result of overly
-      aggressive settings is a blank screen, but older monitors do not all have
-      built in safeguards.</para></warning>
-
-      <para>Other items that may be of interest in this section is the
-      <option>DPMS</option> and associated <option>StandbyTime</option>,
-      <option>SuspendTime</option>, and <option>OffTime</option> options.
-      These parameters control the energy saving features of your monitor.  They
-      may also be controlled at runtime with the <command>xset</command> command
-      or via a graphical interface such as <application>KDE</application>'s
-      Control Center.</para>
-
-      <para>A typical monitor section will normally look like:</para>
-
-<screen><literal>Section "Monitor"
-    DisplaySize   400   300 # mm
-    Identifier   "Monitor0"
-    VendorName   "VSC"
-    ModelName    "G810-2"
-    HorizSync     30.0 - 92.0
-    VertRefresh   50.0 - 180.0
-    Option       "DPMS"
-    Option       "StandbyTime" "10"
-    Option       "SuspendTime" "20"
-    Option       "OffTime"     "30"
-EndSection</literal></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>The 'Device' Section</title>
-
-      <para>This section basically controls your video card. The key entry is
-      the <option>Driver</option> setting.  This can be a driver from the
-      <application>X</application> distribution you are using, from the kernel
-      source, or a proprietary driver for devices such as a Nvidia graphics
-      adaptor.  The driver often is a kernel module or built into the kernel
-      itself, but there are also separate non-kernel components usually found
-      in the <filename
-      class='directory'>/usr/X11R6/lib/modules/drivers/</filename> directory.
-      These were either built with the <application>X</application> server or
-      installed via external (i.e., proprietary) programs.</para>
-
-      <para>There are many options for device drivers and most are specific to
-      the driver being used.  Documentation for many drivers can be found at
-      the <ulink url="http://www.xfree86.org/current/manindex4.html">XFree86
-      Driver Manual Pages</ulink>.</para>
-
-      <para>A typical Device section will look like:</para>
-
-<screen><literal>Section "Device"
-    Identifier  "Videocard0"
-    Driver      "radeon"
-    VendorName  "Videocard vendor"
-    BoardName   "ATI Radeon 7500"
-EndSection</literal></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 id='xlayouts'>
-    <title>Display Layouts</title>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/xlayouts"/></para>
-
-    <para>Within the <application>X Window System</application> configuration
-    file there may be multiple layout sections like:</para>
-
-<screen><literal>Section "ServerLayout"
-    Identifier     "X.org Configured"
-    Screen      0  "Screen0" 0 0
-    InputDevice    "Mouse0" "CorePointer"
-    InputDevice    "Keyboard0" "CoreKeyboard"
-EndSection</literal></screen>
-
-    <para>The default layout is the first, but if you have special needs,
-    you can create others with different configurations.  The
-    <option>Identifier</option> line in each section is the key.  Different
-    layouts can be created using different Screen and InputDevice sections.</para>
-
-    <para>After the configuration file is updated, an alternate configuration
-    can be specified on the <command>startx</command> line.  For instance,
-    to start <application>X</application> with an alternate layout with an
-    Identifier of "layout2", use the following command line:</para>
-
-<screen><command>startx -- -layout layout2</command></screen>
-
-
-  </sect2>
-
-</sect1>
Index: x/installing/x-setup.xml
===================================================================
--- x/installing/x-setup.xml	(revision 3ee626e299997cdb388f2646aa34b08038405722)
+++ 	(revision )
@@ -1,637 +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;
-]>
-
-<sect1 id="x-setup" xreflabel="X Window System Components">
-  <?dbhtml filename="x-setup.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>X Window System Components</title>
-
-  <para condition="html" role="usernotes">User Notes:
-  <ulink url='&blfs-wiki;/XWindowSystemComponents'/></para>
-
-  <sect2 role="configuration" id='X11R6-compat-symlink'
-         xreflabel="Creating an X11R6 Compatibility Symlink">
-
-    <title>Creating an X11R6 Compatibility Symlink</title>
-
-    <para>Until recently (relatively speaking) almost every
-    <application>X Window</application> installation you performed or came
-    across was installed in the
-    <filename class='directory'>/usr/X11R6</filename> directory. That was the
-    standard for years. Developers picked up on this and wrote their package
-    installation scripts looking for <application>X</application> in the
-    standard location. Things have changed and the trend is to now install
-    <application>X</application> in
-    <filename class='directory'>/usr</filename>. Some people want to install
-    it in a custom location.</para>
-
-    <para>Many package developers have not caught up to the change and their
-    packages are still trying to find <application>X</application> in
-    <filename class='directory'>/usr/X11R6</filename> and subsequently fail
-    when you try to build the package. Though for most packages it is not
-    difficult to 'hack' the installation script to fix the problem, that is not
-    the long term solution to the problem. Upstream developers need to modernize
-    their installation scripts and eliminate the problem altogether.</para>
-
-    <para>Until then, you can create a symbolic link to satisfy the
-    <filename class='directory'>/usr/X11R6</filename> requirement so that you
-    won't be inconvenienced with a package build failure due to this known
-    issue. If you wish to create the symlink, issue the following command as
-    the <systemitem class="username">root</systemitem> user (ensure you modify
-    <replaceable>&lt;$XORG_PREFIX&gt;</replaceable> appropriately):</para>
-
-<screen role="root"><userinput>ln -vsf <replaceable>&lt;$XORG_PREFIX&gt;</replaceable> /usr/X11R6</userinput></screen>
-
-<!--    <para>Packages in Xorg store their configuration files in
-    <filename class="directory">$XORG_PREFIX/lib/X11</filename> by default.
-    This is strictly against FHS guidelines.  Correct the installation
-    <filename class="directory">/etc/X11</filename> and create symlinks
-    in the original location with the commands as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>mkdir -p /etc/X11 &amp;&amp;
-for file in $XORG_PREFIX/{lib/X11/xinit,share/X11/{app-defaults,twm}}
-do
-     mv -v $file /etc/X11/ 2&gt; /dev/null &amp;&amp;
-     ln -v -s /etc/X11/$(basename $file) $file
-done
-</userinput></screen>
--->
-
-  </sect2>
-
-  <sect2 role="configuration" id='xconfig'>
-    <title>Configuring The X Window System</title>
-
-    <para>As the <systemitem class="username">root</systemitem> user
-    create a basic X Window System configuration file with the following
-    command:</para>
-
-<screen><userinput>cd ~ &amp;&amp;
-Xorg -configure</userinput></screen>
-
-    <indexterm zone="x-setup xconfig">
-      <primary sortas="e-etc-X11-xorg-conf">/etc/X11/xorg.conf</primary>
-    </indexterm>
-
-    <para>The screen will go blank and you may hear some clicking of the
-    monitor.  This command will create a file,
-    <filename>xorg.conf.new</filename>, in your home directory.</para>
-
-<!--
-    <para>Recent versions of <application>xorg-server</application> force the
-    use of the evdev input driver, and ignore legacy input devices defined in
-    <filename>xorg.conf</filename>.  This will result in an X display that
-    seems to lock up if you are using legacy input devices and do not have the
-    proper input configuration files in place (added later).  Add the following
-    lines to the new <application>Xorg</application> configuration file to
-    overcome this issue:</para>
-
-<screen><userinput>cat &gt;&gt; ~/xorg.conf.new &lt;&lt; "EOF"
-Section "ServerFlags"
-	Option "AllowEmptyInput" "false"
-EndSection
-EOF</userinput></screen>
--->
-
-    <para>Edit the newly created configuration file to suit your system. The
-    details of the files are located in the <filename>xorg.conf.5x</filename>
-    man page.  Some things you may want to do are:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>Section "Files". Change the order of the font paths searched.
-        You may want to put 75dpi fonts ahead of 100dpi fonts if your system
-        normally comes up closer to 75 dots per inch. You may want to remove
-        some font directories completely.</para>
-      </listitem>
-      <listitem>
-        <para>Section "Module". If you are going to install NVIDIA
-        drivers, remove the "dri" line.</para>
-      </listitem>
-      <listitem>
-        <para>Sections "InputDevice". You may want to change the
-        keyboard autorepeat rate by adding
-        <option>Option "Autorepeat" "250 30"</option>.</para>
-      </listitem>
-      <listitem>
-        <para>Section "Monitor". Specify the <option>VertRefresh</option>
-        and <option>HorizSync</option> values if the system does not
-        automatically detect the monitor and its values.</para>
-      </listitem>
-      <listitem>
-        <para>Section "Device". You may want to set some of the options
-        available for your selected video driver. A description of the driver
-        parameters is in the man page for your driver.</para>
-      </listitem>
-      <listitem><para>Section "Screen". Add a DefaultDepth statement such as:
-        <option>DefaultDepth 24</option>. In the SubSection for your
-        default depth, add a modes line such as:
-        <option>Modes "1600x1200" "1280x1024" "1024x768"</option>. The first
-        mode listed will normally be the starting resolution.</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>Test the system with the following command:</para>
-
-<screen><userinput>X -retro -config ~/xorg.conf.new</userinput></screen>
-
-    <para>You will only get a gray background with an X-shaped mouse cursor,
-    but it confirms the system is working. Exit with
-    <keycap>Control+Alt+Backspace</keycap>. If the system does not work, take
-    a look at <filename>/var/log/Xorg.0.log</filename> to see what went
-    wrong.</para>
-
-    <para>As the <systemitem class="username">root</systemitem> user, move the
-    configuration file to the new directory:</para>
-
-<screen role="root"><userinput>install -v -m644 ~/xorg.conf.new /etc/X11/xorg.conf</userinput></screen>
-
-    <para>As the <systemitem class="username">root</systemitem> user, create
-    <filename>.xinitrc</filename>:</para>
-
-<screen><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
-<literal># Begin .xinitrc file
-xterm  -g 80x40+0+0   &amp;
-xclock -g 100x100-0+0 &amp;
-twm</literal>
-EOF</userinput></screen>
-
-    <para>This provides an initial screen with a small clock that is
-    managed by a simple window manager, Tab Window Manager. For details of
-    <command>twm</command>, see the man page.</para>
-
-    <indexterm zone="x-setup xconfig">
-      <primary sortas="e-AA.xinitrc">~/.xinitrc</primary>
-    </indexterm>
-
-    <note>
-      <para>Both the default, and the BLFS configuration for
-      <application>Xorg</application> include <application>xterm</application>.
-      <application>Xorg</application>'s modular distribution no longer includes
-      <application>xterm</application>, and
-      as a result, the <command>startx</command> command will fail if you have
-      not installed <xref linkend="xterm2"/> when using the modular X Window
-      System.  You can remove the <application>xterm</application> line in the
-      above config file to test the xserver, or install one of the other
-      terminal emulators and make appropriate changes.</para>
-    </note>
-
-    <para>When needed, the X Window System creates the directory
-    <filename class='directory'>/tmp/.ICE-unix</filename> if it does not
-    exist. If this directory is not owned by
-    <systemitem class="username">root</systemitem>,
-    the X Window System delays startup by a few seconds and also
-    appends a warning to the logfile. This also affects startup of other
-    applications. To improve performance, it is advisable to manually create
-    the directory before the X Window System uses it. Add the file creation
-    to <filename>/etc/sysconfig/createfiles</filename> that is sourced by
-    the <filename>/etc/rc.d/init.d/cleanfs</filename> startup script.</para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/sysconfig/createfiles &lt;&lt; "EOF"
-/tmp/.ICE-unix dir 1777 root root
-EOF</userinput></screen>
-
-    <indexterm zone="x-setup xconfig">
-      <primary
-      sortas="e-etc-sysconfig-createfiles">/etc/sysconfig/createfiles</primary>
-    </indexterm>
-
-    <para>Start <application>X</application> with:</para>
-
-<screen><userinput>startx</userinput></screen>
-
-    <para>and a basic functional <application>X Window
-    System</application> should be displayed.</para>
-
-  </sect2>
-
-  <sect2 id='dri'>
-    <title>Checking Direct Rendering Infrastructure (DRI) Installation</title>
-
-    <indexterm zone="x-setup dri">
-      <primary sortas="g-DRI">DRI</primary>
-    </indexterm>
-
-    <para>DRI is a framework for allowing software to access graphics hardware
-    in a safe and efficient manner. It is installed in
-    <application>X</application> by default if you have a supported video card.
-    To enable direct rendering using the OpenGL implementation from
-    <xref linkend="mesalib"/> (built separately with <xref linkend="xorg7"/>
-    the "glx" and "dri" modules must be loaded.  Additionally, the created
-    device nodes in <filename class="directory">/dev/dri</filename> must
-    have proper permissions for your users.  A sample
-    <filename>xorg.conf</filename> file might look like this:</para>
-
-<screen><literal>Section "Module"
-    ...
-    Load  "glx"
-    Load  "dri"
-    ...
-EndSection
-...
-Section "DRI"
-    Group "video"
-    Mode  0660
-EndSection</literal></screen>
-
-    <para>The DRI devices are not accessible for any user except
-      <systemitem class="username">root</systemitem> and members of the
-      <systemitem class="groupname">video</systemitem> group. Add any users
-      that might use X to that group:</para>
-
-<screen role="root"><userinput>usermod -a -G video <replaceable>&lt;username&gt;</replaceable></userinput></screen>
-
-    <note><para>DRI configuration may differ if you are using alternate
-    drivers, such as those from
-    <ulink url="http://www.nvidia.com/page/home.html">NVIDIA</ulink> or
-    <ulink url="http://www.ati.com/">ATI</ulink>.</para>
-    </note>
-
-    <para>To check if DRI is installed properly, check the log file
-    <filename>/var/log/Xorg.0.log</filename> for statements like:</para>
-
-<screen><literal>(II) R128(0): Direct rendering enabled</literal></screen>
-
-    <para>If you elected to install the Mesa-Demos package when installing
-    <xref linkend="mesalib"/>, from an <command>xterm</command>, run
-    <command>glxinfo</command> and look for the phrase:</para>
-
-<screen><computeroutput>direct rendering: Yes</computeroutput></screen>
-
-    <para>If direct rendering is not enabled, you can add verbosity by
-    running <command>LIBGL_DEBUG=verbose glxinfo</command>.  This will
-    show the drivers, device nodes and files used by the DRI system.</para>
-
-    <para>Again, if you have added the Mesa-Demos package, you can also
-    run the test program <command>glxgears</command>.
-    This program brings up a window with three gears turning.  The
-    <command>xterm</command> will display how many frames were drawn every
-    five seconds, so this is a reasonable benchmark.  The window is scalable,
-    and the frames drawn per second is highly dependent on the size of
-    the window.</para>
-
-    <indexterm zone="x-setup dri">
-      <primary sortas="b-glxgears">glxgears</primary>
-    </indexterm>
-
-    <indexterm zone="x-setup dri">
-      <primary sortas="b-glxinfo">glxinfo</primary>
-    </indexterm>
-
-    <para>For troubleshooting problems, check the DRI Users Guide at
-    <ulink url="http://dri.sourceforge.net/doc/DRIuserguide.html"/>.</para>
-
-  </sect2>
-
-<!-- ================================================== -->
-
-  <sect2 id='fonts'>
-    <title>Setting up Fonts</title>
-
-    <para>There are two font systems in the
-    <application>X Window System</application>.  The first is the
-    core X font protocol, and the second is Xft.  Toolkits that use the core
-    X font protocol include Xt, Xaw, Motif clones and GTK+-1.2.  Toolkits that
-    use Xft include GTK+-2 and Qt and use <application>Fontconfig</application>
-    for control.  Both font systems should be configured for proper font
-    coverage in the <application>X Window System</application>.</para>
-
-    <indexterm zone="x-setup fonts">
-      <primary sortas="e-etc-X11-xorg-conf">/etc/X11/xorg.conf</primary>
-    </indexterm>
-
-    <sect3>
-      <title>Core X Font Protocol</title>
-
-      <indexterm zone="x-setup fonts">
-        <primary sortas="g-core-x-font">Core X Font Protocol</primary>
-      </indexterm>
-
-      <para>The core X font protocol finds fonts from the server configuration
-      file (<filename>xorg.conf</filename>).
-      If no font paths exist in the configuration file, the server will fall
-      back to an internal hard-coded path of
-      <filename class="directory">$XORG_PREFIX>/share/fonts/X11</filename>.
-      For each directory in the path, the server reads three files:</para>
-
-      <itemizedlist>
-        <listitem>
-          <para><filename>fonts.dir</filename> - maps font files to font
-          names&semi; updated with <command>mkfontdir</command></para>
-        </listitem>
-        <listitem>
-          <para><filename>fonts.alias</filename> - defines aliases (such as
-          "9x18") for existing fonts</para>
-        </listitem>
-        <listitem>
-          <para><filename>fonts.scale</filename> - lists scalable fonts&semi;
-          updated with <command>mkfontscale</command></para>
-        </listitem>
-      </itemizedlist>
-
-      <para>The core X fonts protocol uses names such as
-      <systemitem>-misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-1</systemitem>.
-      These fonts are rendered by the <application>X</application> server
-      without antialiasing.  The server itself uses the "cursor" font for
-      painting the mouse cursor, and the protocol specification requires the
-      font "fixed" to be available.</para>
-
-      <para>Scalable fonts, such as Type1 and TrueType, are read from
-      <filename>fonts.scale</filename> files by the server.  The core X font
-      system uses the "freetype" module for non-antialiased rendering of these
-      fonts.  Ensure that the "freetype" module is loaded in the
-      <filename>xorg.conf</filename> file by adding it to the "Module"
-      section:</para>
-
-<screen><literal>Section "Module"
-    ...
-    Load  "freetype"
-    ...
-EndSection</literal></screen>
-
-      <para>The character set used is part of the font name, e.g. "-iso8859-1".
-      It is important that applications which support a non-English interface
-      specify the character set correctly so that the proper glyphs are used.
-      This can be controlled through the <application>X</application>
-      resources, which will be described later.</para>
-
-      <para>In some cases, applications rely upon the fonts named "fixed" or
-      something like "9x18".  In these cases, it is important that the
-      <filename>fonts.alias</filename> file specifies the correct character
-      set.  Users of ISO-8859-<replaceable>X</replaceable> encodings where
-      <replaceable>X</replaceable> != 1 should modify the
-      <filename>/usr/lib/X11/fonts/misc/fonts.alias</filename> file by
-      replacing the "iso8859-1" string with the proper encoding name.  This is
-      accomplished by running the following command as the <systemitem
-      class="username">root</systemitem> user, substituting the proper value
-      for <replaceable>&lt;X&gt;</replaceable>:</para>
-
-<screen role="root"><userinput>sed -i 's,iso8859-1\( \|$\),iso8859-<replaceable>&lt;X&gt;</replaceable>\1,g' \
-    /usr/lib/X11/fonts/{75dpi,100dpi,misc}/fonts.alias</userinput></screen>
-
-      <para>Users of Cyrillic fonts have properly defined aliases in
-      <filename>/usr/lib/X11/fonts/cyrillic/fonts.alias</filename>.  However,
-      this file will not be used unless the <filename
-      class="directory">/usr/lib/X11/fonts/cyrillic</filename> directory is
-      first in the font search path.  Otherwise, the
-      <filename>/usr/lib/X11/fonts/misc/fonts.alias</filename> file will be
-      used.</para>
-
-    </sect3>
-
-    <sect3 id="xft-font-protocol"  xreflabel="Xft Font Protocol">
-      <title>Xft Font Protocol</title>
-
-      <indexterm zone="x-setup fonts">
-        <primary sortas="g-truetype">TrueType Fonts</primary>
-      </indexterm>
-
-      <para>Xft provides antialiased font rendering through
-      <application>Freetype</application>, and fonts are controlled from the
-      client side using <application>Fontconfig</application>.  The default
-      search path is <filename class="directory">/usr/share/fonts</filename>
-      and <filename class="directory">~/.fonts</filename>.
-      <application>Fontconfig</application> searches directories in its
-      path recursively and maintains a cache of the font characteristics in
-      <filename>fonts.cache-1</filename> files in each directory.  If the cache
-      appears to be out of date, it is ignored, and information is (slowly)
-      fetched from the fonts themselves.  This cache
-      can be regenerated using the <command>fc-cache</command> command at any
-      time. You can see the list of fonts known by
-      <application>Fontconfig</application> by running the command
-      <command>fc-list</command>.</para>
-
-      <para>The <application>X</application> fonts were not installed in a
-      location known to <application>Fontconfig</application>. This prevents
-      <application>Fontconfig</application> from using the poorly rendered
-      Type 1 fonts or the non-scalable bitmapped fonts. Symlinks were created
-      from the <filename class="directory">OTF</filename> and <filename
-      class="directory">TTF</filename> <application>X</application> font
-      directories to <filename
-      class="directory">/usr/share/fonts/X11-{OTF,TTF}</filename>. This allows
-      <application>Fontconfig</application> to use the OpenType and TrueType
-      fonts provided by <application>X</application> (which are scalable and
-      of higher quality).</para>
-
-      <para><application>Fontconfig</application> uses names such as
-      "Monospace 12" to define fonts.  Applications generally use generic font
-      names such as "Monospace", "Sans" and "Serif".
-      <application>Fontconfig</application> resolves these names to a font that
-      has all characters that cover the orthography of the language indicated
-      by the locale settings.  Knowledge of these font names is included in
-      <filename>/etc/fonts/fonts.conf</filename>. Fonts that are not listed
-      in this file are still usable by <application>Fontconfig</application>,
-      but they will not be accessible by the generic family names.</para>
-
-      <para>Standard scalable fonts that come with <application>X</application>
-      provide very poor Unicode coverage.  You may notice in applications that
-      use <application>Xft</application> that some characters appear as a box
-      with four binary digits inside.  In this case, a font set with the
-      available glyphs has not been found.  Other times, applications that
-      don't use other font families by default and don't accept substitutions
-      from <application>Fontconfig</application> will display blank lines when
-      the default font doesn't cover the orthography of the user's language.
-      This happens, e.g., with <application>Fluxbox</application> in the
-      ru_RU.KOI8-R locale.</para>
-
-      <para>In order to provide greater Unicode coverage, it is recommended
-      that you install these fonts:</para>
-
-      <itemizedlist>
-        <listitem>
-          <para><ulink url="http://dejavu.sourceforge.net/">DejaVu fonts</ulink>
-          - These fonts are replacements for the Bitstream Vera fonts and
-          provide Latin-based scripts with accents and Cyrillic glyphs.</para>
-        </listitem>
-        <listitem>
-          <para><ulink
-          url="http://download.savannah.nongnu.org/releases/freefont/">FreeFont</ulink>
-          - This set of fonts covers nearly every non-CJK character, but is not
-          visually pleasing.  <application>Fontconfig</application> will use it
-          as a last resort to substitute generic font family names.</para>
-        </listitem>
-        <listitem>
-          <para><ulink
-          url="http://corefonts.sourceforge.net/">Microsoft Core fonts</ulink>
-          - These fonts provide slightly worse Unicode coverage than FreeFont,
-          but are better hinted.  Be sure to read the license before using
-          them. These fonts are listed in the
-          <filename>/etc/fonts/fonts.conf</filename> aliases by default.</para>
-        </listitem>
-        <listitem>
-          <para><ulink
-          url="http://cle.linux.org.tw/fonts/FireFly">Firefly New Sung font</ulink>
-          - This font provides Chinese coverage. This font is not listed in
-          the <filename>/etc/fonts/fonts.conf</filename> aliases by default.
-          </para>
-        </listitem>
-        <listitem>
-          <para><ulink
-          url="http://cle.linux.org.tw/fonts/Arphic">Arphic fonts</ulink> -
-          A similar set of Chinese fonts to the Firefly New Sung font.
-          These fonts are listed in the
-          <filename>/etc/fonts/fonts.conf</filename> aliases by default.
-          </para>
-        </listitem>
-        <listitem>
-          <para><ulink
-          url="http://sourceforge.jp/projects/efont/">Kochi fonts</ulink> -
-          These provide Japanese characters, and they are listed in the aliases
-          in <filename>/etc/fonts/fonts.conf</filename> by default.</para>
-        </listitem>
-        <listitem>
-          <para><ulink
-          url="http://kldp.net/projects/baekmuk/">Baekmuk fonts</ulink>
-          - These fonts provide Korean coverage, and they are listed in the
-          aliases in <filename>/etc/fonts/fonts.conf</filename> by default.
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <para>The list above will not provide complete Unicode coverage.  For
-      more information, please visit the <ulink
-      url="http://unifont.org/fontguide/">Unicode Font Guide</ulink>.</para>
-
-      <para>As an example, consider the installation of the DejaVu fonts.  From
-      the unpacked source directory, run the following commands as the
-      <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>install -v -d -m755 /usr/share/fonts/dejavu &amp;&amp;
-install -v -m644 *.ttf /usr/share/fonts/dejavu &amp;&amp;
-fc-cache -v /usr/share/fonts/dejavu</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-<!-- ================================================== -->
-
-  <sect2>
-    <title>Setting up Keyboards</title>
-
-    <para>In this version of <application>X</application>, non-Latin
-    keyboard layouts do not include Latin configurations as was previous
-    practice. To set up a keyboard for Latin and non-Latin input, change
-    the XkbLayout keyboard driver option in the InputDevice section
-    of the <filename>xorg.conf</filename> file. For example:</para>
-
-<screen><literal>Section "InputDevice"
-    Identifier          "Keyboard0"
-    Driver              "kbd"
-    Option "XkbModel"   "pc105"
-    Option "XkbLayout"  "en_US,ru"
-    Option "XkbOptions" "grp:switch,grp:alt_shift_toggle,grp_led:scroll"
-EndSection</literal></screen>
-
-    <para>In this example, you can use the <keycap>Alt+Shift</keycap>
-    combination to switch between keyboard layouts and use the Scroll Lock
-    LED to indicate when the second layout is active.</para>
-
-  </sect2>
-
-<!-- ================================================== -->
-<!--
-  <sect2 id='xdm'>
-    <title>Setting up XDM</title>
-
-    <para><command>xdm</command> provides a graphical logon capability and
-    is normally set up in <filename>/etc/inittab</filename>. Most of the
-    information you need to customize <command>xdm</command> is found in
-    its man page. To execute <command>xdm</command> during bootup, change
-    the initdefault level to 5 and add the following lines to
-    <filename>/etc/inittab</filename>:</para>
-
-    <indexterm zone="x-setup xdm">
-      <primary sortas="b-xdm">xdm</primary>
-    </indexterm>
-
-<screen><literal># Run xdm as a separate service
-x:5:respawn:/usr/X11R6/bin/xdm -nodaemon</literal></screen>
-
-    <para>If <application>Linux-PAM</application> is installed on your
-    system, you should create a PAM entry for <command>xdm</command> by
-    duplicating the <command>login</command> entry using the following
-    command:</para>
-
-    <indexterm zone="x-setup xdm">
-      <primary sortas="e-etc-pam.d/xdm">/etc/pam.d/xdm</primary>
-    </indexterm>
-
-<screen role="root"><userinput>cp -v /etc/pam.d/login /etc/pam.d/xdm</userinput></screen>
-
-  </sect2>
--->
-
-<!-- ================================================== -->
-
-  <sect2 id='x-resources'>
-    <title>Using X Resources</title>
-
-    <para>There are many options that can be set in
-    <application>X</application> and <application>X</application>
-    clients via resources. Typically resources are set in the
-    <filename>~/.Xresources</filename> file.</para>
-
-    <para>The layout of the <filename>~/.Xresources</filename> file
-    consists of a list of specifications in the form of</para>
-
-    <indexterm zone="x-setup x-resources">
-      <primary sortas="e-AA.xresources">~/.Xresources</primary>
-    </indexterm>
-
-<screen><literal>object.subobject[.subobject...].attribute: value</literal></screen>
-
-    <para>Components of a resource specification are linked together by
-    either <emphasis>tight</emphasis>, represented by a dot (.), or
-    <emphasis>loose</emphasis>, represented by an asterisk (*), bindings.
-    A tight binding indicates that the components on either side of the
-    dot must be directly next to each other as defined in a specific
-    implementation. An asterisk is a wildcard character that means that
-    any number of levels in a defined hierarchy can be between the components.
-    For example, X offers two special cursors: redglass and whiteglass. To
-    use one of these resources, you need to add the following line:</para>
-
-<screen><literal>Xcursor.theme: whiteglass</literal></screen>
-
-    <para>However, you can specify the background for all clients with:</para>
-
-<screen><literal>*background: blue</literal></screen>
-
-    <para>More specific resource variables will override less specific
-    names.</para>
-
-    <para>Resource definitions can be found in the man pages for each
-    respective client.</para>
-
-    <para>In order to load your resources, the <command>xrdb</command>
-    program must be called with the appropriate parameters. Typically,
-    the first time resources are loaded, you use:</para>
-
-<screen><userinput>xrdb -load &lt;filename&gt;</userinput></screen>
-
-    <para>To add resources to <application>X</application>'s database
-    in memory, use:</para>
-
-<screen><userinput>xrdb -merge &lt;filename&gt;</userinput></screen>
-
-    <para>The <command>xrdb</command> instruction is usually placed in
-    <filename>~/.xinitrc</filename> or <filename>~/.xsession</filename>.
-    To get more information, see the <command>xrdb</command> man page.</para>
-
-    <indexterm zone="x-setup x-resources">
-      <primary sortas="b-xrdb">xrdb</primary>
-    </indexterm>
-
-  </sect2>
-
-</sect1>
Index: x/installing/xconfig-dummy.xml
===================================================================
--- x/installing/xconfig-dummy.xml	(revision 3ee626e299997cdb388f2646aa34b08038405722)
+++ 	(revision )
@@ -1,15 +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">
-
-<sect1 role="dummy">
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Configuring X Window System</title>
-  <para/>
-</sect1>
-
Index: x/lib/lesstif.xml
===================================================================
--- x/lib/lesstif.xml	(revision 3ee626e299997cdb388f2646aa34b08038405722)
+++ 	(revision )
@@ -1,326 +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 lesstif-download-http "&sourceforge-repo;/lesstif/lesstif-&lesstif-version;.tar.bz2">
-  <!ENTITY lesstif-download-ftp  " ">
-  <!ENTITY lesstif-md5sum        "754187dbac09fcf5d18296437e72a32f">
-  <!ENTITY lesstif-size          "2.4 MB">
-  <!ENTITY lesstif-buildsize     "160 MB (includes building and running the test suite)">
-  <!ENTITY lesstif-time          "4.1 SBU (includes building the test suite)">
-]>
-
-<sect1 id="lesstif" xreflabel="LessTif-&lesstif-version;">
-  <?dbhtml filename="lesstif.html" ?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>LessTif-&lesstif-version;</title>
-
-  <indexterm zone="lesstif">
-    <primary sortas="a-LessTif">LessTif</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LessTif</title>
-
-    <para>The <application>LessTif</application> package contains an Open
-    Source version of <application>OSF/Motif®</application>.</para>
-
-    &lfs65_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&lesstif-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&lesstif-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &lesstif-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &lesstif-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &lesstif-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &lesstif-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/lesstif-&lesstif-version;-testsuite_fix-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">LessTif Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="xorg7-lib"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="lynx"/> or <xref linkend="Links"/>
-    (used to generate the <filename>INSTALL</filename> documentation file) and
-    <ulink url="http://dmalloc.com">Dmalloc</ulink></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/lesstif"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LessTif</title>
-
-    <para>First, rename a man page file that conflicts with
-    <application>perl</application>:</para>
-
-    <screen><userinput>pushd doc/lessdox/widgets                      &amp;&amp;
-sed -i -e 's/\tShell.3/\tshell.3/' Makefile.in &amp;&amp;
-mv Shell.3 shell.3                             &amp;&amp;
-popd</userinput></screen>
-
-    <para>Install <application>LessTif</application> by running the following
-    commands:</para>
-
-<screen><userinput>patch -Np1 -i ../lesstif-&lesstif-version;-testsuite_fix-1.patch &amp;&amp;
-./configure --prefix=/usr \
-            --sysconfdir=/etc/X11 \
-            --disable-debug \
-            --enable-production \
-            --with-xdnd \
-            --x-includes=$XORG_PREFIX/include \
-            --x-libraries=$XORG_PREFIX/lib &amp;&amp;
-sed -i "s@libdir)/X11/mwm@sysconfdir)/mwm@" clients/Motif-2.1/mwm/Makefile &amp;&amp;
-make rootdir=/usr/share/doc/lesstif-&lesstif-version;</userinput></screen>
-
-    <para>This package requires that it is installed before the test suite is
-    run. The commands to run the tests are located a bit later in the
-    instructions.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make rootdir=/usr/share/doc/lesstif-&lesstif-version; install &amp;&amp;
-ldconfig</userinput></screen>
-
-    <para>Applicatons that utilize Xorg libraries often, and incorrectly,
-    expect to find configuration files in
-    <filename class="directory">$XORG_PREFIX/lib/X11</filename>.  While still
-    the <systemitem class="username">root</systemitem> user, create a
-    compatibility symlink with the following command:</para>
-
-<screen role="root"><userinput>ln -v -sf /etc/X11/mwm $XORG_PREFIX/lib/X11</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--disable-debug</parameter>: Do not generate debugging
-    information.</para>
-
-    <para><parameter>--enable-production</parameter>: Build the release version
-    of the <application>LessTif</application> libraries.</para>
-
-    <para><parameter>--with-xdnd</parameter>: Enable XDND GNOME compatibility
-    support.</para>
-
-    <para><parameter>rootdir=/usr/share/doc/lesstif-&lesstif-version;</parameter>:
-    This installs the documentation into an appropriate directory instead of the
-    non-FHS compliant <filename class="directory">/usr/LessTif</filename>
-    directory.</para>
-
-    <para><parameter>--x-includes</parameter> and
-    <parameter>--x-libraries</parameter>: tells the build system where to find
-    the Xorg headers and libraries.</para>
-
-    <para><command>sed -i "s@libdir)/X11/mwm@sysconfdir)/mwm@"
-    clients/Motif-2.1/mwm/Makefile</command>: This corrects the installation
-    prefix for the mwm directory for FHS compliance.</para>
-
-  </sect2>
-
-  <sect2 role="testing">
-    <title>Testing LessTif</title>
-
-    <para>It is advisable to test the installation of
-    <application>LessTif</application> using the included test suite. It is
-    not required to install any of the resulting binaries to validate the
-    installation. Issue the following commands to build the test suite:</para>
-
-<screen><userinput>cd test &amp;&amp;
-./configure &amp;&amp;
-make</userinput></screen>
-
-    <para>To run the tests, issue the following commands:</para>
-
-<screen><userinput>cd Xm &amp;&amp;
-./testall *</userinput></screen>
-
-    <para>You may need to manually close four of the test windows. The first
-    one is from <command>test28</command> in the
-    <filename class='directory'>list</filename> directory. The second one is
-    from <command>test10</command> in the
-    <filename class='directory'>menushell</filename> directory. You should
-    click on the button in the window and choose <quote>exit</quote> (do it
-    twice) to finish the test. The third test is from <command>test20</command>
-    in the <filename class='directory'>PushButton</filename> and the last one
-    is from <command>test24</command> in the
-    <filename class='directory'>scrolledwindow</filename> directory.</para>
-
-    <!-- Last test run: 86 failed out of 605. -->
-
-    <para>As many as 101 tests are known to fail. The patch applied at the
-    beginning of the installation created a file used to compare known failures
-    to the failures from the test run. This file was created from an
-    installation using the current LFS book and should be a fairly accurate
-    representation of the failures you'll encounter. You could see some minor
-    variances, however.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring LessTif</title>
-
-    <sect3 id="lesstif-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/X11/mwm/system.mwmrc</filename> and
-      <filename>~/.mwmrc</filename></para>
-
-      <indexterm zone="lesstif lesstif-config">
-        <primary sortas="e-AA.mwmrc">~/.mwmrc</primary>
-      </indexterm>
-
-      <indexterm zone="lesstif lesstif-config">
-        <primary
-        sortas="e-etc-X11-mwm-system.mwmrc">/etc/X11/mwm/system.mwmrc</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>The config files are used to customize the behavior of the
-      <command>mwm</command> window manager. Information about customizing
-      these files can be found in the <filename>mwmrc(5)</filename> man
-      page.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>motif-config, mwm, mxmkmf, uil, and xmbind</seg>
-        <seg>libDtPrints.so, libMrm.so, libUil.so, and libXm.so</seg>
-        <seg>/etc/X11/mwm, /usr/include/Xm, /usr/include/Mrm,
-        /usr/include/uil, /usr/include/Dt, /usr/lib/LessTif, and
-        /usr/share/doc/lesstif-&lesstif-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="motif-config">
-        <term><command>motif-config</command></term>
-        <listitem>
-          <para>is used to find out configuration information for packages
-          needing to link to the <application>LessTif</application>
-          libraries.</para>
-          <indexterm zone="lesstif motif-config">
-            <primary sortas="b-motif-config">motif-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mwm">
-        <term><command>mwm</command></term>
-        <listitem>
-          <para>is a window manager that adheres largely to the
-          <application>Motif</application> <command>mwm</command>
-          specification.</para>
-          <indexterm zone="lesstif mwm">
-            <primary sortas="b-mwm">mwm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mxmkmf">
-        <term><command>mxmkmf</command></term>
-        <listitem>
-          <para>is the <application>LessTif</application> version of
-          <command>xmkmf</command> which creates a
-          <filename>Makefile</filename> from an
-          <filename>Imakefile</filename>.</para>
-          <indexterm zone="lesstif mxmkmf">
-            <primary sortas="b-mxmkmf">mxmkmf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uil">
-        <term><command>uil</command></term>
-        <listitem>
-          <para>is a user interface language compiler which translates a
-          plain text description of the user interface of a
-          <application>Motif</application> application into a
-          machine-readable form.</para>
-          <indexterm zone="lesstif uil">
-            <primary sortas="b-uil">uil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xmbind">
-        <term><command>xmbind</command></term>
-        <listitem>
-          <para> configures the virtual key bindings of
-          <application>LessTif</application> applications.</para>
-          <indexterm zone="lesstif xmbind">
-            <primary sortas="b-xmbind">xmbind</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libXm">
-        <term><filename class='libraryfile'>libXm.so</filename></term>
-        <listitem>
-          <para>is an <application>OSF/Motif®</application> source code
-          compatible library for the <application>X Window
-          System</application>. You can download an excellent reference
-          guide (mainly for programmers) for the Motif-2.1 specification
-          from <ulink
-          url="http://unc.dl.sourceforge.net/lesstif/6B_book.pdf"/>.</para>
-          <indexterm zone="lesstif libXm">
-            <primary sortas="c-libXm">libXm.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision 3ee626e299997cdb388f2646aa34b08038405722)
+++ x/lib/lib.xml	(revision e316715825a314d55b2c10189244df6eb1c5aa7a)
@@ -44,5 +44,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk-vnc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hicolor-icon-theme.xml"/>
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lesstif.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnotify.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsexy.xml"/>
@@ -52,5 +51,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pango.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pangomm.xml"/>
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shared-mime-info.xml"/>
Index: x/lib/qt.xml
===================================================================
--- x/lib/qt.xml	(revision 3ee626e299997cdb388f2646aa34b08038405722)
+++ 	(revision )
@@ -1,563 +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 qt-download-http "&trinity-repo-http;/qt3-3.3.8.d.tar.gz">
-  <!ENTITY qt-download-ftp  "&trinity-repo-ftp;/qt3-3.3.8.d.tar.gz ">
-  <!ENTITY qt-md5sum        "78dc675e84aed595375449818cbb589a">
-  <!ENTITY qt-size          "16.8 MB">
-  <!ENTITY qt-buildsize     "801 MB">
-  <!ENTITY qt-time          "8.6 SBU">
-]>
-
-<sect1 id="qt" xreflabel="Qt-&qt-version;">
-  <?dbhtml filename="qt.html" ?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Qt-&qt-version;</title>
-
-  <indexterm zone="qt">
-    <primary sortas="a-qt">Qt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Qt</title>
-
-    <para>The <application>Qt</application> package contains a
-    <application>C++</application> GUI library. This is useful for creating
-    graphical applications or executing graphical applications that are
-    dynamically linked to the <application>Qt</application> library. Two of
-    the major users of <application>Qt</application> are
-    <application>KDE</application> and its follow on project, 
-    <application>Trinity</application>.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&qt-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&qt-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &qt-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &qt-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &qt-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &qt-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required Patch: <ulink
-          url="&patch-root;/qt-3.3.8.d-libpng15-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Qt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="x-window-system"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libjpeg"/> and
-      <xref linkend="libmng"/>
-    </para>
-
-    <para>Note: if for whatever reason you do not have the recommended
-    libraries installed on your system, you must remove the corresponding
-    <parameter>-system-<replaceable>&lt;library&gt;</replaceable></parameter> and
-    <parameter>-plugin-imgfmt-<replaceable>&lt;library&gt;</replaceable></parameter>
-    parameters from the <command>configure</command> commands shown in the
-    instructions below.</para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cups"/>,
-      <xref linkend="mysql"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="unixodbc"/>,
-      <xref linkend="sqlite"/>, and
-      <ulink url="http://firebird.sourceforge.net/">Firebird</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/qt"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Qt</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/X11R6_symlink.xml"/>
-
-    <para>There are several ways to install a complicated package such as
-    <application>Qt</application>. The files are not completely position
-    independent. Installation procedures execute the program
-    <command>pkg-config</command> to determine the location of package
-    executables, libraries, headers, and other files. For
-    <application>Qt</application>, <command>pkg-config</command> will look
-    for the file <filename>lib/pkgconfig/qt-mt.pc</filename> which must be
-    modified if relocating the package. This file is set up correctly by
-    the build process.</para>
-
-    <para>The default installation places the files in
-    <filename class='directory'>/usr/local/qt/</filename>. Many commercial
-    distributions place the files in the system's
-    <filename class='directory'>/usr</filename> hierarchy. The package can
-    also be installed in an arbitrary directory.</para>
-
-    <para>This section will demonstrate two different methods.</para>
-
-    <warning>
-      <para>Building <application>Qt</application> in a
-      <command>chroot</command> environment may fail.</para>
-    </warning>
-
-    <note>
-      <para>The build time for <application>Qt</application> is quite long. If
-      you want to save some time and don't want the tutorials and examples,
-      change the first <command>make</command> command to:</para>
-
-<screen><userinput>make sub-tools</userinput></screen>
-
-    </note>
-
-    <sect3>
-      <title>Method 1 - Installing in the '/usr' Hierarchy</title>
-
-      <para>The advantage of this method is that no updates to the
-      <filename>/etc/ld.so.conf</filename> or
-      <filename>/etc/man_db.conf</filename> files are required. The package
-      files are distributed within several subdirectories of the
-      <filename class='directory'>/usr</filename> hierarchy.
-      This is the method that most commercial distributions use.</para>
-
-      <note>
-        <para>If <application>Qt</application> is being reinstalled, run the
-        following commands from a console or non-Qt based window manager.
-        It overwrites <application>Qt</application> libraries that should not
-        be in use during the install process.</para>
-      </note>
-
-<screen><userinput>sed -i '/QMAKE_RPATH/d' mkspecs/linux*/qmake.conf &amp;&amp;
-
-bash
-export PATH=$PWD/bin:$PATH                       &amp;&amp;
-export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH &amp;&amp;
-
-patch -Np1 -i ../qt-3.3.8.d-libpng15-1.patch    &amp;&amp;
-
-./configure -prefix     /usr                \
-            -docdir     /usr/share/doc/qt   \
-            -headerdir  /usr/include/qt     \
-            -plugindir  /usr/lib/qt/plugins \
-            -datadir    /usr/share/qt       \
-            -sysconfdir /etc/qt             \
-            -translationdir /usr/share/qt/translations \
-            -qt-gif                         \
-            -system-zlib                    \
-            -system-libpng                  \
-            -system-libjpeg                 \
-            -system-libmng                  \
-            -plugin-imgfmt-png              \
-            -plugin-imgfmt-jpeg             \
-            -plugin-imgfmt-mng              \
-            -no-exceptions                  \
-            -thread                         \
-            -tablet &amp;&amp;
-
-make &amp;&amp;
-exit</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;
-ln -v -sf libqt-mt.so /usr/lib/libqt.so &amp;&amp;
-ln -v -snf ../../bin /usr/share/qt/bin &amp;&amp;
-ln -v -snf ../../include/qt /usr/share/qt/include &amp;&amp;
-ln -v -snf ../../lib /usr/share/qt/lib &amp;&amp;
-cp -v -r doc/man /usr/share &amp;&amp;
-cp -v -r examples /usr/share/doc/qt</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>Method 2 - Installing in '/opt'</title>
-
-      <para>This is the method recommended by the <application>Qt</application>
-      developers. It has the advantage of keeping all the package files
-      consolidated in a dedicated directory hierarchy. By using this method,
-      an update can be made without overwriting a previous installation and
-      users can easily revert to a previous version by changing one symbolic
-      link.</para>
-
-      <para>The <application>Qt</application> developers use a default location
-      of <filename class='directory'>/usr/local/qt/</filename>, however this
-      procedure puts the files in <filename
-      class='directory'>/opt/qt-&qt-version;/</filename>
-      and then creates a symbolic link to <filename>/opt/qt/</filename>.</para>
-
-<screen><userinput>bash
-export QTDIR=$PWD                                &amp;&amp;
-export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH &amp;&amp;
-export PATH=$PWD/bin:$PATH                       &amp;&amp;
-
-patch -Np1 -i ../qt-3.3.8.d-libpng15-1.patch    &amp;&amp;
-
-./configure -prefix /opt/qt-&qt-version; \
-            -sysconfdir /etc/qt   \
-            -qt-gif               \
-            -system-zlib          \
-            -system-libpng        \
-            -system-libjpeg       \
-            -system-libmng        \
-            -plugin-imgfmt-png    \
-            -plugin-imgfmt-jpeg   \
-            -plugin-imgfmt-mng    \
-            -no-exceptions        \
-            -thread               \
-            -tablet &amp;&amp;
-
-make &amp;&amp;
-exit</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;
-ln -v -sfn qt-&qt-version; /opt/qt &amp;&amp;
-ln -v -s libqt-mt.so /opt/qt/lib/libqt.so &amp;&amp;
-cp -v -r doc/man examples /opt/qt/doc</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i '/QMAKE_RPATH/d' mkspecs/linux*/qmake.conf</command>:
-    In Method 1, <application>Qt</application> is being installed into
-    the standard system directories. The runtime library search path does not
-    need to be set in this case.</para>
-
-    <para><command>bash</command>: This command enters a sub-shell to isolate
-    environment changes.</para>
-
-    <para><command>export QTDIR=$PWD</command>: This command defines where
-    the root of the <application>Qt</application> directory is located.</para>
-
-    <para><command>export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH</command>:
-    This command allows the not yet installed <application>Qt</application>
-    libraries to be used by the not yet installed <application>Qt</application>
-    programs.</para>
-
-    <para><command>export PATH=$PWD/bin:$PATH</command>: This command
-    allows the build process to find supporting executables.</para>
-
-    <para><parameter>-qt-gif</parameter>: This switch adds support for
-    <filename>gif</filename> files to the libraries.</para>
-
-    <para><parameter>-system-zlib -system-libpng -system-libjpeg
-    -system-mng</parameter>: These switches force the build instructions to use
-    the shared libraries that are on your system instead of creating a custom
-    set of support libraries for these functions.</para>
-
-    <para><parameter>-plugin-imgfmt-png -plugin-imgfmt-jpeg
-    -plugin-imgfmt-mng</parameter>: These switches enable run-time linking of
-    the referenced libraries.</para>
-
-    <para>If you pass the
-    <option>-plugin-sql-<replaceable>&lt;driver&gt;</replaceable></option> or
-    <option>-qt-sql-<replaceable>&lt;driver&gt;</replaceable></option> switch
-    to the <command>configure</command> command, you must also pass
-    <option>-I<replaceable>&lt;/path/to/sql/headers&gt;</replaceable></option>
-    so <command>make</command> can find the appropriate header files.  For
-    instance, building in <application>MySQL</application> support (as opposed
-    to building the plugin) will need to use <option>-I/usr/include/mysql
-    -qt-sql-mysql</option>.</para>
-
-    <note>
-      <para>To check if <application>mysql</application> is autotetected
-      properly, examine the output of <command>./configure -I/usr/include/mysql
-      -help</command>. Other database support will require similar
-      <command>configure</command> parameters.</para>
-    </note>
-
-    <para><parameter>-no-exceptions</parameter>: This switch disables
-    the exceptions coding generated by the <application>C++</application>
-    compiler.</para>
-
-    <para><parameter>-thread</parameter>: This switch adds
-    support for multi-threading.</para>
-
-    <para><command>ln -v -sf libqt-mt.so /usr/lib/libqt.so</command>: This
-    command allows <command>configure</command> scripts to find a working
-    <application>Qt</application> installation.</para>
-
-    <para><command>ln -v -snf ../../bin /usr/share/qt/bin</command>: This
-    command and the following two allow the
-    <filename class="directory">/usr</filename> style installation to mimic
-    the <filename class="directory">/opt</filename> style installation by
-    making all binaries, headers and libraries available from a single
-    directory, <filename class="directory">/usr/share/qt</filename>.</para>
-
-    <para><command>cp -v -r doc/man examples /usr/share (or
-    /opt/qt/doc)</command>:
-    This command installs the man pages and examples which are missed by
-    <command>make install</command>.</para>
-
-    <para><command>exit</command>: This command returns to the parent shell
-    and eliminates the environment variables set earlier.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Qt</title>
-
-    <sect3 id='qt-config'>
-      <title>Configuration Information</title>
-
-      <para>The <envar>QTDIR</envar> environment variable needs to be set when
-      building packages that depend on <application>Qt</application>. Add the
-      following to the <filename>.bash_profile</filename> initialization script
-      for each user that builds packages using the <application>Qt</application>
-      libraries. Alternatively, the variable can be set in the system wide
-      <filename>/etc/profile</filename> file.</para>
-
-      <para>For Method 1 (This is optional, only set this if an application is
-      unable to find the installed libraries or headers):</para>
-
-<screen><literal>export QTDIR=/usr/share/qt</literal></screen>
-
-      <para>or for Method 2:</para>
-
-<screen><literal>export QTDIR=/opt/qt</literal></screen>
-
-      <para>If you installed <application>Qt</application> using Method 2,
-      you also need to update the following configuration files so that
-      <application>Qt</application> is correctly found by other packages
-      and system processes.</para>
-
-      <para>Update the <filename>/etc/ld.so.conf</filename> and
-      <filename>/etc/man_db.conf</filename> files:</para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF" &amp;&amp;
-<literal># Begin qt addition to /etc/ld.so.conf
-
-/opt/qt/lib
-
-# End qt addition</literal>
-EOF
-ldconfig &amp;&amp;
-cat &gt;&gt; /etc/man_db.conf &lt;&lt; "EOF"
-<literal># Begin qt addition to man_db.conf
-
-MANDATORY_MANPATH /opt/qt/doc/man
-MANPATH_MAP       /opt/qt/bin         /opt/qt/doc/man
-MANDB_MAP         /opt/qt/doc/man     /var/cache/man/qt
-
-# End qt addition to man_db.conf</literal>
-EOF</userinput></screen>
-
-      <indexterm zone="qt qt-config">
-        <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
-      </indexterm>
-
-      <indexterm zone="qt qt-config">
-        <primary sortas="e-etc-man_db.conf">/etc/man_db.conf</primary>
-      </indexterm>
-
-      <indexterm zone="qt qt-config">
-        <primary sortas="e-etc-profile">/etc/profile</primary>
-      </indexterm>
-
-      <indexterm zone="qt qt-config">
-        <primary sortas="e-AA.bash_profile">~/.bash_profile</primary>
-      </indexterm>
-
-      <para>Update the <envar>PKG_CONFIG_PATH</envar> environment variable
-      in your <filename>~/.bash_profile</filename> or
-      <filename>/etc/profile</filename> with the following:</para>
-
-<screen><literal>PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig</literal></screen>
-
-      <para>If you want the <application>Qt</application> executables in your
-      shell search path, update the <envar>PATH</envar> environment variable
-      in your <filename>~/.bash_profile</filename> or
-      <filename>/etc/profile</filename> to include
-      <filename class='directory'>/opt/qt/bin</filename>.</para>
-
-      <tip><para>The PATH, MANPATH, and PKG_CONFIG_PATH can be updated in
-      the extrapaths.sh (or other script) in the /etc/profile.d directory
-      if you set up the startup files as recommended in 
-      <xref linkend='postlfs-config-profile'/>.</para></tip>
-
-      <para>As with most libraries, there is no explicit configuration to do.
-      After updating <filename>/etc/ld.so.conf</filename> as explained above,
-      run <command>/sbin/ldconfig</command> so that <command>ldd</command>
-      can find the shared libraries.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>assistant, designer, linguist, lrelease, lupdate, moc,
-        qm2ts, qmake, qtconfig, and uic</seg>
-        <seg>libqt-mt.so, libqt.so libqui.so, libdesignercore.a,
-        libeditor.a, and libqassistantclient.a</seg>
-        <seg>/opt/qt-&qt-version; or /usr/lib/qt, /usr/share/qt,
-        /usr/share/doc/qt, /usr/include/qt, and /etc/qt</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="assistant">
-        <term><command>assistant</command></term>
-        <listitem>
-          <para>is a tool for presenting on-line documentation.</para>
-          <indexterm zone="qt assistant">
-            <primary sortas="b-assistant">assistant</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="designer">
-        <term><command>designer</command></term>
-        <listitem>
-          <para>is a full-fledged GUI builder. It includes
-          powerful features such as preview mode, automatic widget
-          layout, support for custom widgets, and an advanced
-          property editor.</para>
-          <indexterm zone="qt designer">
-            <primary sortas="b-designer">designer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="linguist">
-        <term><command>linguist</command></term>
-        <listitem>
-          <para>provides support for translating applications into
-          local languages. </para>
-          <indexterm zone="qt linguist">
-            <primary sortas="b-linguist">linguist</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lrelease">
-        <term><command>lrelease</command></term>
-        <listitem>
-          <para>is a simple command line tool. It reads a Qt project
-          file and produces message files used by the application.</para>
-          <indexterm zone="qt lrelease">
-            <primary sortas="b-lrelease">lrelease</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lupdate">
-        <term><command>lupdate</command></term>
-        <listitem>
-          <para>reads a Qt project file, finds the translatable
-          strings in the specified source, header and Qt Designer
-          interface files, and produces or updates the translation
-          files listed in the project file.</para>
-          <indexterm zone="qt lupdate">
-            <primary sortas="b-lupdate">lupdate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="moc">
-        <term><command>moc</command></term>
-        <listitem>
-          <para>generates Qt meta object support code.</para>
-          <indexterm zone="qt moc">
-            <primary sortas="b-moc">moc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qm2ts">
-        <term><command>qm2ts</command></term>
-        <listitem>
-          <para>is a tool for converting Qt message file formats.</para>
-          <indexterm zone="qt qm2ts">
-            <primary sortas="b-qm2ts">qm2ts</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmake">
-        <term><command>qmake</command></term>
-        <listitem>
-          <para>qmake uses information stored in project files to
-          determine what should go in the makefiles it generates.</para>
-          <indexterm zone="qt qmake">
-            <primary sortas="b-qmake">qmake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtconfig">
-        <term><command>qtconfig</command></term>
-        <listitem>
-          <para>is used to customize the appearance of Qt applications.</para>
-          <indexterm zone="qt qtconfig">
-            <primary sortas="b-qtconfig">qtconfig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uic">
-        <term><command>uic</command></term>
-        <listitem>
-          <para>is a Qt user interface compiler.</para>
-          <indexterm zone="qt uic">
-            <primary sortas="b-uic">uic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/wm/wm.xml
===================================================================
--- x/wm/wm.xml	(revision 3ee626e299997cdb388f2646aa34b08038405722)
+++ x/wm/wm.xml	(revision e316715825a314d55b2c10189244df6eb1c5aa7a)
@@ -57,5 +57,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openbox.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sawfish.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="other-wms.xml"/>
 
