[deployment-guide] Re-included The X Window System chapter in the book. (BZ#520952)

Jaromir Hradilek jhradile at fedoraproject.org
Mon Sep 26 10:46:48 UTC 2011


commit 21b98c2097a0f98037360d3de023dea02bb8de68
Author: Jaromir Hradilek <jhradile at redhat.com>
Date:   Mon Sep 26 12:41:17 2011 +0200

    Re-included The X Window System chapter in the book. (BZ#520952)

 en-US/Deployment_Guide.xml    |    2 +-
 en-US/Preface.xml             |    2 -
 en-US/The_X_Window_System.xml | 1368 ++++++++++++++++++++++-------------------
 3 files changed, 720 insertions(+), 652 deletions(-)
---
diff --git a/en-US/Deployment_Guide.xml b/en-US/Deployment_Guide.xml
index c558227..10049c9 100644
--- a/en-US/Deployment_Guide.xml
+++ b/en-US/Deployment_Guide.xml
@@ -90,7 +90,7 @@
   </part>
   <!-- APPENDIXES -->
   <xi:include href="RPM.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-  <!-- <xi:include href="The_X_Window_System.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+  <xi:include href="The_X_Window_System.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
   <xi:include href="The_sysconfig_Directory.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
   <xi:include href="The_proc_File_System.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
   <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
diff --git a/en-US/Preface.xml b/en-US/Preface.xml
index 7133752..3a762ff 100644
--- a/en-US/Preface.xml
+++ b/en-US/Preface.xml
@@ -186,7 +186,6 @@
           </para>
         </listitem>
       </varlistentry>
-      <!--
       <varlistentry>
         <term><xref linkend="ch-The_X_Window_System" /></term>
         <listitem>
@@ -195,7 +194,6 @@
           </para>
         </listitem>
       </varlistentry>
-      -->
       <varlistentry>
         <term><xref linkend="ch-The_sysconfig_Directory" /></term>
         <listitem>
diff --git a/en-US/The_X_Window_System.xml b/en-US/The_X_Window_System.xml
index c8e6876..9d4760f 100644
--- a/en-US/The_X_Window_System.xml
+++ b/en-US/The_X_Window_System.xml
@@ -1,9 +1,11 @@
 <?xml version='1.0'?>
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 ]>
-<appendix
-  id="ch-The_X_Window_System">
+
+<appendix id="ch-The_X_Window_System">
+
   <title>The X Window System</title>
+
   <indexterm
     significance="normal">
     <primary>X Window System</primary>
@@ -29,49 +31,63 @@
     <primary>X</primary>
     <secondary>X clients</secondary>
   </indexterm>
+
   <para>While the heart of &MAJOROS; is the kernel, for many users, the face of the operating system is the graphical environment provided by the <firstterm>X Window System</firstterm>, also called <firstterm>X</firstterm>.</para>
+
   <para>Other windowing environments have existed in the UNIX world, including some that predate the release of the X Window System in June 1984. Nonetheless, X has been the default graphical environment for most UNIX-like operating systems, including &MAJOROS;, for many years.</para>
-  <para>The graphical environment for &MAJOROS; is supplied by the <firstterm>X.Org Foundation</firstterm>, an open source organization created to manage development and strategy for the X Window System and related technologies. X.Org is a large-scale, rapidly developing project with hundreds of developers around the world. It features a wide degree of support for a variety of hardware devices and architectures, and can run on a variety of different operating systems and platforms. This release for &MAJOROS; specifically includes the X11R7.1 release of the X Window System.</para>
-  <para>The X Window System uses a client-server architecture. The <firstterm>X server</firstterm> (the <command>Xorg</command> binary) listens for connections from <firstterm>X client</firstterm> applications via a network or local loopback interface. The server communicates with the hardware, such as the video card, monitor, keyboard, and mouse. X client applications exist in the user-space, creating a <firstterm>graphical user interface</firstterm> (<firstterm>GUI</firstterm>) for the user and passing user requests to the X server.</para>
-  <section
-    id="s1-x-server">
-    <title>The X11R7.1 Release</title>
+
+  <para>The graphical environment for &MAJOROS; is supplied by the <firstterm>X.Org Foundation</firstterm>, an open source organization created to manage development and strategy for the X Window System and related technologies. X.Org is a large-scale, rapid-developing project with hundreds of developers around the world. It features a wide degree of support for a variety of hardware devices and architectures, and runs on myriad operating systems and platforms.</para>
+
+  <!-- This release for &MAJOROS; specifically includes X server version <literal>1.10</literal>. This version is based on the <literal>X11R7.5</literal> release of the X Window System with selected modules added from later releases thereof.</para> -->
+
+  <!-- Should the X server version (xorg-x11-server-1.10.3 for 6.2) cited instead of X11R7.6 ? -->
+
+  <para>The X Window System uses a client-server architecture. Its main purpose is to provide network transparent window system, which runs on a wide range of computing and graphics machines. The <firstterm>X server</firstterm> (the <command>Xorg</command> binary) listens for connections from <firstterm>X client</firstterm> applications via a network or local loopback interface. The server communicates with the hardware, such as the video card, monitor, keyboard, and mouse. X client applications exist in the user space, creating a <firstterm>graphical user interface</firstterm> (<firstterm>GUI</firstterm>) for the user and passing user requests to the X server.</para>
+
+  <section id="s1-x-server">
+
+    <title>The X Server</title>
+
     <indexterm
       significance="normal">
       <primary>X</primary>
       <secondary>X server</secondary>
       <tertiary>features of</tertiary>
     </indexterm>
-    <para>&MAJOROSVER; uses the X11R7.1 release as the base X Window System, which includes several video driver, EXA, and platform support enhancements over the previous release, among others. In addition, this release also includes several automatic configuration features for the X server.</para>
-    <para>X11R7.1 is the first release to take specific advantage of the modularization of the X Window System. This modularization, which splits X into logically distinct modules, makes it easier for open source developers to contribute code to the system.</para>
-    <important>
-      <title>Important</title>
-      <para>&MAJOROS; no longer provides the <trademark
-          class="trade">XFree86</trademark> server packages. Before upgrading a system to the latest version of &MAJOROS;, be sure that the system's video card is compatible with the X11R7.1 release by checking the Red Hat Hardware Compatibility List located online at <ulink
-          url="http://hardware.redhat.com/">http://hardware.redhat.com/</ulink>.</para>
-    </important>
-		<!-- TBD6: /usr/X11R6 is an obsolete directory for Fedora 12 -->
-    <para>In the X11R7.1 release, all libraries, headers, and binaries now live under <filename>/usr/</filename> instead of <filename>/usr/X11R6</filename>. The <filename>/etc/X11/</filename> directory contains configuration files for X client and server applications. This includes configuration files for the X server itself, the <command>xfs</command> font server, the X display managers, and many other base components.</para>
-    <para>The configuration file for the newer Fontconfig-based font architecture is still <filename>/etc/fonts/fonts.conf</filename>. For more on configuring and adding fonts, refer to <xref
-        linkend="s1-x-fonts"/>.</para>
-    <para>Because the X server performs advanced tasks on a wide array of hardware, it requires detailed information about the hardware it works on. The X server automatically detects some of this information; other details must be configured.</para>
-    <para>The installation program installs and configures X automatically, unless the X11R7.1 release packages are not selected for installation. However, if there are any changes to the monitor, video card or other devices managed by the X server, X must be reconfigured.</para>
-    <para>In some situations, reconfiguring the X server may require manually editing its configuration file, <filename>/etc/X11/xorg.conf</filename>. For information about the structure of this file, refer to <xref
-        linkend="s1-x-server-configuration"/>.</para>
-  </section>
-  <section
-    id="s1-x-clients">
-    <title>Desktop Environments and Window Managers</title>
+
+    <para>&MAJOROSVER; uses X server version, which includes several video drivers, EXA, and platform support enhancements over the previous release, among others. In addition, this release includes several automatic configuration features for the X server, as well as the generic input driver, <systemitem>evdev</systemitem>, that supports all input devices that the kernel knows about, including most mice and keyboards.</para>
+
+    <para>X11R7.1 was the first release to take specific advantage of the modularization of the X Window System. With it, X is split into logically distinct modules, which make it easier for open source developers to contribute code to the system.</para>
+
+    <para>In the current release, all libraries, headers, and binaries live under the <filename>/usr/</filename> directory. The <filename>/etc/X11/</filename> directory contains configuration files for X client and server applications. This includes configuration files for the X server itself, the X display managers, and many other base components.</para>
+
+    <para>The configuration file for the newer Fontconfig-based font architecture is still <filename>/etc/fonts/fonts.conf</filename>. For more information on configuring and adding fonts, refer to <xref linkend="s1-x-fonts"/>.</para>
+
+    <para>Because the X server performs advanced tasks on a wide array of hardware, it requires detailed information about the hardware it works on. The X server is able to automatically detect most of the hardware that it runs on and configure itself accordingly. Alternatively, hardware can be manually specified in configuration files.</para>
+
+    <para>The Red Hat Enterprise Linux system installer, Anaconda, installs and configures X automatically, unless the X packages are not selected for installation. If there are any changes to the monitor, video card or other devices managed by the X server, most of the time, X detects and reconfigures these changes automatically. In rare cases, X must be reconfigured manually.</para>
+
+
+    </section>
+
+    <section id="s1-x-clients">
+
+      <title>Desktop Environments and Window Managers</title>
+
     <indexterm
       significance="normal">
       <primary>X</primary>
       <secondary>X clients</secondary>
     </indexterm>
-    <para>Once an X server is running, X client applications can connect to it and create a GUI for the user. A range of GUIs are possible with &MAJOROS;, from the rudimentary <firstterm>Tab Window Manager</firstterm> to the highly developed and interactive <firstterm>GNOME</firstterm> desktop environment that most &MAJOROS; users are familiar with.</para>
-    <para>To create the latter, more comprehensive GUI, two main classes of X client application must connect to the X server: a <firstterm>desktop environment</firstterm> and a <firstterm>window manager</firstterm>.</para>
-    <section
-      id="s2-x-clients-desktop">
+
+    <para>Once an X server is running, X client applications can connect to it and create a GUI for the user. A range of GUIs are available with &MAJOROS;, from the rudimentary <firstterm>Tab Window Manager</firstterm> (twm) to the highly developed and interactive desktop environment (such as <firstterm>GNOME</firstterm> or <firstterm>KDE</firstterm>) that most &MAJOROS; users are familiar with.</para>
+
+    <para>To create the latter, more comprehensive GUI, two main classes of X client application must connect to the X server: a <firstterm>window manager</firstterm> and a <firstterm>desktop environment</firstterm>.</para>
+
+    <section id="s2-x-clients-desktop">
+
       <title>Desktop Environments</title>
+
       <indexterm
         significance="normal">
         <primary>X</primary>
@@ -105,26 +121,32 @@
         <secondary>desktop environments</secondary>
         <tertiary>GNOME</tertiary>
       </indexterm>
-      <para>A desktop environment integrates various X clients to create a common graphical user environment and development platform.</para>
-      <para>Desktop environments have advanced features allowing X clients and other running processes to communicate with one another, while also allowing all applications written to work in that environment to perform advanced tasks, such as drag and drop operations.</para>
+
+      <para>A desktop environment integrates various X clients to create a common graphical user environment and a development platform.</para>
+
+      <para>Desktop environments have advanced features allowing X clients and other running processes to communicate with one another, while also allowing all applications written to work in that environment to perform advanced tasks, such as drag-and-drop operations.</para>
+
       <para>&MAJOROS; provides two desktop environments:</para>
+
       <itemizedlist>
         <listitem>
           <para>
-            <emphasis>GNOME</emphasis> — The default desktop environment for &MAJOROS; based on the GTK+ 2 graphical toolkit.</para>
-        </listitem>
+            <emphasis>GNOME</emphasis> &mdash; The default desktop environment for &MAJOROS; based on the GTK+ 2 graphical toolkit.</para>
+  </listitem>
         <listitem>
           <para>
-            <emphasis>
-              <firstterm>KDE</firstterm>
-            </emphasis> — An alternative desktop environment based on the Qt 4 graphical toolkit.</para>
+            <emphasis>KDE</emphasis> &mdash; An alternative desktop environment based on the Qt 4 graphical toolkit.</para>
         </listitem>
       </itemizedlist>
-      <para>Both GNOME and KDE have advanced productivity applications, such as word processors, spreadsheets, and Web browsers; both also provide tools to customize the look and feel of the GUI. Additionally, if both the GTK+ 2 and the Qt libraries are present, KDE applications can run in GNOME and vice-versa.</para>
+
+      <para>Both GNOME and KDE have advanced-productivity applications, such as word processors, spreadsheets, and Web browsers; both also provide tools to customize the look and feel of the GUI. Additionally, if both the GTK+ 2 and the Qt libraries are present, KDE applications can run in GNOME and vice versa.</para>
+
     </section>
-    <section
-      id="s2-x-clients-winmanagers">
+
+    <section id="s2-x-clients-winmanagers">
+
       <title>Window Managers</title>
+
       <indexterm
         significance="normal">
         <primary>window managers</primary>
@@ -196,67 +218,67 @@
         </primary>
         <seealso>X</seealso>
       </indexterm>
-      <para>
-        <firstterm>Window managers</firstterm> are X client programs which are either part of a desktop environment or, in some cases, stand-alone. Their primary purpose is to control the way graphical windows are positioned, resized, or moved. Window managers also control title bars, window focus behavior, and user-specified key and mouse button bindings.</para>
-      <para>Four window managers are included with &MAJOROS;:</para>
+
+      <para><firstterm>Window managers</firstterm> are X client programs which are either part of a desktop environment or, in some cases, stand-alone. Their primary purpose is to control the way graphical windows are positioned, resized, or moved. Window managers also control title bars, window focus behavior, and user-specified key and mouse button bindings.</para>
+
+      <para>The Red Hat Enterprise Linux repositories provide five different window managers.</para>
+
       <variablelist>
         <varlistentry>
           <term>
+            <command>metacity</command>
+          </term>
+          <listitem>
+      <para>The <firstterm>Metacity</firstterm> window manager is the default window manager for GNOME. It is a simple and efficient window manager which supports custom themes. This window manager is automatically pulled in as a dependency when the GNOME desktop is installed.</para>
+
+          </listitem>
+       </varlistentry>
+
+        <varlistentry>
+          <term>
             <command>kwin</command>
           </term>
           <listitem>
-            <para>The <firstterm>KWin</firstterm> window manager is the default window manager for KDE. It is an efficient window manager which supports custom themes.</para>
+            <para>The <firstterm>KWin</firstterm> window manager is the default window manager for KDE. It is an efficient window manager which supports custom themes. This window manager is automatically pulled in as a dependency when the KDE desktop is installed.</para>
           </listitem>
         </varlistentry>
-        <varlistentry>
+
+  <varlistentry>
           <term>
-            <command>metacity</command>
+            <command>compiz</command>
           </term>
           <listitem>
-            <para>The <firstterm>Metacity</firstterm> window manager is the default window manager for GNOME. It is a simple and efficient window manager which also supports custom themes. To run this window manager, you need to install the <filename>metacity</filename> package.</para>
+      <para>The <firstterm>Compiz</firstterm> compositing window manager is based on OpenGL and can use 3D graphics hardware to create fast compositing desktop effects for window management. Advanced features, such as a cube workspace, are implemented as loadable plug-ins. To run this window manager, you need to install the <filename>compiz</filename> package.</para>
           </listitem>
         </varlistentry>
-        <varlistentry>
+
+  <varlistentry>
           <term>
             <command>mwm</command>
           </term>
           <listitem>
-            <para>The <firstterm>Motif Window Manager</firstterm> (<command>mwm</command>) is a basic, stand-alone window manager. Since it is designed to be a stand-alone window manager, it should not be used in conjunction with GNOME or KDE. To run this window manager, you need to install the <filename>openmotif</filename> package.</para>
+            <para>The <firstterm>Motif Window Manager</firstterm> (<command>mwm</command>) is a basic, stand-alone window manager. Since it is designed to be stand-alone, it should not be used in conjunction with GNOME or KDE. To run this window manager, you need to install the <filename>openmotif</filename> package.</para>
           </listitem>
         </varlistentry>
-        <varlistentry>
+
+  <varlistentry>
           <term>
             <command>twm</command>
           </term>
           <listitem>
-            <para>The minimalist <firstterm>Tab Window Manager</firstterm> (<command>twm</command>, which provides the most basic tool set of any of the window managers, can be used either as a stand-alone or with a desktop environment. It is installed as part of the X11R7.1 release.</para>
+      <para>The minimalist <firstterm>Tab Window Manager</firstterm> (<command>twm</command>), which provides the most basic tool set among the available window managers, can be used either as a stand-alone or with a desktop environment. To run this window manager, you need to install the <filename>xorg-x11-twm</filename> package.</para>
           </listitem>
         </varlistentry>
       </variablelist>
-      <para>To run any of the aforementioned window managers, you will first need to boot into Runlevel 3. For instructions on how to do this, refer to <xref
-          linkend="s1-services-runlevels"/>.</para>
-      <para>Once you are logged in to Runlevel 3, you will be presented with a terminal prompt, not a graphical environment. To start a window manager, type <command>xinit -e <replaceable>&lt;path-to-window-manager&gt;</replaceable>
-        </command> at the prompt.</para>
-      <para>
-        <command>
-          <replaceable>&lt;path-to-window-manager&gt;</replaceable>
-        </command> is the location of the window manager binary file. The binary file can be located by typing <command>which <replaceable>window-manager-name</replaceable>
-        </command>, where <command><replaceable>window-manager-name</replaceable>
-        </command> is the name of the window manager you want to run.</para>
-      <para>For example:</para>
-      <screen>~]# <command>which twm</command>
-/usr/bin/twm
-~]# <command>xinit -e /usr/bin/twm</command></screen>
-      <para>The first command above returns the absolute path to the <command>twm</command> window manager, the second command starts <command>twm</command>.</para>
-      <para>To exit a window manager, close the last window or press <keycombo><keycap>Ctrl</keycap>
-          <keycap>Alt</keycap>
-          <keycap>Backspace</keycap>
-        </keycombo>. Once you have exited the window manager, you can log back into Runlevel 5 by typing <command>startx</command> at the prompt.</para>
-    </section>
+
+      </section>
+
   </section>
