Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 9ae8612016ab62ecbbb07f781d04b620e353608c)
+++ introduction/welcome/changelog.xml	(revision 8d237953ea2be2e568cfd67d21a559c5d6f18228)
@@ -50,4 +50,8 @@
           DJ Lucas.</para>
         </listitem>
+        <listitem>
+          <para>[dnicholson] - Streamlined the commands for each Xorg
+          section.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
Index: x/installing/x7app.xml
===================================================================
--- x/installing/x7app.xml	(revision 9ae8612016ab62ecbbb07f781d04b620e353608c)
+++ x/installing/x7app.xml	(revision 8d237953ea2be2e568cfd67d21a559c5d6f18228)
@@ -11,4 +11,7 @@
   <!ENTITY x7apps-buildsize     "30.7 MB">
   <!ENTITY x7apps-time          "2.9 SBU">
+
+  <!-- Versions for patches -->
+  <!ENTITY xload-version        "1.0.1">
 
 ]>
@@ -63,5 +66,5 @@
       <listitem>
         <para>Required patch: <ulink
-        url="&patch-root;/xload-1.0.1-setuid-1.patch"/></para>
+        url="&patch-root;/xload-&xload-version;-setuid-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -105,16 +108,13 @@
     deprecated and should not be installed.</para></warning>
 
-    <para>A <ulink url='http://wiki.x.org/wiki/Development/Security'>security
-    vulnerability</ulink> has been identified in the xload package.
-    Before building this package with the commands
-    shown below, be sure to apply the supplied patches. The patch can be
-    applied with with the following command:</para>
-
-<screen><userinput>patch -Np1 -i ../xload-1.0.1-setuid-1.patch</userinput></screen>
-
     <para>Install the applications by running the following commands for each
-    chosen package:</para>
-
-<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
+    package:</para>
+
+<screen><userinput>case $(basename "$PWD") in
+xload-&xload-version; )
+    patch -Np1 -i ../xload-&xload-version;-setuid-1.patch
+    ;;
+esac &amp;&amp;
+./configure $XORG_CONFIG &amp;&amp;
 make</userinput></screen>
 
@@ -125,4 +125,14 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>patch -Np1 -i
+    ../xload-&xload-version;-setuid-1.patch</command>: This patch fixes a
+    <ulink url='http://wiki.x.org/wiki/Development/Security'>security
+    vulnerability</ulink> that has been identified in the xload package.</para>
 
   </sect2>
Index: x/installing/x7driver.xml
===================================================================
--- x/installing/x7driver.xml	(revision 9ae8612016ab62ecbbb07f781d04b620e353608c)
+++ x/installing/x7driver.xml	(revision 8d237953ea2be2e568cfd67d21a559c5d6f18228)
@@ -86,19 +86,4 @@
     <title>Installation of Xorg Drivers</title>
 
