Index: x/installing/xfree86-setup.xml
===================================================================
--- x/installing/xfree86-setup.xml	(revision b9ad2f9af761d14d31a6c7462880a50c5393fff3)
+++ x/installing/xfree86-setup.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
@@ -143,20 +143,21 @@
 <!-- ================================================== -->
 <sect2>
-<title>Setting up xdm</title>
-<para><filename>xdm</filename> provides a graphical logon capability and is
+<title>Setting up XDM</title>
+<para><command>xdm</command> provides a graphical logon capability and is
 normally set up in <filename>/etc/inittab</filename>.  Most of the information 
-you need to customize <filename>xdm</filename> is found in its man page.  To 
-execute xdm during bootup, change the initdefault level to 5 and 
+you need to customize <command>xdm</command> is found in its man page.  To 
+execute <command>xdm</command> during bootup, change the initdefault level to 5 and 
 add the following lines to 
 <filename>/etc/inittab</filename>:</para>
 
-<para><screen># Run xdm as a separate service
-x:5:respawn:/usr/X11R6/bin/xdm -nodaemon</screen></para>
-</sect2>
-
-<!-- ================================================== -->
-<sect2>
-<title>Using XFree86 Resources</title>
-<para>There are many options that can be set in XFree86 and X clients via
+<para><screen><userinput># Run xdm as a separate service
+x:5:respawn:/usr/X11R6/bin/xdm -nodaemon</userinput></screen></para>
+</sect2>
+
+<!-- ================================================== -->
+<sect2>
+<title>Using <application>XFree86</application> Resources</title>
+<para>There are many options that can be set in
+<application>XFree86</application> and <application>X</application> clients via
 resources.  Typically resources are set in the <filename>~/.Xresources</filename>
 file.</para>
@@ -188,17 +189,17 @@
 respective client.</para>
 
-<para>In order to load your resources, the <filename>xrdb</filename> 
+<para>In order to load your resources, the <command>xrdb</command> 
 program must be
 called with the appropriate parameters.  Typically, the first time 
 resources are loaded, you use:</para>
 
-<para><screen>xrdb -load &lt;filename&gt;</screen></para>
-
-<para>To add resources to XFree86's database in memory use:</para>
-<para><screen>xrdb -merge &lt;filename&gt;</screen></para>
-
-<para>The <filename>xrdb</filename> instruction is usually placed in 
+<screen><userinput><command>xrdb -load &lt;filename&gt;</command></userinput></screen>
+
+<para>To add resources to <application>XFree86</application>'s database in memory use:</para>
+<screen><userinput><command>xrdb -merge &lt;filename&gt;</command></userinput></screen>
+
+<para>The <command>xrdb</command> instruction is usually placed in 
 <filename>~/.xinitrc</filename> or <filename>~/.xsession</filename>.
-To get more information, see the <filename>xrdb</filename> man page.</para>
+To get more information, see the xrdb man page.</para>
 </sect2>
 
Index: x/installing/xfree86/xfree86-config.xml
===================================================================
--- x/installing/xfree86/xfree86-config.xml	(revision b9ad2f9af761d14d31a6c7462880a50c5393fff3)
+++ x/installing/xfree86/xfree86-config.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
@@ -1,29 +1,29 @@
 <sect2>
-<title>Configuring XFree86</title>
+<title>Configuring <application>XFree86</application></title>
 
 <para>Edit <filename>/etc/ld.so.conf</filename> and add 
-<filename>/usr/X11R6/lib</filename>.
-Run <screen><userinput>ldconfig</userinput></screen></para>
+<filename class="directory">/usr/X11R6/lib</filename>.
+Run <screen><userinput><command>ldconfig</command></userinput></screen></para>
 
 <para>Add <filename class='directory'>/usr/X11R6/bin</filename> to your
 <envar>PATH</envar> environment 
 variable in <filename>.bash_profile</filename>.  The statement should
-look something like <userinput>PATH=$PATH:/usr/X11R6/bin</userinput>
-and be placed before the <userinput>export PATH</userinput>
+look something like <parameter>PATH=$PATH:/usr/X11R6/bin</parameter>
+and be placed before the <command>export PATH</command>
 statement.</para>
 
 <para>Run
