Index: x/installing/xorg-config.xml
===================================================================
--- x/installing/xorg-config.xml	(revision 6da5593487abad218a8786a6e975eee981d418f0)
+++ x/installing/xorg-config.xml	(revision da4b5e09031bba5f1ed3de90b18a8d844f1aa55c)
@@ -20,36 +20,49 @@
   </indexterm>
 
-    <sect2 id='X11-testing' xreflabel="Testing Xorg">
+  <sect2 id='X11-testing' xreflabel="Testing Xorg">
     <title>Testing Xorg</title>
 
-    <note><para>Before starting Xorg for the first time, is is useful to
-    rebuild the library cache by running <userinput>ldconfig</userinput>
-    as the <systemitem class="username">root</systemitem> user.</para></note>
-
-    <para>To test the <application>Xorg</application> installation, issue
-    <userinput>startx</userinput>.  This command brings up a rudimentary window
-    manager called <emphasis>twm</emphasis> with three xterm windows and one
-    xclock window.  The xterm window in the upper left is a login terminal and
-    running <emphasis>exit</emphasis> from this terminal will exit the
-    <application>X Window</application> session.  The third xterm window may be
-    obscured on your system by the other two xterms.</para>
-
-    <note><para>When testing <application>Xorg</application> with the
-    <application>twm</application> window manager, there will be several
-    warnings in the Xorg log file, <filename revision="sysv">
-    /var/log/Xorg.0.log</filename><filename revision="systemd">
-    $HOME/.local/share/xorg/Xorg.0.log</filename>,
-    about missing font files.  In addition, there will be several warnings on
-    the text mode terminal (usually tty1) about missing fonts.  These warnings
-    do not affect functionality, but can be removed if desired by installing
-    the <xref linkend="xorg7-legacy"/>.</para></note>
-
-    <para>Generally, there is no specific configuration required for
-    <application>Xorg</application>, but customization is possible.  For details
-    see <xref linkend='xconfig'/> below.</para>
-
-    </sect2>
-
-    <sect2 role="configuration" id="checking-dri" xreflabel="Checking the DRI installation">
+    <note>
+      <para>
+        Before starting Xorg for the first time, is is useful to
+        rebuild the library cache by running <userinput>ldconfig</userinput>
+        as the <systemitem class="username">root</systemitem> user.
+      </para>
+    </note>
+
+    <para>
+      To test the <application>Xorg</application> installation, issue
+      <command>startx</command>. This command brings up a rudimentary window
+      manager called <emphasis>twm</emphasis> with three xterm windows and one
+      xclock window.  The xterm window in the upper left is a login terminal and
+      running <emphasis>exit</emphasis> from this terminal will exit the
+      <application>X Window</application> session.  The third xterm window may
+      be obscured on your system by the other two xterms.
+    </para>
+
+    <note>
+      <para>
+        When testing <application>Xorg</application> with the
+        <application>twm</application> window manager, there will be several
+        warnings in the Xorg log file, <filename revision="sysv">
+        /var/log/Xorg.0.log</filename><filename revision="systemd">
+        $HOME/.local/share/xorg/Xorg.0.log</filename>, about missing font
+        files. In addition, there will be several warnings on the text mode
+        terminal (usually tty1) about missing fonts. These warnings do not
+        affect functionality, but can be removed if desired by installing
+        the <xref linkend="xorg7-legacy"/>.
+      </para>
+    </note>
+
+    <para>
+      Generally, there is no specific configuration required for
+      <application>Xorg</application>, but customization is possible. For
+      details, see <xref linkend='xconfig'/> below.
+    </para>
+
+  </sect2>
+
+  <sect2 role="configuration" id="checking-dri" xreflabel="Checking the DRI
+  installation">
     <title>Checking the Direct Rendering Infrastructure (DRI)
     Installation</title>
@@ -164,8 +177,7 @@
     </para>
 
-    </sect2>
-
-    <sect2 role="configuration" id="hybrid-graphics" xreflabel="Hybrid
-    Graphics">
+  </sect2>
+
+  <sect2 role="configuration" id="hybrid-graphics" xreflabel="Hybrid Graphics">
     <title>Hybrid Graphics</title>
 