-  <section
-    id="s1-x-server-configuration">
+
+  <section id="s1-x-server-configuration">
+
     <title>X Server Configuration Files</title>
+
     <indexterm
       significance="normal">
       <primary>X</primary>
@@ -270,16 +292,128 @@
       <secondary>configuration files</secondary>
       <tertiary>options within</tertiary>
     </indexterm>
-    <para>The X server is a single binary executable (<filename>/usr/bin/Xorg</filename>). Associated configuration files are stored in the <filename>/etc/X11/</filename> directory (as is a symbolic link — X — which points to <filename>/usr/bin/Xorg</filename>). The configuration file for the X server is <filename>/etc/X11/xorg.conf</filename>.</para>
-    <para>The directory <filename>/usr/lib/xorg/modules/</filename> contains X server modules that can be loaded dynamically at runtime. By default, only some modules in <filename>/usr/lib/xorg/modules/</filename> are automatically loaded by the X server.</para>
-    <para>To load optional modules, they must be specified in the X server configuration file, <filename>/etc/X11/xorg.conf</filename>. For more information about loading modules, refer to <xref
-        linkend="s3-x-server-config-xorg.conf-modules"/>.</para>
-    <para>When &MAJOROSVER; is installed, the configuration files for X are created using information gathered about the system hardware during the installation process.</para>
-    <section
-      id="s2-x-server-config-xorg.conf">
-      <title>
-        <filename>xorg.conf</filename>
-      </title>
+
+    <para>The X server is a single binary executable <filename>/usr/bin/Xorg</filename>; a symbolic link <filename class="symlink">X</filename> pointing to this file is also provided. Associated configuration files are stored in the <filename>/etc/X11/</filename> and <filename>/usr/share/X11/</filename> directories.</para>
+
+    <para>The X Window System supports two different configuration schemes. Configuration files in the <filename class="directory">xorg.conf.d</filename> directory contain preconfigured settings from vendors and from distribution, and these files should not be edited by hand. Configuration in the <filename>xorg.conf</filename> file, on the other hand, is done completely by hand but is not necessary in most scenarios.</para>
+
+    <note><title>When do you need the xorg.conf file?</title>
+      <para>All necessary parameters for a display and peripherals are auto-detected and configured during installation. The configuration file for the X server, <filename>/etc/X11/xorg.conf</filename>, that was necessary in previous releases, is not supplied with the current release of the X Window System. It can still be useful to create the file manually to configure new hardware, to set up an environment with multiple video cards, or for debugging purposes.</para>
+    </note>
+    <!-- Explain how to create the xorg.conf file. -->
+
+    <para>The <filename>/usr/lib/xorg/modules/</filename> (or <filename>/usr/lib64/xorg/modules/</filename>) directory contains X server modules that can be loaded dynamically at runtime. By default, only some modules in <filename>/usr/lib/xorg/modules/</filename> are automatically loaded by the X server.</para>
+
+    <!-- <para>To load optional modules, they must be specified in the X server configuration file, <filename>/etc/X11/xorg.conf</filename>. For more information about loading modules, refer to <xref linkend="s3-x-server-config-xorg.conf-modules"/>.</para> -->
+
+    <para>When &MAJOROSVER; is installed, the configuration files for X are created using information gathered about the system hardware during the installation process by the HAL (Hardware Abstraction Layer) configuration back end. Whenever the X server is started, it asks HAL for the list of input devices and adds each of them with their respective driver. Whenever a new input device is plugged in, or an existing input device is removed, HAL notifies the X server about the change. Because of this notification system, devices using the <systemitem>mouse</systemitem>, <systemitem>kbd</systemitem>, or <systemitem>vmmouse</systemitem> driver configured in the <filename>xorg.conf</filename> file are, by default, ignored by the X server. Refer to <xref linkend="s3-x-server-config-xorg.conf-serverf"/> for further details. Additional configuration is provided in the <filename class="directory">/etc/X11/xorg.conf.d/</filename> directory and it can override or augment any configurat
 ion that has been obtained through HAL.</para>
