Index: general/genlib/mcs.xml
===================================================================
--- general/genlib/mcs.xml	(revision f802f90201e35582cd6caaa12ab8c88e6ef855a1)
+++ general/genlib/mcs.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
@@ -66,6 +66,6 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="GConf"/> and
-    <xref linkend="kdelibs"/></para>
+    <para role="optional"><xref linkend="GConf"/> 
+    <!-- <xref linkend="kdelibs"/> --></para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -95,16 +95,16 @@
     <title>Command Explanations</title>
 
-    <para><option>--with-qt-path=/usr/share/qt</option>: If you have
+    <!-- <para><option>- -with-qt-path=/usr/share/qt</option>: If you have
     <xref linkend="kdelibs"/> installed, you must pass
     additional parameters to the <command>configure</command> script to
     identify the location of Qt and, possibly, KDE libraries and interface
-    headers.</para>
-
-    <para><option>--disable-kconfig</option>: If <filename>configure</filename>
+    headers.</para>-->
+
+    <!-- <para><option>- -disable-kconfig</option>: If <filename>configure</filename>
     finds <filename class="libraryfile">libkdecore</filename> from
     <application>kdelibs</application>, it does not test to check it is indeed
     the <application>kde3</application> version and will try to use it (and
     fail if it is the <application>kde4</application> version). This switch will
-    prevent that.</para>
+    prevent that.</para>-->
 
     <para>For additional information about the various storage backends
Index: general/genutils/pinentry.xml
===================================================================
--- general/genutils/pinentry.xml	(revision f802f90201e35582cd6caaa12ab8c88e6ef855a1)
+++ general/genutils/pinentry.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
@@ -80,5 +80,5 @@
     <para role="optional"><!-- <xref linkend="GTK"/>, -->
     <xref linkend="gtk2"/>,
-    <xref linkend="qt"/> or <xref linkend="qt4"/>, and
+    <!-- <xref linkend="qt"/> or --><xref linkend="qt4"/>, and
     <xref linkend="libcap2"/></para>
 
Index: general/graphlib/graphlib.xml
===================================================================
--- general/graphlib/graphlib.xml	(revision f802f90201e35582cd6caaa12ab8c88e6ef855a1)
+++ general/graphlib/graphlib.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
@@ -37,5 +37,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="exiv2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fribidi.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="poppler-014.xml"/>
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="poppler-014.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="poppler.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="jasper.xml"/>
Index: general/prog/doxygen.xml
===================================================================
--- general/prog/doxygen.xml	(revision f802f90201e35582cd6caaa12ab8c88e6ef855a1)
+++ general/prog/doxygen.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
@@ -88,8 +88,9 @@
     <title>Installation of Doxygen</title>
 
+<!--
     <note><para>If you have both <xref linkend='qt'/> and <xref linkend='qt4'/>
     installed, be sure to set the environment variable QTDIR to point to the
     <application>Qt4</application> top level directory if you add the
-    <option>--with-doxywizard</option> option.</para></note>
+    <option>- -with-doxywizard</option> option.</para></note> -->
 
     <para>Install <application>Doxygen</application> by running the following
Index: general/sysutils/dbus-bindings.xml
===================================================================
--- general/sysutils/dbus-bindings.xml	(revision f802f90201e35582cd6caaa12ab8c88e6ef855a1)
+++ general/sysutils/dbus-bindings.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
@@ -18,5 +18,5 @@
   <!ENTITY dbus-python-buildsize     "5.5 MB">
   <!ENTITY dbus-python-time          "0.2 SBU">
-
+<!--
   <!ENTITY dbus-qt3-download-http "&trinity-repo-http;/dbus-tqt-&trinity-version;.tar.gz">
   <!ENTITY dbus-qt3-download-ftp  "&trinity-repo-ftp;/dbus-tqt-&trinity-version;.tar.gz">
@@ -25,5 +25,5 @@
   <!ENTITY dbus-qt3-buildsize     "4 MB">
   <!ENTITY dbus-qt3-time          "less than 0.1 SBU">
-
+-->
   <!ENTITY eggdbus-download-http   "http://hal.freedesktop.org/releases/eggdbus-&eggdbus-version;.tar.gz">
   <!ENTITY eggdbus-download-ftp    " ">
@@ -74,7 +74,7 @@
         <para><xref linkend="dbus-python"/></para>
       </listitem>
-      <listitem>
+      <!-- <listitem>
         <para><xref linkend="dbus-qt3"/></para>
-      </listitem>
+      </listitem>-->
       <listitem>
         <para><xref linkend="eggdbus"/></para>
