Update Help center: Reorganize TOC, rename files; initial update of FAQ,

Welcome, Quick Start guides; numerous revisions.

21 files changed, 597 insertions, 393 deletions

diff --git a/doc/faq/about.docbook b/doc/faq/about.docbook
index 99bde6a00..9aa9c4908 100644
--- a/doc/faq/about.docbook
+++ b/doc/faq/about.docbook
@@ -3,36 +3,34 @@
 <!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
  "dtd/kdex.dtd">
 -->
- 
+
 <chapter id="about">
 <title>About this <acronym>FAQ</acronym></title>
 
 <qandaset>
 <qandaentry>
 <question>
-<para>What can I do to help out with this <acronym>FAQ</acronym>?</para>
+<para>What can I do to help with this <acronym>FAQ</acronym>?</para>
 </question>
 
 <answer>
 
-<para>First, send us any errors that you may find.  Also, any
-suggestions that you might have, are appreciated.  Better yet, send us
-everything  that you think is unclear, and if possible, send us what
-you think would be a clearer solution. The email address of the current maintainer is <email>jhall@kde.org</email>.
-</para>
+<para>Notify us about any errors you find. Suggestions you have are
+appreciated. Send us everything that you think is unclear. When possible send us what
+you think would be a clearer solution.</para>
 
-<para>Second, send us your solutions of those frequently-asked
-questions which are still not in this <acronym>FAQ</acronym>.  We will
-put them in as soon as possible.</para>
+<para>Send us your solutions of those frequently-asked
+questions which are still not in this <acronym>FAQ</acronym>. We will
+add them as soon as practical.</para>
 
-<para>Last but not least, please make full use of this
-<acronym>FAQ</acronym>.  Read this <acronym>FAQ</acronym> (and other
+<para>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
 &tde; mailing lists or newsgroups.</para>
 
-<note><para> You might also want to consider becoming a
+<note><para>You might want to consider becoming a
 <acronym>FAQ</acronym> maintainer. Please refer to <xref
-linkend="FAQ-maintainer-HOWTO"/> for more details.  </para></note>
+linkend="FAQ-maintainer-HOWTO"/> for details.</para></note>
 
 </answer>
 </qandaentry>
@@ -43,8 +41,8 @@ linkend="FAQ-maintainer-HOWTO"/> for more details.  </para></note>
 </question>
 
 <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
+<para>Actually, becoming an <acronym>FAQ</acronym> maintainer is easy
+and we are always grateful for new help. :-) Send
 us an email at <email>trinity-devel@lists.pearsoncomputing.net</email>.
 </para>
 </answer>
diff --git a/doc/faq/configkde.docbook b/doc/faq/configtde.docbook
index 8f687f69b..8f687f69b 100644
--- a/doc/faq/configkde.docbook
+++ b/doc/faq/configtde.docbook
diff --git a/doc/faq/contrib.docbook b/doc/faq/contrib.docbook
index 0db6389be..702bd7710 100644
--- a/doc/faq/contrib.docbook
+++ b/doc/faq/contrib.docbook
@@ -15,15 +15,15 @@
 </question>
 <answer>
 <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
+contributions. Everybody is encouraged to contribute to &tde;. Not
+only programmers are welcome. There are many ways in which you can
 help to improve &tde;:</para>
 <itemizedlist>
 <listitem><para>Test the software.</para></listitem>
-<listitem><para>Send in bug reports.  For more information on this,
+<listitem><para>Send in bug reports. For more information on this,
 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
+<listitem><para>Write documentation or help files. You can get some
 information by visiting the <ulink
 url="http://i18n.kde.org/doc/">&tde; Editorial Team
 Home Page</ulink>.</para></listitem>
@@ -31,22 +31,22 @@ Home Page</ulink>.</para></listitem>
 For more information on this, you should visit <ulink
 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
+<listitem><para>Draw nice icons or compose sound effects. You can
 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 &tde;.  If you want 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 
+<email>kde-pr@kde.org</email>. This will get you in touch
 with the &tde; public relations volunteers.</para></listitem>
-<listitem><para>Program new &tde; applications.  Please refer to <xref
+<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>
 </itemizedlist>
 <para>There are several places to look for more information if you
-want to get involved in the development.  The first step is to
-subscribe to some of the <ulink  url="http://www.kde.org/mailinglists/">mailing 
-lists</ulink>.  You will soon see something
+want to get involved in the development. The first step is to
+subscribe to some of the <ulink  url="http://www.kde.org/mailinglists/">mailing
+lists</ulink>. You will soon see something
 that can be improved or added.</para>
 </answer>
 </qandaentry>
@@ -57,51 +57,63 @@ that can be improved or added.</para>
 </question>
 <answer>
 <para>There is a bug tracking system available at <ulink
-url="http://bugs.kde.org">http://bugs.kde.org</ulink>.  The
-system features a wizard to submit new bug reports and a
+url="http://bugs.pearsoncomputing.net/">http://bugs.pearsoncomputing.net/</ulink>
+and thanks for helping! The system features several query types and a
 list of all known bugs.</para>
 <para>The easiest way to submit a bug is to select
-<menuchoice><guimenu>Help</guimenu><guimenuitem>Report 
+<menuchoice><guimenu>Help</guimenu><guimenuitem>Report
 Bug...</guimenuitem></menuchoice> from the menu bar of the application
-with the bug.  This will open a small dialog box with a link
+with the bug. This will open a small dialog box with a link
 to the bug tracking system. Please make sure to follow the
 instructions of the bug reporting wizard.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
+<question>
+<para>May I join the development team?</para>
+</question>
+<answer>
+<para>Please! Join our discussion list at
+<ulink url="http://www.trinitydesktop.org/mailinglist.php">
+http://www.trinitydesktop.org/mailinglist.php</ulink>. Join
+Internet Relay Chat (IRC) sessions at chat.freenode.net, channel: #trinity-desktop</para>
+</answer>
+</qandaentry>
+
+<qandaentry>
 <question id="programming">
-<para>I want to program for &tde;.  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 &tde;.  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 &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> 
+<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 &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 
-&konqueror; and bookmark it.  The tutorials
-can be found under "Using 
-Qt".  The source code for each lesson can be found in the <filename
+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
+&konqueror; and bookmark it. The tutorials
+can be found under "Using
+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 &tde; should do: <emphasis>subscribe to the developers
-mailing list</emphasis>.  To subscribe, you have to send an email to
+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>
 with the subject <userinput>subscribe
 <replaceable>your_email_address</replaceable></userinput>.
 <important><para>Please read <link linkend="subscribe">How to
-subscribe/unsubscribe to these lists</link> carefully.  Everything
+subscribe/unsubscribe to these lists</link> carefully. Everything
 said there applies to the development list as
 well.</para></important></para>
 </answer>
@@ -113,15 +125,15 @@ well.</para></important></para>
 </question>
 <answer>
 <para>The &tde; project uses <acronym>SVN</acronym> to develop the
-core parts of the software.  Usually, when you have changed one of 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
 patch to the developer/maintainer of the respective program.</para>
 <para>If you are doing this more or less regularly, there are instructions here on how to get write access to the <acronym>SVN</acronym> repository: <ulink url="http://developer.kde.org/documentation/other/developer-faq.html#q1.8">
-http://developer.kde.org/documentation/other/developer-faq.html#q1.8</ulink>.  But be aware that more users will slow
+http://developer.kde.org/documentation/other/developer-faq.html#q1.8</ulink>. But be aware that more users will slow
 down <acronym>SVN</acronym> access for all developers, so we want to
 keep the number of people with direct <acronym>SVN</acronym> access
-reasonably small.  But feel free to ask!</para>
+reasonably small. But feel free to ask!</para>
 </answer>
 </qandaentry>
 
@@ -154,7 +166,7 @@ language?</para>
 <answer>
 <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 
+program is already translated (most are). Otherwise you will find
 information there on how to do it yourself.</para>
 </answer>
 </qandaentry>
