Update tdebase cmake files with STARTKDE->STARTTDE.

Fix tdebase entities, text strings for future maintenance of handbook files. This partially resolves bug report 694.
Update konqueror user agent strings. This partially resolves bug report 774.

Update TDM help options. This resolves bug report 618.
Fix KTips branding issues and obsolete web addresses. This resolves bug report 842.

21 files changed, 271 insertions, 272 deletions

diff --git a/doc/faq/about.docbook b/doc/faq/about.docbook
index 89c7b6033..99bde6a00 100644
--- a/doc/faq/about.docbook
+++ b/doc/faq/about.docbook
@@ -28,7 +28,7 @@ put them in as soon as possible.</para>
 <para>Last but not least, please make full use of this
 <acronym>FAQ</acronym>.  Read this <acronym>FAQ</acronym> (and other
 relevant documentation) well before asking questions on the various
-&kde; mailing lists or newsgroups.</para>
+&tde; mailing lists or newsgroups.</para>
 
 <note><para> You might also want to consider becoming a
 <acronym>FAQ</acronym> maintainer. Please refer to <xref
@@ -45,7 +45,7 @@ linkend="FAQ-maintainer-HOWTO"/> for more details.  </para></note>
 <answer>
 <para>Actually, it is very easy to become an <acronym>FAQ</acronym>
 maintainer, and we are always in need of fresh blood. :-)  Just send
-us an email at <email>kde-doc-english@kde.org</email>.
+us an email at <email>trinity-devel@lists.pearsoncomputing.net</email>.
 </para>
 </answer>
 </qandaentry>
diff --git a/doc/faq/configkde.docbook b/doc/faq/configkde.docbook
index 10a6b5f3c..b51090b66 100644
--- a/doc/faq/configkde.docbook
+++ b/doc/faq/configkde.docbook
@@ -3,28 +3,28 @@
 <!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd">
 -->
 <chapter id="configure">
-<title>Configuring &kde;</title>
+<title>Configuring &tde;</title>
 
 <qandaset>
 <qandaentry>
 <question>
-<para>How do I set the language used by &kde;?</para>
+<para>How do I set the language used by &tde;?</para>
 </question>
 
 <answer>
-<para>There are two ways to set the language &kde; uses in the
+<para>There are two ways to set the language &tde; uses in the
 messages it will display:</para>
 
 <variablelist>
-<varlistentry><term>Using the <application>&kde; Control Center</application></term>
-<listitem><para>Fire up the <application>&kde; Control Center</application> and select
+<varlistentry><term>Using the <application>&tde; Control Center</application></term>
+<listitem><para>Fire up the <application>&tde; Control Center</application> and select
 <guimenu>Regional &amp; Accessibility</guimenu> followed by
 <guimenuitem>Country/Region &amp; Language</guimenuitem>.  You can select your language and location
-here.  If &kde; cannot find a translation in the first language
+here.  If &tde; cannot find a translation in the first language
 chosen, it will fall back on the default language.  This is usually
 (American) English by default.</para>
-<note><para>Using the <application>&kde; Control Center</application> is the preferred way of choosing
-languages in &kde;.</para></note></listitem>
+<note><para>Using the <application>&tde; Control Center</application> is the preferred way of choosing
+languages in &tde;.</para></note></listitem>
 </varlistentry>
 <varlistentry><term>Using the <envar>LANG</envar> environment variable</term>
 <listitem><para>The second method uses the standard locale setting on
@@ -41,11 +41,11 @@ to set German as the language used.</para></listitem>
 <qandaentry>
 <question>
 <para>Is there any keyboard switcher for international keyboards for
-&kde;?</para>
+&tde;?</para>
 </question>
 <answer>
 <para>
-Yes, you can configure it using the <application>&kde; Control Center</application>
+Yes, you can configure it using the <application>&tde; Control Center</application>
 <guimenu>Regional &amp; Accessibility</guimenu>
 <guimenuitem>Keyboard Layout</guimenuitem>
  configuration page.
@@ -56,12 +56,12 @@ Yes, you can configure it using the <application>&kde; Control Center</applicati
 <qandaentry>
 <question>
 <para>How do I replace the standard text login screen with the
-&kde; login screen?</para>
+&tde; login screen?</para>
 </question>
 <answer>
 <note><para>Your distribution/&UNIX; flavor may have its own setup tools to
 change this (&eg; <application>YaST</application> on &SuSE; &Linux;). This will
-be the safest way to enable the &kde; login screen. However, if for some reason
+be the safest way to enable the &tde; login screen. However, if for some reason
 you do not wish to use these tools, the following instructions may be useful.</para></note>
 <para>First, you need to change to the <quote>xdm runlevel</quote> (runlevel 5 on
 &RedHat; and &SuSE; systems) by editing your
@@ -98,7 +98,7 @@ off secure</userinput>.</para>
 desktop and have the <guimenu>K</guimenu> menu displayed.</para>
 </question>
 <answer>
-<para>Open the <application>&kde; Control Center</application> and
+<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
@@ -110,7 +110,7 @@ the entry labeled <guilabel>Left button</guilabel> to say
 
 <qandaentry>
 <question>
-<para>Where do I find information regarding &kde; themes?</para>
+<para>Where do I find information regarding &tde; themes?</para>
 </question>
 <answer>
 <para>Go to <ulink
@@ -136,7 +136,7 @@ to whatever you want.</para>
 
 <qandaentry>
 <question>
-<para>&kde; (&tdm;) does not read my
+<para>&tde; (&tdm;) does not read my
 <filename>.bash_profile</filename>!</para>
 </question>
 <answer>
@@ -154,7 +154,7 @@ profile.  Please edit your <filename>Xsession</filename> and
 
 <qandaentry>
 <question>
-<para>How do I use &TrueType; fonts in &kde;?</para>
+<para>How do I use &TrueType; fonts in &tde;?</para>
 </question>
 <answer>
 
@@ -168,7 +168,7 @@ Page</ulink> for the font servers.</para>
 
 <para>If you have a bunch of &TrueType; fonts from &Microsoft;
 &Windows;, edit the <filename>XF86Config</filename> file to get the
-fonts from the font folder.  Then just tell &kde; to use these new
+fonts from the font folder.  Then just tell &tde; to use these new
 fonts with the font administrator utility.</para>
 
 </answer>
@@ -177,7 +177,7 @@ fonts with the font administrator utility.</para>
 <qandaentry>
 <question>
 <para>Is it possible to enter, show and work with the Euro Symbol in
-&kde;?</para>
+&tde;?</para>
 </question>
 <answer>
 <para>Yes and no.  For details, look here: <ulink
@@ -186,7 +186,7 @@ url="http://www.koffice.org/kword/euro.php">http://www.koffice.org/kword/euro.ph
 </qandaentry>
 
 <qandaentry>
-<question><para>How do I run a program at &kde; startup?</para></question>
+<question><para>How do I run a program at &tde; startup?</para></question>
 
 <answer><para>There are many ways to do that. If what you want to do
 is to run some scripts that would set some environment variables (for
@@ -195,11 +195,11 @@ these scripts into <filename class="directory">$<envar>TDEHOME</envar>/env/</fil
 <literal role="extension">.sh</literal>. $<envar>TDEHOME</envar> is
 usually a folder named <filename class="directory">.kde</filename>
 (note the period at the beginning) in your home
-folder. If you want scripts to be executed for all &kde; users, you can
-put them under <filename class="directory">$<envar>TDEDIR</envar>/env/</filename>, where $<envar>TDEDIR</envar> is the prefix &kde; was
+folder. If you want scripts to be executed for all &tde; users, you can
+put them under <filename class="directory">$<envar>TDEDIR</envar>/env/</filename>, where $<envar>TDEDIR</envar> is the prefix &tde; was
 installed to (you can find this out using the command
 <userinput><command>kde-config</command> --prefix</userinput>).</para>
-<para>If you wish to start a program after &kde; has started, you may want to use the 
+<para>If you wish to start a program after &tde; has started, you may want to use the 
 <filename class="directory">Autostart</filename> folder. To add
 entries to the <filename class="directory">Autostart</filename> folder:
 <orderedlist>
@@ -224,7 +224,7 @@ the <guilabel>Command</guilabel> text box.</para>
 
 <qandaentry>
 <question>
-<para>How can I allow more than one user to be logged in a at a time?  Can &kde; do <quote>fast user switching</quote>?</para>
+<para>How can I allow more than one user to be logged in a at a time?  Can &tde; do <quote>fast user switching</quote>?</para>
 </question>
 <answer>
 
@@ -233,7 +233,7 @@ computer (sometimes referred to as <quote>fast user switching</quote>) you
 need to tell the program that logs you in that it can use more than one
 session (or, in &X-Window; terms, <quote>display</quote>) at a time.</para>
 
-<para>In &kde;, this program is called &tdm; which stands for <quote>&kde;
+<para>In &tde;, this program is called &tdm; which stands for <quote>&tde;
 Display Manager</quote>. If you are not using &tdm; as your login screen
 then you will need to consult the documentation for the software you are using on how to
 accomplish multiple sessions.</para>
diff --git a/doc/faq/contrib.docbook b/doc/faq/contrib.docbook
index 807050ba7..0db6389be 100644
--- a/doc/faq/contrib.docbook
+++ b/doc/faq/contrib.docbook
@@ -11,13 +11,13 @@
 <qandaset>
 <qandaentry>
 <question>
-<para>How can I contribute to &kde;?</para>
+<para>How can I contribute to &tde;?</para>
 </question>
 <answer>
-<para>&kde; is a free software project that lives from voluntary
-contributions.  Everybody is encouraged to contribute to &kde;.  Not
+<para>&tde; is a free software project that lives from voluntary
+contributions.  Everybody is encouraged to contribute to &tde;.  Not
 only programmers are welcome.  There are many ways in which you can
-help to improve &kde;:</para>
+help to improve &tde;:</para>
 <itemizedlist>
 <listitem><para>Test the software.</para></listitem>
 <listitem><para>Send in bug reports.  For more information on this,
@@ -25,20 +25,20 @@ see <link linkend="bug-report">How do I submit a bug
 report?</link>.</para></listitem>
 <listitem><para>Write documentation or help files.  You can get some
 information by visiting the <ulink
-url="http://i18n.kde.org/doc/">&kde; Editorial Team
+url="http://i18n.kde.org/doc/">&tde; Editorial Team
 Home Page</ulink>.</para></listitem>
 <listitem><para>Translate programs, documentation, and help files.
 For more information on this, you should visit <ulink
-url="http://i18n.kde.org">The &kde; Translators' and Documenters' Web
+url="http://i18n.kde.org">The &tde; Translators' and Documenters' Web
 Site</ulink>.</para></listitem>
 <listitem><para>Draw nice icons or compose sound effects.  You can
-visit the <ulink url="http://artist.kde.org/">&kde;
+visit the <ulink url="http://artist.kde.org/">&tde;
 artists page</ulink> to find out more.</para></listitem>
-<listitem><para>Write articles and books about &kde;.  If you want to
-help spread the word about &kde;, simply send an email to
+<listitem><para>Write articles and books about &tde;.  If you want to
+help spread the word about &tde;, simply send an email to
 <email>kde-pr@kde.org</email>.  This will get you in touch 
-with the &kde; public relations volunteers.</para></listitem>
-<listitem><para>Program new &kde; applications.  Please refer to <xref
+with the &tde; public relations volunteers.</para></listitem>
+<listitem><para>Program new &tde; applications.  Please refer to <xref
 linkend="programming"/> for more information.</para></listitem>
 <listitem><para> Of course, sponsors are also
 welcome. :-)</para></listitem>
