Update help handbooks.

11 files changed, 212 insertions, 329 deletions

diff --git a/doc/faq/about.docbook b/doc/faq/about.docbook
index 9aa9c4908..d1055df2e 100644
--- a/doc/faq/about.docbook
+++ b/doc/faq/about.docbook
@@ -28,21 +28,17 @@ Read this <acronym>FAQ</acronym> (and other
 relevant documentation) well before asking questions on the various
 &tde; mailing lists or newsgroups.</para>
 
-<note><para>You might want to consider becoming a
-<acronym>FAQ</acronym> maintainer. Please refer to <xref
-linkend="FAQ-maintainer-HOWTO"/> for details.</para></note>
-
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question id="FAQ-maintainer-HOWTO">
-<para>How do I become a <acronym>FAQ</acronym> maintainer?</para>
+<para>How do I become an <acronym>FAQ</acronym> maintainer?</para>
 </question>
 
 <answer>
-<para>Actually, becoming an <acronym>FAQ</acronym> maintainer is easy
-and we are always grateful for new help. :-) Send
+<para>Becoming an <acronym>FAQ</acronym> maintainer is easy
+and we are always grateful for help. :-) Send
 us an email at <email>trinity-devel@lists.pearsoncomputing.net</email>.
 </para>
 </answer>
diff --git a/doc/faq/configtde.docbook b/doc/faq/configtde.docbook
index 8f687f69b..7ef125401 100644
--- a/doc/faq/configtde.docbook
+++ b/doc/faq/configtde.docbook
@@ -95,14 +95,14 @@ off secure</userinput>.</para>
 <question>
 
 <para>I would like to click the &LMB; anywhere on the
-desktop and have the <guimenu>K</guimenu> menu displayed.</para>
+desktop and have the <guimenu>TDE</guimenu> menu displayed.</para>
 </question>
 <answer>
 <para>Open the <application>&tde; Control Center</application> and
 choose <menuchoice><guisubmenu>Desktop</guisubmenu>
 <guisubmenu>Behavior</guisubmenu></menuchoice>.  You
 can now choose the behavior of mouse clicks on the desktop.  To have
-the <guimenu>K</guimenu> menu open from a single &LMB; click, change
+the <guimenu>TDE</guimenu> menu open from a single &LMB; click, change
 the entry labeled <guilabel>Left button</guilabel> to say
 <guilabel>Application Menu</guilabel>.</para>
 </answer>
diff --git a/doc/faq/desktop.docbook b/doc/faq/desktop.docbook
index 5c52f3e98..4c984b4ab 100644
--- a/doc/faq/desktop.docbook
+++ b/doc/faq/desktop.docbook
@@ -14,9 +14,9 @@
 </question>
 <answer>
 
-<para>Just choose the desired application from the <guimenu>K</guimenu> menu and drag and drop it to the Desktop.
+<para>Just choose the desired application from the <guimenu>TDE</guimenu> menu and drag and drop it to the Desktop.
 </para> 
-<para>For applications not listed in the <guimenu>K</guimenu> menu, 
+<para>For applications not listed in the <guimenu>TDE</guimenu> menu, 
 use the &RMB; on the desktop and choose <menuchoice><guimenuitem>Create New</guimenuitem><guisubmenu>File</guisubmenu>
 <guimenuitem>Link to Application...</guimenuitem></menuchoice> and fill in the configuration for the application you want to link to.
 </para>
diff --git a/doc/faq/filemng.docbook b/doc/faq/filemng.docbook
index 268d86e65..64f2e0622 100644
--- a/doc/faq/filemng.docbook
+++ b/doc/faq/filemng.docbook
@@ -93,7 +93,7 @@ open different types of files?</para></question>
 <answer>
 <para>In order to configure file associations, you should go to the
 &kcontrolcenter; and choose the item <guimenuitem>File
-Associations</guimenuitem> under the category <guimenu>KDE
+Associations</guimenuitem> under the category <guimenu>TDEDE
 Components</guimenu>.</para>
 <para>
 Suppose the default <acronym>PDF</acronym> viewer is now &kghostview; and
diff --git a/doc/faq/gettde.docbook b/doc/faq/gettde.docbook
index b44dc3195..73911e92d 100644
--- a/doc/faq/gettde.docbook
+++ b/doc/faq/gettde.docbook
@@ -14,8 +14,8 @@
 </question>
 <answer>
 <!-- This needs a rewrite including informations about the latest version (link to the info page?)-->
-<para>The easiest way to get &tde; is to install a &Linux; distribution or another &UNIX; operating system
-that ships with &tde;.
+<para>The easiest way to get &tde; is to install a &Linux; based distribution or another &UNIX; operating system
+that includes &tde;.
 You can find an up-to-date list of distributions that ship
 with &tde; <ulink url="http://www.trinitydesktop.org/">here</ulink>.</para>
 
diff --git a/doc/faq/index.docbook b/doc/faq/index.docbook
index 4a9d866d4..8a87318e8 100644
--- a/doc/faq/index.docbook
+++ b/doc/faq/index.docbook
@@ -94,12 +94,12 @@ maintain this &FAQ;.</para> </abstract>
 <chapter id="credits">
 <title>Credits and License</title>
 
-<para>The current &FAQ; maintainers are:</para>
+<!--<para>The current &FAQ; maintainers are:</para>
 
 <itemizedlist>
 <listitem><para>J Hall
 <email>jes.hall@kdemail.net</email></para></listitem>
-</itemizedlist>
+</itemizedlist>-->
 
 <para>Many of the answers in this &FAQ; are taken
 from the various &tde; mailing lists and newsgroups. Here is a
@@ -107,7 +107,7 @@ from the various &tde; mailing lists and newsgroups. Here is a
 answers that eventually appear in this &FAQ;.</para>
 
 <para>Special thanks go to the former &FAQ;
-maintainers, Rainer Endres and Mr. Lee Wee Tiong </para>
+maintainers, Rainer Endres, Mr. Lee Wee Tiong, and J. Hall. </para>
 
 
 <!-- TRANS:CREDIT_FOR_TRANSLATORS -->
