Update help handbooks.

31 files changed, 490 insertions, 617 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
diff --git a/doc/kcontrol/desktopbehavior/index.docbook b/doc/kcontrol/desktopbehavior/index.docbook
index be43982c1..0a198c907 100644
--- a/doc/kcontrol/desktopbehavior/index.docbook
+++ b/doc/kcontrol/desktopbehavior/index.docbook
@@ -123,7 +123,7 @@ current status of &tde;. </para></listitem>
 <varlistentry>
 <term>Application Menu</term>
 <listitem><para>This brings up the <guimenu>Application</guimenu> Menus
-(also know as the <guimenu>K</guimenu> Menus), so you can start a new
+(also know as the <guimenu>TDE</guimenu> Menus), so you can start a new
 application.</para></listitem>
 </varlistentry>
 
diff --git a/doc/kcontrol/index.docbook b/doc/kcontrol/index.docbook
index 6e36c9736..0c8926797 100644
--- a/doc/kcontrol/index.docbook
+++ b/doc/kcontrol/index.docbook
@@ -86,7 +86,7 @@ Center Modules</link>
 <orderedlist> 
 <listitem>
 <para>
-By selecting <menuchoice><guimenu>K Button</guimenu><guimenuitem>Control
+By selecting <menuchoice><guimenu>TDE Button</guimenu><guimenuitem>Control
 Center</guimenuitem></menuchoice> from the &tde; Panel.
 </para>
 </listitem>
diff --git a/doc/kcontrol/panel/index.docbook b/doc/kcontrol/panel/index.docbook
index d7d743d26..463bc79c8 100644
--- a/doc/kcontrol/panel/index.docbook
+++ b/doc/kcontrol/panel/index.docbook
@@ -38,7 +38,7 @@ easier for you to organize your desktop. Using the &tde; panel you
 can:</para>
 
 <itemizedlist>
-<listitem><para>launch applications using the <guimenu>K</guimenu> menu or
+<listitem><para>launch applications using the <guimenu>TDE</guimenu> menu or
 the application buttons</para></listitem>
 <listitem><para>switch desktops using the panel's pager applet</para>
 </listitem>
@@ -176,7 +176,7 @@ applications, the browser menus you can use to access folders and other
 menus like the recent documents menu.</para>
 
 <para>The <guilabel>TDE Menu</guilabel> frame offers you some options to
-configure the <guimenu>K</guimenu> menu's functionality. This frame consists 
+configure the <guimenu>TDE</guimenu> menu's functionality. This frame consists 
 of 4 items:</para>
 
 <itemizedlist>
diff --git a/doc/khelpcenter/contact.docbook b/doc/khelpcenter/contact.docbook
index ea693226d..f3769329e 100644
--- a/doc/khelpcenter/contact.docbook
+++ b/doc/khelpcenter/contact.docbook
@@ -51,11 +51,6 @@ found in the documentation of their individual application.</para>
 
 <variablelist>
 <varlistentry>
-<term><ulink url="http://www.trinitydesktop.org">www.trinitydesktop.org</ulink></term>
-<listitem><para>&tde;'s official website</para></listitem>
-</varlistentry>
-
-<varlistentry>
 <term><ulink url="http://www.trinitydesktop.org/wiki">www.trinitydesktop.org/wiki</ulink></term>
 <listitem><para>The &tde; Wiki</para></listitem>
 </varlistentry>
diff --git a/doc/khelpcenter/help.docbook b/doc/khelpcenter/help.docbook
index ebb67ab30..a2ab707e3 100644
--- a/doc/khelpcenter/help.docbook
+++ b/doc/khelpcenter/help.docbook
@@ -16,21 +16,16 @@ documentation (&XML;).
 </para>
 
 <para> All base &tde; applications come fully documented, thanks to
-the efforts of the Documentation team.  If you would like to help,
-please write to the Documentation coordinator, Lauri Watts, at
-<email>lauri@kde.org</email> for information.  No experience is
-required, just enthusiasm and patience.
+the efforts of many people. If you would like to help,
+please contact members of the Trinity development team at
+<email>trinity-devel@lists.pearsoncomputing.net</email> for information.
+Experience is not required, just enthusiasm and patience.
 </para>
 
 <para>
-If you would like to help translating &tde; documentation to your native
-language, the Translation coordinator is Thomas Diehl,
-<email>thd@kde.org</email>, and he would also welcome the help.  More
-information, including the coordinators for each language team, can be
-found on the <ulink url="http://i18n.kde.org">Internationalization web
-site</ulink>, and in the <link linkend="contact">Contact</link> section
-of this document.
-</para>
+If you would like to help translate &tde; documentation to your native
+language,please contact members of the Trinity development team at
+<email>trinity-devel@lists.pearsoncomputing.net</email> for information.</para>
 
 <sect2 id="installation">
 <title>Installation</title>
@@ -56,7 +51,7 @@ package or will be found in your operating system tdebase package.
 <term>From the <guimenu>Help</guimenu> menu</term>
 <listitem>
 <para>
-The most common will probably be from within an application.  Choose
+The most common will probably be from within an application. Choose
 <menuchoice><guimenu>Help</guimenu>
 <guimenuitem>Contents</guimenuitem></menuchoice> to open that
 application's help file, at the contents page.
@@ -65,10 +60,10 @@ application's help file, at the contents page.
 </varlistentry>
 
 <varlistentry>
-<term>From the <guimenu>K</guimenu> menu</term>
+<term>From the <guimenu>TDE</guimenu> menu</term>
 <listitem>
 <para>
-Choose the big <guiicon>K</guiicon> in your panel, and select
+Choose the big <guiicon>T</guiicon> in your panel, and select
 <guimenuitem>Help</guimenuitem> to open &khelpcenter;, starting at the
 default welcome page.
 </para>
@@ -90,7 +85,7 @@ Again, the default welcome page is displayed.
 <listitem>
 <para>
 &khelpcenter; may be started using a &URL; to display a
-file.  &URL;s have been added for
+file. &URL;s have been added for
 <command>info</command> and <command>man</command> pages
 also. You can use them as follows:
 </para>
@@ -188,7 +183,7 @@ files themselves, on the left and right respectively.
 
 <para>
 The <guilabel>Contents</guilabel> pane in &khelpcenter; is
-displayed on the left hand side of the window.  As you might expect, you
+displayed on the left hand side of the window. As you might expect, you
 can move the splitter bar, to make sure you can comfortably read the
 contents of either pane.
 </para>
@@ -211,26 +206,28 @@ entries:
 
 <variablelist>
 <varlistentry>
-<term><guilabel>Introduction</guilabel></term>
-<listitem><para>Welcome to &tde; - an introduction to the Trinity Desktop
+<term><guilabel>Welcome to &tde;</guilabel></term>
+<listitem><para>An introduction to the Trinity Desktop
 Environment.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term><guilabel>Introduction to &tde;</guilabel></term>
-<listitem>
-<para>
-The &tde; Quickstart guide.  Contains a tour of the &tde;
+<term><guilabel>A Visual Guide to &tde;</guilabel></term>
+<listitem><para>A visual summary of Trinity
+widgets.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><guilabel>The Quickstart Guide</guilabel></term>
+<listitem><para>Contains a tour of the &tde;
 Interface and specific help and tips on how to work smarter with &tde;.
 </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term><guilabel>&tde; User's manual</guilabel></term>
-<listitem>
-<para>
-The &tde; User's manual is an in-depth exploration of &tde;, including
+<term><guilabel>&tde; User Guide</guilabel></term>
+<listitem><para>An in-depth exploration of &tde;, including
 installation, configuration and customization, and use.
 </para>
 </listitem>
@@ -240,7 +237,7 @@ installation, configuration and customization, and use.
 <term><guilabel>Application manuals</guilabel></term>
 <listitem>
 <para>
-Native &tde; application documentation. All &tde; applications have
+Native &tde; application documentation. &tde; applications have
 documentation in &XML; format, which are converted to
 <acronym>HTML</acronym> when you view them. This section lists all the
 &tde; applications with a brief description and a link to the full
@@ -248,17 +245,17 @@ application documentation.
 </para>
 <para>
 The applications are displayed in a tree structure that echoes the default
-structure of the <guimenu>K</guimenu> menu, making it easy to find the
+structure of the <guimenu>TDE</guimenu> menu, making it easy to find the
 application you are looking for.
 </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term><guilabel>&UNIX; manual pages</guilabel></term>
+<term><guilabel>Unix manual pages</guilabel></term>
 <listitem>
 <para>
-&UNIX; man pages are the traditional on-line documentation format for
+Man pages are the traditional on-line documentation format for
 &UNIX; systems. Most programs on your system will have a man page. In
 addition, man pages exist for programming functions and file
 formats.
@@ -277,40 +274,40 @@ including <command>gcc</command> (the C/C++ compiler),
 </listitem>
 </varlistentry>
 
-<varlistentry>
+<!--<varlistentry>
 <term><guilabel>Tutorials</guilabel></term>
 <listitem>
 <para>
 Short, task based or informational tutorials.
 </para>
 </listitem>
-</varlistentry>
+</varlistentry>-->
 
 <varlistentry>
 <term><guilabel>The &tde; FAQ</guilabel></term>
 <listitem>
 <para>
-Frequently asked questions about &tde;, and their answers.
+Frequently asked questions about &tde; and answers.
 </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term><guilabel>&tde; on the web</guilabel></term>
+<term><guilabel>Contact Information</guilabel></term>
 <listitem>
 <para>
-Links to &tde; on the web, both the official &tde; website, and other
-useful sites.
+Information about contacting &tde; developers, and how to join the
+&tde; mailing lists.
 </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term><guilabel>Contact Information</guilabel></term>
+<term><guilabel>&tde; on the Web</guilabel></term>
 <listitem>
 <para>
-Information on how to contact &tde; developers, and how to join the
-&tde; mailing lists.
+Links to &tde; on the web, both the official &tde; website, and other
+useful sites.
 </para>
 </listitem>
 </varlistentry>