@@ -71,20 +71,20 @@ instructions of the bug reporting wizard.</para>
 
 <qandaentry>
 <question id="programming">
-<para>I want to program for &kde;.  What should I do first?</para>
+<para>I want to program for &tde;.  What should I do first?</para>
 </question>
 <answer>
-<para>Everybody is encouraged to develop software for &kde;.  What you
+<para>Everybody is encouraged to develop software for &tde;.  What you
 should do first depends strongly on your experience, &eg; whether you have
 already learned C++ or have experience with the &Qt; toolkit and so
 on.</para>
-<para>To get into &kde; programming, you will need some basic tools:
+<para>To get into &tde; programming, you will need some basic tools:
 <application>automake</application>,
 <application>autoconf</application>, and
 <application>egcs</application>.  You should look to <ulink
 url="http://developer.kde.org/">http://developer.kde.org/</ulink> 
 for more tips.</para>
-<para>Another excellent resource for learning &kde;
+<para>Another excellent resource for learning &tde;
 programming is the &Qt; 
 online tutorials.  These are installed along with &Qt;.  To view them,
 open <filename>$<envar>QTDIR</envar>/doc/html/index.html</filename> in 
@@ -94,7 +94,7 @@ Qt".  The source code for each lesson can be found in the <filename
 class="directory">$<envar>QTDIR</envar>/tutorial</filename>
 directory.</para>
 <para>There is, however, one thing that everybody interested in
-programming for &kde; should do: <emphasis>subscribe to the developers
+programming for &tde; should do: <emphasis>subscribe to the developers
 mailing list</emphasis>.  To subscribe, you have to send an email to
 <ulink
 url="mailto:kde-devel-request@kde.org">kde-devel-request@kde.org</ulink>
@@ -109,10 +109,10 @@ well.</para></important></para>
 
 <qandaentry>
 <question>
-<para>How do I get access to &kde; <acronym>SVN</acronym>?</para>
+<para>How do I get access to &tde; <acronym>SVN</acronym>?</para>
 </question>
 <answer>
-<para>The &kde; project uses <acronym>SVN</acronym> to develop the
+<para>The &tde; project uses <acronym>SVN</acronym> to develop the
 core parts of the software.  Usually, when you have changed one of the
 parts (&eg; fixed a bug), and you want to commit this change, the best
 way is to create a patch against a current snapshot and send this
@@ -138,21 +138,21 @@ http://developer.kde.org/source/anonsvn.html</ulink>
 
 <qandaentry>
 <question>
-<para>Are there any <acronym>SVN</acronym> mirror sites for &kde;?</para>
+<para>Are there any <acronym>SVN</acronym> mirror sites for &tde;?</para>
 </question>
 <answer>
-<para>No, there are currently no anonymous <acronym>SVN</acronym> mirror sites for &kde;. If you're interested in setting one up, please contact <email>sysadmin@kde.org</email>
+<para>No, there are currently no anonymous <acronym>SVN</acronym> mirror sites for &tde;. If you're interested in setting one up, please contact <email>sysadmin@kde.org</email>
 </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para>How do I go about translating &kde; programs into my native
+<para>How do I go about translating &tde; programs into my native
 language?</para>
 </question>
 <answer>
-<para>Look at the <ulink url="http://i18n.kde.org">The &kde;
+<para>Look at the <ulink url="http://i18n.kde.org">The &tde;
 Translators' and Documenters' Web Site</ulink> to see whether your
 program is already translated (most are).  Otherwise you will find 
 information there on how to do it yourself.</para>
diff --git a/doc/faq/desktop.docbook b/doc/faq/desktop.docbook
index e31f7a8ce..5c52f3e98 100644
--- a/doc/faq/desktop.docbook
+++ b/doc/faq/desktop.docbook
@@ -49,16 +49,16 @@ class="directory">$<envar>TDEDIRS</envar>/share/icons</filename> or <filename
 class="directory">$<envar>HOME</envar>/.kde/share/icons</filename> or
 <filename class="directory">$<envar>HOME</envar>/.kde2/share/icons</filename>.  To use icons
 stored in other locations, you must either copy them into one of the
-above-mentioned fixed &kde; locations or make symlinks.</para>
+above-mentioned fixed &tde; locations or make symlinks.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para>How do I use the mouse scroll wheel in &kde;?</para>
+<para>How do I use the mouse scroll wheel in &tde;?</para>
 </question>
 <answer>
-<para>Mouse wheel support comes with &Qt; 2.0 and above, so &kde; based on
+<para>Mouse wheel support comes with &Qt; 2.0 and above, so &tde; based on
 that will automatically support the use of the mouse scroll wheel if your system is configured correctly. Check your &X-Server; settings support the use of a scrollwheel if it is not working.</para>
 </answer>
 </qandaentry>
@@ -68,7 +68,7 @@ that will automatically support the use of the mouse scroll wheel if your system
 <para>How do I launch applications in a particular desktop?</para>
 </question>
 <answer>
-<para>&kde; comes with a program called &kstart;.
+<para>&tde; comes with a program called &kstart;.
 To start an <application>xterm</application> on the second desktop and then activate it use:
 
 <userinput><command>kstart</command> <option>--desktop 
diff --git a/doc/faq/filemng.docbook b/doc/faq/filemng.docbook
index bfe6d1e98..9f1df73b6 100644
--- a/doc/faq/filemng.docbook
+++ b/doc/faq/filemng.docbook
@@ -5,7 +5,7 @@
 <chapter id="filemanager">
 <title>The File Manager</title>
 
-<para>&kde;'s file manager is &konqueror;.  The
+<para>&tde;'s file manager is &konqueror;.  The
 &konqueror; home page is located at <ulink
 url="http://www.konqueror.org">http://www.konqueror.org</ulink> where a
 &konqueror; specific <acronym>FAQ</acronym> can be found.</para>
@@ -76,7 +76,7 @@ folder you would like &konqueror; to start in.</para>
 <para>Where did the delete entry from my right-click context menu go?</para>
 </question>
 <answer>
-<para>In &kde; 3.4 the delete context menu entries that bypass the
+<para>In &tde; 3.4 the delete context menu entries that bypass the
 trashcan are no longer displayed by default. To enable them, go to 
 <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure
 &konqueror;</guimenuitem></menuchoice > and select
@@ -137,14 +137,14 @@ of <guilabel>Services Preference Order.</guilabel></para></listitem>
 
 <qandaentry> <question> <para>What are <option>%i</option> and
 <option>%m</option> in the Execute line?</para> </question> <answer>
-<para>They are used by all &kde; applications (since they are implemented in
-<classname>KApplication</classname> and all good &kde; programs create a
+<para>They are used by all &tde; applications (since they are implemented in
+<classname>KApplication</classname> and all good &tde; programs create a
 <classname>KApplication</classname> object before they even look at the
-command line arguments).</para> <para>A standard line for a &kde;
+command line arguments).</para> <para>A standard line for a &tde;
 application looks like this: <userinput><command>foo</command>
 <option>... %i %m -caption \"%c\"</option></userinput>.  Pretty confusing,
 -but it has been designed in that way so that it can integrate legacy,
-non-&kde; applications as smoothly as possible.  &konqueror;, when executing
+non-&tde; applications as smoothly as possible.  &konqueror;, when executing
 the line above, will extend the command to
 <userinput><command><replaceable>foo</replaceable></command> <option>-icon
 something.png -miniicon something_mini.png -caption \"The
diff --git a/doc/faq/getkde.docbook b/doc/faq/getkde.docbook
index ceabb2561..89063a680 100644
--- a/doc/faq/getkde.docbook
+++ b/doc/faq/getkde.docbook
@@ -5,27 +5,27 @@
 -->
 
 <chapter id="getting-kde">
-<title>Getting &kde;</title>
+<title>Getting &tde;</title>
 
 <qandaset>
 <qandaentry>
 <question id="where-to-get-kde">
-<para>Where do I get &kde;?</para>
+<para>Where do I get &tde;?</para>
 </question>
 <answer>
 <!-- This needs a rewrite including informations about the latest version (link to the info page?)-->