-<screen><userinput>source ~/.bash_profile</userinput></screen></para>
+<screen><userinput><command>source ~/.bash_profile</command></userinput></screen></para>
 
 <para>Set up your mouse:
-<screen><userinput>cd /dev
-ln -s psaux mouse</userinput></screen>
+<screen><userinput><command>cd /dev
+ln -s psaux mouse</command></userinput></screen>
 
 Adjust the symbolic link as necessary for other types of mice.  For instance, 
 a serial mouse on the first serial port would be linked to ttyS1.</para>
 
-<para>Create the XF86Config file with
-<screen><userinput>cd ~
-XFree86 -configure</userinput></screen>
+<para>Create the <filename>XF86Config</filename> file with
+<screen><userinput><command>cd ~
+XFree86 -configure</command></userinput></screen>
 The screen will go black and you may hear some clicking of the monitor.  This
 command will create a file, <filename>XF86Config.new</filename> in your home
@@ -32,5 +32,5 @@
 <para>Edit <filename>XF86Config.new</filename> to suit your system.  The 
 details of the file are located in the man 
-page <userinput>man XF86Config</userinput>.  Some things you may want to 
+page <command>man XF86Config</command>.  Some things you may want to 
 do are:</para>
 
@@ -42,11 +42,11 @@
 directories completely.</para></listitem>
 
-<listitem><para>Section "Monitor".  Specify the <userinput>VertRefresh</userinput>
-and <userinput>HorizSync</userinput> values if the system does not automatically 
+<listitem><para>Section "Monitor".  Specify the <parameter>VertRefresh</parameter>
+and <parameter>HorizSync</parameter> values if the system does not automatically 
 detect the monitor and its values.</para></listitem>
 
 <listitem><para>Section "InputDevice".  You may want to change the keyboard 
 autorepeat rate by 
-adding <userinput>Option "Autorepeat" "250 30"</userinput>.</para></listitem>
+adding <parameter>Option "Autorepeat" "250 30"</parameter>.</para></listitem>
 
 <listitem><para>Section "Device".  You may want to set some of the options 
@@ -55,7 +55,7 @@
 
 <listitem><para>Section "Screen".  Add a DefaultDepth statement such 
-as: <userinput>DefaultDepth 16</userinput>. In the SubSection for your 
+as: <parameter>DefaultDepth 16</parameter>. In the SubSection for your 
 default depth, add a modes line such 
-as: <userinput> Modes "1280x1024" "1024x768"</userinput>.
+as: <parameter> Modes "1280x1024" "1024x768"</parameter>.
 The first mode listed will normally be the starting 
 resolution.</para></listitem>
@@ -64,5 +64,5 @@
 
 <para>Test the system with
-<screen><userinput>XFree86 -xf86config ~/XF86Config.new</userinput></screen>
+<screen><userinput><command>XFree86 -xf86config ~/XF86Config.new</command></userinput></screen>
 You will only get a gray background with an X-shaped mouse cursor, but it 
 confirms the system is working.  Exit with Control-Alt-Backspace.  If the 
@@ -72,20 +72,20 @@
 
 <para>Move the configuration file to its final location
-<screen><userinput>mv ~/XF86Config.new /etc/X11/XF86Config</userinput></screen></para>
+<screen><userinput><command>mv ~/XF86Config.new /etc/X11/XF86Config</command></userinput></screen></para>
 
 <para>Create <filename>.xinitrc</filename>
-<screen><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
+<screen><userinput><command>cat &gt; ~/.xinitrc &lt;&lt; "EOF"</command>
 # Begin .xinitrc file
 xterm  -g 80x40+0+0   &amp;
 xclock -g 100x100-0+0 &amp;
 twm
-EOF</userinput></screen>
+<command>EOF</command></userinput></screen>
 This provides an initial screen with an xterm and a clock that is managed by a 
 simple window manager, Tab Window Manager.  For details of twm, see the 
 man page.</para>
 