@@ -332,8 +329,8 @@ How to help, and how to get involved.
 
 <para>
 Searching requires you have the <application>ht://Dig</application>
-application installed.  Information on installing and configuring the
-search index is available in the document.  Configuration of the search
+application installed. Information on installing and configuring the
+search index is available in the document. Configuration of the search
 index is performed in the &kcontrol;, by choosing
 <menuchoice><guisubmenu>Help</guisubmenu><guimenuitem>Index</guimenuitem></menuchoice>,
 and detailed help is available from this module.
@@ -347,7 +344,7 @@ up and configured.
 <para>
 Searching the help files is fairly intuitive, enter the word(s) you wish
 to search for in the text box, choose your options (if any), and press
-<guibutton>Search</guibutton>.  The results display in the viewer pane
+<guibutton>Search</guibutton>. The results display in the viewer pane
 to the right.
 </para>
 
@@ -358,7 +355,7 @@ to the right.
 <term><guilabel>Method</guilabel></term>
 <listitem>
 <para>
-Choose how to search for multiple words.  If you choose
+Choose how to search for multiple words. If you choose
 <guilabel>and</guilabel>, results are returned only if all your search
 terms are included in the page. <guilabel>or</guilabel> returns results
 if <emphasis>any</emphasis> of the search terms are found, and
@@ -372,7 +369,7 @@ searches. Some examples:</para>
 <varlistentry>
 <term><userinput>cat and dog</userinput></term>
 <listitem><para>Searches for pages which have both the words
-<userinput>cat</userinput> and <userinput>dog</userinput> in them.  Pages with
+<userinput>cat</userinput> and <userinput>dog</userinput> in them. Pages with
 only one or the other will not be returned.</para></listitem>
 </varlistentry>
 <varlistentry>
@@ -385,7 +382,7 @@ them.</para></listitem>
 <term><userinput>cat or (dog not nose)</userinput></term>
 <listitem><para>Searches for pages which contain <userinput>cat</userinput>, and
 for pages which contain <userinput>dog</userinput> but don't contain
-<userinput>nose</userinput>.  Pages which contain both
+<userinput>nose</userinput>. Pages which contain both
 <userinput>cat</userinput> and <userinput>nose</userinput> would be returned,
 pages containing all three words would not.</para></listitem>
 </varlistentry>
@@ -409,14 +406,14 @@ summary.</para></listitem>
 <term><guilabel>Sort</guilabel></term>
 <listitem><para>Sort the results in order of <guilabel>Score</guilabel> (how
 closely your search terms were matched,) alphabetically by
-<guilabel>Title</guilabel> or by <guilabel>Date</guilabel>.  Selecting the
+<guilabel>Title</guilabel> or by <guilabel>Date</guilabel>. Selecting the
 <guilabel>Reverse order</guilabel> check box, naturally enough, reverses the
 sort order of the results.</para></listitem>
 </varlistentry>
 <varlistentry>
 <term><guilabel>Update index</guilabel></term>
 <listitem><para>Update the search index, to incorporate new documents,
-or if you think your database is incomplete or damaged.  This may take
+or if you think your database is incomplete or damaged. This may take
 some time.</para></listitem>
 </varlistentry>
 </variablelist>
@@ -430,30 +427,30 @@ some time.</para></listitem>
 sections</title>
 
 <para>Man pages are the standard &UNIX; manual pages, and have been in
-use for many years on many operating systems.  They are extremely
+use for many years on many operating systems. They are extremely
 thorough, and are the very best place to get information about most
-&UNIX; commands and applications.  When people say
+&UNIX; commands and applications. When people say
 <quote>RTFM</quote>, the Manual they are referring to is very often the
 man page.</para>
 
-<para>The man pages are not perfect.  They tend to be in depth, but
+<para>The man pages are not perfect. They tend to be in depth, but
 also extremely technical, often written by developers, and for
 developers. In some cases this makes them somewhat unfriendly, if not
-downright impossible for many users to understand.  They are, however,
+downright impossible for many users to understand. They are, however,
 the best source of solid information on most command line
 applications, and very often the only source.</para>
 
 <para>If you've ever wondered what the number is when people write
 things like man(1) it means which section of the manual the item is
-in.  You will see &khelpcenter; uses the numbers to divide the very many
+in. You will see &khelpcenter; uses the numbers to divide the very many
 man pages into their own sections, making it easier for you to find
 the information you're looking for, if you're just browsing.</para>
 
 <para>Also available are the Info pages, intended to be a replacement
-for the man pages.  The maintainer of some applications no longer
+for the man pages. The maintainer of some applications no longer
 update the man pages, so if there is both a man page and an info page
-available, the info page is probably the most recent.  Most
-applications have one or the other though.  If the application you are
+available, the info page is probably the most recent. Most
+applications have one or the other though. If the application you are
 looking for help on is a &GNU; utility, you will most likely find it
 has an info page, not a man page.</para>
 
@@ -462,7 +459,7 @@ has an info page, not a man page.</para>
 
 <para>Info documents are arranged hierarchically with each page called
 a node. All info documents have a <guilabel>Top</guilabel> node,
-&ie; the opening page.  You can return to the
+&ie; the opening page. You can return to the
 <guilabel>Top</guilabel> of an info document by pressing
 <guilabel>Top</guilabel>.</para>
 
@@ -475,7 +472,7 @@ level in the hierarchy. You may move up the hierarchy by pressing
 <guibutton>Up</guibutton>.</para>
 
 <para>Man is treated similarly to info, with the section index being
-the Top node and each man page on the level below.  Man entries are
+the Top node and each man page on the level below. Man entries are
 one page long.</para>
 
 </sect3>
@@ -486,7 +483,7 @@ one page long.</para>
 
 <para>
 The glossary provides a quick reference point, where you can look up
-the definitions of words that may be unfamiliar to you.  These range
+the definitions of words that may be unfamiliar to you. These range
 from &tde; specific applications and technologies, through to general
 &UNIX; computing terms.
 </para>
@@ -531,7 +528,7 @@ The icons available to you in the toolbar are as follows:
 <varlistentry>
 <term><guiicon>Forward</guiicon></term>
 <listitem>
-<para>Go forward one page.  This icon is only active if you have
+<para>Go forward one page. This icon is only active if you have
 already used the <guiicon>Back</guiicon> icon.</para></listitem>
 </varlistentry>
 
@@ -566,7 +563,7 @@ Increase the size of the text in the viewer pane.
 <term><guiicon>Decrease Font</guiicon></term>
 <listitem>
 <para>
-Decrease the size of the text in the viewer pane.  This icon is only
+Decrease the size of the text in the viewer pane. This icon is only
 enabled if you have previously enlarged the text.
 </para>
 </listitem>
@@ -679,7 +676,7 @@ View the <acronym>HTML</acronym> source of the page you are currently
 </term>
 <listitem>
 <para>
-Change the encoding of the current page.  Normally, the default setting
+Change the encoding of the current page. Normally, the default setting
 of <guimenuitem>Auto</guimenuitem> should be sufficient, but if you are
 having problems viewing pages written in languages other than English,
 you may need to choose a specific encoding in this menu.
@@ -715,7 +712,7 @@ entry.</para>
 </menuchoice></term>
 <listitem>
 <para>At the bottom of the <guimenu>Go</guimenu> menu, you will find a
-history list, of the last few pages you have looked at.  Selecting one
+history list, of the last few pages you have looked at. Selecting one
 will take you directly back to that page.</para>
 </listitem></varlistentry></variablelist>
 
diff --git a/doc/khelpcenter/index.docbook b/doc/khelpcenter/index.docbook
index 6189eaac2..6d7140a04 100644
--- a/doc/khelpcenter/index.docbook
+++ b/doc/khelpcenter/index.docbook
@@ -44,10 +44,11 @@ a way round it. (FF) -->
 <releaseinfo>&tde-release-version;</releaseinfo>
 
 <abstract>
-<para>&tde; is a graphical desktop environment for &UNIX; workstations. The
+<para>The
+Trinity Desktop Environment (&tde;) is a graphical desktop environment for &UNIX; workstations. The
 Trinity Desktop Environment combines ease of use, contemporary functionality, and
 professional graphical design along with the technical advantages of
-the &UNIX; operating system.</para>
+&UNIX; operating systems.</para>
 </abstract>
 
 <keywordset>
diff --git a/doc/khelpcenter/support.docbook b/doc/khelpcenter/support.docbook
index b02609f69..f35256e87 100644
--- a/doc/khelpcenter/support.docbook
+++ b/doc/khelpcenter/support.docbook
@@ -10,12 +10,12 @@
 <title>Supporting the &tde; Project</title>
 
 <para> If you are new to &tde;, the &tde; project might look like big
-machinery to you. Undoubtedly, &tde; is no longer a small project,
+machinery to you. Undoubtedly, &tde; is not a small project,
 nevertheless it is very important to realize that it is easy to
 <quote>make a difference</quote> in the &tde; world.  </para>
 
-<para> There is always a need for dedicated developers, graphic
-artists, sound engineers, translators and documentation
+<para> There is always a need for developers, graphic
+artists, sound engineers, translators, and documentation
 writers. Consider jumping aboard this exciting international project
 and make yourself a name in the software world.</para>
 
@@ -35,7 +35,7 @@ platform.  </para>
 <itemizedlist>
 
 <listitem><para>
-Subscribe to the <link linkend="contact">&tde; mailing lists</link>
+Subscribe to the <ulink url="http://www.trinitydesktop.org/mailinglist.php">mailing list</ulink>
 that interest you.
 </para></listitem>
 
@@ -56,7 +56,7 @@ Learn to program using the &tde; application framework and join the
 <sect1 id="supporting-tde-financial-support">
 <title>Supporting financially</title>
 
-<para> The &tde; team is working very hard on providing you with the
+<para> The &tde; team is working hard on providing you with the
 best desktop available for the &UNIX; operating system. &tde; is
 available for free and will always be available for free, including
 each and every line of its source code, for everyone to modify and