diff --git a/doc/faq/install.docbook b/doc/faq/install.docbook
index 0192af04c..9b9bbbeb2 100644
--- a/doc/faq/install.docbook
+++ b/doc/faq/install.docbook
@@ -26,31 +26,25 @@ lists</ulink>) or newsgroups.</para>
 </question>
 <answer>
 
-<para>So you have heard the rumors. Or you have seen the screenshots.
-And you are dying to get hold of &tde;. But you know next to nothing
-about this whole <quote>alternative operating system</quote> business. Don't worry!
-You only need to do some (well, maybe not some) reading, that's
-all!</para>
-
-<para>&tde; does not run on any version of &Microsoft; &Windows; or OS/2 (yet). To run
-&tde;, you need to have a &UNIX; system. Please refer to <xref
+<para>You have heard rumors about &tde;. Or you have seen screenshots.
+You want test &tde;. Yet you know next to nothing
+about this whole <quote>alternate operating system</quote> business. Don't worry!
+You only need to do some (well, maybe not some) reading, that's all!</para>
+
+<para>&tde; does not run on any version of &Microsoft; &Windows;. To run
+&tde;, you need to have a &UNIX; operating system. Please refer to <xref
 linkend="platform"/> for more details.</para>
 
 <para>Decide on a platform and set it up for your system. This
-<acronym>FAQ</acronym> can not help you with this, since &tde;<ulink
-url="http://www.kde.org"> runs on many &UNIX;</ulink> platforms. </para>
-
-<!-- Taken out because we can not help with all platforms and KDEisnotLINUX -->
+<acronym>FAQ</acronym> can not help you with this, since &tde; is intended
+to run on many &UNIX; platforms.</para>
 
-<para>Finally, you are ready to commence the &tde; installation.
-Please start reading from the next section. To get &tde;, please
-refer to <xref linkend="where-to-get-tde"/>. Last but not least, if
-you encounter any problems while installing &tde;, please do not
+<para>To obtain &tde;, please refer to <xref linkend="where-to-get-tde"/>. If
+you encounter problems while installing &tde;, please do not
 hesitate to make use of the &tde; <link
 linkend="mailing-lists">mailing lists</link> and <link
-linkend="newsgroups">newsgroups</link>. But do bear this in mind: no
-question is too silly to ask, but some are too silly to answer,
-especially when they are already answered in this <acronym>FAQ</acronym>.</para>
+linkend="newsgroups">newsgroups</link>. No question is too silly to ask, but
+remember to first look for answers in this <acronym>FAQ</acronym>.</para>
 <para>Good luck and have fun!</para>
 
 </answer>
@@ -61,7 +55,7 @@ especially when they are already answered in this <acronym>FAQ</acronym>.</para>
 <para>What kind of hardware do I need to run &tde; ?</para>
 </question>
 <answer>
-<para>To run &tde; it is recommended that you have at least a pentium II processor, 64MB of memory and 500MB of free disk space for a basic installation. While &tde; may run on slower configurations than this, performance can be severely impaired. Generally, if your computer runs an &X-Server; already with other desktop environments or window managers it's probably fast enough to run &tde;.</para>
+<para>To run &tde; consider at least a Pentium III processor, 512MB of memory, and 500MB of free disk space for a basic installation. A full installation will require about 3GB of hard drive storage space. While &tde; will run on slower hardware, performance likely will require some patience. Generally, if your computer runs other desktop environments then the hardware probably is capable of running &tde;.</para>
 </answer>
 </qandaentry>
 
@@ -72,19 +66,15 @@ especially when they are already answered in this <acronym>FAQ</acronym>.</para>
 <answer>
 
 
-<para>You can find several kinds of binary and source packages for
-different distributions and operating systems on the &kde-ftp;. The
-binary packages are not made by the &tde; Team, but by the
-distributors themselves, or some dedicated individuals. Please refer to
-<ulink url="http://dot.kde.org/986933826/">&tde; Package Policy
-Explained</ulink> for information about the &tde; Package Policy. The
-only <quote>official</quote> release is the source tar.bz2
+<para>You can find binary and source packages for
+different distributions and operating systems on the
+<ulink url="http://www.trinitydesktop.org/installation.php">Trinity web site</ulink>.
+The binary packages are made by dedicated members of the &tde; community.
+The only <quote>official</quote> release is the source tarball
 packages. Please refer to the <filename>README</filename>s and
-<filename>INSTALL</filename>s in the several binaries folders. For
-a list of the available packages for a release, refer to the relevant
-info page. For the latest release this is the <ulink
-url="http://www.kde.org/info/3.4.1.php">&tde; 3.4.1 Info
-Page</ulink>.</para>
+<filename>INSTALL</filename>s in the several binaries folders.
+Find the latest stable release
+<ulink url="http://www.trinitydesktop.org/releases.php">here</ulink>.</para>
 
 </answer>
 </qandaentry>
@@ -97,16 +87,16 @@ Page</ulink>.</para>
 
 <!-- rewrite to make it more general, pointing to the according webpages? -->
 
-<para>For &tde; 3.4.1, you need the &Qt; library version 3.3 or greater.
-Please make sure you download the correct &Qt;. You will
+<para>You need the &Qt; library as provided by the &tde; developers. Previous
+versions of &Qt; will not work with the latest &tde;.
+Please ensure you download the correct &Qt;. You will
 also need the header files, if you want to compile &tde;
-yourself. They are all available, at no cost, from <ulink
-url="http://www.trolltech.com/products/download">http://www.trolltech.com/download</ulink>.
-In addition, there are optional libraries that might improve &tde; if
+yourself. They are all available, at no cost, from the <ulink
+url="http://www.trinitydesktop.org/">&tde; repository</ulink>.
+There are optional libraries that might improve &tde; if
 installed on your system. An example is OpenSSL which will enable
-&konqueror; to browse web pages securely and is needed in a version
->=0.9.6. These should be provided by your distributor; if not, ask
-for an update.</para>
+&konqueror; to browse web pages securely. These additional packages
+should be provided by your distributor.</para>
 
 </answer>
 </qandaentry>
