Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 8d237953ea2be2e568cfd67d21a559c5d6f18228)
+++ introduction/welcome/changelog.xml	(revision 048bc8ccd8cdf875eb2d36c0fa61ceb54f386718)
@@ -54,4 +54,9 @@
           section.</para>
         </listitem>
+        <listitem>
+          <para>[dnicholson] - Commented out the sun video drivers and
+          deprecated modules in the Xorg wget lists and changed the
+          download commands to support the comments.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
Index: x/installing/x7app.xml
===================================================================
--- x/installing/x7app.xml	(revision 8d237953ea2be2e568cfd67d21a559c5d6f18228)
+++ x/installing/x7app.xml	(revision 048bc8ccd8cdf875eb2d36c0fa61ceb54f386718)
@@ -97,6 +97,6 @@
 mkdir app &amp;&amp;
 cd app &amp;&amp;
-wget -B http://xorg.freedesktop.org/releases/individual/app/ \
-     -i ../app-&xorg7-version;.wget</userinput></screen>
+grep -v '^#' ../app-&xorg7-version;.wget | wget -i- \
+    -B http://xorg.freedesktop.org/releases/individual/app/</userinput></screen>
 
   </sect2>
@@ -104,7 +104,4 @@
   <sect2 role="installation">
     <title>Installation of Xorg Applications</title>
-
-    <warning><para>The <application>mkcfm</application> package is
-    deprecated and should not be installed.</para></warning>
 
     <para>Install the applications by running the following commands for each
Index: x/installing/x7data.xml
===================================================================
--- x/installing/x7data.xml	(revision 8d237953ea2be2e568cfd67d21a559c5d6f18228)
+++ x/installing/x7data.xml	(revision 048bc8ccd8cdf875eb2d36c0fa61ceb54f386718)
@@ -76,6 +76,6 @@
 mkdir data &amp;&amp;
 cd data &amp;&amp;
-wget -B http://xorg.freedesktop.org/releases/individual/data/ \
-     -i ../data-&xorg7-version;.wget</userinput></screen>
+grep -v '^#' ../data-&xorg7-version;.wget | wget -i- \
+    -B http://xorg.freedesktop.org/releases/individual/data/</userinput></screen>
 
   </sect2>
@@ -83,8 +83,4 @@
   <sect2 role="installation">
     <title>Installation of Xorg Data</title>
-
-    <warning><para>The <application>xkbdata</application> package is
-    deprecated and should not be installed. It has been replaced by
-    <xref linkend="xkeyboard-config"/>.</para></warning>
 
     <para>Compile the selected packages with the following commands:</para>
Index: x/installing/x7driver.xml
===================================================================
--- x/installing/x7driver.xml	(revision 8d237953ea2be2e568cfd67d21a559c5d6f18228)
+++ x/installing/x7driver.xml	(revision 048bc8ccd8cdf875eb2d36c0fa61ceb54f386718)
@@ -78,6 +78,6 @@
 mkdir driver &amp;&amp;
 cd driver &amp;&amp;
-wget -B http://xorg.freedesktop.org/releases/individual/driver/ \
-     -i ../driver-&xorg7-version;.wget</userinput></screen>
+grep -v '^#' ../driver-&xorg7-version;.wget | wget -i- \
+    -B http://xorg.freedesktop.org/releases/individual/driver/</userinput></screen>
 
   </sect2>
@@ -91,5 +91,6 @@
     exported from the kernel.  Failure to follow this warning will result
     in a display lockup, which requires a hard reboot, when configuring
-    <application>Xorg</application> for the first time.</para></warning>
+    <application>Xorg</application> for the first time. For this reason,
+    these drivers have been commented out in the wget file.</para></warning>
 
     <para>Install the drivers by running the following commands for each