diff --git a/doc/faq/getkde.docbook b/doc/faq/getkde.docbook
deleted file mode 100644
index 89063a680..000000000
--- a/doc/faq/getkde.docbook
+++ /dev/null
@@ -1,79 +0,0 @@
-<!--
-<?xml version="1.0" ?>
-<!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
- "dtd/kdex.dtd">
--->
-
-<chapter id="getting-kde">
-<title>Getting &tde;</title>
-
-<qandaset>
-<qandaentry>
-<question id="where-to-get-kde">
-<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 &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 &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 &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"> &tde; mirror sites</ulink>.</para>
-</answer>
-</qandaentry>
-
-<qandaentry>
-<question>
-<para>What is the current version?</para>
-</question>
-<answer>
-
-<para>Currently, the latest stable version is 3.5.5</para>
-
-<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>
-</qandaentry>
-
-<qandaentry>
-<question>
-<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 &tde;</ulink> for further
-information.
-</para>
-
-</answer>
-</qandaentry>
-
-<qandaentry>
-<question id="where-to-get-qt">
-<para>Where do I get &Qt;?</para>
-</question>
-<answer>
-<para>&Qt; is a product of the Norwegian company Trolltech.  You can
-always get the latest &Qt; version from their 
-<ulink url="ftp://ftp.trolltech.com">&FTP; server</ulink>.</para>
-<para>
-And with most up-to-date &Linux; distributions, &Qt; is already
-included.  Please see <xref linkend="prerequisites"/> for the version
-of &Qt; you need.</para>
-</answer>
-</qandaentry>
-
-
-</qandaset>
-</chapter>
diff --git a/doc/faq/gettde.docbook b/doc/faq/gettde.docbook
new file mode 100644
index 000000000..b44dc3195
--- /dev/null
+++ b/doc/faq/gettde.docbook
@@ -0,0 +1,86 @@
+<!--
+<?xml version="1.0" ?>
+<!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
+ "dtd/kdex.dtd">
+-->
+
+<chapter id="getting-tde">
+<title>Getting &tde;</title>
+
+<qandaset>
+<qandaentry>
+<question id="where-to-get-tde">
+<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 &tde; is to install a &Linux; distribution or another &UNIX; operating system
+that ships with &tde;.
+You can find an up-to-date list of distributions that ship
+with &tde; <ulink url="http://www.trinitydesktop.org/">here</ulink>.</para>
+
+<para>The main distribution site for &tde; is
+<ulink url="http://www.trinitydesktop.org/">http://www.trinitydesktop.org/</ulink>.</para>
+</answer>
+</qandaentry>
+
+<qandaentry>
+<question>
+<para>What is the current version?</para>
+</question>
+<answer>
+<para>TDE is developed continually. Find the latest stable version number <ulink url="http://www.trinitydesktop.org/releases.php">here</ulink>.</para>
+</answer>
+</qandaentry>
+
+<qandaentry>
+<question>
+<para>Binary packages are not available for my distro. What do I do?</para>
+</question>
+<answer>
+<para>That is always a challenging situation. Are there skilled packagers who
+might help? If you are skilled in compiling software from sources, source
+tarballs are available for each TDE release (http://www.trinitydesktop.org/releases.php).
+The development version can also be built from our GIT source tree. Use the forums
+or mailing lists to contact packagers to obtain copies of their build scripts
+that can be massaged to fit your distro.</para>
+</answer>
+</qandaentry>
+
+<qandaentry>
+<question>
+<para>Where do I find &tde; snapshots?</para>
+</question>
+<answer>
+<para>Learn more about the latest development snapshots at <ulink
+url="http://www.trinitydesktop.org/development.php">http://www.trinitydesktop.org/development.php</ulink>.
+You might want to consider setting up your own <acronym>GIT</acronym> account to
+maintain the latest snapshot at all times. Please refer to <ulink
+url="http://www.trinitydesktop.org/development.php">http://www.trinitydesktop.org/development.php</ulink> for further
+information.
+</para>
+
+</answer>
+</qandaentry>
+
+<qandaentry>
+<question id="where-to-get-qt">
+<para>Where do I get &Qt;?</para>
+</question>
+<answer>
+<para>&Qt; is a product of the Norwegian company Trolltech. The version
+upon which TDE is based no longer is actively maintained by Trolltech.
+Maintenance is handled by the TDE developers. Get the latest &Qt; version
+from the TDE GIT repository at
+<ulink url="http://git.trinitydesktop.org/">http://git.trinitydesktop.org/</ulink>.</para>
+<para>
+With most &Linux; distributions, this version of &Qt; no longer is
+included or maintained and must be obtained from the TDE repositories. Because
+this version of &Qt; is now maintained exclusively to support TDE, the version supported
+by TDE developers is not backwards compatible with the original version from Trolltech.</para>
+</answer>
+</qandaentry>
+
+
+</qandaset>
+</chapter>
diff --git a/doc/faq/index.docbook b/doc/faq/index.docbook
index 17b577d36..4a9d866d4 100644
--- a/doc/faq/index.docbook
+++ b/doc/faq/index.docbook
@@ -6,16 +6,16 @@
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
   <!ENTITY faq-about SYSTEM "about.docbook">
   <!ENTITY faq-intro SYSTEM "intro.docbook">
-  <!ENTITY faq-getkde SYSTEM "getkde.docbook">
+  <!ENTITY faq-gettde SYSTEM "gettde.docbook">
   <!ENTITY faq-install SYSTEM "install.docbook">
   <!ENTITY faq-panel SYSTEM "panel.docbook">
   <!ENTITY faq-desktop SYSTEM "desktop.docbook">
   <!ENTITY faq-winmng SYSTEM "winmng.docbook">
   <!ENTITY faq-filemng SYSTEM "filemng.docbook">
   <!ENTITY faq-webbrowse SYSTEM "webbrowse.docbook">
-  <!ENTITY faq-configkde SYSTEM "configkde.docbook">
-  <!ENTITY faq-kdeapps SYSTEM "kdeapps.docbook">
-  <!ENTITY faq-nonkdeapps SYSTEM "nonkdeapps.docbook">
+  <!ENTITY faq-configtde SYSTEM "configtde.docbook">
+  <!ENTITY faq-tdeapps SYSTEM "tdeapps.docbook">
+  <!ENTITY faq-nontdeapps SYSTEM "nontdeapps.docbook">
   <!ENTITY faq-tips SYSTEM "tips.docbook">
   <!ENTITY faq-misc SYSTEM "misc.docbook">
   <!ENTITY faq-notrelated SYSTEM "notrelated.docbook">
@@ -42,35 +42,29 @@
 </authorgroup>
 
 <copyright>
-<year>1997</year>
-<year>1998</year>
-<year>1999</year>
-<year>2000</year>
-<year>2001</year>
-<year>2003</year>
-<year>2004</year>
-<year>2005</year>
+<year>1997-2005</year>
 <holder>The &kde; Team</holder>
 </copyright>
 <copyright>
-<year>2012</year>
+<year>&tde-copyright-date;</year>
 <holder>The &tde; Team</holder>
 </copyright>
 
 <legalnotice>&FDLNotice;</legalnotice>
 
-<date>2005-01-19</date>
-<releaseinfo>3.4</releaseinfo>
+<date>&tde-release-date;</date>
+<releaseinfo>&tde-release-version;</releaseinfo>
 
-<abstract> <para>This is a compilation of the most frequently asked
+<abstract> <para>This is a collection of frequently asked
 questions about the Trinity Desktop Environment.  Please report any bugs,
 inconsistencies, or omissions you find in this &FAQ; to
-<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>
+<email>trinity-devel@lists.pearsoncomputing.net</email>.  Please post
+questions to the &tde; mailing lists. Questions are monitored to help
+maintain this &FAQ;.</para> </abstract>
 
 <keywordset>
 <keyword>KDE</keyword>
+<keyword>TDE</keyword>
 <keyword>FAQ</keyword>
 <keyword>question</keyword>
 <keyword>answer</keyword>
@@ -79,17 +73,17 @@ instead. They are monitored for this &FAQ;.</para> </abstract>
 
 &faq-about;
 &faq-intro;
-&faq-getkde;
+&faq-gettde;
 &faq-install;
 &faq-panel;
 &faq-desktop;
 &faq-winmng;
 &faq-filemng;
 &faq-webbrowse;
-&faq-configkde;
-&faq-kdeapps;
+&faq-configtde;
+&faq-tdeapps;
 &faq-sound;
-&faq-nonkdeapps;
+&faq-nontdeapps;
 &faq-tips;
 &faq-misc;
 &faq-qt;
diff --git a/doc/faq/install.docbook b/doc/faq/install.docbook
index 0aa323631..0192af04c 100644
--- a/doc/faq/install.docbook
+++ b/doc/faq/install.docbook
@@ -6,11 +6,11 @@
 <chapter id="install">
 <title>Installation instructions</title>
 
-<para>These are the generic installation instructions for the K
-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
+<para>These are the generic installation instructions for the Trinity
+Desktop Environment. Please complement your reading with the
+<filename>README</filename> and <filename>INSTALL</filename> text files that
+come along with the package. Please read them carefully and try to
+help yourself if anything goes wrong. If you need further
 assistance, consider joining the &tde; mailing lists
 (see our web site instructions for joining the &tde;
 <ulink url="http://www.kde.org/mailinglists/">mailing
@@ -27,12 +27,12 @@ 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 &tde;.  But you know next to nothing
-about this whole <quote>alternative OS</quote> business.  Don't worry!
+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
+<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>
 
@@ -43,12 +43,12 @@ 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 &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
+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
-hesitate to make use of the &tde; <link 
+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
+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>
 <para>Good luck and have fun!</para>
@@ -73,7 +73,7 @@ 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
+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
@@ -97,15 +97,15 @@ 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>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 &tde;
-yourself.  They are all available, at no cost, from <ulink
+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
-installed on your system.  An example is OpenSSL which will enable
+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
+>=0.9.6. These should be provided by your distributor; if not, ask
 for an update.</para>
 
 </answer>
@@ -117,7 +117,7 @@ for an update.</para>
 </question>
 <answer>
 <para>The base distribution currently consists of twenty
-packages.  Some are required, while others are optional.  Each package
+packages. Some are required, while others are optional. Each package
 is available in each of the aforementioned package formats.</para>
 <variablelist>
 <varlistentry>
@@ -141,7 +141,7 @@ emulator, the control center, the file manager, and the panel.</para>
 <term>&arts;</term>
 <listitem>
 <para>Required</para>
-<para>The &arts; sound server.  A powerful, network transparent sound
+<para>The &arts; sound server. A powerful, network transparent sound
 server.</para>
 </listitem>
 </varlistentry>
@@ -201,7 +201,7 @@ nifty stuff.</para>
 <term>tdenetwork</term>
 <listitem>
 <para>Optional</para>
-<para>Network applications.  Currently contains the instant messaging client &kopete;, the
+<para>Network applications. Currently contains the instant messaging client &kopete;, the
 download manager &kget;, and several other network-related programs.</para>
 </listitem>
 </varlistentry>
@@ -266,7 +266,7 @@ KDE accessibility programs such as a screen magnifier and speech synthesizer fro
 </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>
@@ -316,12 +316,12 @@ every package you want to install.</para></step>
 <term>Installation of the source <filename>.tar.bz2</filename> files</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. 
+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
+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>
@@ -331,12 +331,12 @@ the <filename>configure</filename> script.</para>
 <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
+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
+install"</option></command> (if you aren't already root). If you
 already are, just type <command>make
 <option>install</option></command>.</para></step>
 </procedure>
@@ -354,18 +354,18 @@ already are, just type <command>make
 <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 
+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
+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>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
+<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
@@ -382,21 +382,21 @@ 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
+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
+<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
-can now start to explore the wonderful world of &tde;.  In case you
-want to read some documentation first, there is a highly recommended 
+<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
-guide</ulink> available.  Furthermore, every application has an online
+guide</ulink> available. Furthermore, every application has an online
 help that is available via the <guimenu>help</guimenu> menu.</para>
 </answer>
 </qandaentry>
@@ -408,7 +408,7 @@ help that is available via the <guimenu>help</guimenu> menu.</para>
 one?</para>
 </question>
 <answer>
-<para>In principle, this is not necessary.  <acronym>RPM</acronym> and Debian packages
+<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
@@ -425,11 +425,11 @@ can lead to problems if you are not careful. </para>
 </question>
 <answer>
 <para>The most comfortable method to start &tde; is to use the
-<filename>starttde</filename> script.  Simply put the line
+<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
+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>
@@ -443,7 +443,7 @@ Why?</para>
 </question>
 <answer>
 <para>When your system uses shadow passwords, the screensaver can only
-run properly if the suid bit is set.  This bit gives the screensavers
+run properly if the suid bit is set. This bit gives the screensavers
 root privileges, which are needed to access the shadow passwords.
 <caution><para>The screensavers might be configured to secure the
 machine until the password is entered.</para></caution></para>
@@ -457,7 +457,7 @@ $<envar>TDEDIR</envar>/bin/*.kss</command></para></step>
 </procedure>
 <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
+configure tdebase. Then the suid bit is set automatically during
 <command>make install</command>.</para>
 </answer>
 </qandaentry>
@@ -467,14 +467,14 @@ configure tdebase.  Then the suid bit is set automatically during
 <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
+<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
+<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>
 
@@ -490,7 +490,7 @@ endif
 
 if ( ! $?LIBRARY_PATH ) then
    setenv LIBRARY_PATH $LD_LIBRARY_PATH
-endif  
+endif
 </programlisting>
 <para>For <application>bash</application>:</para>
 <programlisting>
@@ -504,7 +504,7 @@ export TDEDIR PATH LD_LIBRARY_PATH LIBRARY_PATH
 <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
+install to. For example, executing <command>rpm <option>-i
 --prefix=<replaceable>/home/me
 package.rpm</replaceable></option></command> will install the package
 to <filename
@@ -513,7 +513,7 @@ class="directory">/home/me</filename>.</para></step>
 <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
+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
@@ -525,15 +525,15 @@ screen, so this option will not work.</para>
 <qandaentry>
 <question>
 <para><command>starttde</command> fails with <errorname>can not connect to X
-server</errorname>.  What is wrong?</para>
+server</errorname>. What is wrong?</para>
 </question>
 <answer>
-<para>You probably tried to start the X server with <command>starttde</command>.  The X
+<para>You probably tried to start the X server with <command>starttde</command>. The X
 server is started with <command>startx</command>.
-<command>starttde</command> is the 
+<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 &tde;.  See also <xref linkend="starttde"/>.</para>
+daemons for &tde;. See also <xref linkend="starttde"/>.</para>
 </answer>
 </qandaentry>
 
@@ -563,7 +563,7 @@ There is also some older information at <ulink url="http://space.twc.de/~stefan/
 </question>
 <answer>
 <para>If you can get &X-Window; to run on your laptop, you should not have any problem
-getting &tde; 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 &tde; 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>
@@ -609,9 +609,9 @@ 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 &tde; 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> 
+then they should stay.</para>
 </answer>
 </qandaentry>
 
@@ -622,17 +622,17 @@ then they should stay.</para>
 <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
+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
+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
+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
@@ -641,15 +641,15 @@ 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> 
+$<envar>TDEHOME</envar> variable.</para>
 </answer>
 </qandaentry>
 
 <qandaentry id="greyscreen">
 <question>
 <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>
+I get a blank gray screen, and nothing happens. There are errors in
+the console about DCOPserver. What's going on?</para>
 </question>
 
 <answer>
@@ -668,7 +668,7 @@ These are usually to be found in the following locations:</para>
 <para>If the symlinks get broken, usually because a
 <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
+things will happen. These files, and the symlinks, will all be
 created automatically at the start of &tde; so you can safely remove
 them <emphasis>while &tde; is not running</emphasis>.</para>
 
@@ -682,13 +682,49 @@ seconds off your &tde; startup time by doing so.</para>
 
 <qandaentry>
 <question>
+<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>
+</answer>
+</qandaentry>
+
+<qandaentry>
+<question>
+<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
+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>
+</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
+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
+"scrubbing" cleanup. Although the script has been tested we provide the tool "as is"
+with no warranties or guarantees. (The script works really well, actually. :-))</para>
+</answer>
+</qandaentry>
+
+<qandaentry>
+<question>
 <para>Compiling tdebase gives me a <errorname>bin/sh: msgfmt: command
 not found</errorname> error!</para>
 </question>
 <answer>
 <para>You need the &GNU; <application>msgfmt</application> which is
 part of the &GNU; i18n package <application>gettext</application>.
-You should be able to download it from any 
+You should be able to download it from any
 &GNU; mirror.</para>
 </answer>
 </qandaentry>
@@ -701,7 +737,7 @@ source?</para>
 <answer>
 <para>You can uninstall your programs by typing <command>make
 uninstall</command> in the folder where you did <command>make
-install</command>.  If you have already deleted that folder,
+install</command>. If you have already deleted that folder,
 then there is only one way, and it is not good: go to <filename
 class="directory">$<envar>TDEDIR</envar>/bin</filename> and start deleting files
 one by one.</para>
@@ -716,7 +752,7 @@ consider a program such as &GNU; <application>stow</application>, found at
 <para>What is up with &GIF; support?</para>
 </question>
 <answer>
-<para>This has to do with issues with Unisys' &LZW; patent.  &GIF;
+<para>This has to do with issues with Unisys' &LZW; patent. &GIF;
 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>
diff --git a/doc/faq/intro.docbook b/doc/faq/intro.docbook
index a366ae038..d7434b097 100644
--- a/doc/faq/intro.docbook
+++ b/doc/faq/intro.docbook
@@ -13,13 +13,12 @@
 <para>What is &tde;?</para>
 </question>
 <answer>
-<para>&tde; is the Trinity Desktop Environment.  The project was initiated
+<para>&tde; is the Trinity Desktop Environment. The project was initiated
 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
+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, &tde; will bring &UNIX; to the desktop!</para>
-<para>If you want further information about &tde;, have a look at
+<para>If you want further information about &tde;, look at
 <ulink url="http://www.trinitydesktop.org/about.php">About Trinity</ulink></para>
 </answer>
 </qandaentry>
@@ -29,28 +28,40 @@ interface.</para>
 <para>On which platforms can I expect &tde; to work?</para>
 </question>
 <answer>
-<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 &tde; to compile on a not-so-popular variant
-of &UNIX;, or if you are not using the &GNU; development tools, in
+<para>&tde; is a Desktop Environment for all flavors of &UNIX; systems.
+While most &tde; developers use &Linux;, &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
 particular the &gcc; compiler.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
+<para>Why should I use TDE?</para>
+</question>
+<answer>
+<para>TDE provides a traditional computer desktop that is snappy and
+responsive. A project goal is to provide a highly customizable
+desktop without forcing any particular feature or effect on users.
+TDE comes with many software tools to provide a productive and enjoyable
+computer desktop system.</para>
+</answer>
+</qandaentry>
+
+<qandaentry>
+<question>
 <para>Is &tde; a window manager?</para>
 </question>
 <answer>
-<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>&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
-and news clients, drawing programs, a &PostScript; and a &DVI; viewer
+<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
+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
 and so forth.</para>
 </answer>
 </qandaentry>
@@ -64,29 +75,124 @@ and so forth.</para>
 <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, &tde; is a truly unique environment that has and
+desktop environments, &tde; is a unique environment that has and
 will continue to go its own way.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
+<para>On what platform is TDE based?</para>
+</question>
+<answer>
+<para>TDE uses C++ and the <link linkend="qt">&Qt; C++ crossplatform toolkit</link>.
+The TDE development team now maintains the Qt3 toolkit, renamed TQt3.</para>
+</answer>
+</qandaentry>
+
+<qandaentry>
+<question>
 <para>Is &tde; free software?</para>
 </question>
 <answer>
 <para>Yes, &tde; is free software according to the &GNU; General
-Public License.  All &tde; libraries are available under the
+Public License. All &tde; libraries are available under the
 <acronym>LGPL</acronym> making commercial software development for 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
 <acronym>GPL</acronym>.</para>
-<para>It is absolutely legal to make &tde; and &Qt; available on
-&CD-ROM; free of charge.  No runtime fees of any kind are
+<para>Both &tde; and &Qt; can be made available on
+&CD-ROM; free of charge. No runtime fees of any kind are
 incurred.</para>
 </answer>
 </qandaentry>
+
+<qandaentry>
+<question>
+<para>Why the rebranding and renaming efforts? Why can't you continue to call the software KDE?</para>
+</question>
+<answer>
+<para>The "KDE" name, various logos, and related efforts are trademarked by the KDE
+Foundation. Since the Trinity project is not affiliated with the KDE Foundation,
+we can't legally use their trademarks.</para>
+</answer>
+</qandaentry>
+
+<qandaentry>
+<question>
+<para>How is Trinity different from KDE4?</para>
+</question>
+<answer>
+<para>Both desktop environments share common roots to KDE 3.5.10, 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.
+Trinity developers want to maintain a "traditional" desktop environment.</para>
+
+<para>For example, KDE4 offers the following tools:</para>
+
+<itemizedlist>
+
+<listitem>
+<para>Semantic desktop through Nepomuk</para>
+</listitem>
+
+<listitem>
+<para>PIM (Personal Information Management) data caching through Akonadi</para>
+</listitem>
+
+<listitem>
+<para>Desktop file searching through Strigi</para>
+</listitem>
+
+<listitem>
+<para>Activities, a computer desktop metaphor for managing tasks and activities</para>
+</listitem>
+
+</itemizedlist>
+
+<para>Whereas TDE offers the following:</para>
+
+<itemizedlist>
+
+<listitem>
+<para>Desktop search through the locate:/ kio-slave and Beagle</para>
+</listitem>
+
+<listitem>
+<para>Integrated PIM suite with plugins</para>
+</listitem>
+
+<listitem>
+<para>Related task management using multiple desktops</para>
+</listitem>
+
+</itemizedlist>
+
+<para>The KDE developers support alternate desktop interfaces, such as those used
+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
+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
+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>
+</answer>
+</qandaentry>
+
+
 </qandaset>
 </chapter>
 
diff --git a/doc/faq/misc.docbook b/doc/faq/misc.docbook
index 00d6be17d..0fad81c9d 100644
--- a/doc/faq/misc.docbook
+++ b/doc/faq/misc.docbook
@@ -42,7 +42,7 @@ Once you have configured X.org correctly, transparency and other effects can be
 them into the menu?</para>
 </question>
 <answer>
-<para>Use &kmenuedit;. To access it use the &RMB; on the 
+<para>Use &kmenuedit;. To access it use the &RMB; on the
 <guibutton>K</guibutton> button and select <guimenu>Menu Editor</guimenu>.</para>
 </answer>
 </qandaentry>
@@ -64,7 +64,7 @@ folders.</para>
 </question>
 <answer>
 <para>Simply click on the <guibutton>K</guibutton> button and select
-<guimenu>Logout</guimenu>.  In addition, if you
+<guimenu>Logout</guimenu>. In addition, if you
 <mousebutton>right</mousebutton> click on an
 empty area of the desktop, you will be presented with a menu
 containing logout as one of the options.
@@ -81,7 +81,7 @@ session management and cannot be recommended.</para></note></para>
 <acronym>ISP</acronym> if and only if I am online?</para>
 </question>
 <answer>
-<para>&korn; will do the job.  If you are not
+<para>&korn; will do the job. If you are not
 connected, it will just sit there (idling).</para>
 </answer>
 </qandaentry>
@@ -94,7 +94,7 @@ connected, it will just sit there (idling).</para>
 <para>We recommend to always use the latest stable release. If you
 don't, it will probably be difficult to get answers to your
 questions. If you have a problem with an old version, the answer will
-probably be <quote>Please upgrade and try again</quote>.  Note that
+probably be <quote>Please upgrade and try again</quote>. Note that
 new versions also sometimes fix security problems.</para>
 </answer>
 </qandaentry>
@@ -111,7 +111,7 @@ new versions also sometimes fix security problems.</para>
 <step performance="required"><para>Go to the destination area; depending on your configuration,
 you might need to click it using the &LMB; to give it
 focus.</para></step>
-<step performance="required"><para>Click the &MMB; to paste.  If you have a two
+<step performance="required"><para>Click the &MMB; to paste. If you have a two
 button mouse and are emulating a three button mouse, push both buttons
 simultaneously.</para></step>
 </procedure>
@@ -138,14 +138,14 @@ into the &konqueror; address bar. </para>
 <para>What is <acronym>CVS</acronym>?</para>
 </question>
 <answer>
-<para>It stands for Concurrent Versions System.  It is a version 
+<para>It stands for Concurrent Versions System. It is a version
 control system and is based on <acronym>RCS</acronym> (Revision
-Control System), but 
-offers more functionality.  It is used to maintain source code under
-development.  It will keep multiple versions of things (handy if you
+Control System), but
+offers more functionality. It is used to maintain source code under
+development. It will keep multiple versions of things (handy if you
 broke something and have to back up and get a clean old version), and
 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
+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 &tde;.</para>
@@ -172,22 +172,17 @@ such as &tde;.</para>
 </answer>
 </qandaentry>
 
-
 <qandaentry>
 <question>
 <para>How do I check which version of &tde; I am using?</para>
 </question>
 <answer>
-<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>Start any Trinity app. Each app has a Help menu providing
+related information in the <guimenuitem>About</guimenuitem> dialog.
 </para>
 </answer>
 </qandaentry>
 
-
-
 <qandaentry>
 <question>
 <para>How do I go about creating themes and icons?</para>
@@ -201,19 +196,56 @@ artwork at <ulink url="http://kde-look.org">http://kde-look.org</ulink>.
 </answer>
 </qandaentry>
 
+<qandaentry>
+<question>
+<para>How do I learn about development updates?</para>
+</question>
+<answer>
+<para>You might want to subscribe to the &tde; developer's mail list.
+Check <ulink url="http://trinity-devel.pearsoncomputing.net/">http://trinity-devel.pearsoncomputing.net/</ulink>
+if you want to read without subscribing.</para>
+</answer>
+</qandaentry>
+
+<qandaentry>
+<question>
+<para>Is there a release schedule?</para>
+</question>
+<answer>
+<para>The Trinity developers strive for a six to nine month schedule but that is not rigid or set in stone.</para>
+</answer>
+</qandaentry>
+
+<qandaentry>
+<question>
+<para>Are there plans to support semantic desktops?</para>
+</question>
+<answer>
+<para>Not at this time.</para>
+</answer>
+</qandaentry>
+
+<qandaentry>
+<question>
+<para>Are there plans to support tablet-like or special netbook desktop modes?</para>
+</question>
+<answer>
+<para>No. The TDE team suggests a tablet-centric interface such as Unity, KDE4, or GNOME 3 for those devices.</para>
+</answer>
+</qandaentry>
 
 <qandaentry>
 <question>
-<para>How can I get to know about development updates?</para>
+<para>How do the developers propose to transition away from HAL (hardware abstraction layer)?</para>
 </question>
 <answer>
-<para>You might want to subscribe to the various &tde; mailing lists
-available, especially kde-cvs, which lists all commits done to the
-&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>
+<para>The Trinity team developed a new native hardware support layer that is under testing.
+That new system will be enabled by default in a future release, but is available now
+in the development sources.</para>
 </answer>
 </qandaentry>
+
+
 </qandaset>
 </chapter>
 
diff --git a/doc/faq/nonkdeapps.docbook b/doc/faq/nontdeapps.docbook
index f6e234406..f6e234406 100644
--- a/doc/faq/nonkdeapps.docbook
+++ b/doc/faq/nontdeapps.docbook
diff --git a/doc/faq/qt.docbook b/doc/faq/qt.docbook
index d97265aab..2e1b3289c 100644
--- a/doc/faq/qt.docbook
+++ b/doc/faq/qt.docbook
@@ -24,7 +24,7 @@ url="http://www.trolltech.com">http://www.trolltech.com</ulink>.</para>
 <para>Why does &tde; use &Qt;?</para>
 </question>
 <answer>
-<para>&Qt; is a very sophisticated toolkit that provides everything that
+<para>&Qt; is a 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 &tde;.  In our opinion
@@ -72,5 +72,29 @@ information, please contact <ulink
 url="http://www.trolltech.com">Troll Tech</ulink> directly.</para>
 </answer>
 </qandaentry>
+
+<qandaentry>
+<question>
+<para>Isn't Qt3 obsolete and "dead" technology?</para>
+</question>
+<answer>
+<para>The definition for "obsolete" varies based upon who applies the term.
+Generally the term "obsolete" means something no longer is useful or no longer
+needed. In software circles the term often means antiquated or no longer shiny.
+Usefulness often is not part of the intended meaning of the word. The term is
+used as an emotional wedge more than a factual observation.</para>
+</answer>
+</qandaentry>
+
+<qandaentry>
+<question>
+<para>Are there plans to migrate Trinity to Qt4?</para>
+</question>
+<answer>
+<para>Not at this time.</para>
+</answer>
+</qandaentry>
+
+
 </qandaset>
 </chapter>
\ No newline at end of file
diff --git a/doc/faq/kdeapps.docbook b/doc/faq/tdeapps.docbook
index e10a452e7..e10a452e7 100644
--- a/doc/faq/kdeapps.docbook
+++ b/doc/faq/tdeapps.docbook
diff --git a/doc/khelpcenter/contact.docbook b/doc/khelpcenter/contact.docbook
index 598ebd8d5..ea693226d 100644
--- a/doc/khelpcenter/contact.docbook
+++ b/doc/khelpcenter/contact.docbook
@@ -1,12 +1,12 @@
 <chapter id="contact-the-tde-team">
 <chapterinfo>
-<date>2012-02-01</date>
-<releaseinfo>R14.0.0</releaseinfo>
+<date>&tde-release-date;</date>
+<releaseinfo>&tde-release-version;</releaseinfo>
 </chapterinfo>
-<title>Contact the &tde; Team</title>
+<title>Contacting the &tde; Community</title>
 <anchor id="contact"/>
 
-<para>The Trinity team invites you to contact members.</para>
+<para>The Trinity team invites you to contact community members.</para>
 
 <sect1 id="contact-mailinglists">
 <title>Mailing lists</title>
@@ -34,15 +34,11 @@ url="http://www.trinitydesktop.org/mailinglist.php">mailing list archive</ulink>
 
 </variablelist>
 
-</sect1>
-
-<sect1 id="contact-developers">
-<title>Contacting the &tde; developers</title>
+<sect2 id="useful-links">
+<title>Useful web links</title>
 <anchor id="links" />
 
-<para>On this page are links to &tde; related web sites.</para>
-
-<para>The Trinity Desktop Environment is developed by many people
+<para>The Trinity Desktop Environment is developed by people
 around the world. Our main communication channel is the Internet. For
 general questions, you will be best served by asking on the mailing
 lists mentioned in the <link linkend="contact-mailinglists">previous
@@ -76,6 +72,7 @@ found in the documentation of their individual application.</para>
 
 </variablelist>
 
+</sect2>
 </sect1>
 </chapter>
 <!-- Keep this comment at the end of the file
@@ -89,4 +86,3 @@ sgml-always-quote-attributes:t
 sgml-parent-document:index.docbook
 End:
 -->
-
diff --git a/doc/khelpcenter/help.docbook b/doc/khelpcenter/help.docbook
index b42afebe8..ebb67ab30 100644
--- a/doc/khelpcenter/help.docbook
+++ b/doc/khelpcenter/help.docbook
@@ -1,20 +1,20 @@
 <chapter id="help-system-user-manual">
 <chapterinfo>
-<date>2002-02-03</date>
-<releaseinfo>0.08.00</releaseinfo>
+<date>&tde-release-date;</date>
+<releaseinfo>&tde-release-version;</releaseinfo>
 </chapterinfo>
 <title>&tde; Help System User Manual</title>
 <anchor id="help"/>
 
 <sect1 id="help-introduction">
 <title>&tde; Help System</title>
-	
+
 <para>The &tde; help system is designed to make accessing the common
 &UNIX; help systems (<application>man</application> and
 <application>info</application>) simple, as well as the native &tde;
-documentation (&XML;). 
+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
@@ -36,10 +36,9 @@ of this document.
 <title>Installation</title>
 
 <para>
-&khelpcenter; is an integral part of the &tde; Base installation, and
-is installed with every copy of &tde;.  It can be found in the tdebase
-package, and is available from the &kde-ftp;, or will be found in your
-operating system tdebase package.
+&khelpcenter; is an integral part of the &tde; base installation and
+is installed with every copy of &tde;. It can be found in the tdebase
+package or will be found in your operating system tdebase package.
 </para>
 
 </sect2>
@@ -52,15 +51,15 @@ operating system tdebase package.
 &khelpcenter; can be called in several ways:
 </para>
 
-<variablelist> 
-<varlistentry> 
-<term>From the <guimenu>Help</guimenu> menu</term> 
+<variablelist>
+<varlistentry>
+<term>From the <guimenu>Help</guimenu> menu</term>
 <listitem>
-<para>	
+<para>
 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.  
+application's help file, at the contents page.
 </para>
 </listitem>
 </varlistentry>
@@ -73,7 +72,7 @@ Choose the big <guiicon>K</guiicon> in your panel, and select
 <guimenuitem>Help</guimenuitem> to open &khelpcenter;, starting at the
 default welcome page.
 </para>
-</listitem> 
+</listitem>
 </varlistentry>
 
 <varlistentry>
@@ -83,7 +82,7 @@ default welcome page.
 By default, the &kicker; panel contains an icon to call &khelpcenter;.
 Again, the default welcome page is displayed.
 </para>
-</listitem> 
+</listitem>
 </varlistentry>
 
 <varlistentry>
@@ -94,14 +93,14 @@ Again, the default welcome page is displayed.
 file.  &URL;s have been added for
 <command>info</command> and <command>man</command> pages
 also. You can use them as follows:
-</para> 
+</para>
 
 <variablelist>
 <varlistentry>
 <term>An application help file</term>
 <listitem>
 <para>
-<command>khelpcenter</command> 
+<command>khelpcenter</command>
 <option>help:/<replaceable>kedit</replaceable></option>
 </para>
 <para>
@@ -134,7 +133,7 @@ Opens the &kedit; help file, at the contents page.
 <term>An Info page</term>
 <listitem>
 <para>
-<command>khelpcenter</command> 
+<command>khelpcenter</command>
 <option>info:/<replaceable>gcc</replaceable></option>
 </para>
 </listitem>
@@ -177,7 +176,7 @@ different document, and you can use the <guiicon>Back</guiicon> (Left
 pointing arrow) or <guiicon>Forward</guiicon> (Right pointing arrow)
 icons on the toolbar to move through the documents you have viewed in
 this session.
-</para> 
+</para>
 
 <para>
 The two panes display the contents of the help system, and the help
@@ -192,7 +191,7 @@ The <guilabel>Contents</guilabel> pane in &khelpcenter; is
 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> 
+</para>
 
 <para>
 The <guilabel>Contents</guilabel> pane is further divided into two
@@ -208,7 +207,7 @@ of terms.
 <para>
 The <guilabel>Contents</guilabel> contains the following default
 entries:
-</para> 
+</para>
 
 <variablelist>
 <varlistentry>
@@ -234,7 +233,7 @@ Interface and specific help and tips on how to work smarter with &tde;.
 The &tde; User's manual is an in-depth exploration of &tde;, including
 installation, configuration and customization, and use.
 </para>
-</listitem> 
+</listitem>
 </varlistentry>
 
 <varlistentry>
@@ -245,14 +244,14 @@ Native &tde; application documentation. All &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
-application documentation. 
+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
 application you are looking for.
 </para>
-</listitem> 
+</listitem>
 </varlistentry>
 
 <varlistentry>
@@ -264,7 +263,7 @@ application you are looking for.
 addition, man pages exist for programming functions and file
 formats.
 </para>
-</listitem> 
+</listitem>
 </varlistentry>
 
 <varlistentry>
@@ -327,7 +326,7 @@ How to help, and how to get involved.
 </variablelist>
 
 </sect3>
-<!-- 
+<!--
 <sect3 id="search">
 <title>The <guilabel>Search</guilabel> tab</title>
 
@@ -364,7 +363,7 @@ Choose how to search for multiple words.  If you choose
 terms are included in the page. <guilabel>or</guilabel> returns results
 if <emphasis>any</emphasis> of the search terms are found, and
 <guilabel>boolean</guilabel> lets you search using a combination.
-</para> 
+</para>
 <para>
 Boolean syntax lets you use the operators <literal>AND</literal>,
 <literal>OR</literal> and <literal>NOT</literal> to create complex
@@ -388,7 +387,7 @@ them.</para></listitem>
 for pages which contain <userinput>dog</userinput> but don't contain
 <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> 
+pages containing all three words would not.</para></listitem>
 </varlistentry>
 </variablelist>
 <para>If your searches are not returning the results you expect, check
@@ -404,7 +403,7 @@ search.</para></listitem>
 <term><guilabel>Format</guilabel></term>
 <listitem><para>Decide if you want just a short link to the page
 containing your search terms, or do you want a longer
-summary.</para></listitem> 
+summary.</para></listitem>
 </varlistentry>
 <varlistentry>
 <term><guilabel>Sort</guilabel></term>
@@ -730,7 +729,8 @@ will take you directly back to that page.</para>
 <para>&khelpcenter;</para>
 
 <para>Originally developed by &Matthias.Elter; &Matthias.Elter.mail;</para>
-<para>The current maintainer is &Cornelius.Schumacher; &Cornelius.Schumacher.mail;</para>
+<para>Maintained for many years by &Cornelius.Schumacher; &Cornelius.Schumacher.mail;</para>
+<para>Currently maintained by the Trinity Development Team.</para>
 
 &underFDL;
 &underGPL;
diff --git a/doc/khelpcenter/support.docbook b/doc/khelpcenter/support.docbook
index dda5d3586..b02609f69 100644
--- a/doc/khelpcenter/support.docbook
+++ b/doc/khelpcenter/support.docbook
@@ -1,13 +1,13 @@
 <chapter id="supporting-tde">
 <chapterinfo>
-<date>2002-03-04</date>
-<releaseinfo>2.02.00</releaseinfo>
+<date>&tde-release-date;</date>
+<releaseinfo>&tde-release-version;</releaseinfo>
 </chapterinfo>
-<title>Supporting &tde;</title>
+<title>Supporting the &tde; Project</title>
 <anchor id="support"/>
 
 <sect1 id="supporting-tde-introduction">
-<title>Supporting &tde;</title>
+<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,
@@ -40,7 +40,7 @@ that interest you.
 </para></listitem>
 
 <listitem><para>
-Read the <ulink url="trinity-devel@lists.pearsoncomputing.net">&tde;
+Read the <ulink url="http://trinity-devel.pearsoncomputing.net/">&tde;
 developer mailing list</ulink> archives to get a feel for &tde; development.
 </para></listitem>
 
@@ -77,4 +77,3 @@ actively involved in &tde; development, please consider supporting
 
 </sect1>
 </chapter>
-
diff --git a/doc/khelpcenter/welcome.docbook b/doc/khelpcenter/welcome.docbook
index d77c0033e..ff18cb5ee 100644
--- a/doc/khelpcenter/welcome.docbook
+++ b/doc/khelpcenter/welcome.docbook
@@ -6,7 +6,7 @@
 <title>Welcome to the Trinity Desktop Environment (&tde;)</title>
 <anchor id="welcome"/>
 
-<para>The Trinity team welcomes you to user-friendly &UNIX;desktop computing.</para>
+<para>The Trinity team welcomes you to user-friendly &UNIX; desktop computing.</para>
 
 <sect1 id="welcome-information-about-tde">
 <title>Information about &tde;</title>
@@ -14,16 +14,16 @@
 <para>&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>
+
+<para><link linkend="help">TDE Help System User Manual</link></para>
 
 <para><link linkend="what-is-tde">What is the Trinity Desktop Environment?</link></para>
 
-<para><link linkend="contact">Contacting the &tde; Project Team Members</link></para>
+<para><link linkend="contact">Contacting the &tde; Community</link></para>
 
 <para><link linkend="support">Supporting the &tde; Project</link></para>
 
-<para><link linkend="links">Useful links</link></para>
-
 </sect1>
 
 <sect1 id="welcome-getting-the-most-out-of-tde">
@@ -43,7 +43,7 @@ the &UNIX; operating system.</para>
 <sect2 id="welcome-basic-applications">
 <title>Basic applications</title>
 
-<para><ulink url="help:/kicker">Desktop Panel</ulink></para>
+<para><ulink url="help:/kicker">Desktop Panel (Kicker)</ulink></para>
 
 <para><ulink url="help:/kcontrol">Control Center</ulink></para>
 
@@ -52,4 +52,3 @@ the &UNIX; operating system.</para>
 </sect2>
 </sect1>
 </chapter>
-
diff --git a/doc/khelpcenter/whatistde.docbook b/doc/khelpcenter/whatistde.docbook
index 964edc9ee..9da36104a 100644
--- a/doc/khelpcenter/whatistde.docbook
+++ b/doc/khelpcenter/whatistde.docbook
@@ -1,13 +1,13 @@
 <chapter id="what-is-tde">
 <chapterinfo>
-<date>2002-01-18</date>
-<releaseinfo>3.00.00</releaseinfo>
+<date>&tde-release-date;</date>
+<releaseinfo>&tde-release-version;</releaseinfo>
 </chapterinfo>
-<title>What is &tde;?</title>
+<title>What is the Trinity Desktop Environment?</title>
 <anchor id="whatistde"/>
 
 <sect1 id="what-is-tde-introduction">
-<title>What is &tde;?</title>
+<title>What is the Trinity Desktop Environment?</title>
 
 <para>&tde; is a desktop environment. In other words, &tde; is a
 collection of programs, technologies and documentation that attempt to
@@ -17,12 +17,9 @@ philosophy.</para>
 
 <para>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.</para>
-
-<para>The creators of the K Desktop Environment are a world-wide group of
-software engineers. This group's major goal in free software development is to
-provide high quality software that empowers the user with easy control of his
-computer's resources.</para>
+software engineers committed to Free Software development. This group's
+major goal in free software development is to provide high quality software
+that empowers the user with easy control of his computer's resources.</para>
 
 <para>The &tde; developers continue the tradition of KDE 3.5.</para>
 
@@ -122,4 +119,3 @@ Information Manager - an organizer).</para>
 
 </sect1>
 </chapter>
-
diff --git a/doc/quickstart/index.docbook b/doc/quickstart/index.docbook
index 00c372fda..932ecd3a3 100644
--- a/doc/quickstart/index.docbook
+++ b/doc/quickstart/index.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" 
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
   <!ENTITY kappname "&tde; Quick Start Guide">
   <!ENTITY package "tdebase">
@@ -9,7 +9,7 @@
 
 <book lang="&language;">
 <bookinfo>
-	
+
 <title>An Introduction to &tde;</title>
 
 <authorgroup>
@@ -20,11 +20,15 @@
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
 </authorgroup>
 
-<date>2004-08-28</date>
-<releaseinfo>3.00.00</releaseinfo>
+<date>&tde-release-date;</date>
+<releaseinfo>&tde-release-version;</releaseinfo>
 
 <copyright>
-<year>1999</year><year>2000</year><year>2001</year><year>2002</year>
+<year>1999-2002</year>
+<holder>The &kde; Team</holder>
+</copyright>
+<copyright>
+<year>&tde-copyright-date;</year>
 <holder>The &tde; Team</holder>
 </copyright>
 
@@ -36,6 +40,7 @@
 
 <keywordset>
 <keyword>KDE</keyword>
+<keyword>TDE</keyword>
 <keyword>quick start</keyword>
 <keyword>introduction</keyword>
 </keywordset>
@@ -95,7 +100,7 @@ overview assumes that you are using the default environment.
 <para>A <interface>panel</interface> at the bottom of the screen, used
 to start applications and switch between desktops. Among other things, it
 contains the &kmenu;, a large &ticon;
-which displays a menu of applications to start when clicked. 
+which displays a menu of applications to start when clicked.
 </para>
 </listitem>
 
@@ -105,7 +110,7 @@ A <interface>taskbar</interface>, by default embedded in the panel, used
 to switch between and manage currently running applications. Click on an
 application on the taskbar to switch to the application.
 </para>
-</listitem> 
+</listitem>
 
 <listitem>
 <para>
@@ -155,7 +160,7 @@ Choose the <menuchoice><guimenuitem>Control Center</guimenuitem>
 </menuchoice>item on the &kmenu;
 to configure &tde;.
 </para>
-</listitem> 
+</listitem>
 
 <listitem>
 <para>
@@ -164,14 +169,14 @@ switch between applications and <keycombo
 action="simul">&Ctrl;<keycap>Tab</keycap></keycombo> to switch between
 desktops using the keyboard.
 </para>
-</listitem> 
+</listitem>
 
 <listitem>
 <para>
 Use the &RMB; mouse button to access context menus for the panel,
 desktop, and most &tde; applications.
 </para>
-</listitem> 
+</listitem>
 </itemizedlist>
 
 </sect1>
@@ -189,7 +194,7 @@ At the bottom of the screen you will find the desktop panel, which is called
 button on the left with a large &ticon;.
 </para>
 
-<para> 
+<para>
 This button is called the &kmenu;. It has
 a small arrow on the top to indicate that it will pop up a menu if you
 click on it. Just do it! The popup offers you easy access to all &tde;
@@ -199,19 +204,19 @@ applications installed on your computer system.
 <sect2>
 <title>Customizing &kicker;</title>
 
-<!-- FIXME: To add a button, use the little arrows on kicker, not the TDE menu 
+<!-- FIXME: To add a button, use the little arrows on kicker, not the TDE menu
 I am not sure I agree - some distributions fade or hide the applet handles by default, but
-I haven't found one yet that hides the kmenu. (JLH) --> 
+I haven't found one yet that hides the kmenu. (JLH) -->
 
 <para>If you use one application or tool very often, then you may want to have even faster
 access to it. In this case you can add a single application or an entire sub-menu of the
 &kmenu; as a special quick-launch button on the panel. If you want to reach an application
 directly via a launch button, click with the &RMB; either on a clear space on the panel or on the
 &kmenu; icon. Select <menuchoice><guimenu>Panel Menu</guimenu> <guisubmenu>Add Application to Panel...
-</guisubmenu></menuchoice> and then navigate to the application or menu you would like to add to 
+</guisubmenu></menuchoice> and then navigate to the application or menu you would like to add to
 the panel.</para>
 
-	
+
 <para>
 You can add an entire menu this way, or one of the &ticon;
 button sub-menus.  For example, if you have &koffice; installed and
@@ -237,7 +242,7 @@ simply hit the <mousebutton>first</mousebutton> mouse button (by default
 the <mousebutton>left</mousebutton> one). As you may have noticed,
 there is also a menu entry <guimenuitem>Remove</guimenuitem> in case you
 are tired of a certain launch button on your desktop.
-</para> 
+</para>
 </note>
 
 </sect2>
@@ -252,7 +257,7 @@ click the <mousebutton>right</mousebutton> mouse button to display a
 the item you clicked. It is therefore always a good idea to try out the
 <mousebutton>third</mousebutton> mouse button on something, if you do
 not know what to do with it. Even the background of the desktops has
-such a menu!  
+such a menu!
 </para>
 
 </sect2>
@@ -288,7 +293,7 @@ the <guibutton>Use Defaults</guibutton> button.
 By the way, if you are not sure what a certain button does in &tde;,
 just move the mouse pointer over it and wait for a short while: &tde;
 has a built-in mini context help, called <quote>tool tips</quote>, which
-explains the functionality of such controls in a few words.  
+explains the functionality of such controls in a few words.
 </para>
 
 
@@ -308,13 +313,13 @@ in perhaps some surprising places.
 
 <para>
 &tde; provides a very sophisticated command line window called
-&konsole;.  Choose <menuchoice><guimenu>TDE menu</guimenu> 
+&konsole;.  Choose <menuchoice><guimenu>TDE menu</guimenu>
 <guisubmenu>System</guisubmenu>
 <guimenuitem>Konsole</guimenuitem></menuchoice> to start it. This may
 be something you want on your panel: luckily it's already there in the
 default configuration!
 </para>
-  
+
 <para>
 Sometimes, you only want to enter one command on the command line. In
 these cases, you do not need a full-blown terminal. Just hit
@@ -367,7 +372,7 @@ shortcut commands, and you can even add your own!  Take a look in
 
 <para>
 Finally, there's a way to have your command line always available, no
-matter what you're doing - add one to your &kicker; panel! 
+matter what you're doing - add one to your &kicker; panel!
 </para>
 
 <para>Simply &RMB; click on an empty space in the panel and choose
@@ -388,8 +393,8 @@ using &tde;.
 <title>Working with Windows</title>
 
 <para>
-If you have not already done so, start an application using the <link 
-linkend="starter">&kmenu;</link>; say, 
+If you have not already done so, start an application using the <link
+linkend="starter">&kmenu;</link>; say,
 <guimenuitem>Find Files</guimenuitem>.
 </para>
 
@@ -410,7 +415,7 @@ of some of the most common window related functions:
 Drag the window's title bar, or hold the &Alt; key down
 and drag anywhere in the window.
 </para>
-</listitem> 
+</listitem>
 </varlistentry>
 
 <varlistentry>
@@ -418,7 +423,7 @@ and drag anywhere in the window.
 <listitem>
 <para>
 Drag the window's border, or hold the &Alt; key down and drag with the
-&RMB; anywhere in the window. 
+&RMB; anywhere in the window.
 </para>
 </listitem>
 </varlistentry>
@@ -444,7 +449,7 @@ Click the <guilabel>Minimize</guilabel> button in the titlebar (next to <guilabe
 to hide the window.  Restore it by clicking on the window's icon in the
 taskbar.
 </para>
-</listitem> 
+</listitem>
 </varlistentry>
 
 <varlistentry>
@@ -486,20 +491,20 @@ menu.
 <title>On the right side:</title>
 <listitem>
 <para>
-A <guilabel>Minimise</guilabel> button. 
+A <guilabel>Minimise</guilabel> button.
 </para>
 </listitem>
 
 <listitem>
 <para>
-A <guilabel>Maximize</guilabel> button. 
+A <guilabel>Maximize</guilabel> button.
 </para>
 </listitem>
 
 <listitem>
 <para>
 A <guilabel>Close</guilabel> button. This closes the window. Shortcut: <keycombo
-action="simul">&Alt;<keycap>F4</keycap></keycombo>.  
+action="simul">&Alt;<keycap>F4</keycap></keycombo>.
 </para>
 </listitem>
 </itemizedlist>
@@ -543,14 +548,14 @@ an empty area of the desktop, or click the icon with several windows
 on the panel, or finally click the up arrow at the left hand end of
 the taskbar in the panel.
 </para>
-</listitem> 
+</listitem>
 
 <listitem>
 <para>
 Hold down the &Alt; key and press <keycap>Tab</keycap> to cycle through
 the windows.
 </para>
-</listitem> 
+</listitem>
 
 <listitem>
 <para>
@@ -601,7 +606,7 @@ left hand side) and choosing <guimenuitem>Configure Taskbar...</guimenuitem>.
 The icons on the taskbar resize themselves to make room for
 applications, so you can fit many more applications than you might
 think.  Making the panel wider will let the taskbar icons take on a row
-and column layout, but they will still resize to fit more icons.  
+and column layout, but they will still resize to fit more icons.
 </para>
 
 </sect1>
@@ -615,29 +620,29 @@ Now, what was that <quote>sticky</quote> thing?
 
 <para>
 It may happen that you have more windows open than space on your
-desktop. In this case you have three possibilities: 
+desktop. In this case you have three possibilities:
 </para>
 
 <orderedlist>
 <listitem>
-<para> 
+<para>
 Leave all windows open (cluttered desktop)
 </para>
 </listitem>
 
 <listitem>
-<para> 
+<para>
 Iconify those windows which you do not need at present and use
 the taskbar or <keycombo action="simul">&Alt;
 <keycap>Tab</keycap></keycombo> to switch between them
-(still a bit confusing and much work!) 
+(still a bit confusing and much work!)
 </para>
-</listitem> 
+</listitem>
 
 <listitem>
 <para>
 Recommended: Do what a real operating system does if there is not enough
-physical memory: Use virtual memory, in this case virtual desktops. 
+physical memory: Use virtual memory, in this case virtual desktops.
 </para>
 </listitem>
 </orderedlist>
@@ -660,7 +665,7 @@ a small chat window, an alarm clock or whatever. In this case you can
 use the above mentioned <quote>sticky</quote> button which will pin the
 window on the background so that it will appear on every virtual
 desktop.
-</para> 
+</para>
 
 <para>
 The sticky button can also be used to move a window from one virtual
@@ -726,7 +731,7 @@ to remember your choice for the next time you open a file of that type.
 &konqueror; uses MIME types to associate
 files with applications.
 </para>
-</note> 
+</note>
 
 </sect2>
 
@@ -759,7 +764,7 @@ file. Try it!
 
 <sect2>
 <title>Setting File Properties</title>
- 
+
 <para>
 To change file properties, such as its name and permissions, &RMB;
 click the icon and choose <guimenuitem>Properties</guimenuitem> from
@@ -845,7 +850,7 @@ Printers
 <para>
 Mountable Devices (&eg; floppy drives)
 </para>
-</listitem> 
+</listitem>
 <listitem>
 <para>
 Internet resources (&eg; <acronym>WWW</acronym> documents, &FTP;
@@ -876,7 +881,7 @@ role="extension">.desktop</literal> file to the panel to create a
 quick-launch button.
 </para>
 
-<!-- 
+<!--
 <sect2>
 <title>Setting up printers</title>
 
@@ -905,10 +910,10 @@ looks like a <guiicon>cog</guiicon>, and select the <guiicon>Printer</guiicon> i
 </procedure>
 
 <para>Now you should be able to drag a file to the Printer icon and have it
-printed on your default printer.</para> 
+printed on your default printer.</para>
 </sect2>
 
---> 
+-->
 
 <sect2>
 <title>Mounting devices</title>
@@ -965,7 +970,7 @@ class="directory">/floppy</filename>, but you can just as easily have floppy
 disks mounted on <filename class="directory">~/mydisk</filename> if you
 want.
 </para>
-</step> 
+</step>
 <step>
 <para>
 Click the <guilabel>Unmounted Icon</guilabel> and select the picture
@@ -1012,9 +1017,9 @@ configuring your desktop.
 Launch the &kcontrolcenter; from the <link linkend="starter">&kmenu;</link>.
 A window with two panes appears, displaying a list of
 modules in the left pane.
-</para>  
+</para>
 
-<para> 
+<para>
 Open a module by clicking its name; a list of submodules will
 appear. Then, click one of the submodule category names to edit its
 configuration in the right pane.
@@ -1211,7 +1216,7 @@ entry in the &kmenu;.
 <para>In &konqueror; find or make a file with the extension you wish to
 link.
 </para>
-</step> 
+</step>
 
 <step>
 <para>
@@ -1254,7 +1259,7 @@ way as you did in the last step, and you can change the preferred
 order using the <guibutton>Move Up</guibutton> and <guibutton>Move
 Down</guibutton> buttons.
 </para>
-</step> 
+</step>
 
 <step>
 <para>
@@ -1268,7 +1273,7 @@ you have changed your mind and just want to close the dialog box.
 </para>
 </step>
 </procedure>
-  
+
 <para>
 Be sure to try your new association by opening a folder containing
 a file of the type you just selected. Click on the file, and the
@@ -1296,7 +1301,7 @@ the &konqueror; window, then you can set up a filename pattern that
 matches <literal>^<replaceable>clientname</replaceable>*</literal>.
 Then any files that have <replaceable>clientname</replaceable> at the
 beginning (the <token>^</token> character means <quote>starts with...</quote>) and
-without any regard to the rest of the filename. 
+without any regard to the rest of the filename.
 </para>
 </note>
 
diff --git a/doc/tdm/tdmrc-ref.docbook b/doc/tdm/tdmrc-ref.docbook
index b4668ebb9..488cbe689 100644
--- a/doc/tdm/tdmrc-ref.docbook
+++ b/doc/tdm/tdmrc-ref.docbook
@@ -37,7 +37,7 @@ display class (which can be ignored in most cases).</para>
 make up a section class.</para>
 
 <para>You can use the wildcard <literal>*</literal> (match any) for
-<replaceable>host</replaceable>, <replaceable>number</replaceable>, 
+<replaceable>host</replaceable>, <replaceable>number</replaceable>,
 and <replaceable>class</replaceable>. You may omit trailing components;
 they are assumed to be <literal>*</literal> then. The host part may be a
 domain specification like <replaceable>.inf.tu-dresden.de</replaceable>
@@ -972,7 +972,7 @@ The default depends on the system &tdm; was built on.
 <term id="option-systemshell"><option>SystemShell</option></term>
 <listitem>
 <para>
-The <envar>SHELL</envar> environment variable for all programs but the 
+The <envar>SHELL</envar> environment variable for all programs but the
 <option>Session</option>.
 </para>
 <para>The default is <quote>/bin/sh</quote>.</para>
@@ -1480,7 +1480,7 @@ Enable autocompletion in the username line edit.
 <term id="option-userlist"><option>UserList</option></term>
 <listitem>
 <para>
-Show a user list with unix login names, real names, and images in the greeter.
+Show a user list with login names, real names, and images in the greeter.
 </para>
 <para>The default is <quote>true</quote>.</para>
 </listitem>
@@ -1504,7 +1504,7 @@ Items in <option>SelectedUsers</option> and <option>HiddenUsers</option>
 which are prefixed with <literal>@</literal> represent all users in the
 user group named by that item.
 Finally, the user list will be sorted alphabetically, if
-<option>SortUsers</option> is enabled. 
+<option>SortUsers</option> is enabled.
 </para>
 <para>The default is <quote>NotHidden</quote>.</para>
 </listitem>
@@ -1740,7 +1740,7 @@ succeed. A grab may fail if some other X-client has the &X-Server; or the
 keyboard grabbed, or possibly if the network latencies are very high. You
 should be cautious when raising the timeout, as a user can be spoofed by
 a look-alike window on the display. If a grab fails, &tdm; kills and
-restarts the &X-Server; (if possible) and the session. 
+restarts the &X-Server; (if possible) and the session.
 </para>
 <para>The default is <quote>3</quote>.</para>
 </listitem>
@@ -1957,7 +1957,7 @@ file.
 display which should constantly be
 managed and which is not using &XDMCP;. This method is typically used only for
 local &X-Server;s that are started by &tdm;, but &tdm; can manage externally
-started (<quote>foreign</quote>) &X-Server;s as well, may they run on the 
+started (<quote>foreign</quote>) &X-Server;s as well, may they run on the
 local machine or rather remotely.</para>
 
 <para>The formal syntax of a specification is
@@ -2092,7 +2092,7 @@ permanently assigned range of multicast addresses for &XDMCP;. The
 identifier, such as 1 for Node-Local, 2 for Link-Local, 5 for Site-Local, and
 so on (see IETF RFC 2373 or its replacement for further details and scope
 definitions). &tdm; defaults to listening on the Link-Local scope address
-ff02:0:0:0:0:0:0:12b to most closely match the IPv4 subnet broadcast behavior. 
+ff02:0:0:0:0:0:0:12b to most closely match the IPv4 subnet broadcast behavior.
 If no <literal>LISTEN</literal> lines are given, &tdm; listens on all
 interfaces and joins the default &XDMCP; IPv6 multicast group (when
 compiled with IPv6 support).
@@ -2301,7 +2301,7 @@ the following environment variables are passed:</para>
 <para>Symmetrical with <filename>Xstartup</filename>, the
 <filename>Xreset</filename> program is run after the user session has
 terminated. Run as <systemitem class="username">root</systemitem>, it should
-contain commands that undo the effects of commands in 
+contain commands that undo the effects of commands in
 <filename>Xstartup</filename>, removing entries from <filename>utmp</filename>
 or unmounting directories from file servers.</para>
 
diff --git a/doc/userguide/index.docbook b/doc/userguide/index.docbook
index d09af55f1..05c48e363 100644
--- a/doc/userguide/index.docbook
+++ b/doc/userguide/index.docbook
@@ -67,7 +67,7 @@ The &tde; Documentation Team
 </authorgroup>
 
 <copyright>
-<year>2004</year><year>2005</year>
+<year>2004-2005</year>
 <holder>The &kde; Documentation Team</holder>
 </copyright>
 <copyright>
diff --git a/doc/visualdict/index.docbook b/doc/visualdict/index.docbook
index 9a4e1477a..6ce3ba1ed 100644
--- a/doc/visualdict/index.docbook
+++ b/doc/visualdict/index.docbook
@@ -23,7 +23,7 @@ The &tde; Team
 <releaseinfo>&tde-release-version;</releaseinfo>
 
 <copyright>
-<year>2000</year><year>2006</year>
+<year>2000-2006</year>
 <holder>The &kde; Team</holder>
 </copyright>
 <copyright>
@@ -33,13 +33,13 @@ The &tde; Team
 
 <legalnotice>&FDLNotice;</legalnotice>
 
-<abstract><para>A visual guide to &tde;'s interface.  This is a very early
-version
-of the document.  Eventually, this will be a graphical tour of
+<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>
 
 <keywordset>
 <keyword>KDE</keyword>
+<keyword>TDE</keyword>
 <keyword>Visual</keyword>
 <keyword>Dictionary</keyword>
 <keyword>Guide</keyword>