@@ -116,11 +106,37 @@ for an update.</para>
 <para>Description of the base packages</para>
 </question>
 <answer>
-<para>The base distribution currently consists of twenty
+<para>The base distribution currently consists of several
 packages. Some are required, while others are optional. Each package
 is available in each of the aforementioned package formats.</para>
+
 <variablelist>
 <varlistentry>
+<term>tqt3</term>
+<listitem>
+<para>Required</para>
+<para>This package contains the foundational widget support needed by all
+&tde; applications.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>tqtinterface</term>
+<listitem>
+<para>Required</para>
+<para>Necessary for supporting subsequent versions of Qt.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>arts</term>
+<listitem>
+<para>Required</para>
+<para>The core sound system for &tde;</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
 <term>tdelibs</term>
 <listitem>
 <para>Required</para>
@@ -128,6 +144,7 @@ is available in each of the aforementioned package formats.</para>
 &tde; applications.</para>
 </listitem>
 </varlistentry>
+
 <varlistentry>
 <term>tdebase</term>
 <listitem>
@@ -137,6 +154,7 @@ of the Trinity Desktop Environment like the window manager, the terminal
 emulator, the control center, the file manager, and the panel.</para>
 </listitem>
 </varlistentry>
+
 <varlistentry>
 <term>&arts;</term>
 <listitem>
@@ -145,13 +163,15 @@ emulator, the control center, the file manager, and the panel.</para>
 server.</para>
 </listitem>
 </varlistentry>
+
 <varlistentry>
 <term>tdeaddons</term>
 <listitem>
-<para>Optional</para>
+<para>Optional but recommended</para>
 <para>Various plugins for &kate;, &kicker;, &knewsticker;, &konqueror; and &noatun; </para>
 </listitem>
 </varlistentry>
+
 <varlistentry>
 <term>tdeartwork</term>
 <listitem>
@@ -159,6 +179,7 @@ server.</para>
 <para>Additional wallpapers, themes, styles, sounds ...</para>
 </listitem>
 </varlistentry>
+
 <varlistentry>
 <term>tdebindings</term>
 <listitem>
@@ -166,6 +187,7 @@ server.</para>
 <para>Various bindings for other languages, including &Java;, Perl, Python, ...</para>
 </listitem>
 </varlistentry>
+
 <varlistentry>
 <term>tdegames</term>
 <listitem>
@@ -174,29 +196,33 @@ server.</para>
 &kpatience;.</para>
 </listitem>
 </varlistentry>
+
 <varlistentry>
 <term>tdegraphics</term>
 <listitem>
-<para>Optional</para>
+<para>Optional but recommended</para>
 <para>Various graphics-related programs like &PostScript; previewer,
 &DVI; previewer, and a drawing program.</para>
 </listitem>
 </varlistentry>
+
 <varlistentry>
 <term>tdeutils</term>
 <listitem>
-<para>Optional</para>
+<para>Optional but recommended</para>
 <para>Various desktop tools like a calculator, an editor and other
 nifty stuff.</para>
 </listitem>
 </varlistentry>
+
 <varlistentry>
 <term>tdemultimedia</term>
 <listitem>
-<para>Optional</para>
+<para>Optional but recommended</para>
 <para>Multimedia applications like a &CD; player and a mixer.</para>
 </listitem>
 </varlistentry>
+
 <varlistentry>
 <term>tdenetwork</term>
 <listitem>
@@ -205,20 +231,23 @@ nifty stuff.</para>
 download manager &kget;, and several other network-related programs.</para>
 </listitem>
 </varlistentry>
+
 <varlistentry>
 <term>tdepim</term>
 <listitem>
-<para>Optional</para>
+<para>Optional but recommended</para>
 <para>Personal information management tools. Contains the email client &kmail;, the newsreader &knode; and other related programs.</para>
 </listitem>
 </varlistentry>
+
 <varlistentry>
 <term>tdeadmin</term>
 <listitem>
-<para>Optional</para>
+<para>Optional but recommended</para>
 <para>System administration programs.</para>
 </listitem>
 </varlistentry>
+
 <varlistentry>
 <term>tdeedu</term>
 <listitem>
@@ -228,15 +257,17 @@ Educational and entertaining applications for &tde;'s younger users.
 </para>
 </listitem>
 </varlistentry>
+
 <varlistentry>
 <term>tdeaccessibility</term>
 <listitem>
-<para>Optional</para>
+<para>Optional but recommended</para>
 <para>
-KDE accessibility programs such as a screen magnifier and speech synthesizer front end.
+&tde; accessibility programs such as a screen magnifier and speech synthesizer front end.
 </para>
 </listitem>
 </varlistentry>
+
 <varlistentry>
 <term>tdetoys</term>
 <listitem>
@@ -244,13 +275,15 @@ KDE accessibility programs such as a screen magnifier and speech synthesizer fro
 <para>Toys!</para>
 </listitem>
 </varlistentry>
+
 <varlistentry>
 <term>tdevelop</term>
 <listitem>
 <para>Optional</para>
-<para>A complete Integrated Development Environment for &tde; and Qt</para>
+<para>A complete Integrated Development Environment for &tde; and &Qt;</para>
 </listitem>
 </varlistentry>
+
 <varlistentry>
 <term>tdewebdev</term>
 <listitem>
@@ -258,18 +291,19 @@ KDE accessibility programs such as a screen magnifier and speech synthesizer fro
 <para>Web development applications. Contains such applications as &quanta;, an integrated web development environment and other applications useful in web development</para>
 </listitem>
 </varlistentry>
+
 <varlistentry>
 <term>tdesdk</term>
 <listitem>
 <para>Optional</para>
-<para>KDE Software Development Kit. Contains a collection of applications and tools used by KDE Developers.</para>
+<para>&tde; Software Development Kit. Contains a collection of applications and tools used by &tde; Developers.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para>&arts; and then tdelibs should be installed before everything
-else, and tdeaddons last. The other packages can be installed in any
-arbitrary order.</para>
+<para>Information about compiling all packages is available at the
+<ulink url="http://www.trinitydesktop.org/wiki/bin/view/Developers/HowToBuild">
+Trinity wiki</ulink>.</para>
 
 <para>Most package management tools will let you put all these
 packages in one folder and install them all at once, figuring out