Index: x/installing/x7font.xml
===================================================================
--- x/installing/x7font.xml	(revision 8d237953ea2be2e568cfd67d21a559c5d6f18228)
+++ x/installing/x7font.xml	(revision 048bc8ccd8cdf875eb2d36c0fa61ceb54f386718)
@@ -73,6 +73,6 @@
 mkdir font &amp;&amp;
 cd font &amp;&amp;
-wget -B http://xorg.freedesktop.org/releases/individual/font/ \
-     -i ../font-&xorg7-version;.wget</userinput></screen>
+grep -v '^#' ../font-&xorg7-version;.wget | wget -i- \
+    -B http://xorg.freedesktop.org/releases/individual/font/</userinput></screen>
 
   </sect2>
Index: x/installing/x7lib.xml
===================================================================
--- x/installing/x7lib.xml	(revision 8d237953ea2be2e568cfd67d21a559c5d6f18228)
+++ x/installing/x7lib.xml	(revision 048bc8ccd8cdf875eb2d36c0fa61ceb54f386718)
@@ -100,6 +100,6 @@
 mkdir lib &amp;&amp;
 cd lib &amp;&amp;
-wget -B http://xorg.freedesktop.org/releases/individual/lib/ \
-     -i ../lib-&xorg7-version;.wget</userinput></screen>
+grep -v '^#' ../lib-&xorg7-version;.wget | wget -i- \
+    -B http://xorg.freedesktop.org/releases/individual/lib/</userinput></screen>
 
   </sect2>
Index: x/installing/x7proto.xml
===================================================================
--- x/installing/x7proto.xml	(revision 8d237953ea2be2e568cfd67d21a559c5d6f18228)
+++ x/installing/x7proto.xml	(revision 048bc8ccd8cdf875eb2d36c0fa61ceb54f386718)
@@ -76,6 +76,6 @@
 mkdir proto &amp;&amp;
 cd proto &amp;&amp;
-wget -B http://xorg.freedesktop.org/releases/individual/proto/ \
-     -i ../proto-&xorg7-version;.wget</userinput></screen>
+grep -v '^#' ../proto-&xorg7-version;.wget | wget -i- \
+    -B http://xorg.freedesktop.org/releases/individual/proto/</userinput></screen>
 
   </sect2>
Index: x/installing/x7util.xml
===================================================================
--- x/installing/x7util.xml	(revision 8d237953ea2be2e568cfd67d21a559c5d6f18228)
+++ x/installing/x7util.xml	(revision 048bc8ccd8cdf875eb2d36c0fa61ceb54f386718)
@@ -78,6 +78,6 @@
 mkdir util &amp;&amp;
 cd util &amp;&amp;
-wget -B http://xorg.freedesktop.org/releases/individual/util/ \
-     -i ../util-&xorg7-version;.wget</userinput></screen>
+grep -v '^#' ../util-&xorg7-version;.wget | wget -i- \
+    -B http://xorg.freedesktop.org/releases/individual/util/</userinput></screen>
 
   </sect2>
Index: x/installing/xorg7.xml
===================================================================
--- x/installing/xorg7.xml	(revision 8d237953ea2be2e568cfd67d21a559c5d6f18228)
+++ x/installing/xorg7.xml	(revision 048bc8ccd8cdf875eb2d36c0fa61ceb54f386718)
@@ -61,5 +61,7 @@
     should download the wget file lists.  The list of files are ordered by
     dependency, and the package versions listed in the files are known to
-    work well with each other.  Newer packages are likely intended for the
+    work well with each other. Further, the wget file lists contain comments
+    for specific packages that are deprecated or are not recommended to
+    install. Newer packages are likely intended for the
     next release of <application>Xorg</application> and have already proved
     to be incompatible with current versions of software installed in BLFS.
@@ -82,5 +84,5 @@
 
 <screen>bash -e #exit on all errors
-for package in $(cat ../wgetlist.wget)
+for package in $(grep -v '^#' ../wgetlist.wget)
 do
   packagedir=$(echo $package | sed 's/.tar.bz2//')