@@ -329,4 +329,5 @@
 
   <!-- Begin D-Bus Qt3 Bindings -->
+  <!--
   <sect2 id="dbus-qt3" xreflabel="D-Bus Trinity Qt3 Bindings-&dbus-qt3-version;">
   <title>Trinity D-Bus Qt3 Bindings</title>
@@ -439,6 +440,6 @@
 
     </sect3>
-
   </sect2>
+-->
 
   <!-- Begin D-Bus GObject Bindings (EggDBus) -->
Index: index.xml
===================================================================
--- index.xml	(revision f802f90201e35582cd6caaa12ab8c88e6ef855a1)
+++ index.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
@@ -22,5 +22,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="server/server.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x/x.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde/kde.xml"/>
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde/kde.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde4/kde4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome/gnome.xml"/>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision f802f90201e35582cd6caaa12ab8c88e6ef855a1)
+++ introduction/welcome/changelog.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
@@ -46,7 +46,10 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Remove Trinity/KDE3, Qt3, and related packages.</para>
+        </listitem>
+        <listitem>
           <para>[rthomsen] - Modified MySQL instructions to install shared libraries.</para>
         </listitem>
-	<listitem>
+        <listitem>
           <para>[rthomsen] - Poppler 0.18.4.</para>
         </listitem>
@@ -78,13 +81,13 @@
       <para>March 24th, 2012</para>
       <itemizedlist>
-	<listitem>
+   <listitem>
           <para>[rthomsen] - Added information about further KDE4 packages.</para>
-	</listitem>
+   </listitem>
         <listitem>
           <para>[rthomsen] - Removed kdesdk, kdewebdev, kdevplatform and kdevelop.</para>
-	</listitem>
+   </listitem>
         <listitem>
           <para>[rthomsen] - Removed kdetoys, kdegames, kdeedu and kdeaccessibility.</para>
-        </listitem>	
+        </listitem>  
          <listitem>
           <para>[rthomsen] - Added instructions for starting KDE4.</para>
@@ -93,5 +96,5 @@
           <para>[rthomsen] - Kdepim-runtime 4.8.1.</para>
         </listitem>
-	<listitem>
+   <listitem>
           <para>[rthomsen] - Kdepim 4.8.1.</para>
         </listitem>
Index: introduction/welcome/which.xml
===================================================================
--- introduction/welcome/which.xml	(revision f802f90201e35582cd6caaa12ab8c88e6ef855a1)
+++ introduction/welcome/which.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
@@ -65,5 +65,5 @@
   portion of the book starts with a part talking about <xref linkend="x"/>. This
   part also deals with some generic X-based libraries (<xref linkend="x-lib"/>).
-  After this, <xref linkend="kde"/> and <xref linkend="gnome"/> are given their
+  After this, <xref linkend="kde4"/> and <xref linkend="gnome"/> are given their
   own parts which are followed by one on <xref linkend="xsoft"/>.</para>
 
Index: kde4/add/ark.xml
===================================================================
--- kde4/add/ark.xml	(revision f802f90201e35582cd6caaa12ab8c88e6ef855a1)
+++ kde4/add/ark.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
@@ -23,5 +23,5 @@
   <title>Ark-&ark-version;</title>
 
-  <indexterm zone="ark">
+  <indexterm zone="ark4">
     <primary sortas="a-ark">ark</primary>
   </indexterm>
Index: kde4/add/kate.xml
===================================================================
--- kde4/add/kate.xml	(revision f802f90201e35582cd6caaa12ab8c88e6ef855a1)
+++ kde4/add/kate.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
@@ -23,5 +23,5 @@
   <title>Kate-&kate-version;</title>
 
-  <indexterm zone="kate">
+  <indexterm zone="kate4">
     <primary sortas="a-kate">kate</primary>
   </indexterm>
Index: kde4/add/kcalc.xml
===================================================================
--- kde4/add/kcalc.xml	(revision f802f90201e35582cd6caaa12ab8c88e6ef855a1)
+++ kde4/add/kcalc.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
@@ -23,5 +23,5 @@
   <title>Kcalc-&kcalc-version;</title>
 
-  <indexterm zone="kcalc">
+  <indexterm zone="kcalc4">
     <primary sortas="a-kcalc">kcalc</primary>
   </indexterm>
Index: kde4/add/konsole.xml
===================================================================
--- kde4/add/konsole.xml	(revision f802f90201e35582cd6caaa12ab8c88e6ef855a1)
+++ kde4/add/konsole.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
@@ -23,5 +23,5 @@
   <title>Konsole-&konsole-version;</title>
 
