Index: gnome/core/gnome-desktop/gnome-desktop-intro.xml
===================================================================
--- gnome/core/gnome-desktop/gnome-desktop-intro.xml	(revision 48d4c920ac585a763e3b24cd378742eada7f72f7)
+++ gnome/core/gnome-desktop/gnome-desktop-intro.xml	(revision 2dae8b3d8664f02c71b0f22dd26c70dbd2c01f73)
@@ -30,5 +30,4 @@
 <para>
 <xref linkend="startup-notification"/>
-<!-- KDE -->
 </para></sect4>
 </sect3>
Index: gnome/core/gnome-panel/gnome-panel-intro.xml
===================================================================
--- gnome/core/gnome-panel/gnome-panel-intro.xml	(revision 48d4c920ac585a763e3b24cd378742eada7f72f7)
+++ gnome/core/gnome-panel/gnome-panel-intro.xml	(revision 2dae8b3d8664f02c71b0f22dd26c70dbd2c01f73)
@@ -29,5 +29,4 @@
 <xref linkend="gtk-doc"/> and
 <ulink url="http://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/">evolution-data-server</ulink>
-<!-- KDE -->
 </para></sect4>
 </sect3>
Index: gnome/core/scrollkeeper/scrollkeeper-exp.xml
===================================================================
--- gnome/core/scrollkeeper/scrollkeeper-exp.xml	(revision 48d4c920ac585a763e3b24cd378742eada7f72f7)
+++ gnome/core/scrollkeeper/scrollkeeper-exp.xml	(revision 2dae8b3d8664f02c71b0f22dd26c70dbd2c01f73)
@@ -12,5 +12,5 @@
 the static library from being built.</para>
 
-<para><parameter>--omfdirs=/usr/share/omf:/opt/gnome/share/omf:/opt/kde/share/omf:/opt/gnome-&gnome-version;/share/omf</parameter>:
+<para><parameter>--omfdirs=/usr/share/omf:/opt/kde-&kde-version;/share/omf:/opt/gnome-&gnome-version;/share/omf</parameter>:
 This switch sets all the locations for <filename>OMF</filename> files for scrollkeeper.</para>
 </sect2>
Index: gnome/core/scrollkeeper/scrollkeeper-inst.xml
===================================================================
--- gnome/core/scrollkeeper/scrollkeeper-inst.xml	(revision 48d4c920ac585a763e3b24cd378742eada7f72f7)
+++ gnome/core/scrollkeeper/scrollkeeper-inst.xml	(revision 2dae8b3d8664f02c71b0f22dd26c70dbd2c01f73)
@@ -7,5 +7,5 @@
     --localstatedir=/var --disable-static \
     --with-omfdirs=/usr/share/omf:/opt/gnome/share/omf:\
-/opt/kde/share/omf:/opt/gnome-&gnome-version;/share/omf &amp;&amp;
+/opt/kde-&kde-version;/share/omf:/opt/gnome-&gnome-version;/share/omf &amp;&amp;
 make &amp;&amp;
 make install</command></userinput></screen>
Index: index.xml
===================================================================
--- index.xml	(revision 48d4c920ac585a763e3b24cd378742eada7f72f7)
+++ index.xml	(revision 2dae8b3d8664f02c71b0f22dd26c70dbd2c01f73)
@@ -3,7 +3,7 @@
 	"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 
-<!ENTITY version "CVS-20040522">
-<!ENTITY releasedate "May 22nd, 2004">
-<!ENTITY pubdate "2004-05-22">
+<!ENTITY version "CVS-20040523">
+<!ENTITY releasedate "May 23rd, 2004">
+<!ENTITY pubdate "2004-05-23">
 <!ENTITY blfs-version "cvs">
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 48d4c920ac585a763e3b24cd378742eada7f72f7)
+++ introduction/welcome/changelog.xml	(revision 2dae8b3d8664f02c71b0f22dd26c70dbd2c01f73)
@@ -11,4 +11,8 @@
 
 <itemizedlist>
+
+<listitem><para>May 23rd, 2004 [tushar]: Use envvar KDE_PREFIX
+to allow the user to install KDE into /usr or /opt. Closes Bug
+760.</para></listitem>
 
 <listitem><para>May 19th, 2004 [igor]: Added winbind boot script,
Index: kde/core/arts.xml
===================================================================
--- kde/core/arts.xml	(revision 48d4c920ac585a763e3b24cd378742eada7f72f7)
+++ kde/core/arts.xml	(revision 2dae8b3d8664f02c71b0f22dd26c70dbd2c01f73)
@@ -6,5 +6,4 @@
 &arts-inst;
 &arts-exp;
-&arts-config;
 
 </sect1>