-<para>Start X with 
-<screen><userinput>startx</userinput></screen>
-to get basic functional X Window System.</para>
+<para>Start <application>X</application> with 
+<screen><userinput><command>startx</command></userinput></screen>
+to get basic functional <application>X</application> Window System.</para>
 
 </sect2>
Index: x/installing/xfree86/xfree86-desc.xml
===================================================================
--- x/installing/xfree86/xfree86-desc.xml	(revision b9ad2f9af761d14d31a6c7462880a50c5393fff3)
+++ x/installing/xfree86/xfree86-desc.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
@@ -2,12 +2,13 @@
 <title>Contents</title>
 
-<para>The XFree86 package contains the X Window System for Linux 
+<para>The <application>XFree86</application> package contains the
+<application>X</application> Window System for Linux 
 (and other operating systems).  It includes
-the X server, fonts, xterm, a simple window manager (twm), 
+the <application>X</application> server, fonts, xterm, a simple window manager (twm), 
 various utilities, video output drivers, 
 and various input drivers including the mouse and keyboard.</para>
 
-<para>XFree86 also contains libraries and header files for development of
-the X Window System programs.</para>
+<para><application>XFree86</application> also contains libraries and header files for development of
+the <application>X</application> Window System programs.</para>
 
 </sect2>
@@ -16,57 +17,69 @@
 
 <note><para>The following list of programs is not comprehensive. The
-full list is in <filename>/usr/X11R6/bin</filename>.  For additional
+full list is in <filename class="directory">/usr/X11R6/bin</filename>.  For additional
 information about these programs, see the respective man page.</para></note>
 
 <sect3>
 <title>XFree86</title>
-<para>XFree86 is the X11R6 implementation of the X Window System server.
+<para><application>XFree86</application> is the X11R6 implementation of
+the <application>X</application> Window System server.
 </para></sect3>
 
 <sect3><title>xf86config</title>
-<para>An interactive program for generating an XF86Config file for use with 
-XFree86 X servers.</para></sect3>
+<para><command>xf86config</command> is an interactive program for
+generating an <filename>XF86Config</filename> file for use with 
+<application>XFree86</application> <application>X</application> servers.</para></sect3>
 
 <sect3><title>xf86cfg</title>
-<para>A tool to configure XFree86 that can be used to either write the 
+<para><command>xf86cfg</command> is a tool to configure
+<application>XFree86</application> that can be used to either write the 
 initial configuration file or make customizations to the current 
 configuration.</para></sect3>
 
 <sect3><title>startx</title>
-<para>A script to initialize the X session. It runs xinit.</para></sect3>
+<para><command>startx</command> is a script to initialize the
+<application>X</application> session. It runs <command>xinit</command>.</para></sect3>
 
 <sect3><title>xinit</title>
-<para>This program is used to start the X Window System server.</para></sect3>
+<para><command>xinit</command> is used to start the
+<application>X</application> Window System server.</para></sect3>
 
 <sect3><title>twm</title>
-<para>A Tab Window Manager for the X Window System.</para></sect3>
+<para><command>twm</command> is a Tab Window Manager for the
+<application>X</application> Window System.</para></sect3>
 
 <sect3><title>xterm</title>
-<para>A terminal emulator for X.</para></sect3>
+<para><command>xterm</command> is a terminal emulator for
+<application>X</application>.</para></sect3>
 
 <sect3><title>xwininfo</title>
-<para>A window information utility for X.</para></sect3>
+<para><command>xwininfo</command> is a window information utility for
+<application>X</application>.</para></sect3>
 
 <sect3><title>x11perf</title>
-<para>An X11 server performance test program.</para></sect3>
+<para><command>x11perf</command> is an <application>X</application>11 server performance test program.</para></sect3>
 
 <sect3><title>xlsfonts</title>
-<para>A program to list fonts available to the X server.</para></sect3>
+<para><command>xlsfonts</command> is a program to list fonts available
+to the <application>X</application> server.</para></sect3>
 
 <sect3><title>xvidtune</title>
-<para>A video mode tuner for XFree86.</para></sect3>
+<para><command>xvidtune</command> is a video mode tuner for
+<application>XFree86</application>.</para></sect3>
 
 <sect3><title>xload</title>