-<para>The easiest way to get &kde; is to install a &Linux; distribution or another UNIX-like OS that ships with &kde;.
+<para>The easiest way to get &tde; is to install a &Linux; distribution or another UNIX-like OS that ships with &tde;.
 You can find an up-to-date list of distributions that ship
-with &kde; <ulink url="http://www.kde.org/download/distributions.php">here</ulink>. For alternative methods of 
-trying &kde; that do not require you to be running &Linux;, please see 
-<ulink url="http://kde.org/try_kde">Try &kde;</ulink></para>
+with &tde; <ulink url="http://www.kde.org/download/distributions.php">here</ulink>. For alternative methods of 
+trying &tde; that do not require you to be running &Linux;, please see 
+<ulink url="http://kde.org/try_kde">Try &tde;</ulink></para>
 
-<para>The main distribution site for &kde; is 
+<para>The main distribution site for &tde; is 
 <ulink url="ftp://ftp.kde.org/">ftp.kde.org</ulink>. However, this site is
 often under heavy load, so you might prefer to use 
 <ulink url="http://download.kde.org/">download.kde.org</ulink> which automatically
 redirects you to the mirror nearest to you.
-You can also have a look at the list of <ulink url="http://www.kde.org/ftpmirrors.html"> &kde; mirror sites</ulink>.</para>
+You can also have a look at the list of <ulink url="http://www.kde.org/ftpmirrors.html"> &tde; mirror sites</ulink>.</para>
 </answer>
 </qandaentry>
 
@@ -37,7 +37,7 @@ You can also have a look at the list of <ulink url="http://www.kde.org/ftpmirror
 
 <para>Currently, the latest stable version is 3.5.5</para>
 
-<para>The <ulink url="http://www.kde.org/info/3.5.5.php">&kde; 3.5.5 Info
+<para>The <ulink url="http://www.kde.org/info/3.5.5.php">&tde; 3.5.5 Info
 Page</ulink> contains a lot of information specific to this
 release.</para>
 </answer>
@@ -45,14 +45,14 @@ release.</para>
 
 <qandaentry>
 <question>
-<para>Where do I find &kde; snapshots?</para>
+<para>Where do I find &tde; snapshots?</para>
 </question>
 <answer>
 <para>You can get the latest snapshots from <ulink
 url="ftp://ftp.kde.org/pub/kde/unstable/snapshots">ftp://ftp.kde.org/pub/kde/unstable/snapshots</ulink>.
 You might also want to consider setting up your own <acronym>SVN</acronym> client in order to
 maintain the latest snapshot at all times.  Please refer to <ulink
-url="http://developer.kde.org/source/anonsvn.html">Anonymous <acronym>SVN</acronym> and &kde;</ulink> for further
+url="http://developer.kde.org/source/anonsvn.html">Anonymous <acronym>SVN</acronym> and &tde;</ulink> for further
 information.
 </para>
 