-    <para>The <application>xf86-input-evdev</application>,
-    <application>xf86-video-ati</application>,
-    <application>xf86-video-fbdev</application>,
-    <application>xf86-video-glint</application>, and
-    <application>xf86-video-newport</application> packages install
-    man pages in UTF-8 encoding, and they will not display correctly
-    using <application>Man-DB</application>. Issue the following
-    command before building these packages to replace the offending
-    characters with ones that <command>man</command> can properly
-    display.</para>
-
-<screen><userinput>sed -i -e "s/\xc3\xb8/\\\\[\/o]/" \
-       -e "s/\xc3\xa4/\\\\[:a]/" \
-       -e "s/\xc3\x9c/\\\\[:U]/" man/*.man</userinput></screen>
-
     <warning><para>It is very important not to build display drivers that
     cannot be used with your hardware.  For instance, do not build Sun drivers
@@ -111,5 +96,14 @@
     package:</para>
 
-<screen><userinput>./configure $XORG_CONFIG \
+<screen><userinput>case $(basename "$PWD") in
+xf86-input-evdev-[0-9]* | xf86-video-ati-[0-9]* | \
+xf86-video-fbdev-[0-9]* | xf86-video-glint-[0-9]* | \
+xf86-video-newport-[0-9]* )
+    sed -i -e "s/\xc3\xb8/\\\\[\/o]/" \
+           -e "s/\xc3\xa4/\\\\[:a]/" \
+           -e "s/\xc3\x9c/\\\\[:U]/" man/*.man
+    ;;
+esac &amp;&amp;
+./configure $XORG_CONFIG \
     --with-xorg-module-dir=$XORG_PREFIX/lib/X11/modules &amp;&amp;
 make</userinput></screen>
@@ -126,4 +120,10 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para><command>sed -i ... man/*.man</command>: A few packages install
+    man pages in UTF-8 encoding, and they will not display correctly
+    using <application>Man-DB</application>. This command converts the
+    offending characters to ones that <command>man</command> can properly
+    display.</para>
 
     <para><parameter>--with-xorg-module-dir=...</parameter>: This switch
Index: x/installing/x7lib.xml
===================================================================
--- x/installing/x7lib.xml	(revision 9ae8612016ab62ecbbb07f781d04b620e353608c)
+++ x/installing/x7lib.xml	(revision 8d237953ea2be2e568cfd67d21a559c5d6f18228)
@@ -11,4 +11,8 @@
   <!ENTITY x7libs-buildsize     "186 MB">
   <!ENTITY x7libs-time          "6.6 SBU">
+
+  <!-- Versions for patches -->
+  <!ENTITY libX11-version       "1.1.1">
+  <!ENTITY libXfont-version     "1.2.7">
 
 ]>
@@ -62,9 +66,9 @@
       <listitem>
         <para>Required patch: <ulink
-        url="&patch-root;/libX11-1.1.1-xinitimage-1.patch"/></para>
+        url="&patch-root;/libX11-&libX11-version;-xinitimage-1.patch"/></para>
       </listitem>
       <listitem>
         <para>Required patch: <ulink
-        url="&patch-root;/libXfont-1.2.7-bdf_fontsdir-1.patch"/></para>
+        url="&patch-root;/libXfont-&libXfont-version;-bdf_fontsdir-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -104,22 +108,16 @@
     <title>Installation of Xorg Libraries</title>
 
-    <para><ulink url='http://wiki.x.org/wiki/Development/Security'>Security
-    vulnerabilities</ulink> have been identified in the
-    <application>libX11</application> and <application>libXfont</application>
-    packages. Before building these packages with the commands shown below,
-    be sure to apply the supplied patches. For <application>libX11</application>,
-    this can be done by issuing the following command:</para>
-
-<screen><userinput>patch -Np1 -i ../libX11-1.1.1-xinitimage-1.patch</userinput></screen>
-
-    <para>For <application>libXfont</application>, the patch can be applied
-    with the following command:</para>
-
-<screen><userinput>patch -Np1 -i ../libXfont-1.2.7-bdf_fontsdir-1.patch</userinput></screen>
-
     <para>Install the libraries by running the following commands for each
-    of the chosen packages:</para>
-
-<screen><userinput>./configure $XORG_CONFIG --without-xcb &amp;&amp;
+    package:</para>
+
+<screen><userinput>case $(basename "$PWD") in
+libX11-&libX11-version; )
+    patch -Np1 -i ../libX11-&libX11-version;-xinitimage-1.patch
+    ;;
+libXfont-&libXfont-version; )
+    patch -Np1 -i ../libXfont-&libXfont-version;-bdf_fontsdir-1.patch
+    ;;
+esac &amp;&amp;
+./configure $XORG_CONFIG &amp;&amp;
 make</userinput></screen>
 
@@ -141,4 +139,10 @@
     for it's transport layer unless this parameter is supplied. This parameter
     will be ignored for other packages.</para>
+
+    <para><command>patch -Np1 -i ...</command>: These commands apply patches
+    to fix <ulink url='http://wiki.x.org/wiki/Development/Security'>security
+    vulnerabilities</ulink> identified in the
+    <application>libX11</application> and <application>libXfont</application>
+    packages.</para>
 
   </sect2>