diff --git a/doc/khelpcenter/welcome.docbook b/doc/khelpcenter/welcome.docbook
index ff18cb5ee..9f351f912 100644
--- a/doc/khelpcenter/welcome.docbook
+++ b/doc/khelpcenter/welcome.docbook
@@ -11,7 +11,7 @@
 <sect1 id="welcome-information-about-tde">
 <title>Information about &tde;</title>
 
-<para>&tde; is a graphical desktop environment for &UNIX; workstations. The
+<para>The Trinity Desktop Environment (&tde;) is a graphical desktop environment for &UNIX; workstations. The
 Trinity Desktop Environment combines ease of use, contemporary functionality, and
 professional graphical design along with the technical advantages of
 &UNIX; operating systems.</para>
diff --git a/doc/khelpcenter/whatistde.docbook b/doc/khelpcenter/whatistde.docbook
index 9da36104a..2ad77c94b 100644
--- a/doc/khelpcenter/whatistde.docbook
+++ b/doc/khelpcenter/whatistde.docbook
@@ -13,9 +13,9 @@
 collection of programs, technologies and documentation that attempt to
 make life easier for computer users. &tde; is targeted at &UNIX;
 workstations. &tde; features network transparency and a contemporary work
-philosophy.</para>
+flow philosophy.</para>
 
-<para>The Trinity Desktop Environment is a fork of the K Desktop Environment
+<para>Historically, the Trinity Desktop Environment is a fork of the K Desktop Environment
 version 3.5, originally written by the KDE Team, a world-wide network of
 software engineers committed to Free Software development. This group's
 major goal in free software development is to provide high quality software
@@ -25,38 +25,38 @@ that empowers the user with easy control of his computer's resources.</para>
 
 <para>&tde; seeks to fill the need for an easy to use desktop for
 &UNIX; workstations, similar to the desktop environments found under
-&MacOS; or &Windows; 95/NT. &tde; meets the requirement
+&MacOS; or &Windows;. &tde; meets the requirement
 of users for an easy to use work environment. Tools used to reach
-this end are: enhanced inter-application communication, component
+this goal are: enhanced inter-application communication, component
 reuse, generalized drag and drop, uniform look and feel and many
 more. Thus, &tde; offers much more than the traditional &UNIX; window
 managers.</para>
 
 <para>Stability, scaleability and openness are qualities which have
 made &UNIX; the undisputed choice for the information technology
-professional for many years.  &tde; builds on top of this excellent
+professional for many years. &tde; builds on top of this excellent
 base framework and brings new, much needed qualities: usability, user
-friendliness and beauty! &tde; was the first, and stays the forefront
-player in bringing these qualities to &UNIX;, which constituted for
+friendliness and beauty! &tde; remains as a forefront
+player in bringing these qualities to &UNIX; systems, which constituted for
 years, the premier platform for server computers and scientific
 institutions, but wasn't very attractive for desktop users.</para>
 
-<para>Without &UNIX; the Internet would not exist, or at least would
-have a vastly different form. &UNIX; has not, until now, addressed the
+<para>Without Unix the Internet would not exist, or at least would
+have a vastly different form. Unix has not, until recent years, addressed the
 needs of the average computer user. This fact is particularly