-<para>A system load average display for X.</para></sect3>
+<para><command>xload</command> is a system load average display for
+<application>X</application>.</para></sect3>
 
 <sect3><title>xcalc</title>
-<para>A scientific calculator for X.</para></sect3>
+<para><command>xcalc</command> is a scientific calculator for
+<application>X</application>.</para></sect3>
 
 <sect3><title>xclock and oclock</title>
-<para>Clock programs for X.</para></sect3>
+<para>Clock programs for <application>X</application>.</para></sect3>
 
 <sect3><title>xmodmap</title>
-<para>A utility for modifying keymaps and pointer button mappings 
-in X.</para></sect3>
+<para><command>xmodmap</command> is a utility for modifying keymaps and pointer button mappings 
+in <application>X</application>.</para></sect3>
 
 </sect2>
Index: x/installing/xfree86/xfree86-inst.xml
===================================================================
--- x/installing/xfree86/xfree86-inst.xml	(revision b9ad2f9af761d14d31a6c7462880a50c5393fff3)
+++ x/installing/xfree86/xfree86-inst.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
@@ -1,24 +1,27 @@
 <sect2>
-<title>Installation of XFree86</title>
+<title>Installation of <application>XFree86</application></title>
 
 <sect3>
 <title>Kernel Compilation Settings</title>
 <para>If you have an Intel P6 (Pentium Pro, Pentium II and later) it is recommended 
-that you compile MTRR (Memory Type Range Registers) support into the kernel.
-The kernel can map Cyrix and AMD CPUs to the MTRR interface so selecting this
+that you compile <acronym>MTRR</acronym> (Memory Type Range Registers) support into the kernel.
+The kernel can map Cyrix and AMD <acronym>CPU</acronym>s to the
+<acronym>MTRR</acronym> interface so selecting this
 option is useful for those processors also.
 This option is found in the 
 "Processor type and features" menu.  It can increase performance of
-image write operations 2.5 times or more on PCI or AGP video cards.</para>
-
-<para>In the "Character Devices" section, enable AGP Support and select the chipset
+image write operations 2.5 times or more on <acronym>PCI</acronym> or
+<acronym>AGP</acronym> video cards.</para>
+
+<para>In the "Character Devices" section, enable <acronym>AGP</acronym> Support and select the chipset
 support on your motherboard.  If you do not know the chipset, you may select
 all the chip types at the expense of extra kernel size. You can usually 
 determine your motherboard's chipset by doing:
-<screen><userinput>cat /proc/pci</userinput></screen></para>
+<screen><userinput><command>cat /proc/pci</command></userinput></screen></para>
 
 <para>In the "Character Devices" section, <emphasis>disable</emphasis> Direct 
-Rendering Manager unless you have a Direct Rendering Infrastructure (DRI) 
-supported video card.  A complete list of DRI supported video cards can
+Rendering Manager unless you have a Direct Rendering Infrastructure
+(<acronym>DRI</acronym>) 
+supported video card.  A complete list of <acronym>DRI</acronym> supported video cards can
 be found at <ulink url="http://dri.sourceforge.net" /> in the Status section.  
 Currently,
@@ -27,5 +30,5 @@
 Radeon 7X00, Radeon 2), Intel (i810, i815), and Matrox (G200, G400, G450). 
 Additionally NVidia provides their own closed source binary drivers.
-If you do enable DRI here, make sure you select the video card(s) you want 
+If you do enable <acronym>DRI</acronym> here, make sure you select the video card(s) you want 
 to support as a <emphasis>module</emphasis>.</para>
 
@@ -45,7 +48,7 @@
 </para>
 
-<note><para>If you build XFree86 in a chroot environment, make sure the kernel 
+<note><para>If you build <application>XFree86</application> in a chroot environment, make sure the kernel 
 version of the base system and the target system are the same.  This is 
-especially important if you enabled DRI support as a module as 
+especially important if you enabled <acronym>DRI</acronym> support as a module as 
 instructed above.</para></note>
 
@@ -54,9 +57,11 @@
 <sect3><title>Creating <filename>host.def</filename></title>
 