@@ -280,142 +314,84 @@ the dependencies as they go.</para>
 
 <qandaentry>
 <question>
-<para>Installation instructions for the different package
-formats</para>
+<para>Installation instructions for the different package formats</para>
+</question>
+<answer>
+<para>As &tde; is intended for many &UNIX; systems, please consult the installtion
+procedures and package management document for the system being used.</para>
+</answer>
+</qandaentry>
+
+<qandaentry>
+<question>
+<para>Post-installation procedures</para>
 </question>
 <answer>
-<para><important>
-<para>Please do not forget to read the <filename>README</filename> and <filename>INSTALL</filename> files if they are available.</para>
-</important></para>
+<para>There should be nothing to do after installing the packages except use them!
+Nonetheless, should problems arise, there are some common problems to consider:</para>
+
 <variablelist>
+
 <varlistentry>
-<term>Installation of the Debian packages</term>
+<term>System search path</term>
 <listitem>
-<para>The Debian packages install in accordance with the upcoming <acronym>FHS</acronym> (File
-Hierarchy Standard).</para>
-<procedure>
-<step performance="required"><para>become superuser</para></step>
-<step performance="required"><para>run <command>dpkg <option>-i
-<replaceable>packagename.deb</replaceable></option></command> for
-every package you want to install.</para></step>
-</procedure>
+<para>Be sure all &tde; binary files are installed
+in a location listed in your system's <envar>PATH</envar>.</para>
 </listitem>
 </varlistentry>
+
 <varlistentry>
-<term>Installation of the <acronym>RPM</acronym> packages</term>
+<term>Library files</term>
 <listitem>
-<procedure>
-<title>To install binary <acronym>RPM</acronym>s</title>
-<step performance="required"><para>become superuser</para></step>
-<step performance="required"><para>execute <command>rpm <option>-ivh
-<replaceable>packagename.rpm</replaceable></option></command></para></step>
-</procedure>
+<para>Be sure the &tde; library files are installed in the expected locations for your
+system.</para>
 </listitem>
 </varlistentry>
+
 <varlistentry>
-<term>Installation of the source <filename>.tar.bz2</filename> files</term>
+<term><envar>TDEDIR</envar> environment variable</term>
 <listitem>
-<para>Since there are always changes and updates to the way &tde; is compiled, please
-refer to <ulink url="http://developer.kde.org/build/index.html">Download and Install from Source</ulink> for the most up to date installation instructions for the source packages.
-</para>
-<para>The general approach should work in most cases though.
-</para>
-<para>The source <filename>.tar.bz2</filename> package installs into <filename
-class="directory">/usr/local/kde</filename> by default. You can
-override this setting by using the <option>--prefix</option> option of
-the <filename>configure</filename> script.</para>
-<procedure>
-<step performance="required"><para>unpack the packages with <command>tar <option>jxvf
-<replaceable>packagename.tar.bz2</replaceable></option></command></para></step>
-<step performance="required"><para>change folder to the package folder: <command>cd
-<replaceable>packagename</replaceable></command></para></step>
-<step performance="required"><para>configure the package: <command>./configure</command>
-<note><para>Some packages (notably tdebase) have special configuration
-options that might be applicable to your installation. Type
-<command>./configure <option>--help</option></command> to see the
-available options.</para></note></para></step>
-<step performance="required"><para>build the package: <command>make</command></para></step>
-<step performance="required"><para>install the package: <command>su <option>-c "make
-install"</option></command> (if you aren't already root). If you
-already are, just type <command>make
-<option>install</option></command>.</para></step>
-</procedure>
+<para>Be sure the <envar>TDEDIR</envar> environment variable is correctly set.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term><filename>starttde</filename> script installation</term>
+<listitem>
+<para>Verify the <filename>starttde</filename> script is installed to <filename
+class="directory">$<envar>TDEDIR</envar>/bin</filename> and therefore in your
+system's search path.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term><filename>starttde</filename> script is run correctly</term>
+<listitem>
+<para>Be sure the <filename>starttde</filename> script is being run from within the appropriate
+xinitrc or xsession script.</para>
 </listitem>
 </varlistentry>
+
 </variablelist>
-</answer>
-</qandaentry>
 
-<qandaentry>
-<question>
-<para>Post-installation procedures</para>
-</question>
-<answer>
-<para>First of all, please make sure that you have added &tde;'s binary
-installation folder (&eg; <filename
-class="directory">/usr/local/kde/bin</filename>) to your <envar>PATH</envar>
-and &tde;'s
-library installation folder to your <envar>LD_LIBRARY_PATH</envar> (only
-necessary on systems that do not support rpath; on &Linux; &ELF;, it
-should work without). This environment variable may be called
-differently on some systems, &eg; it is called
-<envar>SHLIB_PATH</envar> on &IRIX;. Then set the environment variable
-<envar>TDEDIR</envar> to the base of your &tde; tree, &eg; <filename
-class="directory">/usr/local/kde</filename>.
-<caution>
-<para>Please bear in mind that it is unwise to set
-<envar>LD_LIBRARY_PATH</envar> blindly. In the vast majority of cases it is
-unnecessary and can do more harm than good. There is a web page
-written by <ulink url="mailto:barr@cis.ohio-state.edu">Dave
-Barr</ulink> explaining the evils of <envar>LD_LIBRARY_PATH</envar> and it can be
-found at <ulink
-url="http://www.cis.ohio-state.edu/~barr/ldpath.html">http://www.cis.ohio-state.edu/~barr/ldpath.html</ulink>.</para>
-</caution>
-</para>
-<para>Even though you can use most of the &tde; applications simply by
-calling them, you can only benefit fully from &tde;'s advanced
-features if you use the &tde; window manager and its helper
-programs.</para>
-<para>In order to make it easy for you, we have provided a simple
-script called <filename>starttde</filename> which gets installed in <filename
-class="directory">$<envar>TDEDIR</envar>/bin</filename> and is therefore in your
-path.</para>
-<para>Edit the file <filename>.xinitrc</filename> in your home folder (make a backup
-copy first!), remove everything that looks like calling a window
-manager, and insert <command>starttde</command> instead. Restart the &X-Server;. If you use
-&tdm;/<application>xdm</application>, you will have to edit the file <filename>.xsession</filename> instead of
-<filename>.xinitrc</filename>. And if there is no <filename>.xinitrc</filename> or <filename>.xsession</filename> in your home
-folder, simply create a new one with just one line containing
-<command>starttde</command>.
-<note>
-<para>Some systems (notably &RedHat; &Linux;) use <filename>.Xclients</filename>
-instead.</para>
-</note></para>
-<para>This should present you with a new shining &tde; desktop. You
+<para>This should present you with a new &tde; desktop. You
 can now start to explore the wonderful world of &tde;. In case you