@@ -200,22 +212,28 @@
     </para>
 
-    </sect2>
+  </sect2>
 
   <sect2 role="configuration" id='xconfig'>
     <title>Setting up Xorg Devices</title>
 
-    <para>For most hardware configurations, modern Xorg will automatically
-    get the server configuration correct without any user intervention. There
-    are, however, some cases where auto-configuration will be incorrect.
-    Following are some example manual configuration items that may be of use in
-    these instances.</para>
+    <para>
+      For most hardware configurations, modern Xorg will automatically
+      get the server configuration correct without any user intervention. There
+      are, however, some cases where auto-configuration will be incorrect.
+      Following are some example manual configuration items that may be of use
+      in these instances.
+    </para>
 
     <sect3 id="xinput">
-    <title>Setting up X Input Devices</title>
-    <para>For most input devices, no additional configuration will be
-    necessary. This section is provided for informational purposes only.</para>
-
-    <para>A sample default XKB setup could look like the following (executed as
-    the <systemitem class="username">root</systemitem> user):</para>
+      <title>Setting up X Input Devices</title>
+      <para>
+        For most input devices, no additional configuration will be
+        necessary. This section is provided for informational purposes only.
+      </para>
+
+      <para>
+        A sample default XKB setup could look like the following (executed as
+        the <systemitem class="username">root</systemitem> user):
+      </para>
 
 <screen role="root"><userinput>cat &gt; /etc/X11/xorg.conf.d/xkb-defaults.conf &lt;&lt; "EOF"
@@ -228,20 +246,22 @@
 EOF</userinput></screen>
 
-    <para>
-      The <quote>XkbLayout</quote> line is an example for a French (AZERTY)
-      keyboard. Change it to your keyboard model. That line is not needed for
-      a QWERTY (US/GB) keyboard.
-    </para>
-  </sect3>
-
-  <sect3 id="xdisplay">
-  <title>Fine Tuning Display Settings</title>
-
-  <para>Again, with modern Xorg, little or no additional configuration is
-  necessary. If you should need extra options passed to your video driver,
-  for instance, you could use something like the following (again, executed as
-  the <systemitem class="username">root</systemitem> user):</para>
-
-<screen><userinput role="root">cat &gt; /etc/X11/xorg.conf.d/videocard-0.conf &lt;&lt; "EOF"
+      <para>
+        The <quote>XkbLayout</quote> line is an example for a French (AZERTY)
+        keyboard. Change it to your keyboard model. That line is not needed for
+        a QWERTY (US) keyboard.
+      </para>
+    </sect3>
+
+    <sect3 id="xdisplay">
+      <title>Fine Tuning Display Settings</title>
+
+      <para>
+        Again, with modern Xorg, little or no additional configuration is
+        necessary. If you should need extra options passed to your video driver,
+        for instance, you could use something like the following (again,
+        executed as the <systemitem class="username">root</systemitem> user):
+      </para>
+
+<screen role="root"><userinput>cat &gt; /etc/X11/xorg.conf.d/videocard-0.conf &lt;&lt; "EOF"
 Section "Device"
     Identifier  "Videocard0"
@@ -253,9 +273,11 @@
 EOF</userinput></screen>
 
-  <para>Another common setup is having multiple server layouts for use in
-  different environments. Though the server will automatically detect the
-  presence of another monitor, it may get the order incorrect:</para>
-
-<screen><userinput role="root">cat &gt; /etc/X11/xorg.conf.d/server-layout.conf &lt;&lt; "EOF"
+      <para>
+        Another common setup is having multiple server layouts for use in
+        different environments. Though the server will automatically detect the
+        presence of another monitor, it may get the order incorrect:
+      </para>
+
+<screen role="root"><userinput>cat &gt; /etc/X11/xorg.conf.d/server-layout.conf &lt;&lt; "EOF"
 Section "ServerLayout"
     Identifier     "DefaultLayout"
@@ -266,5 +288,5 @@
 EOF</userinput></screen>
 
-  </sect3>
+    </sect3>
   </sect2>
 </sect1>