-<para>Although XFree86 will compile without a host.def file, the following file 
+<para>Although <application>XFree86</application> will compile without a
+<filename>host.def</filename> file, the following file 
 is recommended for customizing the installation. Start from 
-the <filename>xc</filename> directory.</para>
-
-<note><para>The <filename>host.def</filename> file is a c file, not the 
+the <filename class="directory">xc</filename> directory.</para>
+
+<note><para>The <filename>host.def</filename> file is a
+<application>C</application> file, not the 
 usual configuration file.  If you make any changes, be sure the comment characters
 (<userinput>/*</userinput> and <userinput>*/</userinput>) 
@@ -65,5 +70,5 @@
 </para></note>
 
-<para><screen><userinput>cat &gt; config/cf/host.def &lt;&lt; "EOF"
+<para><screen><userinput><command>cat &gt; config/cf/host.def &lt;&lt; "EOF"</command>
 /* Begin XFree86 host.def file */
 
@@ -180,5 +185,5 @@
 
 /* End XFree86 host.def file */
-EOF</userinput></screen></para>
+<command>EOF</command></userinput></screen></para>
 
 <para>Edit the file for your hardware and desires.</para>
@@ -188,39 +193,40 @@
 <sect3>
 <title>Build Commands</title>
-<para>Install XFree86 by running the following commands:</para>
-
-
-<para><screen><userinput>WORLDOPTS="" make World 2&gt;&amp;1 | tee xfree-compile.log &amp;&amp;
+<para>Install <application>XFree86</application> by running the following commands:</para>
+
+
+<screen><userinput><command>WORLDOPTS="" make World 2&gt;&amp;1 | tee xfree-compile.log &amp;&amp;
 make install &amp;&amp;
 make install.man &amp;&amp;
 ln -sf /usr/X11R6/bin /usr/bin/X11 &amp;&amp;
 ln -sf /usr/X11R6/lib/X11 /usr/lib/X11 &amp;&amp;
-ln -sf /usr/X11R6/include/X11 /usr/include/X11</userinput></screen></para>
+ln -sf /usr/X11R6/include/X11 /usr/include/X11</command></userinput></screen>
 
 </sect3>
 
 <sect3>
-<title>Updating Direct Rendering Infrastructure (DRI)</title>
-<para>If you have one of the supported DRI cards and have enabled DRI kernel modules as explained
+<title>Updating Direct Rendering Infrastructure (<acronym>DRI</acronym>)</title>
+<para>If you have one of the supported <acronym>DRI</acronym> cards and
+have enabled <acronym>DRI</acronym> kernel modules as explained
 above, you now need to update the kernel modules to ensure they are compatible with the
-current version of XFree86.  To do this, perform the following:</para>
-
-<para><screen><userinput>cd programs/Xserver/hw/xfree86/os-support/linux/drm/kernel &amp;&amp; 
+current version of <application>XFree86</application>.  To do this, perform the following:</para>
+
+<screen><userinput><command>cd programs/Xserver/hw/xfree86/os-support/linux/drm/kernel &amp;&amp; 
 make  CC=/opt/gcc-2.95.3/bin/gcc -f Makefile.linux  &amp;&amp; 
 mkdir -p /lib/modules/`uname -r`/kernel/drivers/char/drm/  &amp;&amp; 
 cp gamma.o radeon.o sis.o r128.o i810.o i830.o mga.o tdfx.o \
     /lib/modules/`uname -r`/kernel/drivers/char/drm/  &amp;&amp; 
-depmod -a</userinput></screen>
-</para>
+depmod -a</command></userinput></screen>
+
 <warning><para>If you recompile or upgrade your kernel, you will need to re-copy the 
 appropriate driver module(s)
-to the kernel module library and rerun depmod.</para></warning>
-
-<note><para>If you created AGP support as a module when compiling the kernel, you may
+to the kernel module library and rerun <command>depmod</command>.</para></warning>
+
+<note><para>If you created <acronym>AGP</acronym> support as a module when compiling the kernel, you may
 have to add a line to <filename>/etc/modules.conf</filename> to ensure
