Index: x/installing/installing.xml
===================================================================
--- x/installing/installing.xml	(revision 44ae5736060f9a6b96813f533a3facef1b95ae5d)
+++ x/installing/installing.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
@@ -64,12 +64,12 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcb-util-renderutil.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcb-util-wm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mesalib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mesalib-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xbitmaps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7app.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcursor-themes.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7font.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xkeyboard-config.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg-server.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7driver.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xkeyboard-config-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg-server-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7driver-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="twm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xterm.xml"/>
Index: x/installing/mesalib-systemd.xml
===================================================================
--- x/installing/mesalib-systemd.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
+++ x/installing/mesalib-systemd.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
@@ -0,0 +1,464 @@
+<?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 mesalib-download-http " ">
+  <!ENTITY mesalib-download-ftp
+           "ftp://ftp.freedesktop.org/pub/mesa/&mesalib-version;/MesaLib-&mesalib-version;.tar.bz2">
+  <!ENTITY mesalib-md5sum        "c0a2a975899c4e7485124b388c16cd2f">
+  <!ENTITY mesalib-size          "7.0 MB">
+  <!ENTITY mesalib-buildsize     "255 MB">
+  <!ENTITY mesalib-time          "5.2 SBU">
+]>
+
+<sect1 id="mesalib" xreflabel="MesaLib-&mesalib-version;">
+  <?dbhtml filename="mesalib.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>MesaLib-&mesalib-version;</title>
+
+  <indexterm zone="mesalib">
+    <primary sortas="a-MesaLib">MesaLib</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to MesaLib</title>
+
+    <para>
+      <application>Mesa</application> is an OpenGL compatible 3D graphics
+      library.
+    </para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&mesalib-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&mesalib-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &mesalib-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &mesalib-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &mesalib-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &mesalib-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Recommended patch:
+          <ulink url="&patch-root;/MesaLib-&mesalib-version;-add_xdemos-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">MesaLib Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libdrm"/>,
+      <xref linkend="python2"/> and
+      <xref linkend="xorg7-lib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="elfutils"/> (required for Radeon 3D drivers),
+      <xref linkend="libvdpau"/> (to build VDPAU drivers for supported hardware),
+      <xref linkend="llvm"/> (required for Radeon 3D drivers and also for
+      llvmpipe which is intended to be the fastest of the three sw rasterizers,
+      see <ulink url="http://www.mesa3d.org/faq.html#part3"></ulink>) and
+      <xref linkend="wayland"/> (required for <filename>libwayland-egl</filename>
+      library which is used by many packages that use
+      <application>Wayland</application>)
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <ulink url="http://libclc.llvm.org/">libclc</ulink>
+      (to build Radeon OpenCL library) and
+      <ulink url="http://omxil.sourceforge.net/">libomxil-bellagio</ulink>
+      (to build Radeon OpenMAX driver)
+    </para>
+
+    <note>
+      <para>
+        The instructions below assume that <application>elfutils</application>
+        and <application>LLVM</application> are installed. You will
+        need to modify the instructions if you choose not to install them.
+        Please note that <application>elfutils</application> and
+        <application>LLVM</application> are <emphasis>required</emphasis>
+        for Radeon 3D drivers. For an explanation of Gallium please see
+        <ulink url="https://en.wikipedia.org/wiki/Gallium3D"></ulink>.
+      </para>
+    </note>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/mesalib"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of MesaLib</title>
+
+    <note>
+      <para>
+        Unlike other packages, the
+        <filename>MesaLib-&mesalib-version;.tar.bz2</filename>
+        archive will extract to the
+        <filename class="directory">Mesa-&mesalib-version;</filename>
+        directory.
+      </para>
+    </note>
+
+    <para>
+      If you have downloaded the xdemos patch (needed if testing the Xorg
+      installation per BLFS instructions), apply it by running the following
+      command:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../MesaLib-&mesalib-version;-add_xdemos-1.patch</userinput></screen>
+
+    <para>
+      Install <application>MesaLib</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./autogen.sh CFLAGS="-O2" CXXFLAGS="-O2" \
+            --prefix=/usr                \
+            --sysconfdir=/etc            \
+            --disable-gallium-egl        \
+            --enable-texture-float       \
+            --enable-gles1               \
+            --enable-gles2               \
+            --enable-osmesa              \
+            --enable-xa                  \
+            --enable-gbm                 \
+            --enable-glx-tls             \
+            --with-egl-platforms="drm,x11,wayland" \
+            --with-gallium-drivers="nouveau,r300,r600,radeonsi,svga,swrast" &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      If you have applied the xdemos patch, build the demo programs by
+      running the following command:
+    </para>
+
+<screen><userinput>make -C xdemos DEMOS_PREFIX=/usr</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      If you have built the demo programs, install them by running the
+      following command as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make -C xdemos DEMOS_PREFIX=/usr install</userinput></screen>
+
+    <para>
+      If desired, install the optional documentation by running
+      the following commands as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>install -v -dm755 /usr/share/doc/MesaLib-&mesalib-version; &amp;&amp;
+cp -rfv docs/* /usr/share/doc/MesaLib-&mesalib-version;</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>CFLAGS="-O2" CXXFLAGS="-O2"</parameter>: By default,
+      <application>Autoconf</application> sets CFLAGS and CXXFLAGS to
+      "-g -O2". That results in binaries and libraries being built with
+      debugging symbols which make them bigger. Override the default
+      flags to omit -g compiler flag so the final libraries are smaller.
+    </para>
+
+    <para>
+      <parameter>--disable-gallium-egl</parameter>: This switch disables
+      the egl_gallium loader in favor of egl_dri2 loader which supports
+      both DRI and Gallium drivers.
+    </para>
+
+    <para>
+      <parameter>--enable-texture-float</parameter>: This switch enables
+      floating-point textures and render buffers. Please consult
+      <filename>docs/patents.txt</filename> to see if there are
+      any legal issues if you use this feature.
+    </para>
+
+    <para>
+      <parameter>--enable-gles1</parameter>: This switch enables support for
+      OpenGL ES 1.x API.
+    </para>
+
+    <para>
+      <parameter>--enable-gles2</parameter>: This switch enables support for
+      OpenGL ES 2.x API.
+    </para>
+
+    <para>
+      <parameter>--enable-osmesa</parameter>: This switch enables building of
+      the <filename class="libraryfile">libOSMesa</filename> library.
+    </para>
+
+    <para>
+      <parameter>--enable-xa</parameter>: This switch enables building of the
+      XA X Acceleration API (Required for VMware 3D Driver).
+    </para>
+
+    <para>
+      <parameter>--enable-gbm</parameter>: This switch enables building of the
+      <application>Mesa</application> Graphics Buffer Manager library.
+    </para>
+
+    <para>
+      <parameter>--enable-gallium-gbm</parameter>: This switch enables optional
+      GBM state tracker for Gallium.
+    </para>
+
+    <para>
+      <parameter>--enable-glx-tls</parameter>: This switch enables TLS (Thread Local
+      Storage) support in GLX.
+    </para>
+
+    <para>
+      <parameter>--with-egl-platforms="..."</parameter>: This parameter
+      controls for which platforms EGL should be built. Available
+      platforms are drm, x11 and wayland. Remove <option>wayland</option>
+      from the list if you have not installed
+      <application>Wayland</application>.
+    </para>
+
+    <para>
+      <parameter>--with-gallium-drivers="..."</parameter>: This parameter
+      controls which Gallium drivers should be built. Available drivers
+      are: i915, ilo, nouveau, r300, r600, radeonsi, svga and swrast. You
+      will need to remove r300, r600 and radeonsi from the list if you did
+      not install <application>elfutils</application> and
+      <application>LLVM</application>.
+    </para>
+
+    <para>
+      <option>--enable-r600-llvm-compiler</option>: Use this switch to
+      enable experimental R600 <application>LLVM</application> backend
+      for graphics shaders which claims to speed up the driver.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          glxgears and glxinfo
+        </seg>
+        <seg>
+          libEGL.so,
+          libgbm.so,
+          libglapi.so,
+          libGLESv1_CM.so,
+          libGLESv2.so,
+          libGL.so,
+          libOSMesa.so,
+          libwayland-egl.so, and
+          libxatracker.so
+        </seg>
+        <seg>
+          /usr/include/EGL,
+          /usr/include/GL,
+          /usr/include/GLES,
+          /usr/include/GLES2,
+          /usr/include/GLES3,
+          /usr/include/KHR,
+          /usr/include/VG,
+          /usr/lib/dri,
+          /usr/lib/egl,
+          /usr/lib/gallium-pipe,
+          /usr/lib/gbm,
+          /usr/lib/vdpau, and
+          /usr/share/doc/MesaLib-&mesalib-version; (optional)
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="glxgears">
+        <term><command>glxgears</command></term>
+        <listitem>
+          <para>
+            is a GL demo useful for troubleshooting graphics
+            problems.
+          </para>
+          <indexterm zone="mesalib glxgears">
+            <primary sortas="b-glxgears">glxgears</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="glxinfo">
+        <term><command>glxinfo</command></term>
+        <listitem>
+          <para>
+            is a diagnostic program that displays information about the
+            graphics hardware and installed GL libraries.
+          </para>
+          <indexterm zone="mesalib glxinfo">
+            <primary sortas="b-glxinfo">glxinfo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libEGL">
+        <term><filename class="libraryfile">libEGL.so</filename></term>
+        <listitem>
+          <para>
+            provides a native platform graphics interface as
+            defined by the EGL-1.4 specification.
+          </para>
+          <indexterm zone="mesalib libEGL">
+            <primary sortas="c-libGL">libEGL.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgbm">
+        <term><filename class="libraryfile">libgbm.so</filename></term>
+        <listitem>
+          <para>
+            is the <application>Mesa</application> Graphics Buffer
+            Manager library.
+          </para>
+          <indexterm zone="mesalib libgbm">
+            <primary sortas="c-libgbm">libgbm.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libGLESv1_CM">
+        <term><filename class="libraryfile">libGLESv1_CM.so</filename></term>
+        <listitem>
+          <para>
+            is the <application>Mesa</application> OpenGL ES 1.1 library.
+          </para>
+          <indexterm zone="mesalib libGLESv1_CM">
+            <primary sortas="c-libGLESv1_CM">libGLESv1_CM.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libGLES2">
+        <term><filename class="libraryfile">libGLES2.so</filename></term>
+        <listitem>
+          <para>
+            is the <application>Mesa</application> OpenGL ES 2.0 library.
+          </para>
+          <indexterm zone="mesalib libGLES2">
+            <primary sortas="c-libGLES2">libGLES2.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libGL">
+        <term><filename class="libraryfile">libGL.so</filename></term>
+        <listitem>
+          <para>
+            is the main <application>Mesa</application> OpenGL library.
+          </para>
+          <indexterm zone="mesalib libGL">
+            <primary sortas="c-libGL">libGL.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libOSMesa">
+        <term><filename class="libraryfile">libOSMesa.so</filename></term>
+        <listitem>
+          <para>
+            is the <application>Mesa</application> Off-screen Rendering library.
+          </para>
+          <indexterm zone="mesalib libOSMesa">
+            <primary sortas="c-libOSMesa">libOSMesa.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libwayland-egl">
+        <term><filename class="libraryfile">libwayland-egl.so</filename></term>
+        <listitem>
+          <para>
+            is the <application>Wayland</application> specific EGL library.
+          </para>
+          <indexterm zone="mesalib libwayland-egl">
+            <primary sortas="c-libwayland-egl">libwayland-egl.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libxatracker">
+        <term><filename class="libraryfile">libxatracker.so</filename></term>
+        <listitem>
+          <para>
+            is the Xorg Gallium3D acceleration library.
+          </para>
+          <indexterm zone="mesalib libxatracker">
+            <primary sortas="c-libxatracker">libxatracker.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: x/installing/mesalib.xml
===================================================================
--- x/installing/mesalib.xml	(revision 44ae5736060f9a6b96813f533a3facef1b95ae5d)
+++ 	(revision )
@@ -1,480 +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 mesalib-download-http " ">
-  <!ENTITY mesalib-download-ftp
-  "ftp://ftp.freedesktop.org/pub/mesa/&mesalib-version;/MesaLib-&mesalib-version;.tar.bz2">
-  <!ENTITY mesalib-md5sum        "c0a2a975899c4e7485124b388c16cd2f">
-  <!ENTITY mesalib-size          "7.0 MB">
-  <!ENTITY mesalib-buildsize     "253 MB (additional 2 MB for the docs)">
-  <!ENTITY mesalib-time          "5.2 SBU">
-
-]>
-
-<sect1 id="mesalib" xreflabel="MesaLib-&mesalib-version;">
-  <?dbhtml filename="mesalib.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>MesaLib-&mesalib-version;</title>
-
-  <indexterm zone="mesalib">
-    <primary sortas="a-MesaLib">MesaLib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to MesaLib</title>
-
-    <para>
-      <application>Mesa</application> is an OpenGL compatible 3D graphics
-      library.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mesalib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mesalib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mesalib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mesalib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mesalib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mesalib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Recommended patch:
-          <ulink url="&patch-root;/MesaLib-&mesalib-version;-add_xdemos-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">MesaLib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-lib"/>,
-      <xref linkend="libdrm"/>, and
-      <xref linkend="python2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="elfutils"/> (required for radeon 3d drivers),
-      <xref linkend="libvdpau"/> (to build VDPAU drivers),
-      <xref linkend="llvm"/> (required for radeon 3d drivers and also for
-      llvmpipe which is intended to be the fastest of the three sw rasterizers,
-      see <ulink url="http://www.mesa3d.org/faq.html#part3"></ulink> )
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="ftp://ftp.freedesktop.org/pub/mesa/demos/">mesa-demos</ulink>
-      provides more than 300 extra demos to test
-      <application>MesaLib</application>; two of them overwrites the ones
-      included by
-      <filename>MesaLib-&mesalib-version;-add_xdemos-1.patch</filename>;
-      to avoid that, install in a different prefix or add, e.g.
-      <option>--program-prefix=md</option> to configure, and
-      <ulink url="http://wayland.freedesktop.org/">Wayland</ulink>
-    </para>
-
-    <note>
-      <para>
-        The instructions below assume that <application>elfutils</application>
-        and <application>LLVM</application> are installed. You will
-        need to modify the instructions if you choose not to install them.
-        Please note that <application>elfutils</application> and
-        <application>LLVM</application> are <emphasis>required</emphasis>
-        for Radeon 3D drivers.  For an explanation of gallium please see
-        <ulink url="https://en.wikipedia.org/wiki/Gallium3D"></ulink>.
-      </para>
-    </note>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/mesalib"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of MesaLib</title>
-
-    <note>
-      <para>
-        Unlike other packages, the
-        <filename>MesaLib-&mesalib-version;.tar.bz2</filename>
-        archive will extract to the
-        <filename class="directory">Mesa-&mesalib-version;</filename>
-        directory.
-      </para>
-    </note>
-
-    <para>
-      If you have downloaded the xdemos patch (needed if testing the Xorg
-      installation per BLFS instructions), apply it by running the following
-      command:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../MesaLib-&mesalib-version;-add_xdemos-1.patch</userinput></screen>
-
-    <para>
-      Install <application>MesaLib</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./autogen.sh CFLAGS="-O2" CXXFLAGS="-O2"   \
-            --prefix=$XORG_PREFIX          \
-            --sysconfdir=/etc              \
-            --enable-texture-float         \
-            --enable-gles1                 \
-            --enable-gles2                 \
-            --enable-openvg                \
-            --enable-osmesa                \
-            --enable-xa                    \
-            --enable-gbm                   \
-            --enable-gallium-egl           \
-            --enable-gallium-gbm           \
-            --enable-glx-tls               \
-            --with-egl-platforms="drm,x11" \
-            --with-gallium-drivers="nouveau,r300,r600,radeonsi,svga,swrast" &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have applied the xdemos patch, build the demo programs by
-      running the following command:
-    </para>
-
-<screen><userinput>make -C xdemos DEMOS_PREFIX=$XORG_PREFIX</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you have built the demo programs, install them by running the
-      following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make -C xdemos DEMOS_PREFIX=$XORG_PREFIX install</userinput></screen>
-
-    <para>
-      If desired, install the optional documentation by running
-      the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -dm755 /usr/share/doc/MesaLib-&mesalib-version; &amp;&amp;
-cp -rfv docs/* /usr/share/doc/MesaLib-&mesalib-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>patch -Np1...</command>: Fix various problems
-      introduced with LLVM-3.5.0.
-    </para>
-
-    <para>
-      <parameter>CFLAGS="-O2" CXXFLAGS="-O2"</parameter>: By default,
-      <application>Autoconf</application> sets CFLAGS and CXXFLAGS to
-      "-g -O2". That results in binaries and libraries being built with
-      debugging symbols which make them bigger. Override the default
-      flags to omit -g compiler flag so the final libraries are smaller.
-    </para>
-
-    <para>
-      <parameter>--enable-texture-float</parameter>: This switch enables
-      floating-point textures and render buffers. Please consult
-      <filename>docs/patents.txt</filename> to see if there are
-      any legal issues if you use this feature.
-    </para>
-
-    <para>
-      <parameter>--enable-gles1</parameter>: This switch enables support for
-      OpenGL ES 1.x API.
-    </para>
-
-    <para>
-      <parameter>--enable-gles2</parameter>: This switch enables support for
-      OpenGL ES 2.x API.
-    </para>
-
-    <para>
-      <parameter>--enable-openvg</parameter>: This switch enables support for
-      OpenVG API.
-    </para>
-
-    <para>
-      <parameter>--enable-osmesa</parameter>: This switch enables building of
-      the <filename class="libraryfile">libOSMesa</filename> library.
-    </para>
-
-    <para>
-      <parameter>--enable-xa</parameter>: This switch enables building of the
-      XA X Acceleration API (Required for VMware 3D Driver).
-    </para>
-
-    <para>
-      <parameter>--enable-gbm</parameter>: This switch enables building of the
-      <application>Mesa</application> Graphics Buffer Manager library.
-    </para>
-
-    <para>
-      <parameter>--enable-gallium-egl</parameter>: This switch enables optional
-      EGL state tracker for Gallium.
-    </para>
-
-    <para>
-      <parameter>--enable-gallium-gbm</parameter>: This switch enables optional
-      GBM state tracker for Gallium.
-    </para>
-
-    <para>
-      <parameter>--enable-glx-tls</parameter>: This switch enables TLS (Thread Local
-      Storage) support in GLX.
-    </para>
-
-    <para>
-      <parameter>--with-egl-platforms="..."</parameter>: This parameter
-      controls for which platforms EGL should be built. Available
-      platforms are drm, x11 and wayland.
-    </para>
-
-    <para>
-      <parameter>--with-gallium-drivers="..."</parameter>: This parameter
-      controls which Gallium drivers should be built. Available drivers
-      are: i915, ilo, nouveau, r300, r600, radeonsi, svga and swrast. You
-      will need to remove r300, r600 and radeonsi from the list if you did
-      not install <application>elfutils</application> and
-      <application>LLVM</application>.
-    </para>
-
-    <para>
-      <option>--enable-r600-llvm-compiler</option>: Use this switch to
-      enable experimental R600 <application>LLVM</application> backend
-      for graphics shaders which claims to speed up the driver.
-    </para>
-
-    <para>
-      <option>--enable-sysfs</option>: Use this switch to enable simple PCI
-      identification method, required for building DRI on systems without udev.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          glxgears and glxinfo
-        </seg>
-        <seg>
-          libEGL.so,
-          libgbm.so,
-          libglapi.so,
-          libGLESv1_CM.so,
-          libGLESv2.so,
-          libGL.so,
-          libOpenVG.so,
-          libOSMesa.so, and
-          libxatracker.so
-          <!--libXvMCnouveau.so and libXvMCr600.so-->
-        </seg>
-        <seg>
-          $XORG_PREFIX/include/EGL,
-          $XORG_PREFIX/include/GL,
-          $XORG_PREFIX/include/GLES,
-          $XORG_PREFIX/include/GLES2,
-          $XORG_PREFIX/include/GLES3,
-          $XORG_PREFIX/include/KHR,
-          $XORG_PREFIX/include/VG,
-          $XORG_PREFIX/lib/dri,
-          $XORG_PREFIX/lib/egl,
-          $XORG_PREFIX/lib/gbm,
-          $XORG_PREFIX/lib/vdpau, and
-          /usr/share/doc/MesaLib-&mesalib-version; (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="glxgears">
-        <term><command>glxgears</command></term>
-        <listitem>
-          <para>
-            is a GL demo useful for troubleshooting graphics
-            problems.
-          </para>
-          <indexterm zone="mesalib glxgears">
-            <primary sortas="b-glxgears">glxgears</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="glxinfo">
-        <term><command>glxinfo</command></term>
-        <listitem>
-          <para>
-            is a diagnostic program that displays information about the
-            graphics hardware and installed GL libraries.
-          </para>
-          <indexterm zone="mesalib glxinfo">
-            <primary sortas="b-glxinfo">glxinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libEGL">
-        <term><filename class="libraryfile">libEGL.so</filename></term>
-        <listitem>
-          <para>
-            provides a native platform graphics interface as
-            defined by the EGL-1.4 specification.
-          </para>
-          <indexterm zone="mesalib libEGL">
-            <primary sortas="c-libGL">libEGL.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgbm">
-        <term><filename class="libraryfile">libgbm.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Mesa</application> Graphics Buffer
-            Manager library.
-          </para>
-          <indexterm zone="mesalib libgbm">
-            <primary sortas="c-libgbm">libgbm.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libGLESv1_CM">
-        <term><filename class="libraryfile">libGLESv1_CM.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Mesa</application> OpenGL ES 1.1 library.
-          </para>
-          <indexterm zone="mesalib libGLESv1_CM">
-            <primary sortas="c-libGLESv1_CM">libGLESv1_CM.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libGLES2">
-        <term><filename class="libraryfile">libGLES2.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Mesa</application> OpenGL ES 2.0 library.
-          </para>
-          <indexterm zone="mesalib libGLES2">
-            <primary sortas="c-libGLES2">libGLES2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libGL">
-        <term><filename class="libraryfile">libGL.so</filename></term>
-        <listitem>
-          <para>
-            is the main <application>Mesa</application> OpenGL library.
-          </para>
-          <indexterm zone="mesalib libGL">
-            <primary sortas="c-libGL">libGL.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libOpenVG">
-        <term><filename class="libraryfile">libOpenVG.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Mesa</application> OpenVG 1.0 library.
-          </para>
-          <indexterm zone="mesalib libOpenVG">
-            <primary sortas="c-libOpenVG">libOpenVG.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libOSMesa">
-        <term><filename class="libraryfile">libOSMesa.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Mesa</application> Off-screen Rendering library.
-          </para>
-          <indexterm zone="mesalib libOSMesa">
-            <primary sortas="c-libOSMesa">libOSMesa.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxatracker">
-        <term><filename class="libraryfile">libxatracker.so</filename></term>
-        <listitem>
-          <para>
-            is the Xorg Gallium3D acceleration library.
-          </para>
-          <indexterm zone="mesalib libxatracker">
-            <primary sortas="c-libxatracker">libxatracker.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/installing/x7driver-ati.xml
===================================================================
--- x/installing/x7driver-ati.xml	(revision 44ae5736060f9a6b96813f533a3facef1b95ae5d)
+++ x/installing/x7driver-ati.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
@@ -144,6 +144,10 @@
 CONFIG_EXTRA_FIRMWARE_DIR="/lib/firmware"</literal></screen>
 
-     <note><para>CONFIG_EXTRA_FIRMWARE should all be on one line.  It
-     is shown above as two lines for presentation only.</para></note>
+     <note>
+       <para>
+         CONFIG_EXTRA_FIRMWARE should all be on one line. It
+         is shown above as two lines for presentation only.
+       </para>
+     </note>
 
       <tip>
Index: x/installing/x7driver-intel-systemd.xml
===================================================================
--- x/installing/x7driver-intel-systemd.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
+++ x/installing/x7driver-intel-systemd.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
@@ -0,0 +1,227 @@
+<?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 xorg-intel-driver-version "2.99.916">
+
+  <!ENTITY xorg-intel-driver-download-http "&xorg-download-http;/driver/xf86-video-intel-&xorg-intel-driver-version;.tar.bz2">
+  <!ENTITY xorg-intel-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-intel-&xorg-intel-driver-version;.tar.bz2">
+  <!ENTITY xorg-intel-driver-md5sum        "7e24551eae0b952f4d795e791e88ebe5">
+  <!ENTITY xorg-intel-driver-size          "2.1 MB">
+  <!ENTITY xorg-intel-driver-buildsize     "71 MB">
+  <!ENTITY xorg-intel-driver-time          "0.6 SBU">
+]>
+
+  <!-- Begin Xorg Intel Driver -->
+  <sect2 id="xorg-intel-driver" xreflabel="Xorg Intel Driver-&xorg-intel-driver-version;">
+
+    <title>Xorg Intel Driver-&xorg-intel-driver-version;</title>
+
+    <indexterm zone="xorg-intel-driver">
+      <primary sortas="a-xorg-intel-driver">xorg-intel-driver</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Xorg Intel Driver</title>
+
+      <para>
+        The <application>Xorg Intel Driver</application> package contains the X.Org
+        Video Driver for Intel integrated video cards including 8xx, 9xx, Gxx, Qxx
+        and HD graphics processors (SandyBridge, IvyBridge and Haswell).
+      </para>
+
+      &lfs76_checked;
+
+      <note><para>This is a development version of the Intel driver 
+      which is needed to work properly with the latest hardware.</para></note>
+
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&xorg-intel-driver-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&xorg-intel-driver-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &xorg-intel-driver-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &xorg-intel-driver-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &xorg-intel-driver-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &xorg-intel-driver-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Xorg Intel Driver Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="xcb-util"/> and
+        <xref linkend="xorg-server"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/xorg-intel-driver"/>
+      </para>
+    </sect3>
+
+    <sect3 role="kernel" id="xorg-intel-driver-kernel">
+      <title>Kernel Configuration</title>
+
+    <para>
+      Enable the following options in the kernel configuration and recompile the
+      kernel if necessary:
+    </para>
+
+<screen><literal>Device Drivers  ---&gt;
+  Graphics support ---&gt;
+    Intel I810: Y or M
+    Intel 8xx/9xx/G3x/G4x/HD Graphics: Y or M
+      Enable modesetting on intel by default: Y</literal></screen>
+
+      <indexterm zone="xorg-intel-driver xorg-intel-driver-kernel">
+        <primary sortas="d-xorg-intel-driver">xorg-intel-driver</primary>
+      </indexterm>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Xorg Intel Driver</title>
+
+      <para>
+        Install <application>Xorg Intel Driver</application> by running the following
+        commands:
+      </para>
+
+<screen><userinput>./configure $XORG_CONFIG      \
+            --enable-kms-only \
+            --enable-uxa      \
+            --enable-glamor   \
+            --disable-dri3    &amp;&amp;
+make</userinput></screen>
+
+      <para>
+        This package does not come with a test suite.
+      </para>
+
+      <para>
+        Now, as the <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    </sect3>
+
+    <sect3 role="commands">
+      <title>Command Explanations</title>
+
+      <para>
+        <parameter>--enable-kms-only</parameter>: This switch omits the UMS
+        (User Mode Setting) code.
+      </para>
+
+      <para>
+        <parameter>--enable-uxa</parameter>: This switch enables Unified
+        Acceleration Architecture (UXA) which is required for Glamor
+        acceleration.
+      </para>
+
+      <para>
+        <option>--enable-glamor</option>: This switch enables
+        new GL-based 2D acceleration. As well as specifying this in the
+        build, it needs to be enabled at run time (see below).
+      </para>
+
+      <para>
+        <parameter>--disable-dri3</parameter>: This switch disables DRI3
+        support in the driver as it has been known to be buggy with the
+        current stack.
+      </para>
+
+    </sect3>
+
+    <sect3>
+      <title>Glamor Acceleration</title>
+
+      <para>
+        Glamor is an acceleration library which uses cards' 3D capabilities to
+        accelerate 2D rendering. Glamor acceleration is not enabled by default.
+        You have to use a <filename>xorg.conf</filename> file to enable it. To
+        enable Glamor, create the following
+        <filename>/etc/X11/xorg.conf</filename> as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>cat &gt;&gt; /etc/X11/xorg.conf &lt;&lt; "EOF"
+<literal>Section "Module"
+        Load "dri2"
+        Load "glamoregl"
+EndSection
+
+Section "Device"
+        Identifier "intel"
+        Driver "intel"
+        Option "AccelMethod" "glamor"
+EndSection</literal>
+EOF</userinput></screen>
+
+    </sect3>
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Library</segtitle>
+        <segtitle>Installed Xorg Driver</segtitle>
+
+        <seglistitem>
+          <seg>
+            libIntelXvMC.so
+          </seg>
+          <seg>
+            intel_drv.so
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <variablelist>
+        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
+        <?dbfo list-presentation="list"?>
+        <?dbhtml list-presentation="table"?>
+
+        <varlistentry id="intel_drv">
+          <term><filename class="libraryfile">intel_drv.so</filename></term>
+          <listitem>
+            <para>
+              is an Xorg video driver for Intel integrated graphics chipsets.
+            </para>
+            <indexterm zone="xorg-intel-driver intel_drv">
+              <primary sortas="c-intel_drv">intel_drv.so</primary>
+            </indexterm>
+          </listitem>
+        </varlistentry>
+
+      </variablelist>
+
+    </sect3>
+
+  </sect2>
+  <!-- End Xorg Intel Driver -->
Index: x/installing/x7driver-intel.xml
===================================================================
--- x/installing/x7driver-intel.xml	(revision 44ae5736060f9a6b96813f533a3facef1b95ae5d)
+++ 	(revision )
@@ -1,220 +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 xorg-intel-driver-version "2.99.916">
-
-  <!ENTITY xorg-intel-driver-download-http "&xorg-download-http;/driver/xf86-video-intel-&xorg-intel-driver-version;.tar.bz2">
-  <!ENTITY xorg-intel-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-intel-&xorg-intel-driver-version;.tar.bz2">
-  <!ENTITY xorg-intel-driver-md5sum        "7e24551eae0b952f4d795e791e88ebe5">
-  <!ENTITY xorg-intel-driver-size          "2.1 MB">
-  <!ENTITY xorg-intel-driver-buildsize     "71 MB">
-  <!ENTITY xorg-intel-driver-time          "0.6 SBU">
-]>
-
-  <!-- Begin Xorg Intel Driver -->
-  <sect2 id="xorg-intel-driver" xreflabel="Xorg Intel Driver-&xorg-intel-driver-version;">
-
-    <title>Xorg Intel Driver-&xorg-intel-driver-version;</title>
-
-    <indexterm zone="xorg-intel-driver">
-      <primary sortas="a-xorg-intel-driver">xorg-intel-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Xorg Intel Driver</title>
-
-      <para>
-        The <application>Xorg Intel Driver</application> package contains the X.Org
-        Video Driver for Intel integrated video cards including 8xx, 9xx, Gxx, Qxx
-        and HD graphics processors (SandyBridge, IvyBridge and Haswell).
-      </para>
-
-      &lfs76_checked;
-
-      <note><para>This is a development version of the Intel driver 
-      which is needed to work properly with the latest hardware.</para></note>
-
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&xorg-intel-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&xorg-intel-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &xorg-intel-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &xorg-intel-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &xorg-intel-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &xorg-intel-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Xorg Intel Driver Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xcb-util"/> and
-        <xref linkend="xorg-server"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/xorg-intel-driver"/>
-      </para>
-    </sect3>
-
-    <sect3 role="kernel" id="xorg-intel-driver-kernel">
-      <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile the
-      kernel if necessary:
-    </para>
-
-<screen><literal>Device Drivers  ---&gt;
-  Graphics support ---&gt;
-    Intel I810: Y or M
-    Intel 8xx/9xx/G3x/G4x/HD Graphics: Y or M
-      Enable modesetting on intel by default: Y</literal></screen>
-
-      <indexterm zone="xorg-intel-driver xorg-intel-driver-kernel">
-        <primary sortas="d-xorg-intel-driver">xorg-intel-driver</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg Intel Driver</title>
-
-      <para>
-        Install <application>Xorg Intel Driver</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>./configure $XORG_CONFIG      \
-            --enable-kms-only \
-            --enable-uxa      \
-            --enable-glamor   &amp;&amp;
-make</userinput></screen>
-
-      <para>
-        This package does not come with a test suite.
-      </para>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="commands">
-      <title>Command Explanations</title>
-
-      <para>
-        <parameter>--enable-kms-only</parameter>: This switch omits the UMS
-        (User Mode Setting) code.
-      </para>
-
-      <para>
-        <parameter>--enable-uxa</parameter>: This switch enables Unified
-        Acceleration Architecture (UXA) and is required for Glamor
-        acceleration.
-      </para>
-
-      <para>
-        <option>--enable-glamor</option>: This switch enables
-        new GL-based 2D acceleration. As well as specifying this in the
-        build, it needs to be enabled at run time (see below).
-      </para>
-
-    </sect3>
-
-    <sect3>
-      <title>Glamor Acceleration</title>
-
-      <para>
-        Glamor is an acceleration library which uses cards' 3D capabilities to
-        accelerate 2D rendering. Glamor acceleration is not enabled by default.
-        You have to use a <filename>xorg.conf</filename> file to enable it. To
-        enable Glamor, create the following
-        <filename>/etc/X11/xorg.conf</filename> as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/X11/xorg.conf &lt;&lt; "EOF"
-<literal>Section "Module"
-        Load "dri2"
-        Load "glamoregl"
-EndSection
-
-Section "Device"
-        Identifier "intel"
-        Driver "intel"
-        Option "AccelMethod" "glamor"
-EndSection</literal>
-EOF</userinput></screen>
-
-    </sect3>
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Library</segtitle>
-        <segtitle>Installed Xorg Driver</segtitle>
-
-        <seglistitem>
-          <seg>
-            libIntelXvMC.so
-          </seg>
-          <seg>
-            intel_drv.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="intel_drv">
-          <term><filename class="libraryfile">intel_drv.so</filename></term>
-          <listitem>
-            <para>
-              is an Xorg video driver for Intel integrated graphics chipsets.
-            </para>
-            <indexterm zone="xorg-intel-driver intel_drv">
-              <primary sortas="c-intel_drv">intel_drv.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
-  <!-- End Xorg Intel Driver -->
Index: x/installing/x7driver-synaptics.xml
===================================================================
--- x/installing/x7driver-synaptics.xml	(revision 44ae5736060f9a6b96813f533a3facef1b95ae5d)
+++ x/installing/x7driver-synaptics.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
@@ -105,4 +105,5 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
     </sect3>
 
Index: x/installing/x7driver-systemd.xml
===================================================================
--- x/installing/x7driver-systemd.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
+++ x/installing/x7driver-systemd.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
@@ -0,0 +1,160 @@
+<?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 BLFS76 "http://www.linuxfromscratch.org/blfs/view/7.6/x/x7driver.html">
+
+]>
+
+<sect1 id="xorg7-driver" xreflabel="Xorg Drivers">
+  <?dbhtml filename="x7driver.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Xorg Drivers</title>
+
+  <indexterm zone="xorg7-driver">
+    <primary sortas="a-xorg7-driver">xorg7-driver</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Xorg Drivers</title>
+
+    <para>
+      The <application>Xorg Drivers</application> page contains the
+      instructions for building Xorg drivers that are necessary in order
+      for Xorg Server to take the advantage of the hardware that it is
+      running on. At least one input and one video driver is required
+      for Xorg Server to start.
+    </para>
+
+    <note>
+      <para>
+        If you are unsure which video hardware you have, you can use
+        <command>lspci</command> from <xref linkend="pciutils"/>
+        to find out which video hardware you have and then look at
+        the descriptions of the packages in order to find out
+        which driver you need.
+      </para>
+    </note>
+
+    <note>
+      <para>
+        In addition to the drivers listed below, there are several other
+        drivers for very old hardware that may still be relevant.
+        Instructions for building these now unmaintained drivers may be found in a 
+        prior version of BLFS: <ulink url="&BLFS76;">&BLFS76;</ulink>
+      </para>
+    </note>
+
+    <sect3 id="xorg-input-drivers">
+      <title>Xorg Input Drivers</title>
+
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            <xref linkend="xorg-evdev-driver"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <xref linkend="xorg-synaptics-driver"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <xref linkend="xorg-vmmouse-driver"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <xref linkend="xorg-wacom-driver"/>
+          </para>
+        </listitem>
+      </itemizedlist>
+
+    </sect3>
+
+    <sect3 id="xorg-video-drivers">
+      <title>Xorg Video Drivers</title>
+
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            <xref linkend="xorg-ati-driver"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <xref linkend="xorg-cirrus-driver"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <xref linkend="xorg-fbdev-driver"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <xref linkend="xorg-intel-driver"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <xref linkend="xorg-nouveau-driver"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <xref linkend="xorg-vesa-driver"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <xref linkend="xorg-vmware-driver"/>
+          </para>
+        </listitem>
+      </itemizedlist>
+
+    </sect3>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="x7driver-evdev.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="x7driver-synaptics.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="x7driver-vmmouse-systemd.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="x7driver-wacom-systemd.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="x7driver-ati.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="x7driver-cirrus.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="x7driver-fbdev.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="x7driver-intel-systemd.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="x7driver-nouveau.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="x7driver-vesa.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="x7driver-vmware-systemd.xml"/>
+
+</sect1>
Index: x/installing/x7driver-vmmouse-systemd.xml
===================================================================
--- x/installing/x7driver-vmmouse-systemd.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
+++ x/installing/x7driver-vmmouse-systemd.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY xorg-vmmouse-driver-version "13.0.0">
+
+  <!ENTITY xorg-vmmouse-driver-download-http "&xorg-download-http;/driver/xf86-input-vmmouse-&xorg-vmmouse-driver-version;.tar.bz2">
+  <!ENTITY xorg-vmmouse-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-input-vmmouse-&xorg-vmmouse-driver-version;.tar.bz2">
+  <!ENTITY xorg-vmmouse-driver-md5sum        "34f9f64ee6a1a51fc8266a9af24e1e07">
+  <!ENTITY xorg-vmmouse-driver-size          "308 KB">
+  <!ENTITY xorg-vmmouse-driver-buildsize     "2.9 MB">
+  <!ENTITY xorg-vmmouse-driver-time          "less than 0.1 SBU">
+]>
+
+  <!-- Begin Xorg VMMouse Driver -->
+  <sect2 id="xorg-vmmouse-driver" xreflabel="Xorg VMMouse Driver-&xorg-vmmouse-driver-version;">
+
+    <title>Xorg VMMouse Driver-&xorg-vmmouse-driver-version;</title>
+
+    <indexterm zone="xorg-vmmouse-driver">
+      <primary sortas="a-xorg-vmmouse-driver">xorg-vmmouse-driver</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Xorg VMMouse Driver</title>
+
+      <para>
+        The <application>Xorg VMMouse Driver</application> package contains the VMMouse input
+        driver for the Xorg X server. The VMMouse driver enables support for the special
+        VMMouse protocol that is provided by VMware virtual machines to give absolute
+        pointer positioning.
+      </para>
+
+      &lfs76_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&xorg-vmmouse-driver-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&xorg-vmmouse-driver-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &xorg-vmmouse-driver-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &xorg-vmmouse-driver-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &xorg-vmmouse-driver-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &xorg-vmmouse-driver-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Additional Downloads</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Required patch:
+            <ulink url="&patch-root;/xf86-input-vmmouse-&xorg-vmmouse-driver-version;-build_fix-1.patch"/>
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Xorg VMMouse Driver Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="xorg-server"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/xorg-vmmouse-driver"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Xorg VMMouse Driver</title>
+
+      <para>
+        Install <application>Xorg VMMouse Driver</application> by running the following
+        commands:
+      </para>
+
+<screen><userinput>patch -Np1 -i ../xf86-input-vmmouse-&xorg-vmmouse-driver-version;-build_fix-1.patch &amp;&amp;
+./configure $XORG_CONFIG               \
+            --without-hal-callouts-dir \
+            --without-hal-fdi-dir      \
+            --with-udev-rules-dir=/lib/udev/rules.d &amp;&amp;
+make</userinput></screen>
+
+      <para>
+        This package does not come with a test suite.
+      </para>
+
+      <para>
+        Now, as the <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+    </sect3>
+
+    <sect3>
+      <title>Command Explanations</title>
+
+      <para>
+        <parameter>--without-hal-*-dir</parameter>: These switches
+        disable installation of the <application>HAL</application>
+        components which are not needed on Linux.
+      </para>
+
+      <para>
+        <parameter>--with-udev-rules-dir=/lib/udev/rules.d</parameter>:
+        This switch specifies where Udev rules should be installed.
+      </para>
+
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Program</segtitle>
+        <segtitle>Installed Xorg Drivers</segtitle>
+
+        <seglistitem>
+          <seg>
+            vmmouse_detect
+          </seg>
+          <seg>
+            vmmouse_drv.so
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <variablelist>
+        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
+        <?dbfo list-presentation="list"?>
+        <?dbhtml list-presentation="table"?>
+
+        <varlistentry id="vmmouse_detect">
+          <term><command>vmmouse_detect</command></term>
+          <listitem>
+            <para>
+              is a tool for detecting if running in a VMware environment where
+              vmmouse is used.
+            </para>
+            <indexterm zone="xorg-vmmouse-driver vmmouse_detect">
+              <primary sortas="b-vmmouse_detect">vmmouse_detect</primary>
+            </indexterm>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry id="vmmouse_drv">
+          <term><filename class="libraryfile">vmmouse_drv.so</filename></term>
+          <listitem>
+            <para>
+              is an Xorg input driver for VMware Mouse.
+            </para>
+            <indexterm zone="xorg-vmmouse-driver vmmouse_drv">
+              <primary sortas="c-vmmouse_drv">vmmouse_drv.so</primary>
+            </indexterm>
+          </listitem>
+        </varlistentry>
+
+      </variablelist>
+
+    </sect3>
+
+  </sect2>
+  <!-- End Xorg VMMouse Driver -->
Index: x/installing/x7driver-vmmouse.xml
===================================================================
--- x/installing/x7driver-vmmouse.xml	(revision 44ae5736060f9a6b96813f533a3facef1b95ae5d)
+++ 	(revision )
@@ -1,188 +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 xorg-vmmouse-driver-version "13.0.0">
-
-  <!ENTITY xorg-vmmouse-driver-download-http "&xorg-download-http;/driver/xf86-input-vmmouse-&xorg-vmmouse-driver-version;.tar.bz2">
-  <!ENTITY xorg-vmmouse-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-input-vmmouse-&xorg-vmmouse-driver-version;.tar.bz2">
-  <!ENTITY xorg-vmmouse-driver-md5sum        "34f9f64ee6a1a51fc8266a9af24e1e07">
-  <!ENTITY xorg-vmmouse-driver-size          "308 KB">
-  <!ENTITY xorg-vmmouse-driver-buildsize     "2.9 MB">
-  <!ENTITY xorg-vmmouse-driver-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin Xorg VMMouse Driver -->
-  <sect2 id="xorg-vmmouse-driver" xreflabel="Xorg VMMouse Driver-&xorg-vmmouse-driver-version;">
-
-    <title>Xorg VMMouse Driver-&xorg-vmmouse-driver-version;</title>
-
-    <indexterm zone="xorg-vmmouse-driver">
-      <primary sortas="a-xorg-vmmouse-driver">xorg-vmmouse-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Xorg VMMouse Driver</title>
-
-      <para>
-        The <application>Xorg VMMouse Driver</application> package contains the VMMouse input
-        driver for the Xorg X server. The VMMouse driver enables support for the special
-        VMMouse protocol that is provided by VMware virtual machines to give absolute
-        pointer positioning.
-      </para>
-
-      &lfs76_built;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&xorg-vmmouse-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&xorg-vmmouse-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &xorg-vmmouse-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &xorg-vmmouse-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &xorg-vmmouse-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &xorg-vmmouse-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Additional Downloads</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Required patch:
-            <ulink url="&patch-root;/xf86-input-vmmouse-&xorg-vmmouse-driver-version;-build_fix-1.patch"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Xorg VMMouse Driver Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xorg-server"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/xorg-vmmouse-driver"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg VMMouse Driver</title>
-
-      <para>
-        Install <application>Xorg VMMouse Driver</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>patch -Np1 -i ../xf86-input-vmmouse-&xorg-vmmouse-driver-version;-build_fix-1.patch &amp;&amp;
-./configure $XORG_CONFIG               \
-            --without-hal-fdi-dir      \
-            --without-hal-callouts-dir \
-            --with-udev-rules-dir=/lib/udev/rules.d &amp;&amp;
-make</userinput></screen>
-
-      <para>
-        This package does not come with a test suite.
-      </para>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-    </sect3>
-
-    <sect3>
-      <title>Command Explanations</title>
-
-      <para>
-        <parameter>--with-udev-rules-dir=/lib/udev/rules.d</parameter>:
-        This switch specifies where udev rules should be installed.
-      </para>
-
-      <para>
-        <option>--without-hal-*-dir</option>: These switches disable
-        installation of the <application>HAL</application> components
-        which are not needed on Linux.
-      </para>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Program</segtitle>
-        <segtitle>Installed Xorg Drivers</segtitle>
-
-        <seglistitem>
-          <seg>
-            vmmouse_detect
-          </seg>
-          <seg>
-            vmmouse_drv.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="vmmouse_detect">
-          <term><command>vmmouse_detect</command></term>
-          <listitem>
-            <para>
-              is a tool for detecting if running in a VMware environment where
-              vmmouse is used.
-            </para>
-            <indexterm zone="xorg-vmmouse-driver vmmouse_detect">
-              <primary sortas="b-vmmouse_detect">vmmouse_detect</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="vmmouse_drv">
-          <term><filename class="libraryfile">vmmouse_drv.so</filename></term>
-          <listitem>
-            <para>
-              is an Xorg input driver for VMware Mouse.
-            </para>
-            <indexterm zone="xorg-vmmouse-driver vmmouse_drv">
-              <primary sortas="c-vmmouse_drv">vmmouse_drv.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
-  <!-- End Xorg VMMouse Driver -->
Index: x/installing/x7driver-vmware-systemd.xml
===================================================================
--- x/installing/x7driver-vmware-systemd.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
+++ x/installing/x7driver-vmware-systemd.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
@@ -0,0 +1,182 @@
+<?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 xorg-vmware-driver-version "13.0.2">
+
+  <!ENTITY xorg-vmware-driver-download-http "&xorg-download-http;/driver/xf86-video-vmware-&xorg-vmware-driver-version;.tar.bz2">
+  <!ENTITY xorg-vmware-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-vmware-&xorg-vmware-driver-version;.tar.bz2">
+  <!ENTITY xorg-vmware-driver-md5sum        "91d1d7d33181766714405ab013d31244">
+  <!ENTITY xorg-vmware-driver-size          "432 KB">
+  <!ENTITY xorg-vmware-driver-buildsize     "9.1 MB">
+  <!ENTITY xorg-vmware-driver-time          "0.1 SBU">
+]>
+
+  <!-- Begin Xorg VMware Driver -->
+  <sect2 id="xorg-vmware-driver" xreflabel="Xorg VMware Driver-&xorg-vmware-driver-version;">
+
+    <title>Xorg VMware Driver-&xorg-vmware-driver-version;</title>
+
+    <indexterm zone="xorg-vmware-driver">
+      <primary sortas="a-xorg-vmware-driver">xorg-vmware-driver</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Xorg VMware Driver</title>
+
+      <para>
+        The <application>Xorg VMware Driver</application> package contains the X.Org
+        Video Driver for VMware SVGA virtual video cards.
+      </para>
+
+      &lfs76_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&xorg-vmware-driver-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&xorg-vmware-driver-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &xorg-vmware-driver-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &xorg-vmware-driver-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &xorg-vmware-driver-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &xorg-vmware-driver-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Additional Downloads</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Required patch:
+            <ulink url="&patch-root;/xf86-video-vmware-&xorg-vmware-driver-version;-upstream_fixes-1.patch"/>
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Xorg VMware Driver Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="xorg-server"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/xorg-vmware-driver"/>
+      </para>
+    </sect3>
+
+    <sect3 role="kernel" id="xorg-vmware-driver-kernel">
+      <title>Kernel Configuration</title>
+
+    <para>
+      Enable the following options in the kernel configuration and recompile the
+      kernel if necessary:
+    </para>
+
+<screen><literal>Device Drivers  ---&gt;
+  Graphics support  ---&gt;
+    Direct Rendering Manager  ---&gt;
+      DRM driver for VMware Virtual GPU: Y or M
+        Enable framebuffer console under vmwgfx by default: Y</literal></screen>
+
+      <indexterm zone="xorg-vmware-driver xorg-vmware-driver-kernel">
+        <primary sortas="d-xorg-vmware-driver">xorg-vmware-driver</primary>
+      </indexterm>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Xorg VMware Driver</title>
+
+      <para>
+        Install <application>Xorg VMware Driver</application> by running the following
+        commands:
+      </para>
+
+<screen><userinput>patch -Np1 -i ../xf86-video-vmware-&xorg-vmware-driver-version;-upstream_fixes-1.patch &amp;&amp;
+sed -i "/xf86xv.h/i #include &lt;xorg-server.h&gt;" vmwgfx/vmwgfx_overlay.c &amp;&amp;
+
+./configure $XORG_CONFIG &amp;&amp;
+make</userinput></screen>
+
+      <para>
+        This package does not come with a test suite.
+      </para>
+
+      <para>
+        Now, as the <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    </sect3>
+
+    <sect3>
+      <title>Command Explanations</title>
+
+      <para>
+        <command>sed -i ...</command>: This sed fixes building with the latest
+        version of <application>Glibc</application>.
+      </para>
+
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Xorg Driver</segtitle>
+
+        <seglistitem>
+          <seg>
+            vmware_drv.so
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <variablelist>
+        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
+        <?dbfo list-presentation="list"?>
+        <?dbhtml list-presentation="table"?>
+
+        <varlistentry id="vmware_drv">
+          <term><filename class="libraryfile">vmware_drv.so</filename></term>
+          <listitem>
+            <para>
+              is an Xorg video driver for VMware SVGA virtual video card.
+            </para>
+            <indexterm zone="xorg-vmware-driver vmware_drv">
+              <primary sortas="c-vmware_drv">vmware_drv.so</primary>
+            </indexterm>
+          </listitem>
+        </varlistentry>
+
+      </variablelist>
+
+    </sect3>
+
+  </sect2>
+  <!-- End Xorg VMware Driver -->
Index: x/installing/x7driver-vmware.xml
===================================================================
--- x/installing/x7driver-vmware.xml	(revision 44ae5736060f9a6b96813f533a3facef1b95ae5d)
+++ 	(revision )
@@ -1,168 +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 xorg-vmware-driver-version "13.0.2">
-
-  <!ENTITY xorg-vmware-driver-download-http "&xorg-download-http;/driver/xf86-video-vmware-&xorg-vmware-driver-version;.tar.bz2">
-  <!ENTITY xorg-vmware-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-vmware-&xorg-vmware-driver-version;.tar.bz2">
-  <!ENTITY xorg-vmware-driver-md5sum        "91d1d7d33181766714405ab013d31244">
-  <!ENTITY xorg-vmware-driver-size          "432 KB">
-  <!ENTITY xorg-vmware-driver-buildsize     "9.1 MB">
-  <!ENTITY xorg-vmware-driver-time          "0.1 SBU">
-]>
-
-  <!-- Begin Xorg VMware Driver -->
-  <sect2 id="xorg-vmware-driver" xreflabel="Xorg VMware Driver-&xorg-vmware-driver-version;">
-
-    <title>Xorg VMware Driver-&xorg-vmware-driver-version;</title>
-
-    <indexterm zone="xorg-vmware-driver">
-      <primary sortas="a-xorg-vmware-driver">xorg-vmware-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Xorg VMware Driver</title>
-
-      <para>
-        The <application>Xorg VMware Driver</application> package contains the X.Org
-        Video Driver for VMware SVGA virtual video cards.
-      </para>
-
-      &lfs76_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&xorg-vmware-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&xorg-vmware-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &xorg-vmware-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &xorg-vmware-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &xorg-vmware-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &xorg-vmware-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Xorg VMware Driver Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xorg-server"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/xorg-vmware-driver"/>
-      </para>
-    </sect3>
-
-    <sect3 role="kernel" id="xorg-vmware-driver-kernel">
-      <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile the
-      kernel if necessary:
-    </para>
-
-<screen><literal>Device Drivers  ---&gt;
-  Graphics support  ---&gt;
-    Direct Rendering Manager  ---&gt;
-      DRM driver for VMware Virtual GPU: Y or M
-        Enable framebuffer console under vmwgfx by default: Y</literal></screen>
-
-      <indexterm zone="xorg-vmware-driver xorg-vmware-driver-kernel">
-        <primary sortas="d-xorg-vmware-driver">xorg-vmware-driver</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg VMware Driver</title>
-
-      <para>
-        Install <application>Xorg VMware Driver</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>sed -i "/xf86xv.h/i #include &lt;xorg-server.h&gt;" vmwgfx/vmwgfx_overlay.c &amp;&amp;
-
-./configure $XORG_CONFIG &amp;&amp;
-make</userinput></screen>
-
-      <para>
-        This package does not come with a test suite.
-      </para>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-    </sect3>
-
-    <sect3>
-      <title>Command Explanations</title>
-      <para>
-        <command>sed -i ...</command>: This sed fixes building with the latest
-        version of <application>Glibc</application>.
-      </para>
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Xorg Driver</segtitle>
-
-        <seglistitem>
-          <seg>
-            vmware_drv.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="vmware_drv">
-          <term><filename class="libraryfile">vmware_drv.so</filename></term>
-          <listitem>
-            <para>
-              is an Xorg video driver for VMware SVGA virtual video card.
-            </para>
-            <indexterm zone="xorg-vmware-driver vmware_drv">
-              <primary sortas="c-vmware_drv">vmware_drv.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
-  <!-- End Xorg VMware Driver -->
Index: x/installing/x7driver-wacom-systemd.xml
===================================================================
--- x/installing/x7driver-wacom-systemd.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
+++ x/installing/x7driver-wacom-systemd.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
@@ -0,0 +1,201 @@
+<?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 xorg-wacom-driver-version "0.26.1">
+
+  <!ENTITY xorg-wacom-driver-download-http "&sourceforge-repo;/linuxwacom/xf86-input-wacom-&xorg-wacom-driver-version;.tar.bz2">
+  <!ENTITY xorg-wacom-driver-download-ftp  " ">
+  <!ENTITY xorg-wacom-driver-md5sum        "75d2beafd3cbdbd0829f4bef363919b3">
+  <!ENTITY xorg-wacom-driver-size          "576 KB">
+  <!ENTITY xorg-wacom-driver-buildsize     "6.3 MB (additional 2.3 MB for the tests)">
+  <!ENTITY xorg-wacom-driver-time          "0.1 SBU">
+]>
+
+  <!-- Begin Xorg Wacom Driver -->
+  <sect2 id="xorg-wacom-driver" xreflabel="Xorg Wacom Driver-&xorg-wacom-driver-version;">
+
+    <title>Xorg Wacom Driver-&xorg-wacom-driver-version;</title>
+
+    <indexterm zone="xorg-wacom-driver">
+      <primary sortas="a-xorg-wacom-driver">xorg-wacom-driver</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Xorg Wacom Driver</title>
+
+      <para>
+        The <application>Xorg Wacom Driver</application> package contains the
+        X.Org X11 driver and SDK for Wacom and Wacom-like tablets. It is not
+        required to use a Wacom tablet, the
+        <application>xf86-input-evdev</application> driver can handle these
+        devices without problems.
+      </para>
+
+      &lfs76_built;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&xorg-wacom-driver-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&xorg-wacom-driver-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &xorg-wacom-driver-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &xorg-wacom-driver-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &xorg-wacom-driver-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &xorg-wacom-driver-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Xorg Wacom Drivers Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="xorg-server"/>
+      </para>
+
+      <bridgehead renderas="sect5">Optional</bridgehead>
+      <para role="optional">
+        <xref linkend="doxygen"/> and
+        <xref linkend="graphviz"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/xorg-wacom-driver"/>
+      </para>
+    </sect3>
+
+    <sect3 role="kernel" id="xorg-wacom-driver-kernel">
+      <title>Kernel Configuration</title>
+
+      <para>
+        To use a Wacom tablet, enable the following options in your kernel
+        configuration and recompile:
+      </para>
+
+<screen><literal>Device Drivers  ---&gt;
+  Input device support  ---&gt;
+    [*] Tablets  ---&gt;
+      Wacom Intuos/Graphire tablet support (USB): Y or M</literal></screen>
+
+      <indexterm zone="xorg-wacom-driver xorg-wacom-driver-kernel">
+        <primary sortas="d-xorg-wacom-driver">xorg-wacom-driver</primary>
+      </indexterm>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Xorg Wacom Driver</title>
+
+      <para>
+        Install <application>Xorg Wacom Driver</application> by running the following
+        commands:
+      </para>
+
+<screen><userinput>./configure $XORG_CONFIG                                \
+            --with-udev-rules-dir=/lib/udev/rules.d     \
+            --with-systemd-unit-dir=/lib/systemd/system &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>
+
+    </sect3>
+
+    <sect3>
+      <title>Command Explanations</title>
+
+      <para>
+        <parameter>--with-udev-rules-dir=/lib/udev/rules.d</parameter>:
+        This switch specifies where Udev rules should be installed.
+      </para>
+
+      <para>
+        <parameter>--with-systemd-unit-dir=/lib/systemd/system</parameter>:
+        This switch specifies where systemd units should be installed.
+      </para>
+
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Xorg Driver</segtitle>
+
+        <seglistitem>
+          <seg>
+            isdv4-serial-debugger, isdv4-serial-inputattach, and xsetwacom
+          </seg>
+          <seg>
+            wacom_drv.so
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <variablelist>
+        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
+        <?dbfo list-presentation="list"?>
+        <?dbhtml list-presentation="table"?>
+
+        <varlistentry id="xsetwacom">
+          <term><command>xsetwacom</command></term>
+          <listitem>
+            <para>
+              is a commandline utility used to query
+              and modify wacom driver settings.
+            </para>
+            <indexterm zone="xorg-wacom-driver xsetwacom">
+              <primary sortas="b-xsetwacom">xsetwacom</primary>
+            </indexterm>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry id="wacom_drv">
+          <term><filename class="libraryfile">wacom_drv.so</filename></term>
+          <listitem>
+            <para>
+              is an Xorg input driver for Wacom devices.
+            </para>
+            <indexterm zone="xorg-wacom-driver wacom_drv">
+              <primary sortas="c-wacom_drv">wacom_drv.so</primary>
+            </indexterm>
+          </listitem>
+        </varlistentry>
+
+      </variablelist>
+
+    </sect3>
+
+  </sect2>
+  <!-- End Xorg Wacom Driver -->
Index: x/installing/x7driver-wacom.xml
===================================================================
--- x/installing/x7driver-wacom.xml	(revision 44ae5736060f9a6b96813f533a3facef1b95ae5d)
+++ 	(revision )
@@ -1,183 +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 xorg-wacom-driver-version "0.26.1">
-
-  <!ENTITY xorg-wacom-driver-download-http "&sourceforge-repo;/linuxwacom/xf86-input-wacom-&xorg-wacom-driver-version;.tar.bz2">
-  <!ENTITY xorg-wacom-driver-download-ftp  " ">
-  <!ENTITY xorg-wacom-driver-md5sum        "75d2beafd3cbdbd0829f4bef363919b3">
-  <!ENTITY xorg-wacom-driver-size          "576 KB">
-  <!ENTITY xorg-wacom-driver-buildsize     "6.3 MB (additional 2.3 MB for the tests)">
-  <!ENTITY xorg-wacom-driver-time          "0.1 SBU">
-]>
-
-  <!-- Begin Xorg Wacom Driver -->
-  <sect2 id="xorg-wacom-driver" xreflabel="Xorg Wacom Driver-&xorg-wacom-driver-version;">
-
-    <title>Xorg Wacom Driver-&xorg-wacom-driver-version;</title>
-
-    <indexterm zone="xorg-wacom-driver">
-      <primary sortas="a-xorg-wacom-driver">xorg-wacom-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Xorg Wacom Driver</title>
-
-      <para>
-        The <application>Xorg Wacom Driver</application> package contains the
-        X.Org X11 driver and SDK for Wacom and Wacom-like tablets. It is not
-        required to use a Wacom tablet, the
-        <application>xf86-input-evdev</application> driver can handle these
-        devices without problems.
-      </para>
-
-      &lfs76_built;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&xorg-wacom-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&xorg-wacom-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &xorg-wacom-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &xorg-wacom-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &xorg-wacom-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &xorg-wacom-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Xorg Wacom Drivers Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xorg-server"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="doxygen"/> and
-        <xref linkend="graphviz"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/xorg-wacom-driver"/>
-      </para>
-    </sect3>
-
-    <sect3 role="kernel" id="xorg-wacom-driver-kernel">
-      <title>Kernel Configuration</title>
-
-      <para>
-        To use a Wacom tablet, enable the following options in your kernel
-        configuration and recompile:
-      </para>
-
-<screen><literal>Device Drivers  ---&gt;
-  Input device support  ---&gt;
-    [*] Tablets  ---&gt;
-      Wacom Intuos/Graphire tablet support (USB): Y or M</literal></screen>
-
-      <indexterm zone="xorg-wacom-driver xorg-wacom-driver-kernel">
-        <primary sortas="d-xorg-wacom-driver">xorg-wacom-driver</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg Wacom Driver</title>
-
-      <para>
-        Install <application>Xorg Wacom Driver</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>./configure $XORG_CONFIG --with-systemd-unit-dir=no &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>
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Xorg Driver</segtitle>
-
-        <seglistitem>
-          <seg>
-            isdv4-serial-debugger, isdv4-serial-inputattach, and xsetwacom
-          </seg>
-          <seg>
-            wacom_drv.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="xsetwacom">
-          <term><command>xsetwacom</command></term>
-          <listitem>
-            <para>
-              is a commandline utility used to query
-              and modify wacom driver settings.
-            </para>
-            <indexterm zone="xorg-wacom-driver xsetwacom">
-              <primary sortas="b-xsetwacom">xsetwacom</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="wacom_drv">
-          <term><filename class="libraryfile">wacom_drv.so</filename></term>
-          <listitem>
-            <para>
-              is an Xorg input driver for Wacom devices.
-            </para>
-            <indexterm zone="xorg-wacom-driver wacom_drv">
-              <primary sortas="c-wacom_drv">wacom_drv.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
-  <!-- End Xorg Wacom Driver -->
Index: x/installing/xkeyboard-config-systemd.xml
===================================================================
--- x/installing/xkeyboard-config-systemd.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
+++ x/installing/xkeyboard-config-systemd.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
@@ -0,0 +1,153 @@
+<?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 xkeyboard-config-download-http
+           "&xorg-download-http;/data/xkeyboard-config/xkeyboard-config-&xkeyboard-config-version;.tar.bz2">
+  <!ENTITY xkeyboard-config-download-ftp
+           "&xorg-download-ftp;/data/xkeyboard-config/xkeyboard-config-&xkeyboard-config-version;.tar.bz2">
+  <!ENTITY xkeyboard-config-md5sum        "a415775ca8ecf4dfafc9488b8cbd7114">
+  <!ENTITY xkeyboard-config-size          "922 KB">
+  <!ENTITY xkeyboard-config-buildsize     "14 MB">
+  <!ENTITY xkeyboard-config-time          "0.1 SBU">
+]>
+
+<sect1 id="xkeyboard-config" xreflabel="xkeyboard-config-&xkeyboard-config-version;">
+  <?dbhtml filename="xkeyboard-config.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>XKeyboardConfig-&xkeyboard-config-version;</title>
+
+  <indexterm zone="xkeyboard-config">
+    <primary sortas="a-XKeyboardConfig">XKeyboardConfig</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to XKeyboardConfig</title>
+
+    <para>
+      The <application>XKeyboardConfig</application> package contains
+      the keyboard configuration database for the X Window System.
+    </para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&xkeyboard-config-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&xkeyboard-config-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &xkeyboard-config-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &xkeyboard-config-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &xkeyboard-config-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &xkeyboard-config-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">XKeyboardConfig Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libxslt"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="xorg7-proto"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/xkeyboard-config"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of XKeyboardConfig</title>
+
+    <para>
+      Install <application>XKeyboardConfig</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr          \
+            --disable-runtime-deps \
+            --with-xkb-rules-symlink=xorg &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>--disable-runtime-deps</parameter>: This switch disables
+      checking for Xorg Protocol Headers which are only required for
+      <application>Xorg</application> at runtime.
+    </para>
+
+    <para>
+      <parameter>--with-xkb-rules-symlink=xorg</parameter>: By default, the
+      XKB rules installed are named "base". This creates symlinks named
+      "xorg" to those rules, which is the default name used by Xorg.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>None</seg>
+        <seg>
+          /usr/share/X11/xkb
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
Index: x/installing/xkeyboard-config.xml
===================================================================
--- x/installing/xkeyboard-config.xml	(revision 44ae5736060f9a6b96813f533a3facef1b95ae5d)
+++ 	(revision )
@@ -1,140 +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 xkeyboard-config-download-http
-  "&xorg-download-http;/data/xkeyboard-config/xkeyboard-config-&xkeyboard-config-version;.tar.bz2">
-  <!ENTITY xkeyboard-config-download-ftp
-  "&xorg-download-ftp;/data/xkeyboard-config/xkeyboard-config-&xkeyboard-config-version;.tar.bz2">
-  <!ENTITY xkeyboard-config-md5sum        "a415775ca8ecf4dfafc9488b8cbd7114">
-  <!ENTITY xkeyboard-config-size          "922 KB">
-  <!ENTITY xkeyboard-config-buildsize     "14 MB">
-  <!ENTITY xkeyboard-config-time          "0.1 SBU">
-]>
-
-<sect1 id="xkeyboard-config" xreflabel="xkeyboard-config-&xkeyboard-config-version;">
-  <?dbhtml filename="xkeyboard-config.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>XKeyboardConfig-&xkeyboard-config-version;</title>
-
-  <indexterm zone="xkeyboard-config">
-    <primary sortas="a-XKeyboardConfig">XKeyboardConfig</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to XKeyboardConfig</title>
-
-    <para>
-      The <application>XKeyboardConfig</application> package contains
-      the keyboard configuration database for the X Window System.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xkeyboard-config-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xkeyboard-config-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xkeyboard-config-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xkeyboard-config-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xkeyboard-config-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xkeyboard-config-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">XKeyboardConfig Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/xkeyboard-config"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of XKeyboardConfig</title>
-
-    <para>
-      Install <application>XKeyboardConfig</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure $XORG_CONFIG --with-xkb-rules-symlink=xorg &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-xkb-rules-symlink=xorg</parameter>: By default, the
-      XKB rules installed are named "base". This creates symlinks named
-      "xorg" to those rules, which is the default name used by Xorg.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg>
-          <envar>$XORG_PREFIX</envar>/share/X11/xkb
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: x/installing/xorg-server-systemd.xml
===================================================================
--- x/installing/xorg-server-systemd.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
+++ x/installing/xorg-server-systemd.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
@@ -0,0 +1,320 @@
+<?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 xorg-server-download-http "&xorg-download-http;/xserver/xorg-server-&xorg-server-version;.tar.bz2">
+  <!ENTITY xorg-server-download-ftp  "&xorg-download-ftp;/xserver/xorg-server-&xorg-server-version;.tar.bz2">
+  <!ENTITY xorg-server-md5sum        "b1ff364222e921d32de40c4786e8bc47">
+  <!ENTITY xorg-server-size          "5.5 MB">
+  <!ENTITY xorg-server-buildsize     "495 MB">
+  <!ENTITY xorg-server-time          "1.4 SBU">
+]>
+
+<sect1 id="xorg-server" xreflabel="Xorg-Server-&xorg-server-version;">
+  <?dbhtml filename="xorg-server.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Xorg-Server-&xorg-server-version;</title>
+
+  <indexterm zone="xorg-server">
+    <primary sortas="a-xorg-server">xorg-server</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Xorg Server</title>
+
+    <para>
+      The <application>Xorg</application> Server is the core
+      of the X Window system.
+    </para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&xorg-server-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&xorg-server-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &xorg-server-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &xorg-server-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &xorg-server-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &xorg-server-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Optional patch:
+          <ulink url="&patch-root;/xorg-server-&xorg-server-version;-add_prime_support-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Xorg Server Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="openssl"/> or
+      <xref linkend="nettle"/> or
+      <xref linkend="libgcrypt"/>,
+      <xref linkend="pixman"/>,
+      <xref linkend="xorg7-font"/>, and
+      <xref linkend="xkeyboard-config"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libepoxy"/> (for Glamor),
+      <xref linkend="wayland"/> (both for <command>Xwayland</command>) and
+      <xref linkend="systemd"/> (for Logind)
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para>
+      <xref linkend="acpid"/> (runtime),
+      <xref linkend="doxygen"/> (to build API documentation),
+      <xref linkend="fop"/>, (to build documentation),
+      <xref linkend="gs"/> (to build documentation),
+      <xref linkend="xmlto"/>, (to build documentation), and
+      <ulink url="http://download.savannah.gnu.org/releases/libunwind/">libunwind</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url='&blfs-wiki;/Xorg7Server'/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Xorg Server</title>
+
+    <para>
+      If you have downloaded the optional patch, apply it by running
+      the following command:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-add_prime_support-1.patch</userinput></screen>
+
+    <para>
+      Install the server by running the following commands:
+    </para>
+
+<screen><userinput>./configure $XORG_CONFIG                    \
+           --with-xkb-output=/var/lib/xkb   \
+           --enable-dmx                     \
+           --enable-glamor                  \
+           --enable-suid-wrapper            &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 &amp;&amp;
+mkdir -pv /etc/X11/xorg.conf.d</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>--enable-dmx</parameter>: This switch enables building of the DMX
+      (Distributed Multihead X) server.
+    </para>
+
+    <para>
+      <parameter>--enable-glamor</parameter>: This switch enables building
+      of the Glamor DIX module which is required by some drivers and
+      <command>Xwayland</command>. Remove it if you don't want to install
+      <application>libepoxy</application> and are not going to need
+      <command>Xwayland</command> or you don't have any hardware that
+      requires Glamor (Radeon "Southern Islands" and later GPUs).
+    </para>
+
+    <para>
+      <parameter>--enable-suid-wrapper</parameter>: This switch enables building of
+      the suid-root wrapper for legacy driver support on rootless xserver systems.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          cvt, dmxaddinput, dmxaddscreen, dmxinfo, dmxreconfig, dmxresize,
+          dmxrminput, dmxrmscreen, dmxtodmx, dmxwininfo, gtf, vdltodmx, X,
+          Xdmx, xdmxconfig, Xnest, Xorg, Xvfb, and Xwayland
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          $XORG_PREFIX/include/xorg,
+          $XORG_PREFIX/lib/xorg,
+          $XORG_PREFIX/share/X11/xorg.conf.d, and
+          /var/lib/xkb
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="cvt-x7">
+        <term><command>cvt</command></term>
+        <listitem>
+          <para>
+            calculates VESA CVT mode lines.
+          </para>
+          <indexterm zone="xorg-server cvt-x7">
+            <primary sortas="b-cvt">cvt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dmx-x7">
+        <term><command>dmx*</command></term>
+        <listitem>
+          <para>
+            are various tools used for manipulating the dmx server.
+          </para>
+          <indexterm zone="xorg-server dmx-x7">
+            <primary sortas="b-dmx">dmx*</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gtf-x7">
+        <term><command>gtf</command></term>
+        <listitem>
+          <para>
+            calculates VESA GTF mode lines.
+          </para>
+          <indexterm zone="xorg-server gtf-x7">
+            <primary sortas="b-gtf">gtf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="vdltodmx-x7">
+        <term><command>vdltodmx</command></term>
+        <listitem>
+          <para>
+            is a tool used to convert VDL config files to DMX config
+            files.
+          </para>
+          <indexterm zone="xorg-server vdltodmx-x7">
+            <primary sortas="b-vdltodmx">vdltodmx</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="X-x7">
+        <term><command>X</command></term>
+        <listitem>
+          <para>
+            is a symbolic link to Xorg.
+          </para>
+          <indexterm zone="xorg-server X-x7">
+            <primary sortas="b-X">X</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="Xnest-x7">
+        <term><command>Xnest</command></term>
+        <listitem>
+          <para>
+            is a nested X server.
+          </para>
+          <indexterm zone="xorg-server Xnest-x7">
+            <primary sortas="b-Xnest">Xnest</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="Xorg-x7">
+        <term><command>Xorg</command></term>
+        <listitem>
+          <para>
+            is the X11R7 X Server.
+          </para>
+          <indexterm zone="xorg-server Xorg-x7">
+            <primary sortas="b-Xorg">Xorg</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="Xvfb-x7">
+        <term><command>Xvfb</command></term>
+        <listitem>
+          <para>
+            is the virtual framebuffer X server for X Version 11.
+          </para>
+          <indexterm zone="xorg-server Xvfb-x7">
+            <primary sortas="b-Xvfb">Xvfb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xdmxconfig-x7">
+        <term><command>xdmxconfig</command></term>
+        <listitem>
+          <para>
+            is a graphical configuration utility for the dmx server.
+          </para>
+          <indexterm zone="xorg-server xdmxconfig-x7">
+            <primary sortas="b-xdmxconfig">xdmxconfig</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: x/installing/xorg-server.xml
===================================================================
--- x/installing/xorg-server.xml	(revision 44ae5736060f9a6b96813f533a3facef1b95ae5d)
+++ 	(revision )
@@ -1,335 +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 xorg-server-download-http "&xorg-download-http;/xserver/xorg-server-&xorg-server-version;.tar.bz2">
-  <!ENTITY xorg-server-download-ftp  "&xorg-download-ftp;/xserver/xorg-server-&xorg-server-version;.tar.bz2">
-  <!ENTITY xorg-server-md5sum        "b1ff364222e921d32de40c4786e8bc47">
-  <!ENTITY xorg-server-size          "5.5 MB">
-  <!ENTITY xorg-server-buildsize     "495 MB">
-  <!ENTITY xorg-server-time          "1.4 SBU">
-]>
-
-<sect1 id="xorg-server" xreflabel="Xorg-Server-&xorg-server-version;">
-  <?dbhtml filename="xorg-server.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Xorg-Server-&xorg-server-version;</title>
-
-  <indexterm zone="xorg-server">
-    <primary sortas="a-xorg-server">xorg-server</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xorg Server</title>
-
-    <para>
-      The <application>Xorg</application> Server is the core
-      of the X Window system.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xorg-server-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xorg-server-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xorg-server-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xorg-server-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xorg-server-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xorg-server-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch:
-          <ulink url="&patch-root;/xorg-server-&xorg-server-version;-add_prime_support-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xorg Server Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="openssl"/> or
-      <xref linkend="nettle"/> or
-      <xref linkend="libgcrypt"/>,
-      <xref linkend="pixman"/>,
-      <xref linkend="xorg7-font"/>, and
-      <xref linkend="xkeyboard-config"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libepoxy"/> (required for glamor, see command
-      explanations below)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="acpid"/> (runtime),
-      <xref linkend="doxygen"/> (to build API documentation),
-      <xref linkend="fop"/>, (to build documentation),
-      <xref linkend="gs"/> (to build documentation), and
-      <xref linkend="xmlto"/>, (to build documentation)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url='&blfs-wiki;/Xorg7Server'/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xorg Server</title>
-
-    <para>
-      If you have downloaded the optional patch, apply it by running
-      the following command:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-add_prime_support-1.patch</userinput></screen>
-
-    <para>
-      Install the server by running the following commands:
-    </para>
-
-<screen><userinput>./configure $XORG_CONFIG                    \
-           --with-xkb-output=/var/lib/xkb   \
-           --enable-dmx                     \
-           --enable-glamor                  \
-           --enable-install-setuid          \
-           --enable-suid-wrapper            &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 &amp;&amp;
-mkdir -pv /etc/X11/xorg.conf.d &amp;&amp;
-cat &gt;&gt; /etc/sysconfig/createfiles &lt;&lt; "EOF"
-<literal>/tmp/.ICE-unix dir 1777 root root
-/tmp/.X11-unix dir 1777 root root</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-dmx</parameter>: Build DMX (Distributed Multihead X)
-      server.
-    </para>
-
-    <para>
-      <parameter>--enable-glamor</parameter>: Build the Glamor DIX (Device
-      Independent X) module which is currently required for Southern Islands and
-      Sea Islands radeon video chipsets, optional for some other radeons, and
-      also optional for the intel driver.
-    </para>
-
-    <para>
-      <parameter>--enable-install-setuid</parameter>: The Xorg binary must run as
-      the root user. This switch ensures that the binary is installed
-      setuid when <command>make</command> is run by an unprivileged user.
-    </para>
-
-    <para>
-      <parameter>--enable-suid-wrapper</parameter>: Build suid-root wrapper for
-      legacy driver support on rootless xserver systems.
-    </para>
-
-    <para>
-      <command>cat &gt;&gt; /etc/sysconfig/createfiles...</command>: This
-      command creates the <filename class="directory">/tmp/.ICE-unix</filename>
-      and <filename class="directory">/tmp/.X11-unix</filename> directories at
-      startup, and ensures that the permissions and ownership are correct as
-      required by the server.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          cvt, dmxaddinput, dmxaddscreen, dmxinfo, dmxreconfig, dmxresize,
-          dmxrminput, dmxrmscreen, dmxtodmx, dmxwininfo, gtf, vdltodmx, X,
-          Xdmx, xdmxconfig, Xnest, Xorg, and Xvfb
-        </seg>
-        <seg>
-          several under $XORG_PREFIX/lib/xorg/modules/{,extensions,multimedia}
-        </seg>
-        <seg>
-          $XORG_PREFIX/include/xorg,
-          $XORG_PREFIX/lib/xorg,
-          $XORG_PREFIX/share/X11/xorg.conf.d, and
-          /var/lib/xkb
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cvt-x7">
-        <term><command>cvt</command></term>
-        <listitem>
-          <para>
-            calculates VESA CVT mode lines.
-          </para>
-          <indexterm zone="xorg-server cvt-x7">
-            <primary sortas="b-cvt">cvt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dmx-x7">
-        <term><command>dmx*</command></term>
-        <listitem>
-          <para>
-            are various tools used for manipulating the dmx server.
-          </para>
-          <indexterm zone="xorg-server dmx-x7">
-            <primary sortas="b-dmx">dmx*</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtf-x7">
-        <term><command>gtf</command></term>
-        <listitem>
-          <para>
-            calculates VESA GTF mode lines.
-          </para>
-          <indexterm zone="xorg-server gtf-x7">
-            <primary sortas="b-gtf">gtf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vdltodmx-x7">
-        <term><command>vdltodmx</command></term>
-        <listitem>
-          <para>
-            is a tool used to convert VDL config files to DMX config
-            files.
-          </para>
-          <indexterm zone="xorg-server vdltodmx-x7">
-            <primary sortas="b-vdltodmx">vdltodmx</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="X-x7">
-        <term><command>X</command></term>
-        <listitem>
-          <para>
-            is a symbolic link to Xorg.
-          </para>
-          <indexterm zone="xorg-server X-x7">
-            <primary sortas="b-X">X</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="Xnest-x7">
-        <term><command>Xnest</command></term>
-        <listitem>
-          <para>
-            is a nested X server.
-          </para>
-          <indexterm zone="xorg-server Xnest-x7">
-            <primary sortas="b-Xnest">Xnest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="Xorg-x7">
-        <term><command>Xorg</command></term>
-        <listitem>
-          <para>
-            is the X11R7 X Server.
-          </para>
-          <indexterm zone="xorg-server Xorg-x7">
-            <primary sortas="b-Xorg">Xorg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="Xvfb-x7">
-        <term><command>Xvfb</command></term>
-        <listitem>
-          <para>
-            is the virtual framebuffer X server for X Version 11.
-          </para>
-          <indexterm zone="xorg-server Xvfb-x7">
-            <primary sortas="b-Xvfb">Xvfb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xdmxconfig-x7">
-        <term><command>xdmxconfig</command></term>
-        <listitem>
-          <para>
-            is a graphical configuration utility for the dmx server.
-          </para>
-          <indexterm zone="xorg-server xdmxconfig-x7">
-            <primary sortas="b-xdmxconfig">xdmxconfig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/installing/xorg7.xml
===================================================================
--- x/installing/xorg7.xml	(revision 44ae5736060f9a6b96813f533a3facef1b95ae5d)
+++ x/installing/xorg7.xml	(revision 5b5c0e9735ce9443a780253f2e9b53a9bf7da93c)
@@ -133,5 +133,5 @@
     <note><para>If you've decided to use the standard <filename
     class="directory">/usr</filename> prefix, you can omit the remainder of
-    this page and continue at <xref linkend='util-macros'/>.</para></note>
+    this page and continue at <xref linkend="util-macros"/>.</para></note>
 
     <para>If you've decided to <emphasis>not</emphasis> use the standard
@@ -183,5 +183,5 @@
     user:</para>
 
-<screen><userinput role="root">ln -s $XORG_PREFIX/share/X11 /usr/share/X11</userinput></screen>
+<screen><userinput role="root">ln -sfv $XORG_PREFIX/share/X11 /usr/share/X11</userinput></screen>
 
     <para>Finally, if building on x86_64, you will need to create the