-unfortunate, since a number of implementations of &UNIX; (<ulink
+unfortunate, since a number of implementations of &UNIX; systems (<ulink
 url="http://www.linux.org">&Linux;</ulink>, <ulink
 url="http://www.freebsd.org">FreeBSD</ulink>, <ulink
 url="http://www.netbsd.org">NetBSD</ulink>, &etc;) are freely
 available on the Internet, all of which are of exceptional quality and
-stability.  </para>
+stability. </para>
 
 </sect1>
 
 <sect1 id="what-is-tde-the-desktop">
 <title>&tde; The Desktop Environment</title>
 
-<para>In combination with a free implementation of &UNIX;, &tde;
+<para>In combination with a free implementation of &UNIX; systems, &tde;
 provides to the world an open and completely free desktop computing
 platform either at home or at work.</para>
 
@@ -64,12 +64,12 @@ platform either at home or at work.</para>
 its source code for anyone to modify.</para>
 
 <para>While there will always be room for improvement we believe we
-have now delivered a viable alternative to some of the more commonly
+provide a viable alternative to some of the more commonly
 found and commercial operating systems/desktops combinations available
-today. It is our hope that the combination of &UNIX; and &tde; will
+today. It is our hope that the combination of &UNIX; systems and &tde; will
 finally bring the same open, reliable, stable, and monopoly free
 computing to the average computer user that scientists and computing
-professionals world-wide have enjoyed for years.  </para>
+professionals world-wide have enjoyed for years. </para>
 
 </sect1>
 
@@ -78,17 +78,17 @@ professionals world-wide have enjoyed for years.  </para>
 
 <para>&tde; focuses on the user's needs, but it's obvious that this
 focus is more easily achieved by also giving developers the best
-tools.  &tde; code contains, and comes with, some of the best
+tools. &tde; code contains, and comes with, some of the best
 development technologies of the modern computing age.</para>
 
-<para>Authoring applications under &UNIX;/X11 used to be an extremely
-tedious and labor intensive process. &tde; recognizes the fact that a
+<para>Authoring applications under &UNIX;/X11 systems used to be an extremely
+tedious and labor intensive process. &tde; developers recognize the fact that a
 computing platform is only as good as the number of first class
 applications available to the users of that particular
 platform.</para>
 
-<para>&tde; defines new technologies in &DCOP; and KParts, created to
-offer a component document model and technology.  Together with the
+<para>&tde; includes technologies such as &DCOP; and KParts, created to
+offer a component document model and technology. Together with the
 complete &tde; libraries programming interface, &DCOP;/KParts are set
 in direct competition with other similar technologies like &Microsoft;
 <abbrev>MFC</abbrev>/<abbrev>COM</abbrev>/ActiveX technologies. The
@@ -103,17 +103,16 @@ reinventing the wheel.</para>
 <title>&tde; The Office Application Suite</title>
 
 <para>In its current form, &tde; provides, apart from the essential desktop
-component applications, a suite of powerful office programs known to the
-world by the name &koffice;.</para>
+component applications, a suite of office programs known as &koffice;.</para>
 
 <para>&koffice; is based on the &tde; &DCOP;/KParts
-technologies. It currently contains: a word processor with desktop
+technologies. It contains: a word processor with desktop
 publishing capabilities (&kword;), a spreadsheet application (&kspread;)
 and accompanying charting program (&kchart;), a presentation program
-(&kpresenter;) and a vector drawing program (&kontour;).  Tying things
+(&kpresenter;) and a vector drawing program (&karbon14;). Tying things
 together is the <application>KOffice Workspace</application>, an
 integrated shell to ease the use of the &koffice; components in
-conjunction with each other.  Additional components include an email
+conjunction with each other. Additional components include an email
 client, a news reader, and a powerful <abbrev>PIM</abbrev> (Personal
 Information Manager - an organizer).</para>
 
diff --git a/doc/kicker/index.docbook b/doc/kicker/index.docbook
index 6c8d0ab93..6de60a035 100644
--- a/doc/kicker/index.docbook
+++ b/doc/kicker/index.docbook
@@ -62,7 +62,7 @@ the desktop.
 
 <para>
 &kicker; is the application launcher panel of the Trinity Desktop Environment.
-Besides the <guimenu>K</guimenu> Menu, where you can start applications,
+Besides the <guimenu>TDE</guimenu> Menu, where you can start applications,
 &kicker; is also capable of running docked applets like the pager, the
 taskbar or the clock, and extensions, such as child panels.
 </para>
@@ -135,7 +135,7 @@ basics</link>.
 <para>
 The main use of &kicker; is starting applications. This is
 done by clicking icons, either from the panel or from the
-<guimenu>K</guimenu> Menu. &kicker; shows some more things too, so let's
+<guimenu>TDE</guimenu> Menu. &kicker; shows some more things too, so let's
 see.
 </para>
 
@@ -146,11 +146,11 @@ Having a look at the screenshots above, there are from left to right:
 <variablelist>
 
 <varlistentry>
-<term>The <guimenu>K</guimenu> Menu</term>
+<term>The <guimenu>TDE</guimenu> Menu</term>
 <listitem>
 <para>
 It is used for launching applications and some other useful
-things. Refer to <link linkend="k-menu">The <guimenu>K</guimenu> Menu
+things. Refer to <link linkend="k-menu">The <guimenu>TDE</guimenu> Menu
 </link>for more information.
 </para>
 </listitem>
@@ -273,7 +273,7 @@ There are three different ways to add an application to &kicker;:
 <listitem>
 <para>
 Simply drag any file from &konqueror; into &kicker; and it's there. Dragging
-also works from the <guimenu>K</guimenu> Menu with any entry.  You can
+also works from the <guimenu>TDE</guimenu> Menu with any entry.  You can
 change the attributes like optional command line parameters or the icon
 by clicking it with the &RMB; and choosing <guimenuitem>Configure 
 <replaceable>applicationname</replaceable> Button...</guimenuitem> from the
@@ -342,7 +342,7 @@ removed.
 <para>
 Folders can be added by simply dragging a folder to any free space of
 &kicker;. Quick Browsers can also be added from the context
-menu or the <guimenu>K</guimenu> Menu.
+menu or the <guimenu>TDE</guimenu> Menu.
 </para>
 
 <para>
@@ -419,7 +419,7 @@ then <guilabel>Special Buttons</guilabel> on the right top of the
 fileref="k_menu_icon.png"
 format="PNG"/></imageobject></inlinemediaobject></guiicon> The
 <guiicon>TDE Menu icon</guiicon> is one of the most necessary icons in
-&kicker;. As you might guess, it opens the <guimenu>K</guimenu> Menu,
+&kicker;. As you might guess, it opens the <guimenu>TDE</guimenu> Menu,
 which you can learn more about in <link linkend="k-menu">The K
 Menu</link>.
 </para>
@@ -522,7 +522,7 @@ about quick browsers.
 <!-- fileref="nonkdeapp_icon.png" format="PNG"/></imageobject> -->
 <!-- </inlinemediaobject></guiicon> -->
 The <guilabel>Non-&tde; Application Launcher</guilabel> lets you add an
-application which doesn't appear in the <guimenu>K</guimenu> menu to &kicker;.
+application which doesn't appear in the <guimenu>TDE</guimenu> menu to &kicker;.
 Refer to <link linkend="adding-apps">Adding Applications</link> for more
 information about Non-&tde; Applications.
 </para>
@@ -712,7 +712,7 @@ menu.
 Every <guiicon>application starter</guiicon> has some preferences you
 can set from their context menu with <guimenuitem>Configure <replaceable>application name</replaceable>Button...</guimenuitem>. Usually applications
 and folders have the same preferences as in &konqueror;.  Only the
-applications which are located in the <guimenu>K</guimenu> Menu (for
+applications which are located in the <guimenu>TDE</guimenu> Menu (for
 experienced users: those which have a <literal
 role="extension">.desktop</literal> extension in the <filename
 class="directory">applnk</filename> folder) have a special kind of config
@@ -727,7 +727,7 @@ Here you can see some information about the application link. You can also
 choose an icon by clicking on the <guibutton>icon button</guibutton>
 <!-- and change the filename of the link file -->.
 This may be useful if you want the icon on the panel behave different
-to the analog one in the <guimenu>K</guimenu> Menu.
+to the analog one in the <guimenu>TDE</guimenu> Menu.
 </para>
 <!-- Note: illogic-al: Modification not possible from Kicker's Properties menu
 as root usually owns these .desktop files-->
@@ -1034,22 +1034,22 @@ naturally, disables the panel animations.
 
 <para>
 In the <guilabel>Menus</guilabel> tab you can configure the panel menu's
-behavior. This affects the <guimenu>K</guimenu> menu you will often use
+behavior. This affects the <guimenu>TDE</guimenu> menu you will often use
 to launch applications, the browser menus you can use to access
 folders and other menus like the recent documents menu.
 </para>
 
 <para>
 The <guilabel>TDE Menu</guilabel> frame offers you some options to
-configure the <guimenu>K</guimenu> menu's functionality. The
+configure the <guimenu>TDE</guimenu> menu's functionality. The
 <guilabel>Bookmarks</guilabel> and <guilabel>Recent Documents</guilabel> options
 will enable submenus showing your <application>konqueror</application>
 bookmarks and the last documents you've opened using &tde; applications
 respectively. The <guilabel>Quick Browser</guilabel> option will enable a browser menu.
 Enabling the <guilabel>Show side image</guilabel> check box will display a neat
-image on the left side of the <guimenu>K</guimenu> menu.
+image on the left side of the <guimenu>TDE</guimenu> menu.
 The <guilabel>Menu item format</guilabel> entry allows you to set how
-detailed the <guimenu>K</guimenu> menu entries will be.
+detailed the <guimenu>TDE</guimenu> menu entries will be.
 The <guilabel>Name only</guilabel> option simply shows the application's name in the menu.
 The <guilabel>Name (Description)</guilabel> option will show a small description
 besides the name of the application.
@@ -1069,7 +1069,7 @@ when you browse folders containing many files.
 </para>
 
 <para>
-The quick start section in the <guimenu>K</guimenu> menu offers quick
+The quick start section in the <guimenu>TDE</guimenu> menu offers quick
 access to programs you have used often or recently. In the
 <guilabel>QuickStart Menu Items</guilabel> frame you
 can choose whether this section will show the most recently or the most
@@ -1424,15 +1424,15 @@ taskbar button contains more than one application.
 </chapter>
 
 <chapter id="k-menu">
-<title>The <guimenu>K</guimenu> Menu</title>
+<title>The <guimenu>TDE</guimenu> Menu</title>
 
 <para>
-The <guimenu>K</guimenu> Menu is one of the central elements of
+The <guimenu>TDE</guimenu> Menu is one of the central elements of
 &kicker;.
 </para>
 
 <para>
-There are five main groups in the <guimenu>K</guimenu> Menu which will
+There are five main groups in the <guimenu>TDE</guimenu> Menu which will
 be described now from bottom to top.
 </para>
 
@@ -1440,7 +1440,7 @@ be described now from bottom to top.
 <title>The &tde; Group</title>
 
 <para>
-This group is for the common &tde; things in the <guimenu>K</guimenu>
+This group is for the common &tde; things in the <guimenu>TDE</guimenu>
 Menu.
 </para>
 
@@ -1472,7 +1472,7 @@ screensaver's password settings.
 <term>Special Configuration</term>
 <listitem>
 <para>
-Clicking with the &RMB; on the <guimenu>K</guimenu> Menu, will produce a
+Clicking with the &RMB; on the <guimenu>TDE</guimenu> Menu, will produce a
 special submenu. In this submenu is the <guisubmenu>Panel Menu</guisubmenu>.
 Here you can change the settings of &kicker;, described in the
 <link linkend="configuring">Configuring &kicker;</link> section, add
@@ -2165,7 +2165,7 @@ There is only one standard shortcut available in &kicker;:
 <term><keycombo action="simul">&Alt;<keycap>F1</keycap></keycombo></term>
 <listitem>
 <para>
-Opens the <guimenu>K</guimenu> Menu
+Opens the <guimenu>TDE</guimenu> Menu
 </para>
 </listitem>
 </varlistentry>
@@ -2259,7 +2259,7 @@ taskbar, then choose <guimenuitem>Configure Taskbar...</guimenuitem> and check
 <qandaentry>
 <question>
 <para>
-How can I access the <guimenu>K</guimenu> Menu without using the mouse?
+How can I access the <guimenu>TDE</guimenu> Menu without using the mouse?
 </para>
 </question>
 <answer>
@@ -2322,7 +2322,7 @@ symbolic link: <userinput><command>ln</command> <option>-s</option>
 <qandaentry>
 <question>
 <para>
-Is it possible to change the <guiicon>K</guiicon> button of the panel to
+Is it possible to change the <guiicon>T</guiicon> button of the panel to
 another picture?
 </para>
 </question>
diff --git a/doc/kinfocenter/index.docbook b/doc/kinfocenter/index.docbook
index a7411483b..ceee75297 100644
--- a/doc/kinfocenter/index.docbook
+++ b/doc/kinfocenter/index.docbook
@@ -71,7 +71,7 @@ The &infocenter; can be started 3 ways:
 <orderedlist> 
 <listitem>
 <para>
-By selecting <menuchoice><guimenu>K
+By selecting <menuchoice><guimenu>TDE
 Button</guimenu><guisubmenu>System</guisubmenu><guimenuitem>Info
 Center</guimenuitem></menuchoice> from the &tde; Panel.
 
diff --git a/doc/konqueror/basics.docbook b/doc/konqueror/basics.docbook
index 589fc0e9a..6a89c8d4a 100644
--- a/doc/konqueror/basics.docbook
+++ b/doc/konqueror/basics.docbook
@@ -42,7 +42,7 @@ or desktop, then <mousebutton>left</mousebutton> click on it to open
 </guiicon> shaped icon on the panel or desktop to open &konqueror; in browser 
 mode.</para></listitem>
 
-<listitem><para>From the <guimenu>K</guimenu> menu, select
+<listitem><para>From the <guimenu>TDE</guimenu> menu, select
 <menuchoice><guisubmenu>Internet</guisubmenu><guimenuitem>Konqueror Web
 Browser</guimenuitem></menuchoice> to start it as a browser, or
 <guimenuitem>Home</guimenuitem> to launch &konqueror; in file manager mode.
diff --git a/doc/konqueror/filemanager.docbook b/doc/konqueror/filemanager.docbook
index 6c90833ab..48cf76e48 100644
--- a/doc/konqueror/filemanager.docbook
+++ b/doc/konqueror/filemanager.docbook
@@ -3,7 +3,7 @@
 <authorgroup>
 <author>&Pamela.Roberts;</author>
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
-</authorgroup> 
+</authorgroup>
 
 <date>2005-04-01</date>
 <releaseinfo>3.4</releaseinfo>
@@ -13,22 +13,22 @@
 
 <sect1 id="dirfolders">
 <title>Folders and Paths</title>
-<para>In &UNIX; and &Linux; all folders are arranged in a simple 
-inverted tree structure descending and branching down from from a single top 
+<para>In &UNIX; and &Linux; all folders are arranged in a simple
+inverted tree structure descending and branching down from from a single top
 level folder. This means that you can get from any folder to
 any other by going <quote>up</quote> until you reach a common point then
 <quote>down</quote> through the appropriate subfolders until you reach
 your
-target. </para>  
+target. </para>
 
 <para>The position of any file or folder in the tree can be described by its
 <quote>path</quote>, which is a simple list of the folders you would have
-to descend through to get to the target folder or file. For example 
-<filename class="directory">/home/pam</filename> is the subfolder <filename 
+to descend through to get to the target folder or file. For example
+<filename class="directory">/home/pam</filename> is the subfolder <filename
 class="directory">pam</filename> of the subfolder <filename
 class="directory">home</filename> of the top level folder, and <filename>
-/home/pam/words.txt</filename> is the file <filename>words.txt</filename> in 
-that subfolder. The leading <quote>/</quote> in these paths represents the 
+/home/pam/words.txt</filename> is the file <filename>words.txt</filename> in
+that subfolder. The leading <quote>/</quote> in these paths represents the
 top level folder.</para>
 
 <para>Every folder accessible by your system &mdash; including those on
@@ -38,30 +38,30 @@ from /, their exact paths will depend on how your system was set up (see
 also
 the section on <link linkend="floppy-cd">Floppy and &CD-ROM; Drives</link>).
 </para>
-<para>Every user on a &UNIX; / &Linux; system has their own <quote>home</quote> 
+<para>Every user on a &UNIX; / &Linux; system has their own <quote>home</quote>
 folder to hold their personal files and settings; for example
-<filename class="directory">/home/john</filename> and  
-<filename class="directory">/home/mary</filename>. The 
-symbol <keycap>~</keycap> is often used to represent the user's home 
-folder, so that <filename>~/letter.txt</filename> refers to the file 
+<filename class="directory">/home/john</filename> and
+<filename class="directory">/home/mary</filename>. The
+symbol <keycap>~</keycap> is often used to represent the user's home
+folder, so that <filename>~/letter.txt</filename> refers to the file
 <filename>letter.txt</filename> in my home folder.</para>
-<para>Note that the term <quote>directory</quote> is often used instead of 
+<para>Note that the term <quote>directory</quote> is often used instead of
 <quote>folder</quote>.</para>
 </sect1>
 
 <sect1 id="viewmode">
 <title>View Modes</title>
-<para>In File Manager mode, &konqueror; shows you what files and 
-subfolders are held in a folder, and can provide you with some 
+<para>In File Manager mode, &konqueror; shows you what files and
+subfolders are held in a folder, and can provide you with some
 information about them.</para>
-<para>The <quote>path</quote> of the folder you are looking at is shown in 
+<para>The <quote>path</quote> of the folder you are looking at is shown in
 the Titlebar, and also in the Location Toolbar, prefixed with <quote>file:
-</quote> to indicate that the folder is part of your computer's normal file 
+</quote> to indicate that the folder is part of your computer's normal file
 system. For example <filename>file:/home/pam</filename>.</para>
 
 <para>The way that &konqueror; displays the files and folders depends mainly
 on your choice of View Mode. This can be selected from the <menuchoice>
-<guimenu>View</guimenu><guisubmenu>View Mode</guisubmenu></menuchoice> 
+<guimenu>View</guimenu><guisubmenu>View Mode</guisubmenu></menuchoice>
 sub menu, which gives you the following options:
 </para>
 
@@ -75,25 +75,25 @@ sub menu, which gives you the following options:
 
 <varlistentry>
 <term><guimenuitem>MultiColumn View</guimenuitem></term>
-<listitem><para>Similar to <guimenuitem>Icon View</guimenuitem> except that the 
+<listitem><para>Similar to <guimenuitem>Icon View</guimenuitem> except that the
 display is neatly formatted into regular columns.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term><guimenuitem>Detailed List View</guimenuitem></term>
-<listitem><para>Displays each file or folder on a separate line, as a small 
-icon followed by the file or folder name followed by information about the 
+<listitem><para>Displays each file or folder on a separate line, as a small
+icon followed by the file or folder name followed by information about the
 item. The amount of information shown is controlled by the <menuchoice>
-<guimenu>View</guimenu><guisubmenu>Show Details</guisubmenu></menuchoice> 
+<guimenu>View</guimenu><guisubmenu>Show Details</guisubmenu></menuchoice>
 sub menu settings.
 </para></listitem>
 </varlistentry>
 
 <varlistentry>
 <term><guimenuitem>Text View</guimenuitem></term>
-<listitem><para>Similar to <guimenuitem>Detailed List View</guimenuitem> 
-except that icons are not shown and the first character in each line will be 
+<listitem><para>Similar to <guimenuitem>Detailed List View</guimenuitem>
+except that icons are not shown and the first character in each line will be
 <quote>/</quote> if the item is a folder.
 </para></listitem>
 </varlistentry>
@@ -101,10 +101,10 @@ except that icons are not shown and the first character in each line will be
 <varlistentry>
 <term><guimenuitem>Tree View</guimenuitem></term>
 <listitem><para>This option is useful for <link linkend="navigation">
-navigating</link> through the folder tree below the current folder. 
-The display is similar to <guimenuitem>Detailed List View</guimenuitem> 
-except that the start of each line will show a small <keycap>+</keycap> sign 
-in a box if the item is a folder. 
+navigating</link> through the folder tree below the current folder.
+The display is similar to <guimenuitem>Detailed List View</guimenuitem>
+except that the start of each line will show a small <keycap>+</keycap> sign
+in a box if the item is a folder.
 <mousebutton>Left</mousebutton> clicking on the box will expand the display to
 show the contents of that folder.</para>
 </listitem>
@@ -112,28 +112,28 @@ show the contents of that folder.</para>
 
 <varlistentry>
 <term><guimenuitem>Info List View</guimenuitem></term>
-<listitem><para>Similar to <guimenuitem>Detailed List View</guimenuitem> 
-except that, where applicable, it shows the number of lines, words and 
+<listitem><para>Similar to <guimenuitem>Detailed List View</guimenuitem>
+except that, where applicable, it shows the number of lines, words and
 characters and file format for each file.
 </para></listitem>
 </varlistentry>
 </variablelist>
 
-<para>The default file icons shown in <guimenuitem>Icon View</guimenuitem> and 
-<guimenuitem>MultiColumn View</guimenuitem> modes can be replaced by small 
+<para>The default file icons shown in <guimenuitem>Icon View</guimenuitem> and
+<guimenuitem>MultiColumn View</guimenuitem> modes can be replaced by small
 preview images of the file contents, see the section <link linkend="previews">
 File Previews</link> of this handbook for more details.</para>
 
 <sect2 id="filetipinfo">
 <title>File Tip Info</title>
 <para>Checking the <guilabel>Show file tips</guilabel> box in the <guilabel>
-Behavior</guilabel> page of the &konqueror; Configuration dialog causes a 
-small pop up information 
-window to appear when the mouse pointer is hovered over a file or folder name 
+Behavior</guilabel> page of the &konqueror; Configuration dialog causes a
+small pop up information
+window to appear when the mouse pointer is hovered over a file or folder name
 or icon in <guimenuitem>Icon View</guimenuitem> or <guimenuitem>
-MultiColumn View</guimenuitem> mode. 
+MultiColumn View</guimenuitem> mode.
 </para>
-<para>If the <guilabel>Show previews in file tips</guilabel> checkbox is 
+<para>If the <guilabel>Show previews in file tips</guilabel> checkbox is
 checked the pop up window will also show a small image of the file contents.
 </para>
 </sect2>
@@ -141,21 +141,21 @@ checked the pop up window will also show a small image of the file contents.
 <sect2 id="previews">
 <title>File Previews</title>
 <para>Selecting <menuchoice><guimenu>View</guimenu><guisubmenu>Preview
-</guisubmenu></menuchoice> from the Menubar will bring up a sub menu 
+</guisubmenu></menuchoice> from the Menubar will bring up a sub menu
 that lets you enable file previews for certain types of file.</para>
-<para>Generally this means that the file's icon will be replaced by a small 
+<para>Generally this means that the file's icon will be replaced by a small
 image showing the file contents.</para>
-<para>If file preview is enabled for <guimenuitem>Sound Files</guimenuitem> 
-the file will be played whenever the mouse cursor is hovering over the file 
+<para>If file preview is enabled for <guimenuitem>Sound Files</guimenuitem>
+the file will be played whenever the mouse cursor is hovering over the file
 name or icon.</para>
 <para>Note that file previews are only available in <guimenuitem>Icon View
 </guimenuitem> and <guimenuitem>MultiColumn View</guimenuitem> modes.</para>
-<para>Because &konqueror; has to read much more data than just the file name 
-details to generate a preview, file previews may not be appropriate 
+<para>Because &konqueror; has to read much more data than just the file name
+details to generate a preview, file previews may not be appropriate
 when viewing files on a floppy or from a remote system. The <guilabel>Previews
-</guilabel> page of the File Manager Configuration 
-dialog allows you to disable file previews for protocols such as 
-<link linkend="ftp">ftp</link> where reading the extra data would take too 
+</guilabel> page of the File Manager Configuration
+dialog allows you to disable file previews for protocols such as
+<link linkend="ftp">ftp</link> where reading the extra data would take too
 long.</para>
 </sect2>
 
@@ -163,8 +163,8 @@ long.</para>
 
 <sect1 id="navigation">
 <title>Navigation</title>
-<para>To get to a file with &konqueror; you first need to navigate 
-through the folder tree to find the folder containing that 
+<para>To get to a file with &konqueror; you first need to navigate
+through the folder tree to find the folder containing that
 file.</para>
 
 <para>To move between folders you can simply step up and down the
@@ -174,31 +174,31 @@ tree:</para>
 <listitem><para>To descend into a subfolder <mousebutton>left
 </mousebutton> click on its name or
 icon -- or if you have already <quote>selected</quote> it (see below) -- then just press
-<keycap>Enter</keycap>.</para></listitem> 
+<keycap>Enter</keycap>.</para></listitem>
 <listitem><para>To go up the folder tree you can click on the <guiicon>Up
 </guiicon> button in the Toolbar, use<keycombo action="simul">&Alt;<keysym>Up Arrow</keysym></keycombo>, or use the Menubar
 <menuchoice><guimenu>Go</guimenu><guimenuitem>Up</guimenuitem></menuchoice>
 option.</para></listitem>
 </itemizedlist>
 
-<para>To <quote>select</quote> a file or folder in the displayed folder 
+<para>To <quote>select</quote> a file or folder in the displayed folder
 without opening it in any way use the <keysym>up</keysym> and <keysym>down
-</keysym> arrow keys to move through the items. 
-The selected item will be highlighted and some information about it 
+</keysym> arrow keys to move through the items.
+The selected item will be highlighted and some information about it
 will be displayed in the Status Bar.</para>
 
 <para>Setting the <link linkend="viewmode">View Mode</link> to <guimenuitem>
-Tree View</guimenuitem> can help you locate folders in the tree below the 
-current folder; in this mode each folder is shown with a small box at 
+Tree View</guimenuitem> can help you locate folders in the tree below the
+current folder; in this mode each folder is shown with a small box at
 the left. If the box contains a <keycap>+</keycap> sign, <mousebutton>left
-</mousebutton> clicking on the box (not on the folder name or icon) will 
-display a sub tree showing files and subfolders contained in that folder. 
-The small box will then change to show a <keycap>-</keycap> sign. 
-<mousebutton>Left</mousebutton> click on that to collapse the sub tree. Once 
+</mousebutton> clicking on the box (not on the folder name or icon) will
+display a sub tree showing files and subfolders contained in that folder.
+The small box will then change to show a <keycap>-</keycap> sign.
+<mousebutton>Left</mousebutton> click on that to collapse the sub tree. Once
 you have found the folder you are looking for, <mousebutton>left
 </mousebutton> click on the folder name or icon to open it.</para>
 
-<para>The <link linkend="sidebar">Navigation Panel</link> can also help you 
+<para>The <link linkend="sidebar">Navigation Panel</link> can also help you
 find your way around the file system.</para>
 
 <para>You can go directly to any folder by typing its path into the
@@ -235,9 +235,9 @@ locations.</para></tip>
 
 <para>If you don't know or can't remember where a file or folder is within
 your system, then use the Toolbar <guiicon>Find File</guiicon> button or the
-Menubar <menuchoice><guimenu>Tools</guimenu><guimenuitem>Find 
-File...</guimenuitem></menuchoice> option.  This will embed the file finder 
-application &kfind; into &konqueror;'s window. See the &kfind; Handbook 
+Menubar <menuchoice><guimenu>Tools</guimenu><guimenuitem>Find
+File...</guimenuitem></menuchoice> option.  This will embed the file finder
+application &kfind; into &konqueror;'s window. See the &kfind; Handbook
 for help in using &kfind;.
 </para>
 
@@ -246,9 +246,9 @@ it is a <quote>hidden</quote> file or folder, and will not normally be shown
 by &konqueror;. To see hidden files or folders use the Menubar <menuchoice>
 <guimenu>View</guimenu><guimenuitem>Show Hidden Files</guimenuitem>
 </menuchoice> option.</para>
-<para>Another reason &konqueror; may not show the file or folder you are 
+<para>Another reason &konqueror; may not show the file or folder you are
 looking for is that you may have the <link linkend="konq-plugin"><guisubmenu>
-View Filter</guisubmenu></link> plugin set to display only certain types of 
+View Filter</guisubmenu></link> plugin set to display only certain types of
 file.</para></note>
 
 </sect2>
@@ -256,18 +256,18 @@ file.</para></note>
 <sect2 id="floppy-cd">
 <title>Floppy and &CD-ROM; Drives</title>
 
-<para>Any floppy disk, &CD; drive or other hard disk partition that you have 
+<para>Any floppy disk, &CD; drive or other hard disk partition that you have
 on your system will usually appear in the <filename class="directory">/
-</filename>,  <filename class="directory">/media</filename>, <filename class="directory">/mnt</filename> or 
-<filename class="directory">/auto</filename> folder, having a path something 
+</filename>,  <filename class="directory">/media</filename>, <filename class="directory">/mnt</filename> or
+<filename class="directory">/auto</filename> folder, having a path something
 like <filename class="directory">/mnt/floppy</filename> or
 <filename class="directory">/cdrom</filename>. The details will depend on
 how your system was set up.</para>
 
-<para>&UNIX; / &Linux; requires that you <command>mount</command> a floppy disk 
+<para>&UNIX; / &Linux; requires that you <command>mount</command> a floppy disk
 or &CD-ROM; when you have inserted it into the drive, and <command>mount
-</command> other hard disk partitions when you want to access them. You also 
-need to unmount a floppy disk or &CD-ROM; before removing it to register that 
+</command> other hard disk partitions when you want to access them. You also
+need to unmount a floppy disk or &CD-ROM; before removing it to register that
 it is no longer available. </para>
 
 <para>How you do this will depend on how your system:</para>
@@ -279,12 +279,12 @@ unmounting,
 although you may find that the &CD-ROM; occasionally starts up by itself for no
 apparent reason.</para></listitem>
 
-<listitem><para>You may have <guiicon>Floppy</guiicon>, &CD-ROM; and hard disk 
-icons on your desktop, in which case &LMB; click on the icon to mount it. 
-Doing this should also bring up a &konqueror; window showing the contents of 
-the floppy, &CD-ROM; or partition. To unmount, <mousebutton>right</mousebutton> 
-click on the icon and choose the <guimenuitem>Unmount</guimenuitem> item.  
-Visit the section <link linkend="making">Create New...</link> in this Handbook 
+<listitem><para>You may have <guiicon>Floppy</guiicon>, &CD-ROM; and hard disk
+icons on your desktop, in which case &LMB; click on the icon to mount it.
+Doing this should also bring up a &konqueror; window showing the contents of
+the floppy, &CD-ROM; or partition. To unmount, <mousebutton>right</mousebutton>
+click on the icon and choose the <guimenuitem>Unmount</guimenuitem> item.
+Visit the section <link linkend="making">Create New...</link> in this Handbook
 to see how to create such an icon.</para></listitem>
 
 <listitem><para>Or you can do it the traditional way by typing into a text
@@ -292,7 +292,7 @@ console window:</para>
 
 <para><userinput><command>mount /mnt/floppy</command></userinput></para>
 
-<!-- This markup doesn't work properly, it puts 'mount' and '/mnt/floppy' 
+<!-- This markup doesn't work properly, it puts 'mount' and '/mnt/floppy'
 on separate lines
 <screen>
 <userinput><command>mount</command>
@@ -337,7 +337,7 @@ folder:</para>
 <itemizedlist>
 <listitem><para>You can move it to the <filename>Trash</filename> folder, which
 is the safest method as you can get it back if you realize that you have made a
-mistake.</para></listitem> 
+mistake.</para></listitem>
 
 <listitem><para>You can just plain Delete it, which
 removes the entry from the folder and adds the disk area occupied by the
@@ -382,7 +382,7 @@ the &RMB;, which will bring up a menu containing the
 <menuchoice><guimenu>Edit</guimenu>
 <guimenuitem>Copy</guimenuitem></menuchoice>
 item, or the <keycombo
-action="simul">&Ctrl;<keycap>C</keycap></keycombo> 
+action="simul">&Ctrl;<keycap>C</keycap></keycombo>
 shortcut key combination. You can also select <link linkend="multiple">multiple</link> files or folders to copy/move as well.</para></listitem>
 
 <listitem><para>Navigate to the folder you want to copy the item into then
@@ -405,7 +405,7 @@ instead of <guimenuitem>Copy</guimenuitem>. The item that you have
 <guimenuitem>Cut</guimenuitem> will be removed from the original folder when
 you do the <guimenuitem>Paste</guimenuitem> into the new folder.</para>
 
-<para>You can also copy or move selected item(s) to another folder by using 
+<para>You can also copy or move selected item(s) to another folder by using
 <menuchoice><guimenu>Edit</guimenu>
 <guimenuitem>Copy Files</guimenuitem></menuchoice> (<keycap>F7</keycap>) or
 <menuchoice><guimenu>Edit</guimenu><guimenuitem>Move Files</guimenuitem>
@@ -425,12 +425,12 @@ details.</para></note>
 <para>&konqueror; also supports Drag and Drop copying and moving of files and
 folders.</para>
 
-<para>You can do this by having two instances of &konqueror;, one showing the 
-folder you want to copy from, the other showing the target folder. 
-Position the mouse pointer over the item you wish to copy or move, then, 
+<para>You can do this by having two instances of &konqueror;, one showing the
+folder you want to copy from, the other showing the target folder.
+Position the mouse pointer over the item you wish to copy or move, then,
 holding the &LMB; pressed, <quote>drag</quote> it to a clear space in the
 target
- 
+
 folder. Release the button and you will be
 presented with a menu choice of <guimenuitem>Copy</guimenuitem> or
 <guimenuitem>Move</guimenuitem>. Take care to <quote>drop</quote> the item into
@@ -450,14 +450,14 @@ its window and drag &amp; drop between them.</para>
 
 <para>This screenshot illustrates the use of the Menubar
 <menuchoice><guimenu>Window</guimenu> <guimenuitem>Split View
-Left/Right</guimenuitem></menuchoice> option, also available with the shortcut 
+Left/Right</guimenuitem></menuchoice> option, also available with the shortcut
 <keycombo
 action="simul">&Ctrl;&Shift;<keycap>L</keycap>
 </keycombo>,
 to split the main &konqueror; window into two views, each showing the contents
 of a different folder.</para>
 
-<para>To be able to show different folders in each view they should not be 
+<para>To be able to show different folders in each view they should not be
 linked; the little boxes at the bottom right of each view should be empty.
 </para>
 
@@ -484,20 +484,20 @@ dragging and then drop the file.</para>
 
 <sect2 id="dups">
 <title>Duplicate File Names</title>
-<para>If you try to paste a file into a folder that already 
-contains a file with the same name, &konqueror; will pop up a dialog box warning 
+<para>If you try to paste a file into a folder that already
+contains a file with the same name, &konqueror; will pop up a dialog box warning
 you that the file already exists. You can then choose to:
 </para>
 <itemizedlist>
 <listitem><para>
-<guilabel>Overwrite</guilabel> the old file with the newly copied one. 
-The <guibutton>Overwrite All</guibutton> button can be used if you have copied 
+<guilabel>Overwrite</guilabel> the old file with the newly copied one.
+The <guibutton>Overwrite All</guibutton> button can be used if you have copied
 multiple items.</para></listitem>
 <listitem><para>Cancel the paste operation by pressing the <guibutton>Skip
 </guibutton> or <guibutton>Skip All</guibutton> button.</para></listitem>
-<listitem><para>Give the file that is being copied a different name. You can 
-do this by typing a new name into the text entry box or get &konqueror; to 
-<guibutton>Propose</guibutton> one. When you have done this press the 
+<listitem><para>Give the file that is being copied a different name. You can
+do this by typing a new name into the text entry box or get &konqueror; to
+<guibutton>Propose</guibutton> one. When you have done this press the
 <guibutton>Rename</guibutton> button.</para></listitem>
 </itemizedlist>
 </sect2>
@@ -506,9 +506,9 @@ do this by typing a new name into the text entry box or get &konqueror; to
 <sect1 id="multiple">
 <title>Selecting Multiple Files</title>
 
-<para>You sometimes want to delete, copy or move a number of files that are 
-similar in some way. For example you may wish to move all of the .png graphics 
-files from one folder to another. &konqueror; makes this easy by letting you 
+<para>You sometimes want to delete, copy or move a number of files that are
+similar in some way. For example you may wish to move all of the .png graphics
+files from one folder to another. &konqueror; makes this easy by letting you
 select multiple files based on similarities in their file names.</para>
 
 <para>Use the Menubar
@@ -520,7 +520,7 @@ the wildcard characters <keycap>*</keycap>, which matches any number
 of characters, and <keycap>?</keycap> which matches a single
 character. Press <guibutton>OK</guibutton> and &konqueror; will
 highlight all files with matching names. For example;</para>
-      
+
 <itemizedlist>
 <listitem><para> <userinput><filename>flag*.png</filename></userinput> will
 select all filenames starting with the letters <quote>flag</quote> and ending
@@ -551,7 +551,7 @@ action="simul">&Ctrl;<keycap>*</keycap></keycombo> to do this.</para>
 
 <para>You can also select multiple files and folders by holding the <keycap>&Ctrl;</keycap> button while you click on each individual file or folder. This enables you to then move or copy multiple files and folders to a different location at one time by using the same method above.</para>
 
-<para>A number of useful shortcut keys can be used in list, tree and text 
+<para>A number of useful shortcut keys can be used in list, tree and text
 view modes:</para>
 <variablelist>
 
@@ -572,11 +572,11 @@ view modes:</para>
 </varlistentry>
 
 <varlistentry>
-<term><keycombo action="simul">&Ctrl;<keysym>Up Arrow</keysym></keycombo>, 
-<keycombo action="simul">&Ctrl;<keysym>Down Arrow</keysym></keycombo>, 
-<keycombo action="simul">&Ctrl;<keycap>Home</keycap></keycombo>, 
-<keycombo action="simul">&Ctrl;<keycap>End</keycap></keycombo>, 
-<keycombo action="simul">&Ctrl;<keycap>Page Up</keycap></keycombo>, 
+<term><keycombo action="simul">&Ctrl;<keysym>Up Arrow</keysym></keycombo>,
+<keycombo action="simul">&Ctrl;<keysym>Down Arrow</keysym></keycombo>,
+<keycombo action="simul">&Ctrl;<keycap>Home</keycap></keycombo>,
+<keycombo action="simul">&Ctrl;<keycap>End</keycap></keycombo>,
+<keycombo action="simul">&Ctrl;<keycap>Page Up</keycap></keycombo>,
 <keycombo action="simul">&Ctrl;<keycap>Page Down</keycap></keycombo>
 </term>
 <listitem>
@@ -586,15 +586,15 @@ view modes:</para>
 </varlistentry>
 
 <varlistentry>
-<term><keycombo action="simul">&Shift;<keysym>Up Arrow</keysym></keycombo>, 
-<keycombo action="simul">&Shift;<keysym>Down Arrow</keysym></keycombo>, 
-<keycombo action="simul">&Shift;<keycap>Home</keycap></keycombo>, 
-<keycombo action="simul">&Shift;<keycap>End</keycap></keycombo>, 
-<keycombo action="simul">&Shift;<keycap>Page Up</keycap></keycombo>, 
+<term><keycombo action="simul">&Shift;<keysym>Up Arrow</keysym></keycombo>,
+<keycombo action="simul">&Shift;<keysym>Down Arrow</keysym></keycombo>,
+<keycombo action="simul">&Shift;<keycap>Home</keycap></keycombo>,
+<keycombo action="simul">&Shift;<keycap>End</keycap></keycombo>,
+<keycombo action="simul">&Shift;<keycap>Page Up</keycap></keycombo>,
 <keycombo action="simul">&Shift;<keycap>Page Down</keycap></keycombo>
 </term>
 <listitem>
-<para>Deselect everything, then move the selection, selecting everything on 
+<para>Deselect everything, then move the selection, selecting everything on
 the way.
 </para>
 </listitem>
@@ -608,7 +608,7 @@ move commands will act on all of the selected files at once. </para>
 that the <keycombo
 action="simul">&Ctrl;<keycap>+</keycap></keycombo>, <keycombo
 action="simul">&Ctrl;<keycap>-</keycap></keycombo> and <keycombo
-action="simul">&Ctrl;<keycap>*</keycap></keycombo> shortcuts 
+action="simul">&Ctrl;<keycap>*</keycap></keycombo> shortcuts
 only work with the Numeric keypad <keycap>+</keycap>, <keycap>-</keycap> and
 <keycap>*</keycap> keys.</para></note>
 
@@ -641,11 +641,11 @@ options such as the file types which the application can open are also
 available from this page.</para>
 
 <para>To make the application icon appear on your desktop, create the link in
-your <filename class="directory">~/Desktop</filename> folder (this may be 
-called something slightly different depending on how &tde; was installed on 
+your <filename class="directory">~/Desktop</filename> folder (this may be
+called something slightly different depending on how &tde; was installed on
 your system) or get to the
 <guisubmenu>Create New...</guisubmenu> sub menu by
-<mousebutton>right</mousebutton> clicking on a free area of the desktop 
+<mousebutton>right</mousebutton> clicking on a free area of the desktop
 instead of within &konqueror;'s window.</para>
 
 <para>If you have a lot of specialized application links and don't want to
@@ -703,7 +703,7 @@ Device...</guimenuitem> but for a hard disk drive or
 <varlistentry>
 <term><guimenuitem>CD/DVD-ROM Device...</guimenuitem></term>
 <listitem><para>This option is similar to <guimenuitem>Floppy
-Device...</guimenuitem> but for a <acronym>CD</acronym> or <acronym>DVD</acronym> 
+Device...</guimenuitem> but for a <acronym>CD</acronym> or <acronym>DVD</acronym>
 drive.</para></listitem>
 </varlistentry>
 
@@ -730,7 +730,7 @@ confusion.</para></listitem>
 
 <varlistentry>
 <term><guimenuitem>Presentation Document...</guimenuitem></term>
-<listitem><para>Creates a skeleton &koffice; 
+<listitem><para>Creates a skeleton &koffice;
 &kpresenter; document. Give its name a <literal role="extension">.kpr</literal>
 extension.</para></listitem>
 </varlistentry>
@@ -751,7 +751,7 @@ role="extension">.ksp</literal> extension.</para></listitem>
 
 <varlistentry>
 <term><guimenuitem>Illustration Document...</guimenuitem></term>
-<listitem><para>Creates a new <application>KOffice</application> &kontour;
+<listitem><para>Creates a new <application>KOffice</application> &karbon14;
 document. Name it with the extension <literal
 role="extension">.kil</literal>.</para></listitem>
 </varlistentry>
@@ -763,18 +763,18 @@ role="extension">.kil</literal>.</para></listitem>
 <sect1 id="newname">
 <title>Changing Names and Permissions</title>
 
-<para>The two easiest ways to change the name of a file or folder is to either 
-<mousebutton>right</mousebutton> click on it and select 
+<para>The two easiest ways to change the name of a file or folder is to either
+<mousebutton>right</mousebutton> click on it and select
 <guimenuitem>Rename</guimenuitem>, or select the file or folder and then press the <keycap>F2</keycap> button.</para>
 
-<para>To change the name or permissions of a file or folder 
-<mousebutton>right</mousebutton> click on its name or icon and select the 
-<guimenuitem>Properties...</guimenuitem> item, or if you have 
-<quote>selected</quote> the file or folder, then you can use the Menubar 
-<menuchoice><guimenu>Edit</guimenu> 
+<para>To change the name or permissions of a file or folder
+<mousebutton>right</mousebutton> click on its name or icon and select the
+<guimenuitem>Properties...</guimenuitem> item, or if you have
+<quote>selected</quote> the file or folder, then you can use the Menubar
+<menuchoice><guimenu>Edit</guimenu>
 <guimenuitem>Properties</guimenuitem></menuchoice> option.</para>
 
-<para>This will bring up the Properties dialog box with two tabbed 
+<para>This will bring up the Properties dialog box with two tabbed
 pages:</para>
 
 <itemizedlist>
@@ -788,12 +788,12 @@ ownership and access permissions and lets you change the permissions.
 
 <sect2 id="copyrename">
 <title>Copy and Rename</title>
-<para>If you want to make a copy of an existing file with a different name -- 
-perhaps as a backup -- in the same folder as the original file, do a normal 
-<guimenuitem>Copy</guimenuitem> then when you <guimenuitem>Paste</guimenuitem> 
-it a dialog box will pop up  complaining that the file already exists. 
-Just type the new name into the dialog's text box and press the 
-<guibutton>Rename</guibutton> button (or if you are feeling lazy pressing the 
+<para>If you want to make a copy of an existing file with a different name --
+perhaps as a backup -- in the same folder as the original file, do a normal
+<guimenuitem>Copy</guimenuitem> then when you <guimenuitem>Paste</guimenuitem>
+it a dialog box will pop up  complaining that the file already exists.
+Just type the new name into the dialog's text box and press the
+<guibutton>Rename</guibutton> button (or if you are feeling lazy pressing the
 <guibutton>Propose</guibutton> button will generate a new name for you).</para>
 </sect2>
 
@@ -809,7 +809,7 @@ administrator, often known as the Super User or <systemitem class="username">roo
 
 <para>Rather than logging out then in again, you can launch &konqueror; from
 the
-<guimenu>K</guimenu> Menu in Super User mode by selecting
+<guimenu>TDE</guimenu> Menu in Super User mode by selecting
 <menuchoice><guisubmenu>System</guisubmenu><guimenuitem>File Manager - Super
  User Mode
 </guimenuitem></menuchoice>. You will be asked for the <systemitem class="username">root</systemitem>
@@ -847,7 +847,7 @@ and click on <guibutton>Help</guibutton>.</para>
 
 <para>Although &konqueror; is a very powerful and flexible
 <acronym>GUI</acronym> file manager, there are occasions when the experienced
-&Linux; / &UNIX; user wants to get down to the basics and work at the text 
+&Linux; / &UNIX; user wants to get down to the basics and work at the text
 command line level.</para>
 
 <para>You can, of course, open an instance of &konsole;, perhaps with
@@ -855,25 +855,25 @@ command line level.</para>
 Terminal</guimenuitem></menuchoice> option or with <keycombo
 action="simul">&Ctrl;<keycap>T</keycap></keycombo>.</para>
 <para>If you only want to launch a program or view a &URL;, the <menuchoice>
-<guimenu>Tools</guimenu><guimenuitem>Run Command</guimenuitem></menuchoice> 
-(<keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo>) option may be 
+<guimenu>Tools</guimenu><guimenuitem>Run Command</guimenuitem></menuchoice>
+(<keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo>) option may be
 easier.</para>
 
 <para><menuchoice><guimenu>Tools</guimenu><guimenuitem>Execute Shell Command...
 </guimenuitem></menuchoice> (<keycombo action="simul">&Ctrl;
-<keycap>E</keycap></keycombo>) opens a small command line dialog window where 
+<keycap>E</keycap></keycombo>) opens a small command line dialog window where
 you can enter a shell command such as <userinput>ps -ax | grep tdeinit
-</userinput>. Note that it does not support full featured terminal control 
+</userinput>. Note that it does not support full featured terminal control
 characters, so applications such as <userinput>top</userinput> and <userinput>
-less</userinput> will not work properly, but it is available immediately 
+less</userinput> will not work properly, but it is available immediately
 without the delay involved in starting &konsole;.
 </para>
 
-<para>For more complex operations, &konqueror; has another nice feature: the 
+<para>For more complex operations, &konqueror; has another nice feature: the
 Menubar <menuchoice><guimenu>Window</guimenu><guimenuitem>Show Terminal
-Emulator</guimenuitem></menuchoice> option, which opens up a terminal window as 
-a new view within &konqueror;. As long as the link icon is visible at the 
-bottom right corner of each view, the terminal will follow any folder changes 
+Emulator</guimenuitem></menuchoice> option, which opens up a terminal window as
+a new view within &konqueror;. As long as the link icon is visible at the
+bottom right corner of each view, the terminal will follow any folder changes
 you make in the normal file manager view.</para>
 
 <mediaobject>
diff --git a/doc/konqueror/save-settings.docbook b/doc/konqueror/save-settings.docbook
index 9fb248815..2eab552ea 100644
--- a/doc/konqueror/save-settings.docbook
+++ b/doc/konqueror/save-settings.docbook
@@ -66,7 +66,7 @@ location bar before saving the profile.</para>
 
 <note><para>You can create a desktop icon to start &konqueror; with your new
 profile. First create a desktop icon by dragging the &konqueror; icon from the
-<guimenu>K</guimenu> menu onto the desktop and selecting <guimenuitem>Copy
+<guimenu>TDE</guimenu> menu onto the desktop and selecting <guimenuitem>Copy
 Here</guimenuitem>.  Then <mousebutton>right</mousebutton> click on the new
 icon, select
 <guimenuitem>Properties...</guimenuitem> and change <guilabel>Program
diff --git a/doc/userguide/email.docbook b/doc/userguide/email.docbook
index 9d87aa4e9..376f4e563 100644
--- a/doc/userguide/email.docbook
+++ b/doc/userguide/email.docbook
@@ -81,7 +81,7 @@ if you use <acronym>POP3</acronym>.</para></listitem>
 </para>
 
 <para>Once you have that information, you are ready to start setting
-up &kmail;. Open &kmail; from the <guimenu>K</guimenu> menu (you can
+up &kmail;. Open &kmail; from the <guimenu>TDE</guimenu> menu (you can
 find it in the <guisubmenu>Internet</guisubmenu> submenu, or use one
 of the methods described in <xref linkend="programs-launching"/>.) Once
 &kmail; has opened, select the menu entry
diff --git a/doc/userguide/net-connection-setup.docbook b/doc/userguide/net-connection-setup.docbook
index fe77366eb..af53d1963 100644
--- a/doc/userguide/net-connection-setup.docbook
+++ b/doc/userguide/net-connection-setup.docbook
@@ -94,7 +94,7 @@ is as simple as running the &kppp; wizard.</para>
 <title>Starting the Wizard.</title>
 
 <para>You can start the wizard from &kppp;'s initial screen.  Start &kppp; from
-your <guimenu>K</guimenu> menu, where you will find its entry in the
+your <guimenu>TDE</guimenu> menu, where you will find its entry in the
 <guisubmenu>Internet</guisubmenu> as <guimenuitem>&kppp; (Internet Dial-Up
 Tool</guimenuitem>.</para>
 
diff --git a/doc/userguide/panel-and-desktop.docbook b/doc/userguide/panel-and-desktop.docbook
index a03026118..7720df201 100644
--- a/doc/userguide/panel-and-desktop.docbook
+++ b/doc/userguide/panel-and-desktop.docbook
@@ -32,7 +32,7 @@ next section describes some common ways to customize the panel.</para>
 <title>Customizing the icons on the panel</title>
 
 <para>When you first start &tde;, kicker displays some icons next to
-the <guimenu>K</guimenu> menu. These can be used to start the
+the <guimenu>TDE</guimenu> menu. These can be used to start the
 applications that they represent. To see which application is launched
  by each icon, hold the mouse cursor over the icon until a tooltip (a
 small popup label) appears telling you the name of the application.</para>
@@ -45,7 +45,7 @@ name</replaceable> Button</guilabel> in the popup menu that
 appears. To add a new icon, &RMB;-click on an empty space on the
 panel, and follow the menu entry <guisubmenu>Add Application to Panel
 </guisubmenu>. This leads you to a copy of the
-<guimenu>K</guimenu> menu, where you can find all of the &tde;
+<guimenu>TDE</guimenu> menu, where you can find all of the &tde;
 applications. For example, to add an icon for the &juk; music player,
 follow through the menus to <menuchoice><guisubmenu>Add Application
 to Panel</guisubmenu><guisubmenu>Multimedia</guisubmenu><guimenuitem>&juk; (Music
diff --git a/doc/userguide/usenet.docbook b/doc/userguide/usenet.docbook
index bc7ced686..6b27b2a32 100644
--- a/doc/userguide/usenet.docbook
+++ b/doc/userguide/usenet.docbook
@@ -21,7 +21,7 @@ be found there. Although usenet has become less popular than it once
 was, because of the increasing use of web forums, &etc;, it is still a
 useful tool. &tde; provides a powerful usenet news reader called &knode;.</para>
 
-<para>You can find &knode; in the <guimenu>K</guimenu> Menu under the
+<para>You can find &knode; in the <guimenu>TDE</guimenu> Menu under the
 <guisubmenu>Internet</guisubmenu> entry: the menu entry
 <guimenuitem>&knode; (News Reader)</guimenuitem> launches the program.</para>
 
diff --git a/doc/visualdict/index.docbook b/doc/visualdict/index.docbook
index 6ce3ba1ed..cd553b637 100644
--- a/doc/visualdict/index.docbook
+++ b/doc/visualdict/index.docbook
@@ -33,9 +33,7 @@ The &tde; Team
 
 <legalnotice>&FDLNotice;</legalnotice>
 
-<abstract><para>A visual guide to &tde;'s interface.  This is an early
-version of the document.  Eventually, this will be a graphical tour of
-&tde;.</para></abstract>
+<abstract><para>A visual guide to the &tde; interface.</para></abstract>
 
 <keywordset>
 <keyword>KDE</keyword>
@@ -55,13 +53,12 @@ version of the document.  Eventually, this will be a graphical tour of
 
 <title>&tde; Visual Dictionary of terms</title>
 
-<para>This project was started to help unify the vocabulary used in &tde;
+<para>This handbook is intended help users understand the vocabulary used in &tde;
 documentation.</para>
 
 <para>We provide this for you here as an aid to learning your way around the
-&tde;
-Graphical User Interface.  These names have been standardized within &tde;
-documentation, so that you will always find interface items referred to in the
+&tde; Graphical User Interface. These names have been standardized within &tde;
+documentation, so you will always find interface items referred to in the
 same way.</para>
 
 <tip><para>The term <quote>Widget</quote> refers to the basic building
diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp
index 664933523..3a559409a 100644
--- a/khelpcenter/view.cpp
+++ b/khelpcenter/view.cpp
@@ -118,11 +118,12 @@ void View::showAboutPage()
           .arg( i18n("Help Center") )
           .arg( langLookup( "khelpcenter/lines.png" ) )
           .arg( i18n( "Welcome to the Trinity Desktop Environment" ) )
-          .arg( i18n( "The TDE team welcomes you to user-friendly UNIX computing" ) )
-          .arg( i18n( "TDE is a graphical desktop environment for UNIX workstations. The\n"
+          .arg( i18n( "The TDE team welcomes you to user-friendly UNIX-like computing" ) )
+          .arg( i18n( "The Trinity Desktop Environment (TDE) is a graphical desktop\n"
+                      "environment for UNIX-like workstations. The\n"
                       "Trinity Desktop Environment combines ease of use, contemporary functionality, and\n"
                       "professional graphical design along with the technical advantages of\n"
-                      "the UNIX operating system." ) )
+                      "UNIX-like operating systems." ) )
           .arg( i18n( "What is the Trinity Desktop Environment?" ) )
           .arg( i18n( "Contacting the TDE Project Members" ) )
           .arg( i18n( "Supporting the TDE Project" ) )