-want to read some documentation first, there is a highly recommended
-<ulink
-url="http://www.kde.org/documentation/quickstart/index.html">Quick Start
-guide</ulink> available. Furthermore, every application has an online
-help that is available via the <guimenu>help</guimenu> menu.</para>
+want to read some documentation first, there is a recommended
+<ulink url="help:/khelpcenter/quickstart">A Quick Start Guide to the Desktop</ulink>
+available. Furthermore, every application has an online
+help that is available via the <guimenu>Help</guimenu> menu.</para>
 </answer>
 </qandaentry>
 
-
 <qandaentry>
 <question>
 <para>Should I remove old version xyz before installing a new
 one?</para>
 </question>
 <answer>
-<para>In principle, this is not necessary. <acronym>RPM</acronym> and Debian packages
-should take care of all dependencies.</para>
-<para>If you compile the source code yourself, you should take more care.
-Instructions for running two different versions of &tde; on the same system are
-given at <ulink
-url="http://developer.kde.org/build/kde2-and-trinity.html">http://developer.kde.org/build/kde2-and-trinity.html</ulink>.
-However, please note that running two different versions of &tde; from source
-can lead to problems if you are not careful. </para>
+<para>In principle, this is not necessary. The various distro package managers
+should handle all dependencies.</para>
+<para>If you compile the source code yourself, you should take more care.</para>
 </answer>
 </qandaentry>
 
@@ -424,15 +400,10 @@ can lead to problems if you are not careful. </para>
 <para>How do I start &tde;?</para>
 </question>
 <answer>
-<para>The most comfortable method to start &tde; is to use the
-<filename>starttde</filename> script. Simply put the line
-<command>starttde</command> at the end of your <filename>.xsession</filename>
-file (or your <filename>.xinitrc</filename> or <filename>.Xclients</filename>
-file if you are not using &tdm; or <application>xdm</application>). Please
-also remove the lines that start your previous window manager. If there is no
-<filename>.xsession</filename>, <filename>.xinitrc</filename>, or
-<filename>.Xclients</filename> in your home folder, simply create a new one
-that contains just one line: <command>starttde</command>.</para>
+<para>There are only two methods of starting &tde;: using a login
+manager such as &tdm; or from the command line, using <command>startx</command>.
+The respective startup scripts should contain a reference to the
+<filename>starttde</filename> script.</para>
 </answer>
 </qandaentry>
 <!-- Still needed?
@@ -462,65 +433,6 @@ configure tdebase. Then the suid bit is set automatically during
 </answer>
 </qandaentry>
 -->
-<qandaentry>
-<question>
-<para>Is it possible to install &tde; in my home directory?</para>
-</question>
-<answer>
-<para>Yes, you can install &tde; in any folder you want. What you
-have to do depends on the kind of packages you want to install:</para>
-<procedure><title>Source packages</title>
-<step performance="required"><para>Configure and install the package using <command>configure
-<option>--prefix=<replaceable>/home/me</replaceable></option>;
-make; make install</command> to install into <filename
-class="directory">/home/me</filename>. Replace <replaceable>/home/me</replaceable> with your home directory, generally defined in <envar>$HOME</envar></para></step>
-<step performance="required"><para>Add the following to your init files. Please note that if
-it is not necessary for you to set <envar>LD_LIBRARY_PATH</envar>, it
-is better to leave it out.</para>
-
-<para>For csh or tcsh:</para>
-<programlisting>
-setenv TDEDIR /home/me
-
-if ( $?LD_LIBRARY_PATH ) then
-   setenv LD_LIBRARY_PATH $TDEDIR/lib:$LD_LIBRARY_PATH
-else
-   setenv LD_LIBRARY_PATH $TDEDIR/lib
-endif
-
-if ( ! $?LIBRARY_PATH ) then
-   setenv LIBRARY_PATH $LD_LIBRARY_PATH
-endif
-</programlisting>
-<para>For <application>bash</application>:</para>
-<programlisting>
-TDEDIR=/home/me
-PATH=$TDEDIR/bin:$PATH
-LD_LIBRARY_PATH=$TDEDIR/lib:$LD_LIBRARY_PATH
-LIBRARY_PATH=$LD_LIBRARY_PATH
-export TDEDIR PATH LD_LIBRARY_PATH LIBRARY_PATH
-</programlisting></step>
-</procedure>
-<procedure><title><acronym>RPM</acronym> packages</title>
-<step performance="required"><para><command>rpm</command> allows you to use the
-<option>--prefix</option> option to select the folder you want to
-install to. For example, executing <command>rpm <option>-i
---prefix=<replaceable>/home/me
-package.rpm</replaceable></option></command> will install the package
-to <filename
-class="directory">/home/me</filename>.</para></step>
-</procedure>
-<para><note>
-<para>Although &tde; will run from a user folder, there are some
-problems with programs that require suid root, &eg; the programs in
-the tdeadmin package. But since they are not meant to be run by users
-in the first place, this is nothing to worry about.</para>
-<para>However, on systems using shadow passwords, the screensavers
-have to be suid root to enable password access for unlocking the
-screen, so this option will not work.</para>
-</note></para>
-</answer>
-</qandaentry>
 
 <qandaentry>
 <question>