diff --git a/doc/faq/index.docbook b/doc/faq/index.docbook
index f114e3993..2ab721d3e 100644
--- a/doc/faq/index.docbook
+++ b/doc/faq/index.docbook
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
  "dtd/kdex.dtd" [
-  <!ENTITY kappname "&kde; Frequently Asked Questions">
+  <!ENTITY kappname "&tde; Frequently Asked Questions">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
   <!ENTITY faq-about SYSTEM "about.docbook">
@@ -31,11 +31,11 @@
 <book lang="&language;">
 
 <bookinfo>
-<title>&kde; Frequently Asked Questions</title>
+<title>&tde; Frequently Asked Questions</title>
 
 <authorgroup>
 <author>
-<surname>The &kde; Team</surname>
+<surname>The &tde; Team</surname>
 </author>
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
 
@@ -50,7 +50,7 @@
 <year>2003</year>
 <year>2004</year>
 <year>2005</year>
-<holder>The &kde; Team</holder>
+<holder>The &tde; Team</holder>
 </copyright>
 
 <legalnotice>&FDLNotice;</legalnotice>
@@ -59,10 +59,10 @@
 <releaseinfo>3.4</releaseinfo>
 
 <abstract> <para>This is a compilation of the most frequently asked
-questions about the K Desktop Environment.  Please report any bugs,
+questions about the Trinity Desktop Environment.  Please report any bugs,
 inconsistencies, or omissions you find in this &FAQ; to
-<email>kde-doc-english@kde.org</email>.  Please do not mail your questions
-to this list. Post them to the &kde; mailing lists and newsgroups
+<email>trinity-devel@lists.pearsoncomputing.net</email>.  Please do not mail your questions
+to this list. Post them to the &tde; mailing lists and newsgroups
 instead. They are monitored for this &FAQ;.</para> </abstract>
 
 <keywordset>
@@ -104,7 +104,7 @@ instead. They are monitored for this &FAQ;.</para> </abstract>
 </itemizedlist>
 
 <para>Many of the answers in this &FAQ; are taken
-from the various &kde; mailing lists and newsgroups. Here is a
+from the various &tde; mailing lists and newsgroups. Here is a
 <emphasis>big</emphasis> thank you to all of you who have contributed
 answers that eventually appear in this &FAQ;.</para>
 
diff --git a/doc/faq/install.docbook b/doc/faq/install.docbook
index fc8b094dd..0aa323631 100644
--- a/doc/faq/install.docbook
+++ b/doc/faq/install.docbook
@@ -11,8 +11,8 @@ Desktop Environment.  Please complement your reading with the
 <filename>README</filename>s and <filename>INSTALL</filename>s that
 come along with the package.  Please read them carefully and try to
 help yourself out if anything goes wrong.  If you need further
-assistance, consider joining the &kde; mailing lists
-(see our web site instructions for joining the &kde;
+assistance, consider joining the &tde; mailing lists
+(see our web site instructions for joining the &tde;
 <ulink url="http://www.kde.org/mailinglists/">mailing
 lists</ulink>) or newsgroups.</para>
 
@@ -27,26 +27,26 @@ lists</ulink>) or newsgroups.</para>
 <answer>
 
 <para>So you have heard the rumors. Or you have seen the screenshots.
-And you are dying to get hold of &kde;.  But you know next to nothing
+And you are dying to get hold of &tde;.  But you know next to nothing
 about this whole <quote>alternative OS</quote> business.  Don't worry!
 You only need to do some (well, maybe not some) reading, that's
 all!</para>
 
-<para>&kde; does not run on any version of &Microsoft; &Windows; or OS/2 (yet).  To run
-&kde;, you need to have a &UNIX; system. Please refer to <xref
+<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
 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 &kde;<ulink
+<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 -->
 
-<para>Finally, you are ready to commence the &kde; installation.
-Please start reading from the next section.  To get &kde;, please
+<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-kde"/>.  Last but not least, if
-you encounter any problems while installing &kde;, please do not
-hesitate to make use of the &kde; <link 
+you encounter any 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,
@@ -58,10 +58,10 @@ especially when they are already answered in this <acronym>FAQ</acronym>.</para>
 
 <qandaentry>
 <question>
-<para>What kind of hardware do I need to run &kde; ?</para>
+<para>What kind of hardware do I need to run &tde; ?</para>
 </question>
 <answer>
-<para>To run &kde; 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 &kde; 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 &kde;.</para>
+<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>
 </answer>
 </qandaentry>
 
@@ -74,16 +74,16 @@ especially when they are already answered in this <acronym>FAQ</acronym>.</para>
 
 <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 &kde; Team, but by 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/">&kde; Package Policy
-Explained</ulink> for information about the &kde; Package Policy. The
+<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
 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">&kde; 3.4.1 Info
+url="http://www.kde.org/info/3.4.1.php">&tde; 3.4.1 Info
 Page</ulink>.</para>
 
 </answer>
@@ -97,12 +97,12 @@ Page</ulink>.</para>
 
 <!-- rewrite to make it more general, pointing to the according webpages? -->
 
-<para>For &kde; 3.4.1, you need the &Qt; library version 3.3 or greater.  
+<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
-also need the header files, if you want to compile &kde;
+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 &kde; if
+In addition, 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
@@ -125,7 +125,7 @@ is available in each of the aforementioned package formats.</para>
 <listitem>
 <para>Required</para>
 <para>This package contains shared libraries that are needed by all
-&kde; applications.</para>
+&tde; applications.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
@@ -133,7 +133,7 @@ is available in each of the aforementioned package formats.</para>
 <listitem>
 <para>Required</para>
 <para>This package contains the base applications that form the core
-of the K Desktop Environment like the window manager, the terminal
+of the Trinity Desktop Environment like the window manager, the terminal
 emulator, the control center, the file manager, and the panel.</para>
 </listitem>
 </varlistentry>
@@ -224,7 +224,7 @@ download manager &kget;, and several other network-related programs.</para>
 <listitem>
 <para>Optional</para>
 <para>
-Educational and entertaining applications for &kde;'s younger users.
+Educational and entertaining applications for &tde;'s younger users.
 </para>
 </listitem>
 </varlistentry>
@@ -248,7 +248,7 @@ KDE accessibility programs such as a screen magnifier and speech synthesizer fro
 <term>tdevelop</term>
 <listitem>
 <para>Optional</para>
-<para>A complete Integrated Development Environment for &kde; and Qt</para>
+<para>A complete Integrated Development Environment for &tde; and Qt</para>
 </listitem>
 </varlistentry>
 <varlistentry>
@@ -315,7 +315,7 @@ every package you want to install.</para></step>
 <varlistentry>
 <term>Installation of the source <filename>.tar.bz2</filename> files</term>
 <listitem>
-<para>Since there are always changes and updates to the way &kde; is compiled, please
+<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.
@@ -351,16 +351,16 @@ already are, just type <command>make
 <para>Post-installation procedures</para>
 </question>
 <answer>
-<para>First of all, please make sure that you have added &kde;'s binary
+<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 &kde;'s 
+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 &kde; tree, &eg; <filename
+<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
@@ -372,9 +372,9 @@ 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 &kde; applications simply by
-calling them, you can only benefit fully from &kde;'s advanced
-features if you use the &kde; window manager and its helper
+<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
@@ -391,8 +391,8 @@ folder, simply create a new one with just one line containing
 <para>Some systems (notably &RedHat; &Linux;) use <filename>.Xclients</filename>
 instead.</para>
 </note></para>
-<para>This should present you with a new shining &kde; desktop.  You
-can now start to explore the wonderful world of &kde;.  In case you
+<para>This should present you with a new shining &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
@@ -411,20 +411,20 @@ one?</para>
 <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 &kde; on the same system are
+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 &kde; from source
+However, please note that running two different versions of &tde; from source
 can lead to problems if you are not careful. </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question id="starttde">
-<para>How do I start &kde;?</para>
+<para>How do I start &tde;?</para>
 </question>
 <answer>
-<para>The most comfortable method to start &kde; is to use the
+<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>
@@ -438,7 +438,7 @@ that contains just one line: <command>starttde</command>.</para>
 <!-- Still needed?
 <qandaentry>
 <question>
-<para>Whenever I start &kde;, it complains about "shadow passwords".
+<para>Whenever I start &tde;, it complains about "shadow passwords".
 Why?</para>
 </question>
 <answer>
@@ -455,7 +455,7 @@ $<envar>TDEDIR</envar>/bin/*.kss</command></para></step>
 <step performance="required"><para><command>chmod u+s
 $<envar>TDEDIR</envar>/bin/*.kss</command></para></step>
 </procedure>
-<para>Alternatively, if you compile &kde; from source, you can use
+<para>Alternatively, if you compile &tde; from source, you can use
 <command>./configure <option>with-shadow</option></command> to
 configure tdebase.  Then the suid bit is set automatically during
 <command>make install</command>.</para>
@@ -464,10 +464,10 @@ configure tdebase.  Then the suid bit is set automatically during
 -->
 <qandaentry>
 <question>
-<para>Is it possible to install &kde; in my home directory?</para>
+<para>Is it possible to install &tde; in my home directory?</para>
 </question>
 <answer>
-<para>Yes, you can install &kde; in any folder you want.  What you
+<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
@@ -511,7 +511,7 @@ to <filename
 class="directory">/home/me</filename>.</para></step>
 </procedure>
 <para><note>
-<para>Although &kde; will run from a user folder, there are some
+<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>
@@ -533,24 +533,24 @@ 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
-daemons for &kde;.  See also <xref linkend="starttde"/>.</para>
+daemons for &tde;.  See also <xref linkend="starttde"/>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para>&kde; on &AIX;?</para>
+<para>&tde; on &AIX;?</para>
 </question>
 <answer>
 <para>
 <!--
-<para>If you have trouble building &kde; on
+<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 &kde; on
-Aix</ulink> page for lots of help on building &kde; on this
+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 &kde; on &AIX;. You can find
+<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>
@@ -559,11 +559,11 @@ There is also some older information at <ulink url="http://space.twc.de/~stefan/
 
 <qandaentry>
 <question>
-<para>&kde; on a laptop?</para>
+<para>&tde; on a laptop?</para>
 </question>
 <answer>
 <para>If you can get &X-Window; to run on your laptop, you should not have any problem
-getting &kde; to run on it.  In addition, you might find the following
+getting &tde; to run on it.  In addition, you might find the following
 links helpful:</para>
 <itemizedlist>
 <listitem>
@@ -578,7 +578,7 @@ links helpful:</para>
 
 <qandaentry>
 <question>
-<para>I do not like the default &kde; folder after installation.  How
+<para>I do not like the default &tde; folder after installation.  How
 do I move it without breaking anything?</para>
 </question>
 <answer>
@@ -592,7 +592,7 @@ you have to do:</para>
 <step performance="required"><para><command>ln -s /usr/local/kde
 /opt/kde</command></para></step>
 </procedure>
-<para>This will put all your &kde; files in <filename
+<para>This will put all your &tde; files in <filename
 class="directory">/usr/local/kde</filename> but everything is
 still accessible from <filename
 class="directory">/opt/kde</filename>.</para>
@@ -601,7 +601,7 @@ class="directory">/opt/kde</filename>.</para>
 
 <qandaentry>
 <question>
-<para>What files can I delete from my &kde; install folder?  Can all the
+<para>What files can I delete from my &tde; install folder?  Can all the
 <filename>*.h</filename>, <filename>*.c</filename> and <filename>*.o</filename>
 files be safely removed?</para>
 </question>
@@ -609,7 +609,7 @@ files be safely removed?</para>
 <para>There should not be any need to keep the <filename>.c</filename> and
 <filename>.o</filename> files, but you might want to keep the
 <filename>.h</filename> files, as they are used by includes if you ever want to
-compile your own &kde; programs.  But if you wish to add patches to the source
+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>
@@ -617,17 +617,17 @@ then they should stay.</para>
 
 <qandaentry>
 <question>
-<para>Will I lose my current settings when I upgrade &kde;?</para>
+<para>Will I lose my current settings when I upgrade &tde;?</para>
 </question>
 <answer>
 
-<para>No. In most cases &kde; will be able to transport your settings
+<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 &kde;.  To be safe, you may like to back up your entire
-&kde; configuration. </para>
+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
@@ -635,7 +635,7 @@ 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 &kde; 3.2, and then copy back any necessary mail and news
+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>
@@ -647,14 +647,14 @@ $<envar>TDEHOME</envar> variable.</para>
 
 <qandaentry id="greyscreen">
 <question>
-<para>I upgraded &kde; and it seemed to go fine, but when I start it,
+<para>I upgraded &tde; and it seemed to go fine, but when I start it,
 I get a blank gray screen, and nothing happens.  There are errors in
 the console about DCOPserver.  What's going on?</para>
 </question>
 
 <answer>
 <para>
-&kde; uses several temporary files during its operation.
+&tde; uses several temporary files during its operation.
 These are usually to be 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>
@@ -669,14 +669,14 @@ These are usually to be found in the following locations:</para>
 <command>cron</command> or shutdown script is emptying out 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 &kde; so you can safely remove
-them <emphasis>while &kde; is not running</emphasis>.</para>
+created automatically at the start of &tde; so you can safely remove
+them <emphasis>while &tde; is not running</emphasis>.</para>
 
-<para>If you are only getting a gray screen when you start &kde;, 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>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 &kde; versions) it's
+<para>Normally (&ie; when not upgrading between &tde; versions) it's
 quite safe to leave these files intact, and you may shave a few
-seconds off your &kde; startup time by doing so.</para>
+seconds off your &tde; startup time by doing so.</para>
 </answer>
 </qandaentry>
 
@@ -695,7 +695,7 @@ You should be able to download it from any
 
 <qandaentry>
 <question>
-<para>How do I uninstall &kde; applications compiled from
+<para>How do I uninstall &tde; applications compiled from
 source?</para>
 </question>
 <answer>
diff --git a/doc/faq/intro.docbook b/doc/faq/intro.docbook
index fab2a3064..a366ae038 100644
--- a/doc/faq/intro.docbook
+++ b/doc/faq/intro.docbook
@@ -10,30 +10,29 @@
 <qandaset>
 <qandaentry>
 <question>
-<para>What is &kde;?</para>
+<para>What is &tde;?</para>
 </question>
 <answer>
-<para>&kde; is the K Desktop Environment.  It is a project initiated
+<para>&tde; is the Trinity Desktop Environment.  The project was initiated
 by <ulink url="mailto:ettrich@kde.org">Matthias Ettrich</ulink> in
-1996.  The aim of the &kde; project is to connect the
+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>In short, &kde; will bring &UNIX; to the desktop!</para>
-<para>If you want further information about &kde;, have a look at
-<ulink url="http://www.kde.org/whatiskde">What is
-&kde;?</ulink></para>
+<para>In short, &tde; will bring &UNIX; to the desktop!</para>
+<para>If you want further information about &tde;, have a look at
+<ulink url="http://www.trinitydesktop.org/about.php">About Trinity</ulink></para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question id="platform">
-<para>On which platforms can I expect &kde; to work?</para>
+<para>On which platforms can I expect &tde; to work?</para>
 </question>
 <answer>
-<para>&kde; is a Desktop Environment for all flavors of &UNIX;.  While
-it is true that most &kde; developers use &Linux;, &kde; runs smoothly
+<para>&tde; is a Desktop Environment for all flavors of &UNIX;.  While
+it is true that most &tde; developers use &Linux;, &tde; runs smoothly
 on a wide range of systems.  You may, however, need to tweak the
-source code a bit to get &kde; to compile on a not-so-popular variant
+source code a bit to get &tde; to compile on a not-so-popular variant
 of &UNIX;, or if you are not using the &GNU; development tools, in
 particular the &gcc; compiler.</para>
 </answer>
@@ -41,13 +40,13 @@ particular the &gcc; compiler.</para>
 
 <qandaentry>
 <question>
-<para>Is &kde; a window manager?</para>
+<para>Is &tde; a window manager?</para>
 </question>
 <answer>
-<para>No, &kde; is not a window manager.  While &kde; includes a very
-sophisticated window manager (&twin;), &kde; is much more than that.
+<para>No, &tde; is not a window manager.  While &tde; includes a very
+sophisticated window manager (&twin;), &tde; is much more than that.
 It is a full-blown Integrated Desktop Environment.</para>
-<para>&kde; provides a complete desktop environment, including a web
+<para>&tde; provides a complete desktop environment, including a web
 browser, a file manager, a window manager, a help system, a
 configuration system, uncountable tools and utilities, and an ever
 increasing number of applications, including but not limited to mail
@@ -58,32 +57,32 @@ and so forth.</para>
 
 <qandaentry>
 <question>
-<para>Is &kde; a <acronym>CDE</acronym>, &Windows; or &Mac;
+<para>Is &tde; a <acronym>CDE</acronym>, &Windows; or &Mac;
 <acronym>OS</acronym> clone?</para>
 </question>
 <answer>
-<para>No, &kde; is not a clone. Specifically &kde; is not a
-<acronym>CDE</acronym> or &Windows;  clone. While the &kde; developers
+<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
-desktop environments, &kde; is a truly unique environment that has and
+desktop environments, &tde; is a truly unique environment that has and
 will continue to go its own way.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para>Is &kde; free software?</para>
+<para>Is &tde; free software?</para>
 </question>
 <answer>
-<para>Yes, &kde; is free software according to the &GNU; General
-Public License.  All &kde; libraries are available under the
+<para>Yes, &tde; is free software according to the &GNU; General
+Public License.  All &tde; libraries are available under the
 <acronym>LGPL</acronym> making commercial software development for the
-&kde; desktop possible, but all &kde; applications are licensed under
+&tde; desktop possible, but all &tde; applications are licensed under
 the <acronym>GPL</acronym>.</para>
-<para>&kde; uses the <link linkend="qt">&Qt; C++ crossplatform
+<para>&tde; uses the <link linkend="qt">&Qt; C++ crossplatform
 toolkit</link>, which is also released (since version 2.2) under the
 <acronym>GPL</acronym>.</para>
-<para>It is absolutely legal to make &kde; and &Qt; available on
+<para>It is absolutely legal to make &tde; and &Qt; available on
 &CD-ROM; free of charge.  No runtime fees of any kind are
 incurred.</para>
 </answer>
diff --git a/doc/faq/kdeapps.docbook b/doc/faq/kdeapps.docbook
index 68b1fd2cc..e10a452e7 100644
--- a/doc/faq/kdeapps.docbook
+++ b/doc/faq/kdeapps.docbook
@@ -5,7 +5,7 @@
 -->
 
 <chapter id="applications">
-<title>&kde; applications</title>
+<title>&tde; applications</title>
 
 <qandaset>
 <qandaentry>
@@ -14,7 +14,7 @@
 </question>
 <answer>
 
-<para>Many &kde; users report problems using &kppp;.  But before you
+<para>Many &tde; users report problems using &kppp;.  But before you
 complain about &kppp;, make sure you have already checked the
 following:</para>
 
@@ -26,7 +26,7 @@ least three times and followed its instructions and trouble-shooting
 suggestions?</para></listitem>
 </itemizedlist>
 <para>The &kppp; documentation can be accessed through the 
-<application>&kde; Help Center</application>.
+<application>&tde; Help Center</application>.
  Last, but not least, the &kppp; homepage is at <ulink
  url="http://ktown.kde.org/~kppp/">http://ktown.kde.org/~kppp/</ulink>.</para>
 <para>Now, if you still encounter problems, here's what might help you
@@ -115,14 +115,14 @@ paste by clicking with the &MMB; (or both buttons if you are using a
 
 <varlistentry>
 <term>Why can't &konsole; find the <quote>9x15</quote> and the 2
-<quote>console</quote> bitmap fonts installed with &kde;?</term>
+<quote>console</quote> bitmap fonts installed with &tde;?</term>
 <listitem>
 
 <para><application>FontConfig</application> must find the three fonts
 installed in: <filename
 class="directory">$<envar>TDEDIR</envar>/share/fonts</filename>. 
  If
-the &kde; install does not install these fonts in a directory that
+the &tde; install does not install these fonts in a directory that
 already exists (&eg; <filename
 class="directory">/usr/share/fonts</filename>) then you must add this
 directory to the configuration file <filename
diff --git a/doc/faq/misc.docbook b/doc/faq/misc.docbook
index ec5ce3209..00d6be17d 100644
--- a/doc/faq/misc.docbook
+++ b/doc/faq/misc.docbook
@@ -12,10 +12,10 @@
 
 <qandaentry>
 <question>
-<para>Does &kde; support transparency and other visual effects provided by the new composite extension to X.org?</para>
+<para>Does &tde; support transparency and other visual effects provided by the new composite extension to X.org?</para>
 </question>
 <answer>
-<para> Yes! An exciting new feature for &kde; 3.4 is support for the new X composite extension. This allows for effects such as translucency and drop shadows for all windows, easily configurable through &twin;'s configuration dialog. This requires you to be using X.org version 6.8.0 or newer and have:
+<para> Yes! An exciting new feature for &tde; 3.4 is support for the new X composite extension. This allows for effects such as translucency and drop shadows for all windows, easily configurable through &twin;'s configuration dialog. This requires you to be using X.org version 6.8.0 or newer and have:
 
 <screen>
 Section "Extensions"
@@ -38,7 +38,7 @@ Once you have configured X.org correctly, transparency and other effects can be
 
 <qandaentry>
 <question>
-<para>What about &kde; programs that do not have icons? How do I get
+<para>What about &tde; programs that do not have icons? How do I get
 them into the menu?</para>
 </question>
 <answer>
@@ -49,7 +49,7 @@ them into the menu?</para>
 
 <qandaentry>
 <question>
-<para>Does &kde; have a graphical &FTP; client?</para>
+<para>Does &tde; have a graphical &FTP; client?</para>
 </question>
 <answer>
 <para>Yes, and it is none other than your favorite file
@@ -60,7 +60,7 @@ folders.</para>
 
 <qandaentry>
 <question>
-<para>How do I exit &kde;?</para>
+<para>How do I exit &tde;?</para>
 </question>
 <answer>
 <para>Simply click on the <guibutton>K</guibutton> button and select
@@ -101,7 +101,7 @@ new versions also sometimes fix security problems.</para>
 
 <qandaentry>
 <question>
-<para>How do I copy and paste in &kde;?</para>
+<para>How do I copy and paste in &tde;?</para>
 </question>
 <answer>
 <para>The simplest method is to use your mouse:</para>
@@ -116,7 +116,7 @@ button mouse and are emulating a three button mouse, push both buttons
 simultaneously.</para></step>
 </procedure>
 
-<para>For more information about using the clipboard in &kde; please see the &klipper; hand book, accessed by typing <userinput><command>help:/klipper</command></userinput>
+<para>For more information about using the clipboard in &tde; please see the &klipper; hand book, accessed by typing <userinput><command>help:/klipper</command></userinput>
 into the &konqueror; address bar. </para>
 
 </answer>
@@ -148,17 +148,17 @@ allows people remote access over the Net to pick up the latest source
 code and even to check in new files if they have permission.  It is
 also open source (you pay for support if you want it), and since it is
 free it is the system of choice for people writing more free products,
-such as &kde;.</para>
+such as &tde;.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para>Does &kde; support dual screen (Xinerama)?</para>
+<para>Does &tde; support dual screen (Xinerama)?</para>
 </question>
 <answer>
 <para>Yes, you need to have a multi-headed X server
-(&eg; MetroX or XFree86 4.0 and above) and a &kde; >= 2.2.1
+(&eg; MetroX or XFree86 4.0 and above) and a &tde; >= 2.2.1
 </para>
 </answer>
 </qandaentry>
@@ -175,12 +175,12 @@ such as &kde;.</para>
 
 <qandaentry>
 <question>
-<para>How do I check which version of &kde; I am using?</para>
+<para>How do I check which version of &tde; I am using?</para>
 </question>
 <answer>
-<para>Fire up your <application>&kde; Control
-Center</application>.  It comes up with an Info Screen including the version of &kde;
-The &kde; version is also included in the application's 
+<para>Fire up your <application>&tde; Control
+Center</application>.  It comes up with an Info Screen including the version of &tde;
+The &tde; version is also included in the application's 
 <guimenuitem>About</guimenuitem> dialog.
 </para>
 </answer>
@@ -195,7 +195,7 @@ The &kde; version is also included in the application's
 <answer>
 <para>Go see <ulink
 url="http://artist.kde.org">http://artist.kde.org</ulink>.
-There is also a more informal community of &kde; related artists and
+There is also a more informal community of &tde; related artists and
 artwork at <ulink url="http://kde-look.org">http://kde-look.org</ulink>.
 </para>
 </answer>
@@ -207,9 +207,9 @@ artwork at <ulink url="http://kde-look.org">http://kde-look.org</ulink>.
 <para>How can I get to know about development updates?</para>
 </question>
 <answer>
-<para>You might want to subscribe to the various &kde; mailing lists
+<para>You might want to subscribe to the various &tde; mailing lists
 available, especially kde-cvs, which lists all commits done to the
-&kde; <acronym>CVS</acronym> repository.  Check <ulink
+&tde; <acronym>CVS</acronym> repository.  Check <ulink
 url="http://lists.kde.org">http://lists.kde.org</ulink> if you want to
 read without subscribing.</para>
 </answer>
diff --git a/doc/faq/moreinfo.docbook b/doc/faq/moreinfo.docbook
index 9b28db3a2..2e520388e 100644
--- a/doc/faq/moreinfo.docbook
+++ b/doc/faq/moreinfo.docbook
@@ -10,10 +10,10 @@
 <qandaset>
 <qandaentry>
 <question>
-<para>Where is the &kde; homepage?</para>
+<para>Where is the &tde; homepage?</para>
 </question>
 <answer>
-<para>The &kde; homepage is located at <ulink
+<para>The &tde; homepage is located at <ulink
 url="http://www.kde.org">http://www.kde.org</ulink>.  If you prefer a
 local mirror, there are several to choose from.  For a current list of
 web site mirrors sorted by location, please visit <ulink
@@ -23,20 +23,20 @@ url="http://www.kde.org/mirrors/web.php">http://www.kde.org/mirrors/web.php</uli
 
 <qandaentry>
 <question id="mailing-lists">
-<para>Is there a &kde; mailing list?</para>
+<para>Is there a &tde; mailing list?</para>
 </question>
 <answer>
-<para>There are several &kde; mailing lists.  Each focuses on a different
-aspect of &kde;.  Some are for developers, so they are not
+<para>There are several &tde; mailing lists.  Each focuses on a different
+aspect of &tde;.  Some are for developers, so they are not
 discussed in detail.  Some of the more important lists that users
 might be interested in are:</para>
 <variablelist>
 <varlistentry><term>kde</term>
-<listitem><para>This is the main &kde; mailing list for general
+<listitem><para>This is the main &tde; mailing list for general
 discussions.</para></listitem>
 </varlistentry>
 <varlistentry><term>kde-announce</term>
-<listitem><para>This list is used to announce new versions of &kde; as
+<listitem><para>This list is used to announce new versions of &tde; as
 well as new tools and applications.</para></listitem>
 </varlistentry>
 <varlistentry><term>kde-look</term>
@@ -79,7 +79,7 @@ subject.
 <important><para>Never send subscribe/unsubscribe request to the
 mailing lists directly! Use the list-request
 instead.</para></important></para>
-<para>There is also a complete list of all &kde;-related mailing
+<para>There is also a complete list of all &tde;-related mailing
 lists, and a web interface for subscribing and unsubscribing located
 at <ulink url="http://master.kde.org/mailman/listinfo">http://master.kde.org/mailman/listinfo</ulink>.</para>
 </answer>
@@ -110,7 +110,7 @@ should probably search the <quote>kde</quote>, <quote>kde-linux</quote>, and <qu
 
 <qandaentry>
 <question id="newsgroups">
-<para>Is there a newsgroup about &kde;?</para>
+<para>Is there a newsgroup about &tde;?</para>
 </question>
 <answer>
 <para>Yes, there is!  It is at <literal>comp.windows.x.kde</literal>.
@@ -123,14 +123,14 @@ idea to ask questions which are already answered in this
 
 <qandaentry>
 <question>
-<para>Are there any other &kde;-related
+<para>Are there any other &tde;-related
 &FAQ;s?</para>
 </question>
 <answer>
 <para>Yes.  Here is a list of them:</para>
 <itemizedlist>
 <listitem><para><ulink
-url="http://www.kde.org/info/faq.php">&kde; &FAQ;</ulink></para></listitem>
+url="http://www.kde.org/info/faq.php">&tde; &FAQ;</ulink></para></listitem>
 <listitem><para><ulink
 url="http://konqueror.org/faq/">&konqueror;
 &FAQ;</ulink></para></listitem>
diff --git a/doc/faq/nonkdeapps.docbook b/doc/faq/nonkdeapps.docbook
index e0e732548..1a8ea25f7 100644
--- a/doc/faq/nonkdeapps.docbook
+++ b/doc/faq/nonkdeapps.docbook
@@ -5,7 +5,7 @@
 -->
 
 <chapter id="non-kde-apps">
-<title>&kde; with non-&kde; applications</title>
+<title>&tde; with non-&tde; applications</title>
 
 <!-- FIXME: This seems to be obsolete. The only similar option is "Apply
 *colors* to -->
@@ -14,12 +14,12 @@
 <qandaset>
 <qandaentry>
 <question>
-<para>My non-&kde; applications like &Emacs; and
+<para>My non-&tde; applications like &Emacs; and
 <application>kterm</application> are running amok with strange
 colors!</para>
 </question>
 <answer>
-<para>Start the <application>&kde; Control Center</application> and in
+<para>Start the <application>&tde; Control Center</application> and in
 <menuchoice><guimenu>Appearance &amp; Themes</guimenu><guimenuitem>
 Colors</guimenuitem></menuchoice> uncheck the <guilabel>Apply colors to
 non-KDE applications</guilabel> checkbox and click
@@ -31,7 +31,7 @@ non-KDE applications</guilabel> checkbox and click
 <question><para>How can I set my default web browser to be something other
 than &konqueror;?</para></question>
 <answer>
-<para>If you are using &kde; 3.3 or later, open up the &kcontrolcenter; and
+<para>If you are using &tde; 3.3 or later, open up the &kcontrolcenter; and
 navigate to the <menuchoice><guimenu>KDE
 Components</guimenu><guimenuitem>Component
 Chooser</guimenuitem></menuchoice> panel. Select <guilabel>Web
@@ -46,7 +46,7 @@ in the textbox.</para>
 <qandaentry>
 <question>
 <para>How can I configure the style and fonts of <acronym>GTK</acronym>
-applications within &kde; ?
+applications within &tde; ?
 </para>
 </question>
 <answer>
@@ -55,7 +55,7 @@ The simplest way to achieve this is to download and compile the
 <acronym>gtk-qt</acronym> theme engine from <ulink
 url="http://www.freedesktop.org/Software/gtk-qt">
 http://www.freedesktop.org/Software/gtk-qt</ulink>. This theme engine makes
-your <acronym>GTK</acronym> applications look like your &kde; widget style
+your <acronym>GTK</acronym> applications look like your &tde; widget style
 by calling functions from &Qt; instead of drawing the styles itself. Once
 the theme engine has been installed, there will be a &kcontrolcenter; module
 under <menuchoice><guimenu>Appearance &amp; Themes</guimenu><guimenuitem>GTK
diff --git a/doc/faq/notrelated.docbook b/doc/faq/notrelated.docbook
index f39ee7705..972bd9f32 100644
--- a/doc/faq/notrelated.docbook
+++ b/doc/faq/notrelated.docbook
@@ -7,7 +7,7 @@
 -->
 
 <chapter id="not-kde">
-<title>Not really &kde;-related, but frequently asked nevertheless.</title>
+<title>Not really &tde;-related, but frequently asked nevertheless.</title>
 
 <qandaset>
 <qandaentry>
@@ -130,7 +130,7 @@ ext2.</para>
 
 <qandaentry>
 <question>
-<para>How do I start &kde; with the <keycap>Num Lock</keycap> on?</para>
+<para>How do I start &tde; with the <keycap>Num Lock</keycap> on?</para>
 </question>
 <answer>
 <para>Have you tried <command>man setleds</command>?  In addition, you
@@ -189,9 +189,9 @@ url="http://dforce.sh.cvut.cz/~seli/en/numlockx">http://dforce.sh.cvut.cz/~seli/
 <para>Yes, and there are a lot of them out there, including
 <application>StarOffice</application>, <application>&Netscape; Composer</application>, and
 <application>XEmacs</application>.
-There are also many &kde; applications.  To find the most current
+There are also many &tde; applications.  To find the most current
 list, go to <ulink url="http://kde-apps.org">kde-apps.org: The
-Latest in &kde; Applications</ulink> and search for <emphasis>web
+Latest in &tde; Applications</ulink> and search for <emphasis>web
 development</emphasis>.  Try as many as possible and choose the one
 most suitable to your needs.</para>
 </answer>
diff --git a/doc/faq/panel.docbook b/doc/faq/panel.docbook
index 6c9a1d3a2..5e77e0cf3 100644
--- a/doc/faq/panel.docbook
+++ b/doc/faq/panel.docbook
@@ -12,7 +12,7 @@
 <qandaset>
 <qandaentry>
 <question>
-<para>How do I add applications to the &kde; panel (&kicker;)?</para>
+<para>How do I add applications to the &tde; panel (&kicker;)?</para>
 </question>
 <answer>
 <para>There are several ways to add an application to the panel, of
@@ -40,9 +40,9 @@ you prefer from
 install it using the &kcontrolcenter;.</para>
 <para>In order to change only the &kmenu; icon you can overwrite the
 <filename>kmenu.png</filename> image for every size in an icon theme set.
-So, for &kde; default icons this would be <filename>$<envar>TDEDIR</envar>/share/icons/default.kde/<replaceable>size</replaceable>/apps/kmenu.png</filename>,
+So, for &tde; default icons this would be <filename>$<envar>TDEDIR</envar>/share/icons/default.kde/<replaceable>size</replaceable>/apps/kmenu.png</filename>,
 where <replaceable>size</replaceable> is one of the sizes included in the
-&kde; icon theme. 
+&tde; icon theme. 
 </para>
 </answer>
 </qandaentry>
@@ -55,7 +55,7 @@ After an upgrade my &kmenu; appears to be empty! How can I get my menu back?
 </question>
 <answer>
 <para>
-In &kde; 3.2 and later local modifications to the &kmenu; are stored
+In &tde; 3.2 and later local modifications to the &kmenu; are stored
 in
 <filename>$<envar>HOME</envar>/.config/menus/applications-kmenuedit.menu
 </filename>. Try moving this file out of the way and then issuing the
@@ -75,7 +75,7 @@ back?</para>
 
 <para>The panel disappearing is usually due to it crashing. This is
 most often caused by loading an applet that has a fatal bug or due to
-a bad installation of &kde; and/or the panel.</para>
+a bad installation of &tde; and/or the panel.</para>
 
 <para>The easiest way to get the panel back is to launch the
 <guilabel>Run Command</guilabel> window by pressing <keycombo
@@ -98,7 +98,7 @@ it by hand, start by removing the applet entry groups.</para>
 <para>Where did the Icon Zooming option that used to be in &kicker; go?
 </para></question>
 <answer><para>
-Icon zooming was not actively maintained and had caused severe bugs and usability issues. It was replaced in &kde; 3.4 by the new mouse over effects, which combine esthetics with useful information.
+Icon zooming was not actively maintained and had caused severe bugs and usability issues. It was replaced in &tde; 3.4 by the new mouse over effects, which combine esthetics with useful information.
 </para></answer>
 
 </qandaentry>
@@ -112,7 +112,7 @@ tray?</para>
 in the system tray, run <userinput><command>ksystraycmd </command>
 <option>--hidden</option> <command>konsole</command></userinput>. For
 more information about <command>ksystraycmd</command>, see the section
-<quote>Advanced Window Management</quote> in the &kde;
+<quote>Advanced Window Management</quote> in the &tde;
 User Guide.</para>
 </answer>
 </qandaentry>
@@ -121,13 +121,13 @@ User Guide.</para>
 <question><para>How do I use the &Windows; key to open the &kmenu;?</para>
 </question>
 
-<answer><para>Previous versions of &kde; provided a trick to allow you to
+<answer><para>Previous versions of &tde; provided a trick to allow you to
 use the &Windows; key both as a modifier (so you could have shortcuts
 like <keycombo action="simul"><keysym>Win</keysym><keycap>R</keycap>
 </keycombo>), and as a regular key (so that pressing
 <keysym>Win</keysym> on its own could open the &kmenu;). This feature
 was removed for reasons of usability and accessibility, as well as
-keeping the code clean. For current versions of &kde;, you have two
+keeping the code clean. For current versions of &tde;, you have two
 options: either use a different shortcut to open the &kmenu; (the
 default is <keycombo action="simul">&Alt;<keycap>F1</keycap>
 </keycombo>), or remap the <keysym>Win</keysym> key to be a regular
@@ -164,7 +164,7 @@ able to popup the &kmenu; by pressing the <keysym>Win</keysym> key.</para>
 settings: Create a file <filename>~/.kde/env/win-key.sh</filename>
 (create the directory if it doesn't exist), and add the
 <command>xmodmap</command> command you used previously to it. The
-change should now be applied every time you start &kde;.</para>
+change should now be applied every time you start &tde;.</para>
 </listitem>
 </orderedlist>
 </para>
diff --git a/doc/faq/qt.docbook b/doc/faq/qt.docbook
index 446089edc..d97265aab 100644
--- a/doc/faq/qt.docbook
+++ b/doc/faq/qt.docbook
@@ -11,7 +11,7 @@
 <para>&Qt; is a C++-based class library to build user interfaces. It
 also includes many utility classes like string classes and classes
 to handle input and output. It
-provides most of the widgets you will see in a &kde; application:
+provides most of the widgets you will see in a &tde; application:
 menus, buttons, sliders, &etc;.  &Qt; is a cross-platform library that
 allows you to write code that will compile on &UNIX; systems as well as
 &Windows; and embedded devices.  You can learn more about &Qt; at <ulink
@@ -21,27 +21,27 @@ url="http://www.trolltech.com">http://www.trolltech.com</ulink>.</para>
 
 <qandaentry>
 <question>
-<para>Why does &kde; use &Qt;?</para>
+<para>Why does &tde; use &Qt;?</para>
 </question>
 <answer>
 <para>&Qt; is a very sophisticated toolkit that provides everything that
 is needed to build a modern user interface.  &Qt; is written in C++, thus
 allowing object-oriented development which ensures efficiency and
-code reuse in a project the size and scope of &kde;.  In our opinion
+code reuse in a project the size and scope of &tde;.  In our opinion
 there is no better toolkit available for &UNIX; systems and that it
-would have been a grave mistake to try to build &kde; on anything but
+would have been a grave mistake to try to build &tde; on anything but
 the best.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para>Why does &kde; not use gtk, xforms, xlib, whatever?</para>
+<para>Why does &tde; not use gtk, xforms, xlib, whatever?</para>
 </question>
 <answer>
 <para>There are a number of toolkits available.  To provide a
 consistent user interface and to keep used resources such as memory to
-a minimum, &kde; can use only one of them.  &Qt; was selected for the
+a minimum, &tde; can use only one of them.  &Qt; was selected for the
 reasons mentioned above.</para>
 </answer>
 </qandaentry>
@@ -59,10 +59,10 @@ fulfiling all aspects of <quote>free software</quote>.</para>
 
 <qandaentry>
 <question>
-<para>Can I write commercial software for &kde;?</para>
+<para>Can I write commercial software for &tde;?</para>
 </question>
 <answer>
-<para>You can use the &kde; libraries to write <quote>commercial and
+<para>You can use the &tde; libraries to write <quote>commercial and
 closed source</quote> as well as <quote>commercial and open
 source</quote> software.  If you write open source software you can
 use the &Qt; free edition.  But if you write closed source software
diff --git a/doc/faq/questions.docbook b/doc/faq/questions.docbook
index 1f7db6b63..dc311f421 100644
--- a/doc/faq/questions.docbook
+++ b/doc/faq/questions.docbook
@@ -17,9 +17,9 @@ your question will be ignored</para>
 <question><para>What do I do before I ask?</para></question>
 
 <answer><para>Read the documentation and &FAQ; for the application. There is
-a wealth of &kde; documentation availible both in the help center and
+a wealth of &tde; documentation availible both in the help center and
 online. A lot of time and effort has gone into this documentation, and
-quite often the answer to your question is here. The general &kde; userguide
+quite often the answer to your question is here. The general &tde; userguide
 can be found by typing
 <userinput><command>help:/userguide</command></userinput> into your
 &konqueror; addressbar.</para>
@@ -45,9 +45,9 @@ your helpers as much time as you can, they're busy people.</para> </answer>
 
 <answer><para>Usually the best place to ask a question is on the
 <acronym>IRC</acronym> channels and mailing lists devoted to user
-questions. Don't post simple questions about using &kde; to the devel
+questions. Don't post simple questions about using &tde; to the devel
 channels and mailing lists, these are for technical discussions. Some good
-places are #kde on irc.freenode.net, and the &kde; mailing
+places are #kde on irc.freenode.net, and the &tde; mailing
 lists.</para></answer> </qandaentry>
 
 <qandaentry>
@@ -57,13 +57,13 @@ lists.</para></answer> </qandaentry>
 information possible and is polite and courteous. Don't ask to ask, just
 ask!</para>
 
-<para>Q: &kde; sucks, it's being slow</para>
+<para>Q: &tde; sucks, it's being slow</para>
 
 <para>Is not a question that is likely to get you a useful answer. It does
 not give any useful information about troubleshooting the problem, and it
 starts out attacking the software in a way that isn't productive.</para>
 
-<para>Q: Since upgrading &kde; on Slackware &Linux; from version 3.2.3 to
+<para>Q: Since upgrading &tde; on Slackware &Linux; from version 3.2.3 to
 3.3.2 using sources, I have noticed it's being really slow &mdash; sometimes
 applications take up to 20 seconts to launch. I am using the same user
 configuration as I had with the previous version, and I have tried as a new
@@ -75,13 +75,13 @@ troubleshoot the problem and shows your helpers what avenues you have
 already tried.</para>
 
 <para>Don't assume automatically that the problem is the fault of
-&kde;. Proceed as though this is your error, otherwise you will quickly
+&tde;. Proceed as though this is your error, otherwise you will quickly
 annoy people if it does indeed turn out to be your problem and not
-&kde;.</para>
+&tde;.</para>
 
 <para>Use clear language with correct spelling. Watch out for any
 ambiguities and make sure you think about what you say before you write
-it. If you are asked for clarification, give it as best you can. &kde; is a
+it. If you are asked for clarification, give it as best you can. &tde; is a
 project where many of the users and developers are not native english
 speakers and if you don't use correct english, misunderstandings may
 ensue. Use the language appropriate to the channel or mailing list you are
@@ -91,7 +91,7 @@ ignore your message because it is not in a language they understand.</para>
 <para>Include all information that could be relevant, even if you're not
 sure. Have you upgraded other software or hardware on your system,
 particularly system libraries or a new kernel? These things could affect how
-&kde; performs. Even if you cannot see a link, someone else might.</para>
+&tde; performs. Even if you cannot see a link, someone else might.</para>
 
 <para>Don't paraphrase error messages. Paste in the exact error, and if it's
 more than a line or two don't paste them directly into an
@@ -120,7 +120,7 @@ the incentive for your helper to put in the time and effort to help you?  If
 you're told to go use google, take it graciously and do so.</para> </answer>
 </qandaentry> </qandaset>
 
-<para>Above all, use common courtesy. &kde; users and developers are usually
+<para>Above all, use common courtesy. &tde; users and developers are usually
 volunteering their time out of an already very busy schedule, and like to
 know that you are appreciating that they are helping you for free. Be
 polite, say please and thank you and try to be pleasant and
@@ -129,13 +129,13 @@ friendly. </para>
 <para> Does this seem like a lot of trouble to ask a question? If you want
 to be able to feel that people owe you an answer or support, then you're
 quite welcome to pay for commercial support from companies that support
-&kde; on &UNIX; platforms. If you don't want to pay money, then pay the
+&tde; on &UNIX; platforms. If you don't want to pay money, then pay the
 people who do this for free with your politeness and appreciation :)</para>
 
 
 <para>If you think the answer to your question should be included in the
-&kde; &FAQ; please feel free to submit any patches or suggestions to the
-&kde; &FAQ; Maintainer, at <email>faq@kde.org</email></para>
+&tde; &FAQ; please feel free to submit any patches or suggestions to the
+&tde; &FAQ; Maintainer, at <email>faq@kde.org</email></para>
 
 
 
diff --git a/doc/faq/sound.docbook b/doc/faq/sound.docbook
index af41375ab..ce5397653 100644
--- a/doc/faq/sound.docbook
+++ b/doc/faq/sound.docbook
@@ -1,7 +1,7 @@
 <chapter id="sound">
 <title>Troubleshooting sound problems</title>
 
-<para>&kde; uses the &arts; sound system which is complex and powerful,
+<para>&tde; uses the &arts; sound system which is complex and powerful,
 making it difficult for some users to troubleshoot when things go
 wrong. Here are some tips to help you diagnose what it's doing when your
 sound misbehaves :</para>
@@ -9,14 +9,14 @@ sound misbehaves :</para>
 <qandaset>
 <qandaentry>
 <question>
-<para>How can I troubleshoot sound related problems in &kde;?</para>
+<para>How can I troubleshoot sound related problems in &tde;?</para>
 </question>
 
 <answer><para> To check that sound is working independently of &arts;, make
 sure that <command>artsd</command> isn't running and then try playing sound
 through <application>XMMS</application> or another multimedia application
-that isn't a part of &kde;. If that application doesn't play sound, then
-your general sound setup is probably broken and it's not a &kde;
+that isn't a part of &tde;. If that application doesn't play sound, then
+your general sound setup is probably broken and it's not a &tde;
 problem.</para>
 
 <para>Try playing sound with
@@ -42,9 +42,9 @@ conjunction with using <command>artsplay</command> in a second terminal can give
 </qandaentry>
 <qandaentry>
 <question><para>
-I've upgraded to the latest version of &kde; keeping my old configuration, and my system sounds don't work anymore!</para></question>
+I've upgraded to the latest version of &tde; keeping my old configuration, and my system sounds don't work anymore!</para></question>
 <answer><para>
-Assuming you've installed &arts; correctly and you still have the codecs installed your previous &kde; installation needed, chances are this is a small problem with your <filename>knotifyrc</filename>. To confirm this, try creating an entirely new user and seeing if system notifications work under the new account. If they do, try moving your <filename>$<envar>TDEHOME</envar>/share/config/knotifyrc</filename> out of the way for your original user to see if this solves the problem.
+Assuming you've installed &arts; correctly and you still have the codecs installed your previous &tde; installation needed, chances are this is a small problem with your <filename>knotifyrc</filename>. To confirm this, try creating an entirely new user and seeing if system notifications work under the new account. If they do, try moving your <filename>$<envar>TDEHOME</envar>/share/config/knotifyrc</filename> out of the way for your original user to see if this solves the problem.
 </para></answer>
 </qandaentry>
 
diff --git a/doc/faq/tips.docbook b/doc/faq/tips.docbook
index d47709095..246751635 100644
--- a/doc/faq/tips.docbook
+++ b/doc/faq/tips.docbook
@@ -10,7 +10,7 @@
 <qandaset>
 <qandaentry>
 <question>
-<para>Reading documentation in &kde;</para>
+<para>Reading documentation in &tde;</para>
 </question>
 <answer>
 <para>Pop up the <guilabel>Run Command</guilabel> window (<keycombo
@@ -28,7 +28,7 @@ pages.</para>
 </listitem>
 
 <listitem>
-<para><command>help:<replaceable>kdeappname</replaceable></command> for &kde;
+<para><command>help:<replaceable>kdeappname</replaceable></command> for &tde;
 application help pages.</para>
 </listitem>
 
@@ -37,9 +37,9 @@ application help pages.</para>
 
 <para>You can also enter any of these in the <guilabel>Location</guilabel> text
 box in &konqueror;.</para>
-<para>Or you can use the <application>&kde; Help Center</application> if you are using &kde;
-2.  Simply start the <application>&kde; Help Center</application> by clicking on the icon (the blue
-book with the yellow key) on the toolbar.  Once the <application>&kde; Help Center</application> has
+<para>Or you can use the <application>&tde; Help Center</application> if you are using &tde;
+2.  Simply start the <application>&tde; Help Center</application> by clicking on the icon (the blue
+book with the yellow key) on the toolbar.  Once the <application>&tde; Help Center</application> has
 loaded, the window on the left will contain an entry called
 <guilabel>Unix manual pages</guilabel>.  Click once on this entry, and
 you can browse through all the installed manual pages on your
@@ -58,21 +58,21 @@ button.  <keycombo
 action="simul">&Alt;<mousebutton>right</mousebutton></keycombo> mouse
 button will resize the window.  Last but not least, <keycombo
 action="simul">&Alt;<mousebutton>middle</mousebutton></keycombo> mouse button
-raises/lowers the window. The <application>&kde; Control Center</application>
+raises/lowers the window. The <application>&tde; Control Center</application>
 allows you to change these mouse bindings.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para>Killing windows in &kde;</para>
+<para>Killing windows in &tde;</para>
 </question>
 <answer>
 <para>There is a standard keybinding (<keycombo
 action="simul">&Ctrl;&Alt;&Esc;</keycombo>) 
 that gives you a skull &amp; crossbones cursor.  Click that cursor on a
 window to kill it.  The keybindings are viewable/changeable from the
-<application>&kde; Control Center</application>.
+<application>&tde; Control Center</application>.
 
 <caution><para>Using this option kills the program forcibly. Data may be lost,
 and some processes related to the program may remain active. Use only as a
@@ -122,7 +122,7 @@ with, &kicker;, &klipper; and &kdesktop;.</para>
 <!-- fixme: how to do in KDE2.x
 <qandaentry>
 <question>
-<para>Switching window managers on the fly in &kde; 1.x</para>
+<para>Switching window managers on the fly in &tde; 1.x</para>
 </question>
 <answer>
 <para>If you want to switch your window manager on the fly, type the
diff --git a/doc/faq/webbrowse.docbook b/doc/faq/webbrowse.docbook
index 5beab0376..1538744e9 100644
--- a/doc/faq/webbrowse.docbook
+++ b/doc/faq/webbrowse.docbook
@@ -4,7 +4,7 @@
 
 <chapter id="webbrowser">
 <title>Webbrowsing with &konqueror;</title>
-<para>&konqueror; is &kde;'s open source, standards compliant webbrowser.
+<para>&konqueror; is &tde;'s open source, standards compliant webbrowser.
 It's home page is
 <ulink
 url="http://www.konqueror.org">http://www.konqueror.org</ulink> where a
@@ -14,13 +14,13 @@ url="http://www.konqueror.org">http://www.konqueror.org</ulink> where a
 
 <qandaentry>
 <question><para>Where does the name &konqueror; come from?</para></question>
-<answer><para>It's a word play on the other browsers' names. After the Navigator and the Explorer comes the Conqueror; it's spelled with a K to show that it's part of &kde;. The name change also moves away from <quote>kfm</quote> (the &kde; file manager, &konqueror;'s predecessor) which represented only file management.</para></answer>
+<answer><para>It's a word play on the other browsers' names. After the Navigator and the Explorer comes the Conqueror; it's spelled with a K to show that it's part of &tde;. The name change also moves away from <quote>kfm</quote> (the &tde; file manager, &konqueror;'s predecessor) which represented only file management.</para></answer>
 </qandaentry>
 
 <qandaentry>
-<question><para>Can I run &konqueror; without running &kde;?</para></question>
-<answer><para>Yes. Just install &Qt;, tdelibs and tdebase, and from your favorite window manager just launch &konqueror;. It should work just fine, but if it doesn't (&kde; developers don't test that case often), report it to http://bugs.kde.org and try running "tdeinit" before running &konqueror;, it usually helps. 
-This is of course the same for any other &kde; application. </para>
+<question><para>Can I run &konqueror; without running &tde;?</para></question>
+<answer><para>Yes. Just install &Qt;, tdelibs and tdebase, and from your favorite window manager just launch &konqueror;. It should work just fine, but if it doesn't (&tde; developers don't test that case often), report it to http://bugs.kde.org and try running "tdeinit" before running &konqueror;, it usually helps. 
+This is of course the same for any other &tde; application. </para>
 </answer>
 </qandaentry>
 
@@ -88,11 +88,11 @@ could cause this?</para></question>
 support.  Adding the following to <filename>/etc/profile</filename> or any
 other script that is sourced on login should solve this problem:
 <screen>
-export KDE_NO_IPV6=true
+export TDE_NO_IPV6=true
 </screen>
 for bourne compatible shells, and for C-style shells:
 <screen>
-setenv KDE_NO_IPV6 true
+setenv TDE_NO_IPV6 true
 </screen>
 </para>
 </answer>
diff --git a/doc/faq/winmng.docbook b/doc/faq/winmng.docbook
index d001b8425..4bac8b636 100644
--- a/doc/faq/winmng.docbook
+++ b/doc/faq/winmng.docbook
@@ -9,10 +9,10 @@
 <chapter id="windowmanager">
 <title>The window manager</title>
 
-<para>The default window manager provided by &kde; is the K Window
+<para>The default window manager provided by &tde; is the K Window
 Manager (&twin;).  Please read <quote>The
 K Window Manager Handbook</quote> (which should be accessible from the
-<application>&kde; Help Center</application>) for usage information.</para>
+<application>&tde; Help Center</application>) for usage information.</para>
 
 <qandaset>
 <qandaentry>
@@ -31,7 +31,7 @@ list of shortcuts available.</para>
 </question>
 <answer>
 <para>Yes.  Launch the
-<application>&kde; Control Center</application> and select
+<application>&tde; Control Center</application> and select
 <menuchoice><guimenu>Regional &amp; Accessibility</guimenu><guimenuitem>Keyboard Shortcuts</guimenuitem></menuchoice> to
 configure window manager bindings like maximizing windows, &etc;. 
 </para>
@@ -46,7 +46,7 @@ go?</para>
 <answer>
 <para>With many &X-Window; &GUI;s, the minimize button (a little dot) will
 erase the window that the program is running in and create, instead,
-an icon on the desktop.  &kde; does not do this.  Instead, when a
+an icon on the desktop.  &tde; does not do this.  Instead, when a
 window is iconified it is simply hidden (but the program is still
 running).</para>
 <para>There are a few ways to access <quote>disappeared</quote> windows:</para>
@@ -106,8 +106,8 @@ see a full list of <command>kstart</command> options with
 <option>--help-all</option></userinput>.</para>
 
 <warning><para>If you're using <command>kstart</command> to start
-applications at &kde; startup, you should use the
-<option>--window</option> option. See the &kde; User Guide, section
+applications at &tde; startup, you should use the
+<option>--window</option> option. See the &tde; User Guide, section
 <quote>Advanced Window Management</quote> for more information about
 this feature.</para>
 </warning>
@@ -122,7 +122,7 @@ this feature.</para>
 placement of windows?</para>
 </question>
 <answer>
-<para>Yes.  Run <application>&kde; Control Center</application> and select <guimenu>Look and Feel</guimenu>
+<para>Yes.  Run <application>&tde; Control Center</application> and select <guimenu>Look and Feel</guimenu>
 followed by <guisubmenu>Window Behavior</guisubmenu> and finally
 <guimenuitem>Advanced</guimenuitem>.  There is a dialog option that
 allows you to set the placement policy you want.</para>