-  <indexterm zone="konsole">
+  <indexterm zone="konsole4">
     <primary sortas="a-konsole">konsole</primary>
   </indexterm>
Index: multimedia/audioutils/mpg123.xml
===================================================================
--- multimedia/audioutils/mpg123.xml	(revision f802f90201e35582cd6caaa12ab8c88e6ef855a1)
+++ multimedia/audioutils/mpg123.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
@@ -65,5 +65,5 @@
     <para role="optional">
     <xref linkend="alsa-lib"/>,
-    <xref linkend="arts"/>,
+    <!-- <xref linkend="arts"/>, -->
     <xref linkend="esound"/>,
     <xref linkend='pulseaudio'/>,
Index: multimedia/cdwriteutils/cdwriteutils.xml
===================================================================
--- multimedia/cdwriteutils/cdwriteutils.xml	(revision f802f90201e35582cd6caaa12ab8c88e6ef855a1)
+++ multimedia/cdwriteutils/cdwriteutils.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
@@ -41,5 +41,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udftools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dvd+rw-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="k3b.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="k3b.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorriso.xml"/>
 
Index: multimedia/libdriv/alsa-tools.xml
===================================================================
--- multimedia/libdriv/alsa-tools.xml	(revision f802f90201e35582cd6caaa12ab8c88e6ef855a1)
+++ multimedia/libdriv/alsa-tools.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
@@ -71,6 +71,6 @@
         <command>rmedigicontrol</command>),
       <ulink url="http://www.fltk.org/">FLTK</ulink> 
-        (to build <command>hdspconf</command> and <command>hdspmixer</command>), and
-      <xref linkend="qt"/> (to build <command>qlo10k1</command>).
+        (to build <command>hdspconf</command> and <command>hdspmixer</command>) <!-- , and
+      <xref linkend="qt"/> (to build <command>qlo10k1</command>).-->
     </para>
 
Index: multimedia/libdriv/esound.xml
===================================================================
--- multimedia/libdriv/esound.xml	(revision f802f90201e35582cd6caaa12ab8c88e6ef855a1)
+++ multimedia/libdriv/esound.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
@@ -65,5 +65,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="alsa-lib"/>,
-    <xref linkend="arts"/>,
+    <!-- <xref linkend="arts"/>, -->
     <xref linkend="tcpwrappers"/>, and
     <xref linkend="docbook-utils"/> (Required for building the html documentation)</para>
Index: multimedia/libdriv/libao.xml
===================================================================
--- multimedia/libdriv/libao.xml	(revision f802f90201e35582cd6caaa12ab8c88e6ef855a1)
+++ multimedia/libdriv/libao.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
@@ -69,5 +69,5 @@
       <xref linkend="esound"/>,
       <xref linkend="alsa"/>,
-      <xref linkend="arts"/>, and
+      <!-- <xref linkend="arts"/>, --> and
       <xref linkend='pulseaudio'/> (requires <xref linkend='libatomic_ops'/>
       on x86)
Index: multimedia/libdriv/libdriv.xml
===================================================================
--- multimedia/libdriv/libdriv.xml	(revision f802f90201e35582cd6caaa12ab8c88e6ef855a1)
+++ multimedia/libdriv/libdriv.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
@@ -29,5 +29,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-firmware.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-oss.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="arts.xml"/>
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="arts.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="audiofile.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="esound.xml"/>
Index: multimedia/libdriv/sdl.xml
===================================================================
--- multimedia/libdriv/sdl.xml	(revision f802f90201e35582cd6caaa12ab8c88e6ef855a1)
+++ multimedia/libdriv/sdl.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
@@ -65,5 +65,5 @@
       <xref linkend="esound"/>,
       <xref linkend='pulseaudio'/>
-      <xref linkend="arts"/>,
+      <!-- <xref linkend="arts"/>, -->
       <xref linkend="NASM"/>,
       <xref linkend="libusb"/>,
Index: multimedia/videoutils/avifile.xml
===================================================================
--- multimedia/videoutils/avifile.xml	(revision f802f90201e35582cd6caaa12ab8c88e6ef855a1)
+++ multimedia/videoutils/avifile.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
@@ -90,5 +90,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="qt"/> and
+    <para role="required"><!-- <xref linkend="qt"/> and -->
     <xref linkend="sdl"/></para>
 