@@ -528,8 +440,9 @@ screen, so this option will not work.</para>
 server</errorname>. What is wrong?</para>
 </question>
 <answer>
-<para>You probably tried to start the X server with <command>starttde</command>. The X
-server is started with <command>startx</command>.
+<para>You probably tried to start &tde; directly with <command>starttde</command> rather
+than letting the login manager or startx process run that script. From the command
+line the X server is started with <command>startx</command>.
 <command>starttde</command> is the
 script that should be run from your <filename>.xinitrc</filename>, <filename>.xsession</filename>, or
 <filename>.Xclients</filename> to activate the window manager and the necessary server
@@ -537,27 +450,20 @@ daemons for &tde;. See also <xref linkend="starttde"/>.</para>
 </answer>
 </qandaentry>
 
-<qandaentry>
+<!--<qandaentry>
 <question>
 <para>&tde; on &AIX;?</para>
 </question>
 <answer>
 <para>
-<!--
-<para>If you have trouble building &tde; on
-&AIX; check out Stefan Westerfeld's <ulink
-url="http://space.twc.de/~stefan/kde/aix.html">Running &tde; on
-Aix</ulink> page for lots of help on building &tde; on this
-exceptional &UNIX; variant.</para>
--->
 <acronym>IBM</acronym> now officially support &tde; on &AIX;. You can find
 details at <ulink
 url="http://www.ibm.com/servers/aix/products/aixos/linux/index.html">http://www.ibm.com/servers/aix/products/aixos/linux/index.html</ulink>.
 There is also some older information at <ulink url="http://space.twc.de/~stefan/kde/aix.html">http://space.twc.de/~stefan/kde/aix.html</ulink>.</para>
 </answer>
-</qandaentry>
+</qandaentry>-->
 
-<qandaentry>
+<!--<qandaentry>
 <question>
 <para>&tde; on a laptop?</para>
 </question>
@@ -574,9 +480,9 @@ links helpful:</para>
 </listitem>
 </itemizedlist>
 </answer>
-</qandaentry>
+</qandaentry>-->
 
-<qandaentry>
+<!--<qandaentry>
 <question>
 <para>I do not like the default &tde; folder after installation. How
 do I move it without breaking anything?</para>
@@ -597,9 +503,9 @@ class="directory">/usr/local/kde</filename> but everything is
 still accessible from <filename
 class="directory">/opt/kde</filename>.</para>
 </answer>
-</qandaentry>
+</qandaentry>-->
 
-<qandaentry>
+<!--<qandaentry>
 <question>
 <para>What files can I delete from my &tde; install folder?  Can all the
 <filename>*.h</filename>, <filename>*.c</filename> and <filename>*.o</filename>
@@ -613,41 +519,21 @@ compile your own &tde; programs. But if you wish to add patches to the source
 programs as they become available (rather than downloading everything again),
 then they should stay.</para>
 </answer>
-</qandaentry>
+</qandaentry>-->
 
 <qandaentry>
 <question>
-<para>Will I lose my current settings when I upgrade &tde;?</para>
+<para>Will I lose my current settings when I update &tde;?</para>
 </question>
 <answer>
-
-<para>No. In most cases &tde; will be able to transport your settings
-intact. You may need to reenter passwords in some applications (such
-as &kmail; or &knode;) but most other settings will be safe.</para>
-
-<para>There were mixed reports of results between some previous
-versions of &tde;. To be safe, you may like to back up your entire
-&tde; configuration. </para>
-
-<para>Settings are kept in the <filename
-class="directory">$<envar>HOME</envar>/.kde</filename> or <filename
-class="directory">$<envar>HOME</envar>/.kde2</filename> subfolder in your home
-folder. Copy your
-old <filename class="directory">.kde</filename>/<filename
-class="directory">.kde2</filename> folder to a backup location,
-install &tde; 3.2, and then copy back any necessary mail and news
-settings. That said, most people can make a direct upgrade, without
-removing the old <filename class="directory">.kde</filename> folder,
- without a hitch.</para>
-<para>You can override the use of <filename
-class="directory">$<envar>HOME</envar>/.kde</filename> by setting the
-$<envar>TDEHOME</envar> variable.</para>
+<para>You shouldn't. &tde; should transport your settings
+intact. All settings should be safe.</para>
 </answer>
 </qandaentry>
 
 <qandaentry id="greyscreen">
 <question>
-<para>I upgraded &tde; and it seemed to go fine, but when I start it,
+<para>I updated &tde; and all seemed to go fine, but when I start &tde;,
 I get a blank gray screen, and nothing happens. There are errors in
 the console about DCOPserver. What's going on?</para>
 </question>
@@ -655,18 +541,18 @@ the console about DCOPserver. What's going on?</para>
 <answer>
 <para>
 &tde; uses several temporary files during its operation.
-These are usually to be found in the following locations:</para>
+Usually these directories and files are found in the following locations:</para>
 <itemizedlist>
-<listitem><para><filename>~/.DCOPserver-*</filename> (there are usually two of these; one is a symlink to the other)</para></listitem>
-<listitem><para><filename>~/.kde/socket-<replaceable>hostname</replaceable></filename></para></listitem>
-<listitem><para><filename>~/.kde/tmp-<replaceable>hostname</replaceable></filename> which is normally a symlink to the next file:</para></listitem>
-<listitem><para><filename>/tmp/tmp-kde-<replaceable>USER</replaceable></filename></para></listitem>
-<listitem><para><filename>~/.kde/socket-<replaceable>hostname</replaceable></filename> which is also normally a symlink to:</para></listitem>
-<listitem><para><filename>/tmp/tdesocket-<replaceable>USER</replaceable></filename></para></listitem>
+<listitem><para><filename>$HOME/.DCOPserver-*</filename> (there are usually two of these; one is a symlink to the other)</para></listitem>
+<listitem><para><filename>$HOME/.trinity/socket-<replaceable>hostname</replaceable></filename></para></listitem>
+<listitem><para><filename>$HOME/.trinity/tmp-<replaceable>hostname</replaceable></filename>, which normally is a symlink to the next file:</para></listitem>
+<listitem><para><filename>$TMP/tde-<replaceable>USER</replaceable></filename></para></listitem>
+<listitem><para><filename>$HOME/.trinity/socket-<replaceable>hostname</replaceable></filename>, which normally is a symlink to:</para></listitem>
+<listitem><para><filename>$TMP/tdesocket-<replaceable>USER</replaceable></filename></para></listitem>
 </itemizedlist>
 