Index: kde/core/arts/arts-exp.xml
===================================================================
--- kde/core/arts/arts-exp.xml	(revision 48d4c920ac585a763e3b24cd378742eada7f72f7)
+++ kde/core/arts/arts-exp.xml	(revision 2dae8b3d8664f02c71b0f22dd26c70dbd2c01f73)
@@ -13,12 +13,3 @@
 up one time builds.</para>
 
-<para><command>ln -sfn kde-&kde-version; /opt/kde</command> : This
-parameter creates
-a link for access to <acronym>KDE</acronym>. If a newer version of
-<acronym>KDE</acronym> is released, the new
-system can be built by changing the <parameter>--prefix</parameter>
-location
-and then set up by changing the link as this parameter does.
-</para>
-
 </sect2>
Index: kde/core/arts/arts-inst.xml
===================================================================
--- kde/core/arts/arts-inst.xml	(revision 48d4c920ac585a763e3b24cd378742eada7f72f7)
+++ kde/core/arts/arts-inst.xml	(revision 2dae8b3d8664f02c71b0f22dd26c70dbd2c01f73)
@@ -8,13 +8,5 @@
     --disable-dependency-tracking &amp;&amp;
 make &amp;&amp;
-make install &amp;&amp;
-ln -sfn kde-&kde-version; /opt/kde</command></userinput></screen>
-
-<note><para>Another configure option is
-<parameter>--enable-final</parameter>.
-This option can speed up the build process, but requires a lot of
-memory.  If
-you have less than 256MB of RAM, this option may cause swapping and
-significantly slow compilation.</para></note>
+make install</command></userinput></screen>
 
 </sect2>
Index: kde/core/kdelibs.xml
===================================================================
--- kde/core/kdelibs.xml	(revision 48d4c920ac585a763e3b24cd378742eada7f72f7)
+++ kde/core/kdelibs.xml	(revision 2dae8b3d8664f02c71b0f22dd26c70dbd2c01f73)
@@ -6,5 +6,4 @@
 &kdelibs-inst;
 &kdelibs-exp;
-&kdelibs-config;
 &kdelibs-desc;
 
Index: kde/kde-intro.xml
===================================================================
--- kde/kde-intro.xml	(revision 48d4c920ac585a763e3b24cd378742eada7f72f7)
+++ kde/kde-intro.xml	(revision 2dae8b3d8664f02c71b0f22dd26c70dbd2c01f73)
@@ -13,12 +13,4 @@
 (multimedia, graphics etc).</para> 
 
-<para>As the instructions for compiling and installing <acronym>KDE</acronym> were developed,
-the options to <command>configure</command> were examined and the parameters
-presented are the most likely to compile correctly. In each of the packages,
-one other option to <command>configure</command> can be added: 
-<parameter>--enable-final</parameter>. This option can speed up the build 
-process, but requires a lot of memory. If you have less than 256MB of RAM, 
-this option may cause swapping and significantly slow compilation.</para>
-
 <para><acronym>KDE</acronym> also has many internationalization packages in the form of:
 <filename>kde-i18n-xx-&kde-version;.tar.bz2</filename>
@@ -26,4 +18,59 @@
 do not cover the installation of these packages here.</para>
 
+<para>There are two alternatives for installing <acronym>KDE</acronym>. Option one, that
+is used by most of the commercial distributions, is to
+install <acronym>KDE</acronym> in the standard system prefix: <filename>/usr</filename>.
+This option allows the use of KDE without the need for any additional configuration such
+as modification of various environment variables or configuration files. Option two is
+to install it in a unique prefix such as <filename>/opt/kde</filename> or
+<filename>/opt/kde-&kde-version;</filename>. This option allows for easy removal of
+the package.</para>
+
+<para>Based on your preference, set <envar>KDE_PREFIX</envar>.</para>
+<para>If <application><acronym>KDE</acronym></application> is your desktop of choice:</para>
+<screen><userinput><command>export KDE_PREFIX=/usr</command></userinput></screen>
+<para>If you want to try-out <application><acronym>KDE</acronym></application>:</para>
+<screen><userinput><command>export KDE_PREFIX=/opt/kde-&kde-version;</command></userinput></screen>
+
+<para>Remember to execute <command>ldconfig</command> after installation of libraries to
+update the library cache.</para>
+
+<para>If you are not installing <acronym>KDE</acronym> in <filename>/usr</filename> you will need to make some
+configuration changes:</para>
+
+<para>Add to your system or personal profile:</para>
+
+<screen><userinput><command>export PATH=$PATH:/opt/kde-&kde-version;/bin
+export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/kde-&kde-version;/lib/pkgconfig</command></userinput></screen>
+
+<para>Add to your <filename>/etc/ld.so.conf</filename>:</para>
+
+<screen><userinput><command>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF"</command>
+# Begin kde addition to /etc/ld.so.conf
+
+/opt/kde-&kde-version;/lib
+
+# End kde addition
+<command>EOF</command></userinput></screen>
+
+<para>Add to your <filename>/etc/man.conf</filename>:</para>
+
+<screen><userinput><command>cat &gt;&gt; /etc/man.conf &lt;&lt; "EOF"</command>
+# Begin kde addition to man.conf
+
+MANPATH /opt/kde-&kde-version;/man
+
+# End kde addition to man.conf
+<command>EOF</command></userinput></screen>
+
+<tip>
+<para>If you prefer installing <acronym>KDE</acronym> in <filename>/opt</filename>
+one trick to avoid the above configuration changes is to replace <filename>/opt/kde-&kde-version;</filename>
+with <filename>/opt/kde</filename> and to create a symlink from <filename>/opt/kde-&kde-version;</filename>
+to <filename>/opt/kde</filename>.</para>
+<screen><userinput><command>ln -sf &kde-version; /opt/kde</command></userinput></screen>
+</tip>
+
+<tip>
 <para>All the <acronym>KDE</acronym> packages are comprised of various components. 
 The default is to