Index: multimedia/videoutils/mplayer.xml
===================================================================
--- multimedia/videoutils/mplayer.xml	(revision f802f90201e35582cd6caaa12ab8c88e6ef855a1)
+++ multimedia/videoutils/mplayer.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
@@ -161,5 +161,5 @@
     <para role="optional">
       <xref linkend="alsa"/>,
-      <xref linkend="arts"/>,
+      <!-- <xref linkend="arts"/>, -->
       <xref linkend="esound"/>,
       <xref linkend='pulseaudio'/>,  
Index: networking/mailnews/other.xml
===================================================================
--- networking/mailnews/other.xml	(revision f802f90201e35582cd6caaa12ab8c88e6ef855a1)
+++ networking/mailnews/other.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
@@ -18,9 +18,9 @@
   <para><xref linkend="pan"/> is a GTK2 based newsreader program.</para>
 
-  <para><command>knode</command> is a <application>Qt</application> based
-  newsreader program from <xref linkend="kdepim"/>.</para>
+  <!--<para><command>knode</command> is a <application>Qt</application> based
+  newseader program from <xref linkend="kdepim"/>.</para>-->
 
-  <para><command>kmail</command> is a <application>Qt</application> based mail
-  client from <xref linkend="kdepim"/>.</para>
+  <!--<para><command>kmail</command> is a <application>Qt</application> based mail
+  client from <xref linkend="kdepim"/>.</para>-->
 
   <para><xref linkend="balsa"/> is a GTK2 based mail client.</para>
Index: networking/netutils/avahi.xml
===================================================================
--- networking/netutils/avahi.xml	(revision f802f90201e35582cd6caaa12ab8c88e6ef855a1)
+++ networking/netutils/avahi.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
@@ -63,5 +63,5 @@
         url="&patch-root;/avahi-&avahi-version;-lfs_initscript_fixes-1.patch"/></para>
       </listitem>
-    </itemizedlist>-->
+    </itemizedlist> -->
 
     <bridgehead renderas="sect3">avahi Dependencies</bridgehead>
@@ -83,5 +83,5 @@
     <para role="optional">
     <xref linkend="libdaemon"/>,
-    <xref linkend="qt"/>, and
+    <!-- <xref linkend="qt"/>,--> and
     <xref linkend="qt4"/></para>
 
Index: pst/ps/ps.xml
===================================================================
--- pst/ps/ps.xml	(revision f802f90201e35582cd6caaa12ab8c88e6ef855a1)
+++ pst/ps/ps.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
@@ -28,5 +28,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fop.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="paps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="other.xml"/>
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="other.xml"/> -->
 
 </chapter>
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision f802f90201e35582cd6caaa12ab8c88e6ef855a1)
+++ x/lib/lib.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
@@ -25,5 +25,5 @@
   assist programmers by supplying common elements.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt.xml"/>
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cairo.xml"/>
Index: x/lib/qt4.xml
===================================================================
--- x/lib/qt4.xml	(revision f802f90201e35582cd6caaa12ab8c88e6ef855a1)
+++ x/lib/qt4.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
@@ -253,5 +253,5 @@
 ldconfig</userinput></screen>
 
-      <indexterm zone="qt qt4-config">
+      <indexterm zone="qt4 qt4-config">
         <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
       </indexterm>
Index: xsoft/graphweb/graphweb.xml
===================================================================
--- xsoft/graphweb/graphweb.xml	(revision f802f90201e35582cd6caaa12ab8c88e6ef855a1)
+++ xsoft/graphweb/graphweb.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
@@ -22,5 +22,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="firefox.xml"/>
   <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="galeon.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="konq.xml"/>
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="konq.xml"/> -->
   <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dillo.xml"/> -->
 
Index: xsoft/suites/openoffice.xml
===================================================================
--- xsoft/suites/openoffice.xml	(revision f802f90201e35582cd6caaa12ab8c88e6ef855a1)
+++ xsoft/suites/openoffice.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
@@ -129,5 +129,5 @@
     <xref linkend="evolution"/>,
     <!--<xref linkend="gnome-vfs"/> (should use \-\-enable-gio instead),-->
-    <xref linkend="kde"/>,
+    <!-- <xref linkend="kde"/>, -->
     <xref linkend="libjpeg"/>,
     <ulink url="http://www.mega-nerd.com/libsndfile/">libsndfile</ulink>,
Index: xsoft/suites/suites.xml
===================================================================
--- xsoft/suites/suites.xml	(revision f802f90201e35582cd6caaa12ab8c88e6ef855a1)
+++ xsoft/suites/suites.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
@@ -21,5 +21,5 @@
   applications.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="koffice.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="koffice.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openoffice.xml"/>
 