-<para>If the symlinks get broken, usually because a
-<command>cron</command> or shutdown script is emptying out the
+<para>If the symlinks get broken, such as when
+<command>cron</command> or a shutdown script is emptying the
 <filename class="directory">/tmp</filename> folder, then strange
 things will happen. These files, and the symlinks, will all be
 created automatically at the start of &tde; so you can safely remove
@@ -674,7 +560,7 @@ them <emphasis>while &tde; is not running</emphasis>.</para>
 
 <para>If you are only getting a gray screen when you start &tde;, or if you get an error message telling you to <errorname>Check your installation</errorname>, then shut down X and delete all the files listed above, then try to restart X.</para>
 
-<para>Normally (&ie; when not upgrading between &tde; versions) it's
+<para>Normally (&ie; when not updating between &tde; versions) it's
 quite safe to leave these files intact, and you may shave a few
 seconds off your &tde; startup time by doing so.</para>
 </answer>
@@ -682,32 +568,32 @@ seconds off your &tde; startup time by doing so.</para>
 
 <qandaentry>
 <question>
-<para>Is TDE backwards or binary compatible with KDE 3?</para>
+<para>Is &tde; backwards or binary compatible with KDE 3?</para>
 </question>
 <answer>
-<para>While many programs designed on KDE 3 will compile on Trinity, binary
-compatibility with KDE 3 is not a goal of the TDE project.</para>
+<para>While many programs originally designed for KDE 3 will compile on Trinity, binary
+compatibility with KDE 3 is not a goal of &tde; developers.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para>Is TDE backwards or binary compatible with previous releases of TDE?</para>
+<para>Is &tde; backwards or binary compatible with previous releases of &tde;?</para>
 </question>
 <answer>
 <para>Possibly, but binary compatibility is not a project goal with major point
-releases. A package that built on a previous version of TDE but no longer builds
+releases. A package that built on a previous version of &tde; but no longer builds
 on the current release should be brought to the attention of the developers.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para>Is my KDE3 profile directory compatible with Trinity?</para>
+<para>Is my KDE 3 profile directory compatible with Trinity?</para>
 </question>
 <answer>
 <para>Not quite but don't worry. Some "scrubbing" cleanup is required to migrate
-a KDE3 profile. For new users or those with little customization we recommend
+a KDE 3 profile. For new users or those with little customization we recommend
 creating a fresh profile. For those long-time users who cringe at the thought
 of recreating their desktop, we provide a migratekde3 shell script. That script
 copies a $HOME/.kde3 profile directory to $HOME/.trinity and performs the required
@@ -716,7 +602,7 @@ with no warranties or guarantees. (The script works really well, actually. :-))<
 </answer>
 </qandaentry>
 
-<qandaentry>
+<!--<qandaentry>
 <question>
 <para>Compiling tdebase gives me a <errorname>bin/sh: msgfmt: command
 not found</errorname> error!</para>
@@ -727,9 +613,9 @@ part of the &GNU; i18n package <application>gettext</application>.
 You should be able to download it from any
 &GNU; mirror.</para>
 </answer>
-</qandaentry>
+</qandaentry>-->
 
-<qandaentry>
+<!--<qandaentry>
 <question>
 <para>How do I uninstall &tde; applications compiled from
 source?</para>
@@ -745,9 +631,9 @@ one by one.</para>
 consider a program such as &GNU; <application>stow</application>, found at
 <ulink url="http://www.gnu.org/software/stow/stow.html">http://www.gnu.org/software/stow/stow.html</ulink>.</para>
 </answer>
-</qandaentry>
+</qandaentry>-->
 
-<qandaentry>
+<!--<qandaentry>
 <question id="gif">
 <para>What is up with &GIF; support?</para>
 </question>
@@ -757,6 +643,7 @@ support is turned off from &Qt; 1.44 onwards by default. When you want to use
 &GIF;s and have the relevant license, recompile &Qt; with &GIF; support.
 <command>./configure <option>-gif</option></command>.</para>
 </answer>
-</qandaentry>
+</qandaentry>-->
+
 </qandaset>
 </chapter>
diff --git a/doc/faq/intro.docbook b/doc/faq/intro.docbook
index d7434b097..e09812eca 100644
--- a/doc/faq/intro.docbook
+++ b/doc/faq/intro.docbook
@@ -18,7 +18,7 @@ by <ulink url="mailto:ettrich@kde.org">Matthias Ettrich</ulink> in
 1996 and originally called the K Desktop Environment. The aim of the &tde; project is to connect the
 power of the &UNIX; operating systems with the comfort of a modern user
 interface.</para>
-<para>If you want further information about &tde;, look at
+<para>For additional information about &tde;, check the Trinity web site at
 <ulink url="http://www.trinitydesktop.org/about.php">About Trinity</ulink></para>
 </answer>
 </qandaentry>
@@ -29,7 +29,7 @@ interface.</para>
 </question>
 <answer>
 <para>&tde; is a Desktop Environment for all flavors of &UNIX; systems.
-While most &tde; developers use &Linux;, &tde; should run
+While most &tde; developers use &Linux; based systems, &tde; should run
 on a wide range of systems. You might need to tweak the
 source code a bit to get &tde; to compile on different variant
 of &UNIX; systems, or when not using the &GNU; development tools, in
@@ -57,8 +57,8 @@ computer desktop system.</para>
 <answer>
 <para>No, &tde; is not a window manager. While &tde; includes a
 sophisticated window manager (&twin;), &tde; is much more, providing