@@ -39,11 +86,11 @@
 from the core packages is not advisable since it may result in an
 incomplete <acronym>KDE</acronym> installation.</para>
+</tip>
 
-<note><para><acronym>KDE</acronym> is a large and complicated set of packages.  In
-some cases, users have found fixes that have not made it into the official KDE
-sources yet.  If you have a problem with a specific application, take a look at
-the patches in <filename>http://www.linuxfromscratch.org/patches/downloads/kde*</filename>.
-The current patches will have the version number, &kde-version;, as a part of their 
-filename.</para></note>
+<note><para>In each of the packages,
+one other option to <command>configure</command> can be added: 
+<parameter>--enable-final</parameter>. This option can speed up the build 
+process, but requires a lot of memory. If you have less than 256MB of RAM, 
+this option may cause swapping and significantly slow compilation.</para></note>
 
 </partintro>
Index: kde/kde.ent
===================================================================
--- kde/kde.ent	(revision 48d4c920ac585a763e3b24cd378742eada7f72f7)
+++ kde/kde.ent	(revision 2dae8b3d8664f02c71b0f22dd26c70dbd2c01f73)
@@ -5,5 +5,8 @@
 <!ENTITY kde-download-http "http://mirrors.isc.org/pub/kde/stable/&kde-dldir;/src">
 <!ENTITY kde-download-ftp "ftp://ftp.kde.org/pub/kde/stable/&kde-dldir;/src">
-<!ENTITY kde-dir "/opt/kde-&kde-version;">
+<!ENTITY kde-dir "$KDE_PREFIX">
+
+<!-- KDE Intro -->
+<!ENTITY kde-intro SYSTEM "kde-intro.xml">
 
 <!-- KDE Core Packages -->
Index: x/lib/qt.xml
===================================================================
--- x/lib/qt.xml	(revision 48d4c920ac585a763e3b24cd378742eada7f72f7)
+++ x/lib/qt.xml	(revision 2dae8b3d8664f02c71b0f22dd26c70dbd2c01f73)
@@ -74,5 +74,5 @@
 bash
 export PATH=$PWD/bin:$PATH &amp;&amp;
-export LD_LIBRARY_PATH=$PWD/lib &amp;&amp;
+export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH &amp;&amp;
 ./configure -prefix /usr -docdir /usr/share/doc/qt \
     -headerdir /usr/include/qt -plugindir /usr/lib/qt/plugins \
@@ -107,5 +107,5 @@
 <screen><userinput><command>bash
 export QTDIR=$PWD &amp;&amp;
-export LD_LIBRARY_PATH=$PWD/lib &amp;&amp;
+export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH &amp;&amp;
 export PATH=$PWD/bin:$PATH &amp;&amp;
 ./configure -prefix /opt/qt-&qt-version; -qt-gif -system-libpng \
@@ -143,4 +143,10 @@
 # End qt addition to man.conf
 EOF</command></userinput></screen>
+
+<para>Also, <envar>QTDIR</envar> needs to be set when compiling packages that depend on Qt.
+Add the following so that it is available when compiling packages.</para>
+
+<screen><userinput>export QTDIR=/opt/qt</userinput></screen>
+
 </sect4>
 </sect3>
@@ -160,6 +166,6 @@
 defines where the root of the Qt directory is located.</para>
 
-<para><command>export LD_LIBRARY_PATH=$PWD/lib</command>: This command 
-sets up the location of libraries for the build process.</para>
+<para><command>export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH</command>: This command 
+allows the not yet installed qt libraries to be used by the not yet installed qt programs.</para>
 
 <para><command>export PATH=$PWD/bin:$PATH</command>: This command 