+
+    <section id="s2-x-server-config-xorg.conf-struct">
+
+         <title>The Structure of the Configuration</title>
+
+        <indexterm
+          significance="normal">
+          <primary>X</primary>
+          <secondary>
+            <filename>/etc/X11/xorg.conf</filename>
+          </secondary>
+          <tertiary>structure of</tertiary>
+        </indexterm>
+        <indexterm
+          significance="normal">
+          <primary>X</primary>
+          <secondary>
+            <filename>/etc/X11/xorg.conf</filename>
+          </secondary>
+          <tertiary>
+            <option>Section</option> tag</tertiary>
+        </indexterm>
+        <indexterm
+          significance="normal">
+          <primary>X</primary>
+          <secondary>
+            <filename>/etc/X11/xorg.conf</filename>
+          </secondary>
+          <tertiary>boolean values for</tertiary>
+    </indexterm>
+
+
+  <para>The format of the X configuration files is comprised of many different sections which address specific aspects of the system hardware. Each section begins with a <option>Section "<replaceable>section-name</replaceable>"</option> line, where "<replaceable>section-name</replaceable>" is the title for the section, and ends with an <option>EndSection</option> line. Each section contains lines that include option names and one or more option values. Some of these are sometimes enclosed in double quotes (<literal>"</literal>).</para>
+
+  <para>Some options within the <filename>/etc/X11/xorg.conf</filename> file accept a boolean switch which turns the feature on or off. The acceptable values are:</para>
+
+        <itemizedlist>
+          <listitem>
+            <para>
+              <literal>1</literal>, <literal>on</literal>, <literal>true</literal>, or <literal>yes</literal> &mdash; Turns the option on.</para>
+          </listitem>
+          <listitem>
+            <para>
+              <literal>0</literal>, <literal>off</literal>, <literal>false</literal>, or <literal>no</literal> &mdash; Turns the option off.</para>
+          </listitem>
+    </itemizedlist>
+
+  <para>The following shows a typical configuration file for the keyboard. Lines beginning with a hash sign (<literal>#</literal>) are not read by the X server and are used for human-readable comments.</para>
+
+  <screen># This file is autogenerated by system-setup-keyboard. Any
+# modifications will be lost.
+
+Section "InputClass"
+  Identifier  "system-setup-keyboard"
+  MatchIsKeyboard "on"
+  Option    "XkbModel"  "pc105"
+  Option    "XkbLayout" "cz,us"
+# Option    "XkbVariant"  "(null)"
+  Option    "XkbOptions"  "terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll"
+EndSection</screen>
+
+
+    </section>
+
+    <section id="s2-x-server-config-xorg.conf.d">
+
+      <title>The <filename>xorg.conf.d</filename> Directory</title>
+
+      <indexterm
+        significance="normal">
+        <primary>X</primary>
+        <secondary>configuration directory</secondary>
+        <tertiary>
+          <filename>/etc/X11/xorg.conf.d</filename>
+        </tertiary>
+      </indexterm>
+      <indexterm
+        significance="normal">
+        <primary>X</primary>
+        <secondary>configuration files</secondary>
+        <tertiary>server options</tertiary>
+      </indexterm>
+      <indexterm
+        significance="normal">
+        <primary>X</primary>
+        <secondary>
+          <filename>/etc/X11/xorg.conf</filename>
+        </secondary>
+        <tertiary>introducing</tertiary>
+      </indexterm>
+
+
+      <!--      <para>In addition to signaling the presence of the new device, HAL also provides the X server with a number of options for each device. Most notably, this includes the driver the server should load and the device file to open. It also allows for additional, user-specific configuration options.</para> -->
+
+      <para>The X server supports two configuration directories. The <filename class="directory">/usr/share/X11/xorg.conf.d/</filename> provides separate configuration files from vendors or third-party packages; changes to files in this directory may be overwritten by settings specified in the <filename>/etc/X11/xorg.conf</filename> file. The <filename class="directory">/etc/X11/xorg.conf.d/</filename> directory stores user-specific configuration.</para>
+
+      <para>Files with the suffix <filename class="extension">.conf</filename> in configuration directories are parsed by the X server upon startup and are treated like part of the traditional <filename>xorg.conf</filename> configuration file. These files may contain one or more sections; for a description of the options in a section and the general layout of the configuration file, refer to <xref linkend="s2-x-server-config-xorg.conf" /> or to the <systemitem>xorg.conf(5)</systemitem> man page. The X server essentially treats the collection of configuration files as one big file with entries from <filename>xorg.conf</filename> at the end. Users are encouraged to put custom configuration into <filename>/etc/xorg.conf</filename> and leave the directory for configuration snippets provided by the distribution.</para>
+
+
+
+
+    </section>
+
+    <section id="s2-x-server-config-xorg.conf">
+
+      <title>The <filename>xorg.conf</filename> File</title>
+
       <indexterm
         significance="normal">
         <primary>X</primary>
@@ -301,19 +435,61 @@
           <filename>/etc/X11/xorg.conf</filename>
         </secondary>
         <tertiary>introducing</tertiary>
-      </indexterm>
-      <para>While there is rarely a need to manually edit the <filename>/etc/X11/xorg.conf</filename> file, it is useful to understand the various sections and optional parameters available, especially when troubleshooting.</para>
-      <section
-        id="s3-x-server-config-xorg.conf-struct">
-        <title>The Structure</title>
-        <indexterm
-          significance="normal">
-          <primary>X</primary>
-          <secondary>
-            <filename>/etc/X11/xorg.conf</filename>
-          </secondary>
-          <tertiary>structure of</tertiary>
-        </indexterm>
+       </indexterm>
+
+       <para>In previous releases of the X Window System, <filename>/etc/X11/xorg.conf</filename> file was used to store initial setup for X. When a change occurred with the monitor, video card or other device managed by the X server, the file needed to be edited manually. In &MAJOROS;, there is rarely a need to manually create and edit the <filename>/etc/X11/xorg.conf</filename> file. Nevertheless, it is still useful to understand various sections and optional parameters available, especially when troubleshooting or setting up unusual hardware configuration.</para>
+
+      <para>In the following, some important sections are described in the order in which they appear in a typical <filename>/etc/X11/xorg.conf</filename> file. More detailed information about the X server configuration file can be found in the <filename>xorg.conf(5)</filename> man page. This section is mostly intended for advanced users as most configuration options described below are not needed in typical configuration scenarios.</para>
+
+    <section id="s3-x-server-config-xorg.conf.d-inputclass">
+
+      <title>The <option>InputClass</option> section</title>
+
+      <!--    <para>Similarly to <filename>/etc/X11/xorg.conf</filename>, configuration files in the <filename class="directory">/usr/share/X11/xorg.conf.d</filename> directory are comprised of many different sections which address specific aspects of the system hardware. -->
+
+    <para><option>InputClass</option> is a new type of configuration section that does not apply to a single device but rather to a class of devices, including hot-plugged devices. An <option>InputClass</option> section's scope is limited by the matches specified; in order to apply to an input device, all matches must apply to the device as seen in the example below:</para>
+
+    <screen>Section "InputClass"
+   Identifier      "touchpad catchall"
+   MatchIsTouchpad "on"
+   Driver           "synaptics"
+EndSection</screen>
+
+    <para>If this snippet is present in an <filename>xorg.conf</filename> file or an <filename>xorg.conf.d</filename> directory, any touchpad present in the system is assigned the <systemitem>synaptics</systemitem> driver.</para>
+
+    <note><title>Alphanumeric sorting in <filename class="directory">xorg.conf.d</filename></title>
+
+      <para>Note that due to alphanumeric sorting of configuration files in the <filename class="directory">xorg.conf.d</filename> directory, the  <option>Driver</option> setting in the example above overwrites previously set driver options. The more generic the class, the earlier it should be listed.</para>
+    </note>
+
+    <para>The match options specify which devices a section may apply to. To match a device, all match options must correspond. The following options are commonly used in the <option>InputClass</option> section:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><option>MatchIsPointer</option>, <option>MatchIsKeyboard</option>, <option>MatchIsTouchpad</option>, <option>MatchIsTouchscreen</option>, <option>MatchIsJoystick</option> &mdash; boolean options to specify a type of a device.</para>
+      </listitem>
+      <listitem>
+        <para><option>MatchProduct "<replaceable>product_name</replaceable>"</option> &mdash; this option matches if the <replaceable>product_name</replaceable> substring occurs in the product name of the device.</para>
+      </listitem>
+      <listitem>
+        <para><option>MatchVendor "<replaceable>vendor_name</replaceable>"</option> &mdash; this option matches if the <replaceable>vendor_name</replaceable> substring occurs in the vendor name of the device.</para>
+      </listitem>
+      <listitem>
+        <para><option>MatchDevicePath "<replaceable>/path/to/device</replaceable>"</option> &mdash; this option matches any device if its device path corresponds to the patterns given in the "<replaceable>/path/to/device</replaceable>" template, for example <literal>/dev/input/event*</literal>. Refer to the <command>fnmatch(3)</command> man page for further details.</para>
+      </listitem>
+      <listitem>
+        <para><option>MatchTag "<replaceable>tag_pattern</replaceable>"</option> &mdash; this option matches if at least one tag assigned by the HAL configuration back end matches the <replaceable>tag_pattern</replaceable> pattern.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>A configuration file may have multiple <option>InputClass</option> sections. These sections are optional and are used to configure a class of input devices as they are automatically added. An input device can match more than one <option>InputClass</option> section. When arranging these sections, it is recommended to put generic matches above specific ones because each input class can override settings from a previous one if an overlap occurs.</para>
+
+    </section>
+
+    <section id="s3-x-server-config-xorg.conf-inputd">
+
+        <title>The <option>InputDevice</option> section</title>
+
         <indexterm
           significance="normal">
           <primary>X</primary>
@@ -321,37 +497,63 @@
             <filename>/etc/X11/xorg.conf</filename>
           </secondary>
           <tertiary>
-            <command>Section</command> tag</tertiary>
-        </indexterm>
-        <indexterm
-          significance="normal">
-          <primary>X</primary>
-          <secondary>
-            <filename>/etc/X11/xorg.conf</filename>
-          </secondary>
-          <tertiary>boolean values for</tertiary>
-        </indexterm>
-        <para>The <filename>/etc/X11/xorg.conf</filename> file is comprised of many different sections which address specific aspects of the system hardware.</para>
-        <para>Each section begins with a <command>Section "<replaceable>&lt;section-name&gt;</replaceable>"</command> line (where <replaceable>&lt;section-name&gt;</replaceable> is the title for the section) and ends with an <command>EndSection</command> line. Each section contains lines that include option names and one or more option values. These are sometimes enclosed in double quotes (<command>"</command>).</para>
-        <para>Lines beginning with a hash sign (<command>#</command>) are not read by the X server and are used for human-readable comments.</para>
-        <para>Some options within the <filename>/etc/X11/xorg.conf</filename> file accept a boolean switch which turns the feature on or off. Acceptable boolean values are:</para>
+            <option>InputDevice</option> section</tertiary>
+  </indexterm>
+
+  <para>Each <option>InputDevice</option> section configures one input device for the X server. Previously, systems typically had at least one <option>InputDevice</option> section for the keyboard, and most mouse settings were automatically detected.</para>
+
+  <para>With &MAJOROSVER;, no <option>InputDevice</option> configuration is needed for most setups, and the <package>xorg-x11-drv-*</package> input driver packages provide the automatic configuration through HAL. The default driver for both keyboards and mice is <literal>evdev</literal>.</para>
+
+  <para>The following example shows a typical <option>InputDevice</option> section for a keyboard:</para>
+
+        <screen>Section "InputDevice"
+  Identifier "Keyboard0"
+  Driver "kbd"
+  Option "XkbModel" "pc105"
+  Option "XkbLayout" "us"
+EndSection</screen>
+
+  <para>The following entries are commonly used in the <option>InputDevice</option> section:</para>
+
         <itemizedlist>
           <listitem>
             <para>
-              <command>1</command>, <command>on</command>, <command>true</command>, or <command>yes</command> — Turns the option on.</para>
-          </listitem>
+              <option>Identifier</option> &mdash; Specifies a unique name for this <option>InputDevice</option> section. This is a required entry.</para>
+    </listitem>
+
           <listitem>
-            <para>
-              <command>0</command>, <command>off</command>, <command>false</command>, or <command>no</command> — Turns the option off.</para>
+            <para><option>Driver</option> &mdash; Specifies the name of the device driver X must load for the device. If the <option>AutoAddDevices</option> option is enabled (which is the default setting), any input device section with <option>Driver "mouse"</option> or <option>Driver "kbd"</option> will be ignored. This is necessary due to conflicts between the legacy mouse and keyboard drivers and the new <literal>evdev</literal> generic driver. Instead, the server will use the information from the back end for any input devices. Any custom input device configuration in the <filename>xorg.conf</filename> should be moved to the back end. In most cases, the back end will be HAL and the configuration location will be the <filename class="directory">/etc/X11/xorg.conf.d</filename> directory.</para>
+    </listitem>
+
+
+          <listitem>
+      <para><option>Option</option> &mdash; Specifies necessary options pertaining to the device.</para>
+
+      <para>A mouse may also be specified to override any auto-detected values for the device. The following options are typically included when adding a mouse in the <filename>xorg.conf</filename> file:</para>
+
+            <itemizedlist>
+              <listitem>
+                <para><option>Protocol</option> &mdash; Specifies the protocol used by the mouse, such as <literal>IMPS/2</literal>.</para>
+              </listitem>
+              <listitem>
+                <para><option>Device</option> &mdash; Specifies the location of the physical device.</para>
+              </listitem>
+              <listitem>
+                <para><option>Emulate3Buttons</option> &mdash; Specifies whether to allow a two-button mouse to act like a three-button mouse when both mouse buttons are pressed simultaneously.</para>
+              </listitem>
+            </itemizedlist>
+
+      <para>Consult the <filename>xorg.conf(5)</filename> man page for a complete list of valid options for this section.</para>
+
           </listitem>
-        </itemizedlist>
-        <para>The following are some of the more important sections in the order in which they appear in a typical <filename>/etc/X11/xorg.conf</filename> file. More detailed information about the X server configuration file can be found in the <filename>xorg.conf</filename> man page.</para>
+    </itemizedlist>
+
       </section>
-      <section
-        id="s3-x-server-config-xorg.conf-serverf">
-        <title>
-          <command>ServerFlags</command>
-        </title>
+
+      <section id="s3-x-server-config-xorg.conf-serverf">
+
+        <title>The <option>ServerFlags</option> section</title>
+
         <indexterm
           significance="normal">
           <primary>X</primary>
@@ -359,41 +561,64 @@
             <filename>/etc/X11/xorg.conf</filename>
           </secondary>
           <tertiary>
-            <command>ServerFlags</command> section</tertiary>
-        </indexterm>
-        <para>The optional <command>ServerFlags</command> section contains miscellaneous global X server settings. Any settings in this section may be overridden by options placed in the <command>ServerLayout</command> section (refer to <xref
-            linkend="s3-x-server-config-xorg.conf-serverl"/> for details).</para>
-        <para>Each entry within the <command>ServerFlags</command> section is on its own line and begins with the term <command>Option</command> followed by an option enclosed in double quotation marks (<command>"</command>).</para>
-        <para>The following is a sample <command>ServerFlags</command> section:</para>
+            <option>ServerFlags</option> section</tertiary>
+  </indexterm>
+
+  <para>The optional <option>ServerFlags</option> section contains miscellaneous global X server settings. Any settings in this section may be overridden by options placed in the <option>ServerLayout</option> section (refer to <xref linkend="s3-x-server-config-xorg.conf-serverl"/> for details).</para>
+
+  <para>Each entry within the <option>ServerFlags</option> section occupies a single line and begins with the term <option>Option</option> followed by an option enclosed in double quotation marks (<literal>"</literal>).</para>
+
+  <para>The following is a sample <option>ServerFlags</option> section:</para>
+
         <screen>Section "ServerFlags"
   Option "DontZap" "true"
 EndSection</screen>
-        <para>The following lists some of the most useful options:</para>
+
+  <para>The following lists some of the most useful options:</para>
+
         <itemizedlist>
           <listitem>
             <para>
-              <command>"DontZap" "<replaceable>&lt;boolean&gt;</replaceable>"</command> — When the value of <replaceable>&lt;boolean&gt;</replaceable> is set to true, this setting prevents the use of the <keycombo><keycap>Ctrl</keycap>
+        <option>"DontZap" "<replaceable>boolean</replaceable>"</option> &mdash; When the value of <replaceable>&lt;boolean&gt;</replaceable> is set to <literal>true</literal>, this setting prevents the use of the <keycombo>
+    <keycap>Ctrl</keycap>
                 <keycap>Alt</keycap>
                 <keycap>Backspace</keycap>
-              </keycombo> key combination to immediately terminate the X server.</para>
+    </keycombo> key combination to immediately terminate the X server.</para>
+
+    <note><title>X keyboard extension</title>
+      <para>Even if this option is enabled, the key combination still must be configured in the X Keyboard Extension (XKB) map before it can be used. One way how to add the key combination to the map is to run the following command:
+
+    <screen><command>setxkbmap -option "terminate:ctrl_alt_bksp"</command></screen>
+      </para>
+    </note>
+
           </listitem>
+
           <listitem>
             <para>
-              <command>"DontZoom" "<replaceable>&lt;boolean&gt;</replaceable>"</command> — When the value of <replaceable>&lt;boolean&gt;</replaceable> is set to true, this setting prevents cycling through configured video resolutions using the <keycombo><keycap>Ctrl</keycap>
+        <option>"DontZoom" "<replaceable>boolean</replaceable>"</option> &mdash; When the value of <replaceable>&lt;boolean&gt;</replaceable> is set to <literal>true</literal>, this setting prevents cycling through configured video resolutions using the <keycombo>
+    <keycap>Ctrl</keycap>
                 <keycap>Alt</keycap>
                 <keycap>Keypad-Plus</keycap>
-              </keycombo> and <keycombo><keycap>Ctrl</keycap>
+        </keycombo> and <keycombo>
+    <keycap>Ctrl</keycap>
                 <keycap>Alt</keycap>
                 <keycap>Keypad-Minus</keycap>
               </keycombo> key combinations.</para>
           </listitem>
-        </itemizedlist>
+
+    <listitem>
+      <para><option>"AutoAddDevices" "<replaceable>boolean</replaceable>"</option> &mdash; When the value of <replaceable>&lt;boolean&gt;</replaceable> is set to <literal>false</literal>, the server will not hot plug input devices and instead rely solely on devices configured in the <filename>xorg.conf</filename> file. Refer to <xref linkend="s3-x-server-config-xorg.conf-inputd"/> for more information concerning input devices. This option is enabled by default and HAL (hardware abstraction layer) is used as a back end for device discovery.</para>
+          </listitem>
+    </itemizedlist>
+
       </section>
-      <section
-        id="s3-x-server-config-xorg.conf-serverl">
-        <title>
-          <command>ServerLayout</command>
-        </title>
+
+
+      <section id="s3-x-server-config-xorg.conf-serverl">
+
+        <title><option>ServerLayout</option></title>
+
         <indexterm
           significance="normal">
           <primary>X</primary>
@@ -401,51 +626,70 @@ EndSection</screen>
             <filename>/etc/X11/xorg.conf</filename>
           </secondary>
           <tertiary>
-            <command>ServerLayout</command> section</tertiary>
-        </indexterm>
-        <para>The <command>ServerLayout</command> section binds together the input and output devices controlled by the X server. At a minimum, this section must specify one output device and one input device. By default, a monitor (output device) and keyboard (input device) are specified.</para>
-        <para>The following example illustrates a typical <command>ServerLayout</command> section:</para>
+            <option>ServerLayout</option> section</tertiary>
+  </indexterm>
+
+  <para>The <option>ServerLayout</option> section binds together the input and output devices controlled by the X server. At a minimum, this section must specify one input device and one output device. By default, a monitor (output device) and a keyboard (input device) are specified.</para>
+
+  <para>The following example shows a typical <option>ServerLayout</option> section:</para>
+
         <screen>Section "ServerLayout"
   Identifier "Default Layout"
   Screen 0 "Screen0" 0 0
   InputDevice "Mouse0" "CorePointer"
   InputDevice "Keyboard0" "CoreKeyboard"
 EndSection</screen>
-        <para>The following entries are commonly used in the <command>ServerLayout</command> section:</para>
+
+  <para>The following entries are commonly used in the <option>ServerLayout</option> section:</para>
+
         <itemizedlist>
           <listitem>
             <para>
-              <command>Identifier</command> — Specifies a unique name for this <command>ServerLayout</command> section.</para>
-          </listitem>
+              <option>Identifier</option> &mdash; Specifies a unique name for this <option>ServerLayout</option> section.</para>
+    </listitem>
+
           <listitem>
             <para>
-              <command>Screen</command> — Specifies the name of a <command>Screen</command> section to be used with the X server. More than one <command>Screen</command> option may be present.</para>
-            <para>The following is an example of a typical <command>Screen</command> entry:</para>
-            <screen>Screen 0 "Screen0" 0 0</screen>
-            <para>The first number in this example <command>Screen</command> entry (<command>0</command>) indicates that the first monitor connector or <firstterm>head</firstterm> on the video card uses the configuration specified in the <command>Screen</command> section with the identifier <command>"Screen0"</command>.</para>
-            <para>An example of a <command>Screen</command> section with the identifier <command>"Screen0"</command> can be found in <xref linkend="s3-x-server-config-xorg.conf-screen"/>.</para>
-            <para>If the video card has more than one head, another <command>Screen</command> entry with a different number and a different <command>Screen</command> section identifier is necessary .</para>
-            <para>The numbers to the right of <command>"Screen0"</command> give the absolute X and Y coordinates for the upper-left corner of the screen (<command>0 0</command> by default).</para>
-          </listitem>
+        <option>Screen</option> &mdash; Specifies the name of a <option>Screen</option> section to be used with the X server. More than one <option>Screen</option> option may be present.</para>
+
+            <para>The following is an example of a typical <option>Screen</option> entry:</para>
+
+      <screen>Screen 0 "Screen0" 0 0</screen>
+
+      <para>The first number in this example <option>Screen</option> entry (<literal>0</literal>) indicates that the first monitor connector, or <firstterm>head</firstterm> on the video card, uses the configuration specified in the <option>Screen</option> section with the identifier <option>"Screen0"</option>.</para>
+
+      <para>An example of a <option>Screen</option> section with the identifier <option>"Screen0"</option> can be found in <xref linkend="s3-x-server-config-xorg.conf-screen"/>.</para>
+
+      <para>If the video card has more than one head, another <option>Screen</option> entry with a different number and a different <option>Screen</option> section identifier is necessary.</para>
+
+            <para>The numbers to the right of <option>"Screen0"</option> give the absolute X and Y coordinates for the upper left corner of the screen (<literal>0 0</literal> by default).</para>
+        </listitem>
+
           <listitem>
-            <para>
-              <command>InputDevice</command> — Specifies the name of an <command>InputDevice</command> section to be used with the X server.</para>
-            <para>It is advisable that there be at least two <command>InputDevice</command> entries: one for the default mouse and one for the default keyboard. The options <command>CorePointer</command> and <command>CoreKeyboard</command> indicate that these are the primary mouse and keyboard.</para>
+            <para><option>InputDevice</option> &mdash; Specifies the name of an <option>InputDevice</option> section to be used with the X server.</para>
+
+      <para>It is advisable that there be at least two <option>InputDevice</option> entries: one for the default mouse and one for the default keyboard. The options <option>CorePointer</option> and <option>CoreKeyboard</option> indicate that these are the primary mouse and keyboard. If the <option>AutoAddDevices</option> option is enabled, this entry needs not to be specified in the <option>ServerLayout</option> section. If the <option>AutoAddDevices</option> option is disabled, both mouse and keyboard are auto-detected with the default values.</para>
+
+
           </listitem>
-          <listitem>
-            <para>
-              <command>Option "<replaceable>&lt;option-name&gt;</replaceable>"</command> — An optional entry which specifies extra parameters for the section. Any options listed here override those listed in the <command>ServerFlags</command> section.</para>
-            <para>Replace <replaceable>&lt;option-name&gt;</replaceable> with a valid option listed for this section in the <filename>xorg.conf</filename> man page.</para>
+
+    <listitem>
+            <para><option>Option "<replaceable>option-name</replaceable>"</option> &mdash; An optional entry which specifies extra parameters for the section. Any options listed here override those listed in the <option>ServerFlags</option> section.</para>
+
+            <para>Replace <replaceable>&lt;option-name&gt;</replaceable> with a valid option listed for this section in the <filename>xorg.conf(5)</filename> man page.</para>
           </listitem>
-        </itemizedlist>
-        <para>It is possible to put more than one <command>ServerLayout</command> section in the <filename>/etc/X11/xorg.conf</filename> file. By default, the server only reads the first one it encounters, however.</para>
-        <para>If there is an alternative <command>ServerLayout</command> section, it can be specified as a command line argument when starting an X session.</para>
+    </itemizedlist>
+
+  <para>It is possible to put more than one <option>ServerLayout</option> section in the <filename>/etc/X11/xorg.conf</filename> file. By default, the server only reads the first one it encounters, however. If there is an alternative <option>ServerLayout</option> section, it can be specified as a command line argument when starting an X session; as in the <command>Xorg -layout &lt;layoutname&gt;</command> command.</para>
+
+  <!-- when it's useful to have more? thin clients not handled by autoconfiguration -->
+
       </section>
-      <section
-        id="s3-x-server-config-xorg.conf-files">
-        <title>
-          <command>Files</command>
-        </title>
+
+      <section id="s3-x-server-config-xorg.conf-files">
+
+        <title>The <option>Files</option> section</title>
+
         <indexterm
           significance="normal">
           <primary>X</primary>
@@ -453,154 +697,45 @@ EndSection</screen>
             <filename>/etc/X11/xorg.conf</filename>
           </secondary>
           <tertiary>
-            <command>Files</command> section</tertiary>
+            <option>Files</option> section</tertiary>
         </indexterm>
-        <para>The <command>Files</command> section sets paths for services vital to the X server, such as the font path. This is an optional section, these paths are normally detected automatically. This section may be used to override any automatically detected defaults.</para>
-        <para>The following example illustrates a typical <command>Files</command> section:</para>
+
+  <para>The <option>Files</option> section sets paths for services vital to the X server, such as the font path. This is an optional section, as these paths are normally detected automatically. This section can be used to override automatically detected values.</para>
+
+  <para>The following example shows a typical <option>Files</option> section:</para>
+
         <screen>Section "Files"
   RgbPath "/usr/share/X11/rgb.txt"
   FontPath "unix/:7100"
 EndSection</screen>
-        <para>The following entries are commonly used in the <command>Files</command> section:</para>
-        <itemizedlist>
-          <listitem>
-            <para>
-              <command>RgbPath</command> — Specifies the location of the RGB color database. This database defines all valid color names in X and ties them to specific RGB values.</para>
-          </listitem>
-          <listitem>
-            <para>
-              <command>FontPath</command> — Specifies where the X server must connect to obtain fonts from the <command>xfs</command> font server.</para>
-            <para>By default, the <command>FontPath</command> is <command>unix/:7100</command>. This tells the X server to obtain font information using UNIX-domain sockets for inter-process communication (IPC) on port 7100.</para>
-            <para>Refer to <xref
-                linkend="s1-x-fonts"/> for more information concerning X and fonts.</para>
-          </listitem>
-          <listitem>
-            <para>
-              <command>ModulePath</command> — An optional parameter which specifies alternate directories which store X server modules.</para>
-          </listitem>
-        </itemizedlist>
-      </section>
-      <section
-        id="s3-x-server-config-xorg.conf-modules">
-        <title>
-          <command>Module</command>
-        </title>
-        <indexterm
-          significance="normal">
-          <primary>X</primary>
-          <secondary>
-            <filename>/etc/X11/xorg.conf</filename>
-          </secondary>
-          <tertiary>
-            <command>Module</command> section</tertiary>
-        </indexterm>
-        <para>By default, the X server automatically loads the following modules from the <filename>/usr/lib/xorg/modules/</filename> directory:
-					<itemizedlist>
-						<listitem>
-							<para><filename>extmod</filename>
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                <filename>dbe</filename>
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                <filename>glx</filename>
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                <filename>freetype</filename>
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                <filename>type1</filename>
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                <filename>record</filename>
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                <filename>dri</filename>
-              </para>
-            </listitem>
-          </itemizedlist>
-        </para>
-        <para>The default directory for loading these modules can be changed by specifying a different directory with the optional <command>ModulePath</command> parameter in the <command>Files</command> section. Refer to <xref
-            linkend="s3-x-server-config-xorg.conf-files"/> for more information on this section.</para>
-        <para>Adding a <command>Module</command> section to <filename>/etc/X11/xorg.conf</filename> instructs the X server to load the modules listed in this section <emphasis>instead</emphasis> of the default modules.</para>
-        <para>For example, the following typical <command>Module</command> section:</para>
-        <screen>Section "Module"
-  Load "fbdevhw"
-EndSection</screen>
-					 <para>instructs the X server to load the <filename>fbdevhw</filename> instead of the default modules.</para>
-        <para>As such, if you add a <command>Module</command> section to <filename>/etc/X11/xorg.conf</filename>, you will need to specify any default modules you want to load as well as any extra modules.</para>
-      </section>
-      <section
-        id="s3-x-server-config-xorg.conf-inputd">
-        <title>
-          <command>InputDevice</command>
-        </title>
-        <indexterm
-          significance="normal">
-          <primary>X</primary>
-          <secondary>
-            <filename>/etc/X11/xorg.conf</filename>
-          </secondary>
-          <tertiary>
-            <command>InputDevice</command> section</tertiary>
-        </indexterm>
-        <para>Each <command>InputDevice</command> section configures one input device for the X server. Systems typically have at least one <command>InputDevice</command> section for the keyboard. It is perfectly normal to have no entry for a mouse, as most mouse settings are automatically detected.</para>
-        <para>The following example illustrates a typical <command>InputDevice</command> section for a keyboard:</para>
-        <screen>Section "InputDevice"
-  Identifier "Keyboard0"
-  Driver "kbd"
-  Option "XkbModel" "pc105"
-  Option "XkbLayout" "us"
-EndSection</screen>
-        <para>The following entries are commonly used in the <command>InputDevice</command> section:</para>
+
+  <para>The following entries are commonly used in the <option>Files</option> section:</para>
+
         <itemizedlist>
-          <listitem>
+    <!-- commented out as per D.Airlie's advice          <listitem>
             <para>
-              <command>Identifier</command> — Specifies a unique name for this <command>InputDevice</command> section. This is a required entry.</para>
-          </listitem>
-          <listitem>
-            <para>
-              <command>Driver</command> — Specifies the name of the device driver X must load for the device.</para>
-          </listitem>
+              <option>RgbPath</option> &mdash; Specifies the location of the RGB color database. This database defines all valid color names in X and ties them to specific RGB values.</para>
+    </listitem> -->
+
+    <!-- mcepl: xfs is dead
+    <listitem>
+    <para><option>FontPath</option> &mdash; Specifies where the X server must connect to obtain fonts from the <command>xfs</command> font server.</para>
+
+            <para>By default, the <option>FontPath</option> is <literal>unix/:7100</literal>. This tells the X server to obtain font information using UNIX-domain sockets for inter-process communication (IPC) on port 7100. Refer to <xref linkend="s1-x-fonts"/> for more information concerning X and fonts.</para>
+          </listitem> -->
+
           <listitem>
             <para>
-              <command>Option</command> — Specifies necessary options pertaining to the device.</para>
-            <para>A mouse may also be specified to override any autodetected defaults for the device. The following options are typically included when adding a mouse in the <filename>xorg.conf</filename>:</para>
-            <itemizedlist>
-              <listitem>
-                <para>
-                  <command>Protocol</command> — Specifies the protocol used by the mouse, such as <command>IMPS/2</command>.</para>
-              </listitem>
-              <listitem>
-                <para>
-                  <command>Device</command> — Specifies the location of the physical device.</para>
-              </listitem>
-              <listitem>
-                <para>
-                  <command>Emulate3Buttons</command> — Specifies whether to allow a two-button mouse to act like a three-button mouse when both mouse buttons are pressed simultaneously.</para>
-              </listitem>
-            </itemizedlist>
-            <para>Consult the <filename>xorg.conf</filename> man page for a list of valid options for this section.</para>
+              <option>ModulePath</option> &mdash; An optional parameter which specifies alternate directories which store X server modules.</para>
           </listitem>
-        </itemizedlist>
+    </itemizedlist>
+
       </section>
-      <section
-        id="s3-x-server-config-xorg.conf-monitor">
-        <title>
-          <command>Monitor</command>
-        </title>
+
+      <section id="s3-x-server-config-xorg.conf-monitor">
+
+        <title>The <option>Monitor</option> section</title>
+
         <indexterm
           significance="normal">
           <primary>X</primary>
@@ -608,11 +743,14 @@ EndSection</screen>
             <filename>/etc/X11/xorg.conf</filename>
           </secondary>
           <tertiary>
-            <command>Monitor</command>
+            <option>Monitor</option>
           </tertiary>
-        </indexterm>
-        <para>Each <command>Monitor</command> section configures one type of monitor used by the system. This is an optional entry as well, as most monitors are now automatically detected.</para>
-        <para>This example illustrates a typical <command>Monitor</command> section for a monitor:</para>
+    </indexterm>
+
+  <para>Each <option>Monitor</option> section configures one type of monitor used by the system. This is an optional entry as most monitors are now detected automatically.</para>
+
+  <para>This example shows a typical <option>Monitor</option> section for a monitor:</para>
+
         <screen>Section "Monitor"
   Identifier "Monitor0"
   VendorName "Monitor Vendor"
@@ -621,51 +759,54 @@ EndSection</screen>
   HorizSync 30.0 - 70.0
   VertRefresh 50.0 - 180.0
 EndSection</screen>
-        <warning>
-          <title>Warning</title>
-          <para>Be careful when manually editing values in the <command>Monitor</command> section of <filename>/etc/X11/xorg.conf</filename>. Inappropriate values can damage or destroy a monitor. Consult the monitor's documentation for a listing of safe operating parameters.</para>
-        </warning>
-        <para>The following are commonly entries used in the <command>Monitor</command> section:</para>
+
+<!-- not really a risk anymore
+<warning><title>Risk of damaging your monitor</title>
+          <para>Be careful when manually editing values in the <option>Monitor</option> section of <filename>/etc/X11/xorg.conf</filename>. Inappropriate values can damage or even destroy a monitor. Consult the monitor's documentation for a listing of safe operating parameters.</para>
+  </warning> -->
+
+  <para>The following entries are commonly used in the <option>Monitor</option> section:</para>
+
         <itemizedlist>
           <listitem>
-            <para>
-              <command>Identifier</command> — Specifies a unique name for this <command>Monitor</command> section. This is a required entry.</para>
-          </listitem>
+            <para><option>Identifier</option> &mdash; Specifies a unique name for this <option>Monitor</option> section. This is a required entry.</para>
+    </listitem>
+
           <listitem>
-            <para>
-              <command>VendorName</command> — An optional parameter which specifies the vendor of the monitor.</para>
-          </listitem>
+            <para><option>VendorName</option> &mdash; An optional parameter which specifies the vendor of the monitor.</para>
+    </listitem>
+
           <listitem>
-            <para>
-              <command>ModelName</command> — An optional parameter which specifies the monitor's model name.</para>
-          </listitem>
+            <para><option>ModelName</option> &mdash; An optional parameter which specifies the monitor's model name.</para>
+    </listitem>
+
           <listitem>
-            <para>
-              <command>DisplaySize</command> — An optional parameter which specifies, in millimeters, the physical size of the monitor's picture area.</para>
-          </listitem>
+            <para><option>DisplaySize</option> &mdash; An optional parameter which specifies, in millimeters, the physical size of the monitor's picture area.</para>
+    </listitem>
+
           <listitem>
-            <para>
-              <command>HorizSync</command> — Specifies the range of horizontal sync frequencies compatible with the monitor in kHz. These values help the X server determine the validity of built-in or specified <command>Modeline</command> entries for the monitor.</para>
-          </listitem>
+            <para><option>HorizSync</option> &mdash; Specifies the range of horizontal sync frequencies compatible with the monitor, in kHz. These values help the X server determine the validity of built-in or specified <option>Modeline</option> entries for the monitor.</para>
+    </listitem>
+
           <listitem>
-            <para>
-              <command>VertRefresh</command> — Specifies the range of vertical refresh frequencies supported by the monitor, in kHz. These values help the X server determine the validity of built in or specified <command>Modeline</command> entries for the monitor.</para>
-          </listitem>
+            <para><option>VertRefresh</option> &mdash; Specifies the range of vertical refresh frequencies supported by the monitor, in kHz. These values help the X server determine the validity of built-in or specified <option>Modeline</option> entries for the monitor.</para>
+    </listitem>
+
           <listitem>
-            <para>
-              <command>Modeline</command> — An optional parameter which specifies additional video modes for the monitor at particular resolutions, with certain horizontal sync and vertical refresh resolutions. Refer to the <filename>xorg.conf</filename> man page for a more detailed explanation of <command>Modeline</command> entries.</para>
-          </listitem>
+            <para><option>Modeline</option> &mdash; An optional parameter which specifies additional video modes for the monitor at particular resolutions, with certain horizontal sync and vertical refresh resolutions. Refer to the <filename>xorg.conf(5)</filename> man page for a more detailed explanation of <option>Modeline</option> entries.</para>
+    </listitem>
+
           <listitem>
-            <para>
-              <command>Option "<replaceable>&lt;option-name&gt;</replaceable>"</command> — An optional entry which specifies extra parameters for the section. Replace <replaceable>&lt;option-name&gt;</replaceable> with a valid option listed for this section in the <filename>xorg.conf</filename> man page.</para>
+            <para><option>Option "<replaceable>option-name</replaceable>"</option> &mdash; An optional entry which specifies extra parameters for the section. Replace <replaceable>&lt;option-name&gt;</replaceable> with a valid option listed for this section in the <filename>xorg.conf(5)</filename> man page.</para>
           </listitem>
-        </itemizedlist>
-      </section>
-      <section
-        id="s3-x-server-config-xorg.conf-device">
-        <title>
-          <command>Device</command>
-        </title>
+    </itemizedlist>
+
+  </section>
+
+  <section id="s3-x-server-config-xorg.conf-device">
+
+    <title>The <option>Device</option> section</title>
+
         <indexterm
           significance="normal">
           <primary>X</primary>
@@ -673,11 +814,14 @@ EndSection</screen>
             <filename>/etc/X11/xorg.conf</filename>
           </secondary>
           <tertiary>
-            <command>Device</command>
+            <option>Device</option>
           </tertiary>
-        </indexterm>
-        <para>Each <command>Device</command> section configures one video card on the system. While one <command>Device</command> section is the minimum, additional instances may occur for each video card installed on the machine.</para>
-        <para>The following example illustrates a typical <command>Device</command> section for a video card:</para>
+    </indexterm>
+
+  <para>Each <option>Device</option> section configures one video card on the system. While one <option>Device</option> section is the minimum, additional instances may occur for each video card installed on the machine.</para>
+
+  <para>The following example shows a typical <option>Device</option> section for a video card:</para>
+
         <screen>Section "Device"
   Identifier "Videocard0"
   Driver "mga"
@@ -686,49 +830,55 @@ EndSection</screen>
   VideoRam 8192
   Option "dpms"
 EndSection</screen>
-        <para>The following entries are commonly used in the <command>Device</command> section:</para>
+
+  <para>The following entries are commonly used in the <option>Device</option> section:</para>
+
         <itemizedlist>
           <listitem>
-            <para>
-              <command>Identifier</command> — Specifies a unique name for this <command>Device</command> section. This is a required entry.</para>
-          </listitem>
+            <para><option>Identifier</option> &mdash; Specifies a unique name for this <option>Device</option> section. This is a required entry.</para>
+    </listitem>
+
           <listitem>
-            <para>
-              <command>Driver</command> — Specifies which driver the X server must load to utilize the video card. A list of drivers can be found in <filename>/usr/share/hwdata/videodrivers</filename>, which is installed with the <filename>hwdata</filename> package.</para>
-          </listitem>
+            <para><option>Driver</option> &mdash; Specifies which driver the X server must load to utilize the video card. A list of drivers can be found in <filename>/usr/share/hwdata/videodrivers</filename>, which is installed with the <package>hwdata</package> package.</para>
+    </listitem>
+
           <listitem>
-            <para>
-              <command>VendorName</command> — An optional parameter which specifies the vendor of the video card.</para>
-          </listitem>
+            <para><option>VendorName</option> &mdash; An optional parameter which specifies the vendor of the video card.</para>
+    </listitem>
+
           <listitem>
-            <para>
-              <command>BoardName</command> — An optional parameter which specifies the name of the video card.</para>
-          </listitem>
+            <para><option>BoardName</option> &mdash; An optional parameter which specifies the name of the video card.</para>
+    </listitem>
+
           <listitem>
-            <para>
-              <command>VideoRam</command> — An optional parameter which specifies the amount of RAM available on the video card in kilobytes. This setting is only necessary for video cards the X server cannot probe to detect the amount of video RAM.</para>
-          </listitem>
+            <para><option>VideoRam</option> &mdash; An optional parameter which specifies the amount of RAM available on the video card, in kilobytes. This setting is only necessary for video cards the X server cannot probe to detect the amount of video RAM.</para>
+    </listitem>
+
           <listitem>
-            <para>
-              <command>BusID</command> — An entry which specifies the bus location of the video card. On systems with only one video card a <command>BusID</command> entry is optional and may not even be present in the default <filename>/etc/X11/xorg.conf</filename> file. On systems with more than one video card, however, a <command>BusID</command> entry must be present.</para>
-          </listitem>
+            <para><option>BusID</option> &mdash; An entry which specifies the bus location of the video card. On systems with only one video card a <option>BusID</option> entry is optional and may not even be present in the default <filename>/etc/X11/xorg.conf</filename> file. On systems with more than one video card, however, a <option>BusID</option> entry is required.</para>
+    </listitem>
+
           <listitem>
-            <para>
-              <command>Screen</command> — An optional entry which specifies which monitor connector or head on the video card the <command>Device</command> section configures. This option is only useful for video cards with multiple heads.</para>
-            <para>If multiple monitors are connected to different heads on the same video card, separate <command>Device</command> sections must exist and each of these sections must have a different <command>Screen</command> value.</para>
-            <para>Values for the <command>Screen</command> entry must be an integer. The first head on the video card has a value of <command>0</command>. The value for each additional head increments this value by one.</para>
-          </listitem>
+            <para><option>Screen</option> &mdash; An optional entry which specifies which monitor connector or head on the video card the <option>Device</option> section configures. This option is only useful for video cards with multiple heads.</para>
+
+      <para>If multiple monitors are connected to different heads on the same video card, separate <option>Device</option> sections must exist and each of these sections must have a different <option>Screen</option> value.</para>
+
+            <para>Values for the <option>Screen</option> entry must be an integer. The first head on the video card has a value of <literal>0</literal>. The value for each additional head increments this value by one.</para>
+        </listitem>
+
           <listitem>
-            <para>
-              <command>Option "<replaceable>&lt;option-name&gt;</replaceable>"</command> — An optional entry which specifies extra parameters for the section. Replace <replaceable>&lt;option-name&gt;</replaceable> with a valid option listed for this section in the <filename>xorg.conf</filename> man page.</para>
-            <para>One of the more common options is <command>"dpms"</command> (for Display Power Management Signaling, a VESA standard), which activates the Service Star energy compliance setting for the monitor.</para>
+      <para><option>Option "<replaceable>option-name</replaceable>"</option> &mdash; An optional entry which specifies extra parameters for the section. Replace <replaceable>&lt;option-name&gt;</replaceable> with a valid option listed for this section in the <filename>xorg.conf(5)</filename> man page.</para>
+
+            <para>One of the more common options is <literal>"dpms"</literal> (for Display Power Management Signaling, a VESA standard), which activates the Service Star energy compliance setting for the monitor.</para>
           </listitem>
-        </itemizedlist>
+    </itemizedlist>
+
       </section>
+
       <section id="s3-x-server-config-xorg.conf-screen">
-        <title>
-          <command>Screen</command>
-        </title>
+
+        <title>The <option>Screen</option> section</title>
+
         <indexterm
           significance="normal">
           <primary>X</primary>
@@ -736,11 +886,14 @@ EndSection</screen>
             <filename>/etc/X11/xorg.conf</filename>
           </secondary>
           <tertiary>
-            <command>Screen</command>
+            <option>Screen</option>
           </tertiary>
-        </indexterm>
-        <para>Each <command>Screen</command> section binds one video card (or video card head) to one monitor by referencing the <command>Device</command> section and the <command>Monitor</command> section for each. While one <command>Screen</command> section is the minimum, additional instances may occur for each video card and monitor combination present on the machine.</para>
-        <para>The following example illustrates a typical <command>Screen</command> section:</para>
+    </indexterm>
+
+  <para>Each <option>Screen</option> section binds one video card (or video card head) to one monitor by referencing the <option>Device</option> section and the <option>Monitor</option> section for each. While one <option>Screen</option> section is the minimum, additional instances may occur for each video card and monitor combination present on the machine.</para>
+
+  <para>The following example shows a typical <option>Screen</option> section:</para>
+
         <screen>Section "Screen"
   Identifier "Screen0"
   Device "Videocard0"
@@ -757,42 +910,44 @@ EndSection</screen>
     Modes "1152x864" "1024x768" "800x600" "640x480"
   EndSubSection
 EndSection</screen>
-        <para>The following entries are commonly used in the <command>Screen</command> section:</para>
+
+  <para>The following entries are commonly used in the <option>Screen</option> section:</para>
+
         <itemizedlist>
           <listitem>
-            <para>
-              <command>Identifier</command> — Specifies a unique name for this <command>Screen</command> section. This is a required entry.</para>
-          </listitem>
+            <para><option>Identifier</option> &mdash; Specifies a unique name for this <option>Screen</option> section. This is a required entry.</para>
+    </listitem>
+
           <listitem>
-            <para>
-              <command>Device</command> — Specifies the unique name of a <command>Device</command> section. This is a required entry.</para>
-          </listitem>
+            <para><option>Device</option> &mdash; Specifies the unique name of a <option>Device</option> section. This is a required entry.</para>
+    </listitem>
+
           <listitem>
-            <para>
-              <command>Monitor</command> — Specifies the unique name of a <command>Monitor</command> section. This is only required if a specific <command>Monitor</command> section is defined in the <filename>xorg.conf</filename> file. Normally, monitors are automatically detected.</para>
-          </listitem>
+            <para><option>Monitor</option> &mdash; Specifies the unique name of a <option>Monitor</option> section. This is only required if a specific <option>Monitor</option> section is defined in the <filename>xorg.conf</filename> file. Normally, monitors are detected automatically.</para>
+    </listitem>
+
           <listitem>
-            <para>
-              <command>DefaultDepth</command> — Specifies the default color depth in bits. In the previous example, <command>16</command> (which provides thousands of colors) is the default. Only one <command>DefaultDepth</command> is permitted, although this can be overridden with the Xorg command line option <command>-depth <replaceable>&lt;n&gt;</replaceable>
-              </command>,where <command><replaceable>&lt;n&gt;</replaceable>
-              </command> is any additional depth specified.</para>
+            <para><option>DefaultDepth</option> &mdash; Specifies the default color depth in bits. In the previous example, <literal>16</literal> (which provides thousands of colors) is the default. Only one <option>DefaultDepth</option> entry is permitted, although this can be overridden with the Xorg command line option <command>-depth <replaceable>&lt;n&gt;</replaceable></command>, where <command><replaceable>&lt;n&gt;</replaceable></command> is any additional depth specified.</para>
           </listitem>
+
           <listitem>
-            <para>
-              <command>SubSection "Display"</command> — Specifies the screen modes available at a particular color depth. The <command>Screen</command> section can have multiple <command>Display</command> subsections, which are entirely optional since screen modes are automatically detected.</para>
-            <para>This subsection is normally used to override autodetected modes.</para>
-          </listitem>
+      <para><option>SubSection "Display"</option> &mdash; Specifies the screen modes available at a particular color depth. The <option>Screen</option> section can have multiple <option>Display</option> subsections, which are entirely optional since screen modes are detected automatically.</para>
+
+            <para>This subsection is normally used to override auto-detected modes.</para>
+        </listitem>
+
           <listitem>
             <para>
-              <command>Option "<replaceable>&lt;option-name&gt;</replaceable>"</command> — An optional entry which specifies extra parameters for the section. Replace <replaceable>&lt;option-name&gt;</replaceable> with a valid option listed for this section in the <filename>xorg.conf</filename> man page.</para>
+              <option>Option "<replaceable>option-name</replaceable>"</option> &mdash; An optional entry which specifies extra parameters for the section. Replace <replaceable>&lt;option-name&gt;</replaceable> with a valid option listed for this section in the <filename>xorg.conf(5)</filename> man page.</para>
           </listitem>
-        </itemizedlist>
+    </itemizedlist>
+
       </section>
-      <section
-        id="s3-x-server-config-xorg.conf-dri">
-        <title>
-          <command>DRI</command>
-        </title>
+
+      <section id="s3-x-server-config-xorg.conf-dri">
+
+        <title>The <option>DRI</option> section</title>
+
         <indexterm
           significance="normal">
           <primary>X</primary>
@@ -800,37 +955,39 @@ EndSection</screen>
             <filename>/etc/X11/xorg.conf</filename>
           </secondary>
           <tertiary>
-            <command>DRI</command>
+            <option>DRI</option>
           </tertiary>
-        </indexterm>
-        <para>The optional <command>DRI</command> section specifies parameters for the <firstterm>Direct Rendering Infrastructure</firstterm> (<firstterm>DRI</firstterm>). DRI is an interface which allows 3D software applications to take advantage of 3D hardware acceleration capabilities built into most modern video hardware. In addition, DRI can improve 2D performance via hardware acceleration, if supported by the video card driver.</para>
-        <para>This section rarely appears, as the DRI Group and Mode are automatically initialized to default values. If a different Group or Mode is desired, then adding this section to the <filename>xorg.conf</filename> file will override those defaults.</para>
-        <para>The following example illustrates a typical <command>DRI</command> section:</para>
+    </indexterm>
+
+  <para>The optional <option>DRI</option> section specifies parameters for the <firstterm>Direct Rendering Infrastructure</firstterm> (<firstterm>DRI</firstterm>). DRI is an interface which allows 3D software applications to take advantage of 3D hardware acceleration capabilities built into most modern video hardware. In addition, DRI can improve 2D performance via hardware acceleration, if supported by the video card driver.</para>
+
+  <para>This section is rarely used, as the DRI Group and Mode are automatically initialized to default values. If a different Group or Mode is needed, then adding this section to the <filename>xorg.conf</filename> file will override the default values.</para>
+
+  <para>The following example shows a typical <option>DRI</option> section:</para>
+
         <screen>Section "DRI"
   Group 0
   Mode 0666
 EndSection</screen>
-        <para>Since different video cards use DRI in different ways, do not add to this section without first referring to <ulink
-            url="http://dri.sourceforge.net/">http://dri.sourceforge.net/</ulink>.</para>
-      </section>
-    </section>
+
+  <para>Since different video cards use DRI in different ways, do not add to this section without first referring to <ulink url="http://dri.freedesktop.org/wiki/">http://dri.freedesktop.org/wiki/</ulink>.</para>
+
   </section>
-  <section
-    id="s1-x-fonts">
+
+     </section>
+
+   </section>
+
+   <section id="s1-x-fonts">
+
     <title>Fonts</title>
+
     <indexterm
       significance="normal">
       <primary>X</primary>
       <secondary>fonts</secondary>
       <tertiary>introducing</tertiary>
     </indexterm>
-    <para>&MAJOROS; uses two subsystems to manage and display fonts under X: <firstterm>Fontconfig</firstterm> and <command>xfs</command>.</para>
-    <para>The newer Fontconfig font subsystem simplifies font management and provides advanced display features, such as anti-aliasing. This system is used automatically for applications programmed using the Qt 3 or GTK+ 2 graphical toolkit.</para>
-    <para>For compatibility, &MAJOROS; includes the original font subsystem, called the core X font subsystem. This system, which is over 15 years old, is based around the <firstterm>X Font Server</firstterm> (<firstterm>xfs</firstterm>).</para>
-    <para>This section discusses how to configure fonts for X using both systems.</para>
-    <section
-      id="s2-x-fonts-fontconfig">
-      <title>Fontconfig</title>
       <indexterm
         significance="normal">
         <primary>X</primary>
@@ -841,12 +998,6 @@ EndSection</screen>
         significance="normal">
         <primary>X</primary>
         <secondary>fonts</secondary>
-        <tertiary>X Render Extension</tertiary>
-      </indexterm>
-      <indexterm
-        significance="normal">
-        <primary>X</primary>
-        <secondary>fonts</secondary>
         <tertiary>FreeType</tertiary>
       </indexterm>
       <indexterm
@@ -855,201 +1006,76 @@ EndSection</screen>
         <secondary>fonts</secondary>
         <tertiary>Xft</tertiary>
       </indexterm>
-      <para>The Fontconfig font subsystem allows applications to directly access fonts on the system and use Xft or other rendering mechanisms to render Fontconfig fonts with advanced anti-aliasing. Graphical applications can use the Xft library with Fontconfig to draw text to the screen.</para>
-      <para>Over time, the Fontconfig/Xft font subsystem replaces the core X font subsystem.</para>
-      <important>
-        <title>Important</title>
-        <para>The Fontconfig font subsystem does not yet work for <application>OpenOffice.org</application>, which uses its own font rendering technology.</para>
-      </important>
-      <para>It is important to note that Fontconfig uses the <filename>/etc/fonts/fonts.conf</filename> configuration file, which should not be edited by hand.</para>
-      <note>
-        <title>Tip</title>
-        <para>Due to the transition to the new font system, GTK+ 1.2 applications are not affected by any changes made via the <guilabel>Fonts</guilabel> tab in the <application>Appearance Preferences</application> dialog box (accessed from the panel by selecting <menuchoice><guimenu>System</guimenu><guisubmenu>Preferences</guisubmenu><guimenuitem>Appearance</guimenuitem></menuchoice>). For these applications, a font can be configured by adding the following lines to the file <filename>~/.gtkrc.mine</filename>:</para>
-        <screen>style "user-font" {
-  fontset = "<replaceable>&lt;font-specification&gt;</replaceable>"
-}
-
-widget_class "*" style "user-font"</screen>
-        <para>Replace <replaceable>&lt;font-specification&gt;</replaceable> with a font specification in the style used by traditional X applications, such as <command>-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*</command>. A full list of core fonts can be obtained by running <command>xlsfonts</command> or created interactively using the <command>xfontsel</command> command.</para>
+
+    <para>&MAJOROS; uses <firstterm>Fontconfig</firstterm> subsystem to manage and display fonts under the X Window System. It simplifies font management and provides advanced display features, such as anti-aliasing. This system is used automatically for applications programmed using the <literal>Qt 3</literal> or <literal>GTK+ 2</literal> graphical toolkits, or their newer versions.</para>
+
+
+      <para>The Fontconfig font subsystem allows applications to directly access fonts on the system and use the <firstterm>X FreeType interface library</firstterm> (<firstterm>Xft</firstterm>) or other rendering mechanisms to render Fontconfig fonts with advanced features such as anti-aliasing. Graphical applications can use the Xft library with Fontconfig to draw text to the screen.</para>
+
+      <note><title>Font configuration</title>
+      <para>Fontconfig uses the <filename>/etc/fonts/fonts.conf</filename> configuration file, which should not be edited by hand.</para>
       </note>
-      <section
-        id="s3-x-fonts-fontconfig-add">
+
+  <warning><title>Fonts group</title>
+    <para>Any system where the user expects to run remote X applications needs to have the <systemitem>fonts</systemitem> group installed. This can be done by selecting the group in the installer, and also by running the <command>yum groupinstall fonts</command> command after installation.</para>
+  </warning>
+
+      <section id="s3-x-fonts-fontconfig-add">
+
         <title>Adding Fonts to Fontconfig</title>
+
         <indexterm
           significance="normal">
           <primary>X</primary>
           <secondary>fonts</secondary>
           <tertiary>Fontconfig, adding fonts to</tertiary>
-        </indexterm>
-        <para>Adding new fonts to the Fontconfig subsystem is a straightforward process.</para>
-        <orderedlist
-          continuation="restarts"
-          inheritnum="ignore">
+    </indexterm>
+
+  <para>Adding new fonts to the Fontconfig subsystem is a straightforward process:</para>
+
+        <orderedlist continuation="restarts" inheritnum="ignore">
           <listitem>
-            <para>To add fonts system-wide, copy the new fonts into the <filename>/usr/share/fonts/</filename> directory. It is a good idea to create a new subdirectory, such as <filename>local/</filename> or similar, to help distinguish between user-installed and default fonts.</para>
             <para>To add fonts for an individual user, copy the new fonts into the <filename>.fonts/</filename> directory in the user's home directory.</para>
-          </listitem>
+      <para>To add fonts system-wide, copy the new fonts into the <filename>/usr/share/fonts/</filename> directory. It is a good idea to create a new subdirectory, such as <filename>local/</filename> or similar, to help distinguish between user-installed and default fonts.</para>
+
+        </listitem>
+
           <listitem>
-            <para>Use the <command>fc-cache</command> command to update the font information cache, as in the following example:</para>
-            <screen><command>fc-cache <replaceable>&lt;path-to-font-directory&gt;</replaceable></command></screen>
+      <para>Run the <command>fc-cache</command> command as root to update the font information cache:</para>
+
+      <screen><command>fc-cache <replaceable>&lt;path-to-font-directory&gt;</replaceable></command></screen>
+
             <para>In this command, replace <replaceable>&lt;path-to-font-directory&gt;</replaceable> with the directory containing the new fonts (either <filename>/usr/share/fonts/local/</filename> or <filename>/home/<replaceable>&lt;user&gt;</replaceable>/.fonts/</filename>).</para>
           </listitem>
-        </orderedlist>
-        <note>
-          <title>Tip</title>
-          <para>Individual users may also install fonts graphically, by typing <filename>fonts:///</filename> into the <application>Nautilus</application> address bar, and dragging the new font files there.</para>
+    </orderedlist>
+
+        <note><title>Interactive font installation</title>
+          <para>Individual users may also install fonts interactively, by typing <filename>fonts:///</filename> into the <application>Nautilus</application> address bar, and dragging the new font files there.</para>
         </note>
-        <important>
-          <title>Important</title>
-          <para>If the font file name ends with a <filename>.gz</filename> extension, it is compressed and cannot be used until uncompressed. To do this, use the <command>gunzip</command> command or double-click the file and drag the font to a directory in <application>Nautilus</application>.</para>
-        </important>
-      </section>
-    </section>
-    <section
-      id="s2-x-fonts-core">
-      <title>Core X Font System</title>
-      <indexterm
-        significance="normal">
-        <primary>X</primary>
-        <secondary>fonts</secondary>
-        <tertiary>
-          <command>xfs</command>
-        </tertiary>
-      </indexterm>
-      <indexterm
-        significance="normal">
-        <primary>X</primary>
-        <secondary>fonts</secondary>
-        <tertiary>X Font Server</tertiary>
-      </indexterm>
-      <indexterm
-        significance="normal">
-        <primary>X</primary>
-        <secondary>fonts</secondary>
-        <tertiary>core X font subsystem</tertiary>
-      </indexterm>
-      <para>For compatibility, &MAJOROS; provides the core X font subsystem, which uses the X Font Server (<command>xfs</command>) to provide fonts to X client applications.</para>
-      <para>The X server looks for a font server specified in the <command>FontPath</command> directive within the <command>Files</command> section of the <filename>/etc/X11/xorg.conf</filename> configuration file. Refer to <xref
-          linkend="s3-x-server-config-xorg.conf-files"/> for more information about the <command>FontPath</command> entry.</para>
-      <para>The X server connects to the <command>xfs</command> server on a specified port to acquire font information. For this reason, the <command>xfs</command> service must be running for X to start. For more about configuring services for a particular runlevel, refer to <xref
-          linkend="ch-Services_and_Daemons" />.</para>
-      <section
-        id="s3-x-fonts-xfs-config">
-        <title>
-          <command>xfs</command> Configuration</title>
-        <indexterm
-          significance="normal">
-          <primary>X</primary>
-          <secondary>fonts</secondary>
-          <tertiary>
-            <command>xfs</command> configuration</tertiary>
-        </indexterm>
-				<!--TBD6: /etc/X11/fs is an obsolete directory for Fedora 12-->
-        <para>The <filename>/etc/rc.d/init.d/xfs</filename> script starts the <command>xfs</command> server. Several options can be configured within its configuration file, <filename>/etc/X11/fs/config</filename>.</para>
-        <para>The following lists common options:</para>
-        <itemizedlist>
-          <listitem>
-            <para>
-              <command>alternate-servers</command> — Specifies a list of alternate font servers to be used if this font server is not available. A comma must separate each font server in a list.</para>
-          </listitem>
-          <listitem>
-            <para>
-              <command>catalogue</command> — Specifies an ordered list of font paths to use. A comma must separate each font path in a list.</para>
-            <para>Use the string <command>:unscaled</command> immediately after the font path to make the unscaled fonts in that path load first. Then specify the entire path again, so that other scaled fonts are also loaded.</para>
-          </listitem>
-          <listitem>
-            <para>
-              <command>client-limit</command> — Specifies the maximum number of clients the font server services. The default is <command>10</command>.</para>
-          </listitem>
-          <listitem>
-            <para>
-              <command>clone-self</command> — Allows the font server to clone a new version of itself when the <command>client-limit</command> is hit. By default, this option is <command>on</command>.</para>
-          </listitem>
-          <listitem>
-            <para>
-              <command>default-point-size</command> — Specifies the default point size for any font that does not specify this value. The value for this option is set in decipoints. The default of <command>120</command> corresponds to a 12 point font.</para>
-          </listitem>
-          <listitem>
-            <para>
-              <command>default-resolutions</command> — Specifies a list of resolutions supported by the X server. Each resolution in the list must be separated by a comma.</para>
-          </listitem>
-          <listitem>
-            <para>
-              <command>deferglyphs</command> — Specifies whether to defer loading <firstterm>glyphs</firstterm> (the graphic used to visually represent a font). To disable this feature use <command>none</command>, to enable this feature for all fonts use <command>all</command>, or to turn this feature on only for 16-bit fonts use <command>16</command>.</para>
-          </listitem>
-          <listitem>
-            <para>
-              <command>error-file</command> — Specifies the path and file name of a location where <command>xfs</command> errors are logged.</para>
-          </listitem>
-          <listitem>
-            <para>
-              <command>no-listen</command> — Prevents <command>xfs</command> from listening to particular protocols. By default, this option is set to <command>tcp</command> to prevent <command>xfs</command> from listening on TCP ports for security reasons.</para>
-            <note>
-              <title>Tip</title>
-              <para>If <command>xfs</command> is used to serve fonts over the network, remove this line.</para>
-            </note>
-          </listitem>
-          <listitem>
-            <para>
-              <command>port</command> — Specifies the TCP port that <command>xfs</command> listens on if <command>no-listen</command> does not exist or is commented out.</para>
-          </listitem>
-          <listitem>
-            <para>
-              <command>use-syslog</command> — Specifies whether to use the system error log.</para>
-          </listitem>
-        </itemizedlist>
-      </section>
-      <section
-        id="s2-x-fonts-xfs-add">
-        <title>Adding Fonts to <command>xfs</command>
-        </title>
-        <indexterm
-          significance="normal">
-          <primary>X</primary>
-          <secondary>fonts</secondary>
-          <tertiary>
-            <command>xfs</command>, adding fonts to</tertiary>
-        </indexterm>
-        <para>To add fonts to the core X font subsystem (<command>xfs</command>), follow these steps:</para>
-        <orderedlist
-          continuation="restarts"
-          inheritnum="ignore">
-          <listitem>
-            <para>If it does not already exist, create a directory called <filename>/usr/share/fonts/local/</filename> using the following command as root:</para>
-            <screen>~]# <command>mkdir /usr/share/fonts/local/</command></screen>
-            <para>If creating the <filename>/usr/share/fonts/local/</filename> directory is necessary, it must be added to the <command>xfs</command> path using the following command as root:</para>
-            <screen>~]# <command>chkfontpath --add /usr/share/fonts/local/</command></screen>
-          </listitem>
-          <listitem>
-            <para>Copy the new font file into the <filename>/usr/share/fonts/local/</filename> directory</para>
-          </listitem>
-          <listitem>
-            <para>Update the font information by issuing the following command as root:</para>
-            <screen>~]# <command>ttmkfdir -d /usr/share/fonts/local/ -o /usr/share/fonts/local/fonts.scale</command></screen>
-          </listitem>
-          <listitem>
-            <para>Reload the <command>xfs</command> font server configuration file by issuing the following command as root:</para>
-            <screen>~]# <command>service xfs reload</command></screen>
-          </listitem>
-        </orderedlist>
+
       </section>
-    </section>
+
   </section>
-  <section
-    id="s1-x-runlevels">
+
+  <section id="s1-x-runlevels">
+
     <title>Runlevels and X</title>
+
     <indexterm
       significance="normal">
       <primary>X</primary>
       <secondary>runlevels and</secondary>
     </indexterm>
-    <para>In most cases, the &MAJOROS; installer configures a machine to boot into a graphical login environment, known as <firstterm>Runlevel 5</firstterm>. It is possible, however, to boot into a text-only multi-user mode called <firstterm>Runlevel 3</firstterm> and begin an X session from there.</para>
-    <para>For more information about runlevels, refer to <xref
-        linkend="s1-services-runlevels"/>.</para>
-    <para>The following subsections review how X starts up in both runlevel 3 and runlevel 5.</para>
-    <section
-      id="s2-x-runlevels-3">
+
+    <para>In most cases, the &MAJOROS; installer configures a machine to boot into a graphical login environment, known as <firstterm>runlevel 5</firstterm>. It is possible, however, to boot into a text-only multi-user mode called <firstterm>runlevel 3</firstterm> and begin an X session from there.</para>
+
+    <para>The following subsections review how X starts up in both runlevel 3 and runlevel 5. <!-- For more information about runlevels, refer to <xref linkend="s1-services-runlevels"/>. --></para>
+
+    <section id="s2-x-runlevels-3">
+
       <title>Runlevel 3</title>
+      <!-- anything to update here? -->
+
       <indexterm
         significance="normal">
         <primary>X</primary>
@@ -1091,17 +1117,35 @@ widget_class "*" style "user-font"</screen>
         </primary>
         <see>X</see>
       </indexterm>
-      <para>When in runlevel 3, the best way to start an X session is to log in and type <command>startx</command>. The <command>startx</command> command is a front-end to the <command>xinit</command> command, which launches the X server (<filename>Xorg</filename>) and connects X client applications to it. Because the user is already logged into the system at runlevel 3, <command>startx</command> does not launch a display manager or authenticate users. Refer to <xref
-          linkend="s2-x-runlevels-5"/> for more information about display managers.</para>
-      <para>When the <command>startx</command> command is executed, it searches for the <filename>.xinitrc</filename> file in the user's home directory to define the desktop environment and possibly other X client applications to run. If no <filename>.xinitrc</filename> file is present, it uses the system default <filename>/etc/X11/xinit/xinitrc</filename> file instead.</para>
-      <para>The default <command>xinitrc</command> script then searches for user-defined files and default system files, including <filename>.Xresources</filename>, <filename>.Xmodmap</filename>, and <filename>.Xkbmap</filename> in the user's home directory, and <filename>Xresources</filename>, <filename>Xmodmap</filename>, and <filename>Xkbmap</filename> in the <filename>/etc/X11/</filename> directory. The <filename>Xmodmap</filename> and <filename>Xkbmap</filename> files, if they exist, are used by the <command>xmodmap</command> utility to configure the keyboard. The <filename>Xresources</filename> file is read to assign specific preference values to applications.</para>
-      <para>After setting these options, the <command>xinitrc</command> script executes all scripts located in the <filename>/etc/X11/xinit/xinitrc.d/</filename> directory. One important script in this directory is <filename>xinput.sh</filename>, which configures settings such as the default language.</para>
-      <para>Next, the <command>xinitrc</command> script attempts to execute <filename>.Xclients</filename> in the user's home directory and turns to <filename>/etc/X11/xinit/Xclients</filename> if it cannot be found. The purpose of the <filename>Xclients</filename> file is to start the desktop environment or, possibly, just a basic window manager. The <filename>.Xclients</filename> script in the user's home directory starts the user-specified desktop environment in the <filename>.Xclients-default</filename> file. If <filename>.Xclients</filename> does not exist in the user's home directory, the standard <filename>/etc/X11/xinit/Xclients</filename> script attempts to start another desktop environment, trying GNOME first and then KDE followed by <command>twm</command>.</para>
+
+      <para>When in runlevel 3, the best way to start an X session is to log in and type <command>startx</command>. The <command>startx</command> command is a front-end to the <command>xinit</command> command, which launches the X server (<filename>Xorg</filename>) and connects X client applications to it. Because the user is already logged into the system at runlevel 3, <command>startx</command> does not launch a display manager or authenticate users. Refer to <xref linkend="s2-x-runlevels-5"/> for more information about display managers.</para>
+
+      <procedure>
+      <step>
+        <para>When the <command>startx</command> command is executed, it searches for the <filename>.xinitrc</filename> file in the user's home directory to define the desktop environment and possibly other X client applications to run. If no <filename>.xinitrc</filename> file is present, it uses the system default <filename>/etc/X11/xinit/xinitrc</filename> file instead.</para>
+      </step>
+
+      <step>
+        <para>The default <command>xinitrc</command> script then searches for user-defined files and default system files, including <filename>.Xresources</filename>, <filename>.Xmodmap</filename>, and <filename>.Xkbmap</filename> in the user's home directory, and <filename>Xresources</filename>, <filename>Xmodmap</filename>, and <filename>Xkbmap</filename> in the <filename>/etc/X11/</filename> directory. The <filename>Xmodmap</filename> and <filename>Xkbmap</filename> files, if they exist, are used by the <command>xmodmap</command> utility to configure the keyboard. The <filename>Xresources</filename> file is read to assign specific preference values to applications.</para>
+      </step>
+
+      <step>
+        <para>After setting the above options, the <command>xinitrc</command> script executes all scripts located in the <filename>/etc/X11/xinit/xinitrc.d/</filename> directory. One important script in this directory is <filename>xinput.sh</filename>, which configures settings such as the default language.</para>
+      </step>
+
+      <step>
+        <para>The <command>xinitrc</command> script attempts to execute <filename>.Xclients</filename> in the user's home directory and turns to <filename>/etc/X11/xinit/Xclients</filename> if it cannot be found. The purpose of the <filename>Xclients</filename> file is to start the desktop environment or, possibly, just a basic window manager. The <filename>.Xclients</filename> script in the user's home directory starts the user-specified desktop environment in the <filename>.Xclients-default</filename> file. If <filename>.Xclients</filename> does not exist in the user's home directory, the standard <filename>/etc/X11/xinit/Xclients</filename> script attempts to start another desktop environment, trying GNOME first, then KDE, followed by <command>twm</command>.</para>
+      </step>
+      </procedure>
+
       <para>When in runlevel 3, the user is returned to a text mode user session after ending an X session.</para>
+
     </section>
-    <section
-      id="s2-x-runlevels-5">
+
+    <section id="s2-x-runlevels-5">
+
       <title>Runlevel 5</title>
+
       <indexterm
         significance="normal">
         <primary>X</primary>
@@ -1163,96 +1207,122 @@ widget_class "*" style "user-font"</screen>
         <primary>display managers</primary>
         <see>X</see>
       </indexterm>
+
       <para>When the system boots into runlevel 5, a special X client application called a <firstterm>display manager</firstterm> is launched. A user must authenticate using the display manager before any desktop environment or window managers are launched.</para>
+
       <para>Depending on the desktop environments installed on the system, three different display managers are available to handle user authentication.</para>
+
       <itemizedlist>
         <listitem>
           <para>
-            <command>GNOME</command> — The default display manager for &MAJOROS;, <command>GNOME</command> allows the user to configure language settings, shutdown, restart or log in to the system.</para>
-        </listitem>
+            <command>GDM</command> (GNOME Display Manager) &mdash; The default display manager for &MAJOROS;. <command>GNOME</command> allows the user to configure language settings, shutdown, restart or log in to the system.</para>
+  </listitem>
+
         <listitem>
           <para>
-            <command>KDE</command> — KDE's display manager which allows the user to shutdown, restart or log in to the system.</para>
-        </listitem>
+            <command>KDM</command> &mdash; KDE's display manager which allows the user to shutdown, restart or log in to the system.</para>
+  </listitem>
+
         <listitem>
           <para>
-            <command>xdm</command> — A very basic display manager which only lets the user log in to the system.</para>
+            <command>xdm</command> (X Window Display Manager) &mdash; A very basic display manager which only lets the user log in to the system.</para>
         </listitem>
       </itemizedlist>
-      <para>When booting into runlevel 5, the <command>prefdm</command> script determines the preferred display manager by referencing the <filename>/etc/sysconfig/desktop</filename> file. A list of options for this file is available in this file:</para>
+
+
+      <para>When booting into runlevel 5, the <command>/etc/X11/prefdm</command> script determines the preferred display manager by referencing the <filename>/etc/sysconfig/desktop</filename> file. A list of options for this file is available in this file:</para>
+
       <screen><filename>/usr/share/doc/initscripts-<replaceable>&lt;version-number&gt;</replaceable>/sysconfig.txt</filename></screen>
+
       <para>where <replaceable>&lt;version-number&gt;</replaceable> is the version number of the <filename>initscripts</filename> package.</para>
+
       <para>Each of the display managers reference the <filename>/etc/X11/xdm/Xsetup_0</filename> file to set up the login screen. Once the user logs into the system, the <filename>/etc/X11/xdm/GiveConsole</filename> script runs to assign ownership of the console to the user. Then, the <filename>/etc/X11/xdm/Xsession</filename> script runs to accomplish many of the tasks normally performed by the <command>xinitrc</command> script when starting X from runlevel 3, including setting system and user resources, as well as running the scripts in the <filename>/etc/X11/xinit/xinitrc.d/</filename> directory.</para>
-      <para>Users can specify which desktop environment they want to utilize when they authenticate using the <command>GNOME</command> or <command>KDE</command> display managers by selecting it from the <guimenu>Sessions</guimenu> menu item (accessed by selecting System (on the panel) &gt; <guimenuitem>Preferences</guimenuitem> &gt; <guimenuitem>More Preferences</guimenuitem> &gt; <guimenuitem>Sessions</guimenuitem>). If the desktop environment is not specified in the display manager, the <filename>/etc/X11/xdm/Xsession</filename> script checks the <filename>.xsession</filename> and <filename>.Xclients</filename> files in the user's home directory to decide which desktop environment to load. As a last resort, the <filename>/etc/X11/xinit/Xclients</filename> file is used to select a desktop environment or window manager to use in the same way as runlevel 3.</para>
+
+      <para>Users can specify which desktop environment they want to use when they authenticate using the <command>GNOME</command> or <command>KDE</command> display managers by selecting it from the <guimenu>Sessions</guimenu> menu item accessed by selecting <menuchoice><guimenu>System</guimenu><guisubmenu>Preferences</guisubmenu><guisubmenu>More Preferences</guisubmenu><guimenuitem>Sessions</guimenuitem></menuchoice>. If the desktop environment is not specified in the display manager, the <filename>/etc/X11/xdm/Xsession</filename> script checks the <filename>.xsession</filename> and <filename>.Xclients</filename> files in the user's home directory to decide which desktop environment to load. As a last resort, the <filename>/etc/X11/xinit/Xclients</filename> file is used to select a desktop environment or window manager to use in the same way as runlevel 3.</para>
+
       <para>When the user finishes an X session on the default display (<computeroutput>:0</computeroutput>) and logs out, the <filename>/etc/X11/xdm/TakeConsole</filename> script runs and reassigns ownership of the console to the root user. The original display manager, which continues running after the user logged in, takes control by spawning a new display manager. This restarts the X server, displays a new login window, and starts the entire process over again.</para>
+
       <para>The user is returned to the display manager after logging out of X from runlevel 5.</para>
-      <para>For more information on how display managers control user authentication, refer to the <filename>/usr/share/doc/gdm-<replaceable>&lt;version-number&gt;</replaceable>/README</filename> (where <replaceable>&lt;version-number&gt;</replaceable> is the version number for the <filename>gdm</filename> package installed) and the <command>xdm</command> man page.</para>
+
+      <para>For more information on how display managers control user authentication, refer to the <filename>/usr/share/doc/gdm-<replaceable>&lt;version-number&gt;</replaceable>/README</filename> , where <replaceable>&lt;version-number&gt;</replaceable> is the version number for the <filename>gdm</filename> package installed, or the <command>xdm</command> man page.</para>
+
     </section>
   </section>
-  <section
-    id="s1-x-additional-resources">
+
+  <section id="s1-x-additional-resources">
+
     <title>Additional Resources</title>
+
     <indexterm
       significance="normal">
       <primary>X</primary>
       <secondary>additional resources</secondary>
     </indexterm>
+
     <para>There is a large amount of detailed information available about the X server, the clients that connect to it, and the assorted desktop environments and window managers.</para>
-    <section
-      id="s2-x-installed-documentation">
+
+    <section id="s2-x-installed-documentation">
+
       <title>Installed Documentation</title>
+
       <indexterm
         significance="normal">
         <primary>X</primary>
         <secondary>additional resources</secondary>
         <tertiary>installed documentation</tertiary>
       </indexterm>
+
       <itemizedlist>
         <listitem>
-          <para>
-            <filename>/usr/share/X11/doc/</filename> — contains detailed documentation on the X Window System architecture, as well as how to get additional information about the Xorg project as a new user.</para>
-        </listitem>
+          <para><filename>/usr/share/X11/doc/</filename> &mdash; contains detailed documentation on the X Window System architecture, as well as how to get additional information about the Xorg project as a new user.</para>
+  </listitem>
+
+  <listitem>
+          <para><filename>/usr/share/doc/gdm-<replaceable>&lt;version-number&gt;</replaceable>/README</filename> &mdash; contains information on how display managers control user authentication.</para>
+  </listitem>
+
         <listitem>
           <para>
-            <command>man xorg.conf</command> — Contains information about the <filename>xorg.conf</filename> configuration files, including the meaning and syntax for the different sections within the files.</para>
-        </listitem>
+            <command>man xorg.conf</command> &mdash; Contains information about the <filename>xorg.conf</filename> configuration files, including the meaning and syntax for the different sections within the files.</para>
+  </listitem>
+
         <listitem>
           <para>
-            <command>man Xorg</command> — Describes the <command>Xorg</command> display server.</para>
+            <command>man Xorg</command> &mdash; Describes the <command>Xorg</command> display server.</para>
         </listitem>
       </itemizedlist>
+
     </section>
-    <section
-      id="s2-x-useful-websites">
+
+    <section id="s2-x-useful-websites">
+
       <title>Useful Websites</title>
+
       <indexterm
         significance="normal">
         <primary>X</primary>
         <secondary>additional resources</secondary>
         <tertiary>useful websites</tertiary>
       </indexterm>
+
       <itemizedlist>
         <listitem>
-          <para>
-            <ulink
-              url="http://www.X.org/">http://www.X.org/</ulink> — Home page of the X.Org Foundation, which produces the X11R7.1 release of the X Window System. The X11R7.1 release is bundled with &MAJOROS; to control the necessary hardware and provide a GUI environment.</para>
-        </listitem>
+       <para><ulink url="http://www.X.org/">http://www.X.org/</ulink> &mdash; Home page of the X.Org Foundation, which produces major releases of the X Window System bundled with &MAJOROS; to control the necessary hardware and provide a GUI environment.</para>
+    </listitem>
+
         <listitem>
-          <para>
-            <ulink
-              url="http://dri.sourceforge.net/">http://dri.sourceforge.net/</ulink> — Home page of the DRI (Direct Rendering Infrastructure) project. The DRI is the core hardware 3D acceleration component of X.</para>
-        </listitem>
+          <para><ulink url="http://dri.sourceforge.net/">http://dri.sourceforge.net/</ulink> &mdash; Home page of the DRI (Direct Rendering Infrastructure) project. The DRI is the core hardware 3D acceleration component of X.</para>
+    </listitem>
+
         <listitem>
-          <para>
-            <ulink
-              url="http://www.gnome.org">http://www.gnome.org/</ulink> — Home of the GNOME project.</para>
-        </listitem>
+    <para><ulink url="http://www.gnome.org">http://www.gnome.org/</ulink> &mdash; Home of the GNOME project.</para>
+    </listitem>
+
         <listitem>
-          <para>
-            <ulink
-              url="http://www.kde.org">http://www.kde.org/</ulink> — Home of the KDE desktop environment.</para>
+          <para><ulink url="http://www.kde.org">http://www.kde.org/</ulink> &mdash; Home of the KDE desktop environment.</para>
         </listitem>
       </itemizedlist>
+
     </section>
   </section>
 </appendix>


More information about the docs-commits mailing list