-a full integrated desktop environment.</para>
-<para>&tde; includes a web browser, a file manager, a window manager, a help system, a
+a full integrated desktop environment. &tde; includes a web browser,
+a file manager, a window manager, a help system, a
 configuration system, many tools and utilities, and many
 applications, including but not limited to mail
 and news clients, drawing programs, a PDF and a &DVI; viewer
@@ -72,9 +72,9 @@ and so forth.</para>
 <acronym>OS</acronym> clone?</para>
 </question>
 <answer>
-<para>No, &tde; is not a clone. Specifically &tde; is not a
-<acronym>CDE</acronym> or &Windows;  clone. While the &tde; developers
-have and will continue to glean the best features from all existing
+<para>&tde; is not a clone. Specifically &tde; is not a
+Common Desktop Environment (<acronym>CDE</acronym>) or &Windows; clone.
+While developers have and will continue to glean the best features from existing
 desktop environments, &tde; is a unique environment that has and
 will continue to go its own way.</para>
 </answer>
@@ -101,7 +101,7 @@ Public License. All &tde; libraries are available under the
 &tde; desktop possible, but all &tde; applications are licensed under
 the <acronym>GPL</acronym>.</para>
 <para>&tde; uses the <link linkend="qt">&Qt; C++ crossplatform
-toolkit</link>, which is also released (since version 2.2) under the
+toolkit</link>, which, since version 2.2, is released under the
 <acronym>GPL</acronym>.</para>
 <para>Both &tde; and &Qt; can be made available on
 &CD-ROM; free of charge. No runtime fees of any kind are
@@ -111,7 +111,7 @@ incurred.</para>
 
 <qandaentry>
 <question>
-<para>Why the rebranding and renaming efforts? Why can't you continue to call the software KDE?</para>
+<para>Why the rebranding and renaming efforts? Why not continue calling the software KDE?</para>
 </question>
 <answer>
 <para>The "KDE" name, various logos, and related efforts are trademarked by the KDE
@@ -125,14 +125,14 @@ we can't legally use their trademarks.</para>
 <para>How is Trinity different from KDE4?</para>
 </question>
 <answer>
-<para>Both desktop environments share common roots to KDE 3.5.10, the last
+<para>Both desktop environments share common roots to KDE 3.5.10, which was the last
 official release of KDE in the 3.x series. Many KDE developers wanted to break
 from that code chain and tool sets to start afresh. Thus was born KDE4. In
 addition to moving to the Qt4 tool set, the KDE developers revamped the
 underlying KDE code set.</para>
 
 <para>KDE4 and Trinity have different philosophies about work flow preferences.
-KDE4 developers want to support emerging work flow concepts and techniques.
+KDE4 developers want to support certain work flow concepts and techniques.
 Trinity developers want to maintain a "traditional" desktop environment.</para>
 
 <para>For example, KDE4 offers the following tools:</para>
@@ -179,13 +179,13 @@ Trinity developers want to maintain a "traditional" desktop environment.</para>
 with netbooks, tablets, and smart phones. TDE provides a single interface that is
 optimized for the mouse/keyboard HCI (Human-computer interaction) model.</para>
 
-<para>Both desktop environments provide an excellent choice for different work
+<para>Both desktop environments provide an excellent choice for various work
 flows but differ in approach. Trinity leans toward user expectations of how
 desktop environments have functioned traditionally. There is a sense of
 familiarity with that environment many people like. Similarly other users prefer
 the work flow features offered by KDE4 because those features match their
 expectations of how they want their computer to behave. The difference between the
-two environments does not mean one is smaller, buggier, or slower -- only that
+two environments does not mean one is better, buggier, or slower -- only that
 they are different and appeal to different types of people. Although sharing a
 common heritage, both desktops appeal to different groups of people. As always
 with free/libre software, there is a choice.</para>
diff --git a/doc/faq/misc.docbook b/doc/faq/misc.docbook
index 0fad81c9d..0b2e4febd 100644
--- a/doc/faq/misc.docbook
+++ b/doc/faq/misc.docbook
@@ -125,7 +125,7 @@ into the &konqueror; address bar. </para>
 <qandaentry>
 <question>
 <para>How do I convert the default &RedHat; menus into a menu in the
-<guimenu>K</guimenu> menu?</para>
+<guimenu>TDE</guimenu> menu?</para>
 </question>
 <answer>
 <para>Click on the <guibutton>K</guibutton> button and select
diff --git a/doc/faq/nontdeapps.docbook b/doc/faq/nontdeapps.docbook
index f6e234406..b433d671d 100644
--- a/doc/faq/nontdeapps.docbook
+++ b/doc/faq/nontdeapps.docbook
@@ -32,7 +32,7 @@ non-TDE applications</guilabel> checkbox and click
 than &konqueror;?</para></question>
 <answer>
 <para>If you are using &tde; 3.3 or later, open up the &kcontrolcenter; and
-navigate to the <menuchoice><guimenu>KDE
+navigate to the <menuchoice><guimenu>TDEDE
 Components</guimenu><guimenuitem>Component
 Chooser</guimenuitem></menuchoice> panel. Select <guilabel>Web
 Browser</guilabel> from the list on the left, then select <guilabel>Open
diff --git a/doc/faq/webbrowse.docbook b/doc/faq/webbrowse.docbook
index 1538744e9..7de7bbb9d 100644
--- a/doc/faq/webbrowse.docbook
+++ b/doc/faq/webbrowse.docbook
@@ -182,7 +182,7 @@ Under the latest versions of X.org, having the composite extension loaded can ca
 </para></answer>
 </qandaentry>
 
-<qandaentry>
+<!--<qandaentry>
 <question>
 <para>Why can't &konqueror; render &GIF; images?</para>
 </question>
@@ -190,7 +190,7 @@ Under the latest versions of X.org, having the composite extension loaded can ca
 <para>It is because you did not enable &GIF; support in &Qt;.  Please see
 <xref linkend="gif"/> for more details.</para>
 </answer>
-</qandaentry>
+</qandaentry>-->
 
 <qandaentry>
 <question><para>When I try to open a web page with &konqueror;, I get the