-the agpgart module is loaded.  For instance, the AGP version of the Radeon video card
+the agpgart module is loaded.  For instance, the <acronym>AGP</acronym> version of the Radeon video card
 will use the <filename>radeon.o</filename> driver.  It will
 need to have the line <screen>below radeon agpgart</screen> in 
-<filename>/etc/modules.conf</filename> to enable DRI support.</para></note>
+<filename>/etc/modules.conf</filename> to enable <acronym>DRI</acronym> support.</para></note>
 
 </sect3>
Index: x/installing/xfree86/xfree86-intro.xml
===================================================================
--- x/installing/xfree86/xfree86-intro.xml	(revision b9ad2f9af761d14d31a6c7462880a50c5393fff3)
+++ x/installing/xfree86/xfree86-intro.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
@@ -1,12 +1,12 @@
 <sect2>
-<title>Introduction to XFree86</title>
+<title>Introduction to <application>XFree86</application></title>
 
 <para><application>XFree86</application> is a freely redistributable open-source 
 implementation of the 
-X Window System. <application>XFree86</application> provides a client/server 
+<application>X</application> Window System. <application>XFree86</application> provides a client/server 
 interface between display 
 hardware (the mouse, keyboard, and video displays) and the desktop environment 
 while also providing both the windowing infrastructure and a standardized 
-application interface (API).</para>
+application interface (<acronym>API</acronym>).</para>
 
 <sect3><title>Package information</title>
@@ -29,10 +29,10 @@
 <para>The following packages are included in the <application>XFree86</application> package, 
 however they
-are updated more often than the XFree86 package and are highly recommended:
+are updated more often than the <application>XFree86</application> package and are highly recommended:
 <xref linkend="expat"/>, <xref linkend="freetype2"/> and <xref linkend="fontconfig"/></para>
 
 <note><para>If you choose to not install these separate packages, the
 <filename>host.def</filename> file below will have to be modified to
-instruct XFree86 build them.</para></note>
+instruct <application>XFree86</application> build them.</para></note>
 </sect4>
 
@@ -61,12 +61,14 @@
 There are also two packages <filename>doctools-1.3.1.tgz</filename>,  which 
 contain programs to regenerate hardcopy documentation, and 
-<filename>utils-1.1.0.tgz</filename>, which contain <filename>gnutar</filename>
-and <filename>zlib</filename> which are already installed on an LFS system.
+<filename>utils-1.1.0.tgz</filename>, which contain
+<application><acronym>GNU</acronym> <acronym>TAR</acronym></application>
+and <application>zlib</application> which are already installed on an
+<acronym>LFS</acronym> system.
 </para>
 
 <para>To check your downloads for integrity, download the <filename>SUMS.md5sum</filename>
 file.  Then:
-<screen>md5sum X430src* &gt; md5sums &amp;&amp;
-diff md5sums SUMS.md5sum</screen>
+<screen><userinput><command>md5sum X430src* &gt; md5sums &amp;&amp;
+diff md5sums SUMS.md5sum</command></userinput></screen>
 The only differences you should see are for <filename>README</filename>, 
 <filename>doctools-1.3.1.tgz</filename>, and
@@ -75,12 +77,12 @@
 </para>
 
-<para>The fixes subdirectory also has a SUMS.md5sum and this can be checked against
+<para>The fixes subdirectory also has a <filename>SUMS.md5sum</filename> and this can be checked against
 the patch file:
 <screen><filename>md5sum 4.3.0-4.3.0.1.diff.gz</filename></screen></para>
 
 <para>After unpacking the <filename>X430src-?.tgz</filename> files, change to the 
-<filename>xc</filename> directory and run:
-<screen>gunzip 4.3.0-4.3.0.1.diff.gz &amp;&amp;
-patch -Np1 -i 4.3.0-4.3.0.1.diff</screen></para>
+<filename class="directory">xc</filename> directory and run:
+<screen><userinput><command>gunzip 4.3.0-4.3.0.1.diff.gz &amp;&amp;
+patch -Np1 -i 4.3.0-4.3.0.1.diff</command></userinput></screen></para>
 
 </sect3>
