Attachment 390 Details for Bug 694 – Updated patch to update help files and user guides from KDE3 to TDE

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Updated patch to update help files and user guides from KDE3 to TDE

tdebase-docbook.diff (text/plain), 609.06 KB, created by Darrell on 2012-02-18 00:17:01 CST

(hide)

Description:

Filename:

MIME Type:

Creator: Darrell

Created: 2012-02-18 00:17:01 CST

Size: 609.06 KB

patch

obsolete

>diff -urN tdebase/doc/faq/about.docbook tdebase.new/doc/faq/about.docbook
>--- tdebase/doc/faq/about.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/faq/about.docbook	2012-02-17 22:41:06.000000000 -0600
>@@ -28,7 +28,7 @@
> <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 @@
> <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 -urN tdebase/doc/faq/configkde.docbook tdebase.new/doc/faq/configkde.docbook
>--- tdebase/doc/faq/configkde.docbook	2012-01-26 15:03:48.000000000 -0600
>+++ tdebase.new/doc/faq/configkde.docbook	2012-02-17 22:41:06.000000000 -0600
>@@ -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 @@
> <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 @@
> <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 @@
> 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 @@
> 
> <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 @@
> 
> <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 @@
> 
> <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 @@
> 
> <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 @@
> <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 @@
> </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 @@
> <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 @@
> 
> <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 @@
> 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 -urN tdebase/doc/faq/contrib.docbook tdebase.new/doc/faq/contrib.docbook
>--- tdebase/doc/faq/contrib.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/faq/contrib.docbook	2012-02-17 22:41:06.000000000 -0600
>@@ -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 @@
> 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 @@
> 
> <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 @@
> 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 @@
> 
> <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 @@
> 
> <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 -urN tdebase/doc/faq/desktop.docbook tdebase.new/doc/faq/desktop.docbook
>--- tdebase/doc/faq/desktop.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/faq/desktop.docbook	2012-02-17 22:41:06.000000000 -0600
>@@ -49,16 +49,16 @@
> 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 @@
> <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 -urN tdebase/doc/faq/filemng.docbook tdebase.new/doc/faq/filemng.docbook
>--- tdebase/doc/faq/filemng.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/faq/filemng.docbook	2012-02-17 22:41:06.000000000 -0600
>@@ -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 @@
> <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 @@
> 
> <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 -urN tdebase/doc/faq/getkde.docbook tdebase.new/doc/faq/getkde.docbook
>--- tdebase/doc/faq/getkde.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/faq/getkde.docbook	2012-02-17 22:41:06.000000000 -0600
>@@ -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>
> 
>-<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 @@
> 
> <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 @@
> 
> <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 -urN tdebase/doc/faq/index.docbook tdebase.new/doc/faq/index.docbook
>--- tdebase/doc/faq/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/faq/index.docbook	2012-02-17 22:41:06.000000000 -0600
>@@ -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" > 
>   <!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>
> 
> 
>@@ -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 @@
> </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 -urN tdebase/doc/faq/install.docbook tdebase.new/doc/faq/install.docbook
>--- tdebase/doc/faq/install.docbook	2012-02-15 13:26:30.000000000 -0600
>+++ tdebase.new/doc/faq/install.docbook	2012-02-17 22:41:06.000000000 -0600
>@@ -11,8 +11,8 @@
> <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 @@
> <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>
> 
> 
> 
>-<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 @@
> 
> <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 @@
> 
> <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 @@
> 
> 
> 
>-<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 @@
> <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 @@
> <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 @@
> <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 @@
> <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 @@
> <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 @@
> <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 @@
> 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 @@
> <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 @@
> <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 @@
> 
> <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 @@
> 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 @@
> <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>
> 
>-<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 @@
> 
> <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 @@
> 
> <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 @@
> <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 @@
> 
> <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 @@
> <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 @@
> 
> <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 @@
> 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 @@
> 
> <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 @@
> <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 @@
> 
> <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 -urN tdebase/doc/faq/intro.docbook tdebase.new/doc/faq/intro.docbook
>--- tdebase/doc/faq/intro.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/faq/intro.docbook	2012-02-17 22:41:06.000000000 -0600
>@@ -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 @@
> 
> <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 @@
> 
> <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 -urN tdebase/doc/faq/kdeapps.docbook tdebase.new/doc/faq/kdeapps.docbook
>--- tdebase/doc/faq/kdeapps.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/faq/kdeapps.docbook	2012-02-17 22:41:06.000000000 -0600
>@@ -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 @@
> 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 @@
> 
> <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 -urN tdebase/doc/faq/misc.docbook tdebase.new/doc/faq/misc.docbook
>--- tdebase/doc/faq/misc.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/faq/misc.docbook	2012-02-17 22:41:06.000000000 -0600
>@@ -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 @@
> 
> <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 @@
> 
> <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 @@
> 
> <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 @@
> 
> <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 @@
> 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 @@
> 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 @@
> 
> <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 @@
> <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 @@
> <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 -urN tdebase/doc/faq/moreinfo.docbook tdebase.new/doc/faq/moreinfo.docbook
>--- tdebase/doc/faq/moreinfo.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/faq/moreinfo.docbook	2012-02-17 22:41:06.000000000 -0600
>@@ -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 @@
> 
> <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 @@
> <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 @@
> 
> <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 @@
> 
> <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 -urN tdebase/doc/faq/nonkdeapps.docbook tdebase.new/doc/faq/nonkdeapps.docbook
>--- tdebase/doc/faq/nonkdeapps.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/faq/nonkdeapps.docbook	2012-02-17 22:41:06.000000000 -0600
>@@ -5,7 +5,7 @@
> -->
> 
> <chapter id="non-kde-apps">
>-<title>&kde; with non-&kde; applications</title>
>+<title>&tde; with non-&tde; applications</title>
> 
> 
>@@ -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 @@
> <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 @@
> <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 @@
> <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 -urN tdebase/doc/faq/notrelated.docbook tdebase.new/doc/faq/notrelated.docbook
>--- tdebase/doc/faq/notrelated.docbook	2012-01-26 15:03:48.000000000 -0600
>+++ tdebase.new/doc/faq/notrelated.docbook	2012-02-17 22:41:06.000000000 -0600
>@@ -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 @@
> 
> <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 @@
> <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 -urN tdebase/doc/faq/panel.docbook tdebase.new/doc/faq/panel.docbook
>--- tdebase/doc/faq/panel.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/faq/panel.docbook	2012-02-17 22:41:06.000000000 -0600
>@@ -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 @@
> 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 @@
> </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 @@
> 
> <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 @@
> <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 @@
> 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 @@
> <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 @@
> 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 -urN tdebase/doc/faq/qt.docbook tdebase.new/doc/faq/qt.docbook
>--- tdebase/doc/faq/qt.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/faq/qt.docbook	2012-02-17 22:41:06.000000000 -0600
>@@ -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 @@
> 
> <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 @@
> 
> <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 -urN tdebase/doc/faq/questions.docbook tdebase.new/doc/faq/questions.docbook
>--- tdebase/doc/faq/questions.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/faq/questions.docbook	2012-02-17 22:41:06.000000000 -0600
>@@ -17,9 +17,9 @@
> <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 @@
> 
> <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 @@
> 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 @@
> 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 @@
> <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 @@
> 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 @@
> <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 -urN tdebase/doc/faq/sound.docbook tdebase.new/doc/faq/sound.docbook
>--- tdebase/doc/faq/sound.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/faq/sound.docbook	2012-02-17 22:41:06.000000000 -0600
>@@ -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 @@
> <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 @@
> </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 -urN tdebase/doc/faq/tips.docbook tdebase.new/doc/faq/tips.docbook
>--- tdebase/doc/faq/tips.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/faq/tips.docbook	2012-02-17 22:41:06.000000000 -0600
>@@ -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 @@
> </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 @@
> 
> <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 @@
> 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 @@
> 
> 
> 				MOST IMPORTANT: you can use <emphasis>kprinter</emphasis>
>-				with all its features in all non-&kde; applications that allow
>+				with all its features in all non-&tde; applications that allow
> 				a customized print command, like gv, Acrobat Reader, Netscape,
> 				Mozilla, Galeon, StarOffice, OpenOffice and all GNOME programs.
> 
>+&tde; file manager)</para></listitem> -->
> 
>-<listitem><para><guilabel>Toolbar:</guilabel> Font used in &kde; application
>+<listitem><para><guilabel>Toolbar:</guilabel> Font used in &tde; application
> toolbars</para></listitem>
> 
>-<listitem><para><guilabel>Menu:</guilabel> Font used in &kde; application
>+<listitem><para><guilabel>Menu:</guilabel> Font used in &tde; application
> menus</para></listitem>
> 
> <listitem><para><guilabel>Window title:</guilabel> Font used in the window
>@@ -70,7 +70,7 @@
> button.</para>
> 
> <para>When you are done, simply click <guibutton>OK</guibutton>, and
>-all necessary components of &kde; will be restarted so your changes
>+all necessary components of &tde; will be restarted so your changes
> can take affect immediately.</para>
> 
> <para>The <guibutton>Adjust All Fonts...</guibutton> button allows you to
>@@ -98,7 +98,7 @@
> fonts will <emphasis>not</emphasis> be anti-aliased.  This range is specified 
> with the two combo boxes on the same line.</para>
> 
>-<para>You can also choose the method that &kde; uses to create an anti-alias
>+<para>You can also choose the method that &tde; uses to create an anti-alias
> look to your fonts, and how strongly it should be applied. If you are not
> familiar with the individual methods, you should leave this option
> alone.</para>
>@@ -111,7 +111,7 @@
> support in both X and the &Qt; toolkit, that you have suitable fonts
> installed, and that you are using the built-in font serving capabilities
> of the X server.  If you still are having problems, please contact the
>-appropriate &kde; mailing list, or check the
>+appropriate &tde; mailing list, or check the
> <acronym>FAQ</acronym>.</para></note>
> 
> </sect2>
>diff -urN tdebase/doc/kcontrol/helpindex/index.docbook tdebase.new/doc/kcontrol/helpindex/index.docbook
>--- tdebase/doc/kcontrol/helpindex/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/kcontrol/helpindex/index.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -30,12 +30,12 @@
> 
> <title>Help Index</title>
> 
>-<note><para>At the time of writing, for most installations of &kde; the entire search engine function in &khelpcenter; is disabled, and settings made in this &kcontrol; module will have no effect.  We hope to have it back in a future release.</para></note>
>+<note><para>At the time of writing, for most installations of &tde; the entire search engine function in &khelpcenter; is disabled, and settings made in this &kcontrol; module will have no effect.  We hope to have it back in a future release.</para></note>
> 
>-<para>&kde; comes with a lot of documentation for applications and
>+<para>&tde; comes with a lot of documentation for applications and
> components. While it is possible to just browse the manuals until you
> find that piece of information you're looking for, this may be a very
>-time-consuming task. To make this easier for you, &kde; offers
>+time-consuming task. To make this easier for you, &tde; offers
> fulltext search using a program called
> <application>ht://dig</application>. It works quite similar to search
> engines on the web, in fact some search engines you know might even use
>@@ -45,7 +45,7 @@
> 
> <para>However, to make use of this feature,
> <application>ht://dig</application> has to be installed on your system
>-and &kde; has to be configured to make use of it. This control module
>+and &tde; has to be configured to make use of it. This control module
> tries to help you doing the latter. If you haven't installed
> <application>ht://dig</application> and it wasn't shipped with your
> operating system you have to get ht://dig yourself. Have a look at
>@@ -55,13 +55,13 @@
> <para>When you first start, you are in display mode only.  To modify
> your settings, click on <guibutton>Administrator Mode</guibutton>.  If
> you are logged in as <systemitem class="username">root</systemitem>,
>-you will go straight to the change dialog.  If not, &kde; will ask for
>+you will go straight to the change dialog.  If not, &tde; will ask for
> a superuser password.</para>
> <sect2 id="help-index-use"> 
> 
> <title>Use</title> 
> 
>-<para>There are two important things to tell &kde; so it can make use of the
>+<para>There are two important things to tell &tde; so it can make use of the
> fulltext search engine:</para>
> 
> <itemizedlist>
>@@ -74,7 +74,7 @@
> 
> <title>The <application>ht://dig</application> Programs</title>
> 
>-<para> There are three programs &kde; needs that come with
>+<para> There are three programs &tde; needs that come with
> <application>ht://dig</application>: <command>htdig</command>,
> <command>htsearch</command> and <command>htmerge</command>. For each program you
> have to provide the full path including the program name, for example: <filename
>@@ -114,7 +114,7 @@
> &ie; made available to the search engine.</para>
> 
> <para>In the <guilabel>Scope</guilabel> frame you can select some
>-typical resources you want to be indexed, &ie; the &kde; help files,
>+typical resources you want to be indexed, &ie; the &tde; help files,
> and the information offered by the <command>man</command> and
> <command>info</command> commands. Note that some of those may still be
> disabled, which means that support for them has not been added
>diff -urN tdebase/doc/kcontrol/icons/index.docbook tdebase.new/doc/kcontrol/icons/index.docbook
>--- tdebase/doc/kcontrol/icons/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/kcontrol/icons/index.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -29,10 +29,10 @@
> <sect2 id="icons-intro">
> <title>Introduction</title>
> 
>-<para>&kde; comes with a full set of icons in several sizes. These icons
>-are being used all over &kde;: the desktop, the panel, the &konqueror; file
>-manager, in every toolbar of every &kde; application, etc. The icons
>-control module offers you very flexible ways of customizing the way &kde;
>+<para>&tde; comes with a full set of icons in several sizes. These icons
>+are being used all over &tde;: the desktop, the panel, the &konqueror; file
>+manager, in every toolbar of every &tde; application, etc. The icons
>+control module offers you very flexible ways of customizing the way &tde;
> handles icons. You can:</para>
> 
> <itemizedlist>
>@@ -46,8 +46,8 @@
> </itemizedlist>
> 
> <important><para>Please note that some of these settings may depend on
>-your selected icon theme. &kde; comes with two icon themes by default,
>-&kde;-Classic (HiColor) and Crystal SVG.  There is also a low color theme
>+your selected icon theme. &tde; comes with two icon themes by default,
>+&tde;-Classic (HiColor) and Crystal SVG.  There is also a low color theme
> in the tdeartwork package, along with others.</para></important>
> 
> </sect2>
>@@ -57,7 +57,7 @@
> 
> <para>Starting at the top, you can see some example icons.  These change
> in appearance depending on the icon theme you select. Most default
>-installations will have only one icon theme available, the &kde; default
>+installations will have only one icon theme available, the &tde; default
> Crystal SVG theme.  There are others contained separately in the
> tdeartwork package, and you can download more from the Internet.</para>
> 
>@@ -101,7 +101,7 @@
> <title>Icon Size</title>
> 
> <para>You have two options relating to icon sizes. First, you can choose
>-from a list of icon sizes. Second, you can tell &kde; to draw all icons
>+from a list of icon sizes. Second, you can tell &tde; to draw all icons
> using double sized pixels. The largest icon sizes are especially useful
> for visually impaired people.</para>
> 
>@@ -110,7 +110,7 @@
> example, the low color icon theme only offers the sizes 16 and 32 for
> desktop icons and 16, 22 and 32 for toolbar icons. The HiColor theme
> offers icon sizes 16, 32 and 48 as well as sizes from 64 to 128.
>-However, as &kde; can not have all these icon sizes in store, icons
>+However, as &tde; can not have all these icon sizes in store, icons
> using size 64 to 128 will be automatically generated which may result in
> a loss of quality.</para>
> 
>@@ -121,7 +121,7 @@
> this makes it possible to achieve very large icon sizes, the quality is
> poor: icons will look <quote>blocky</quote>, an effect you may remember
> if you've grown up using a Sinclair ZX Spectrum or similar. If this is
>-an option for you, using the large sizes offered by &kde;'s HiColor
>+an option for you, using the large sizes offered by &tde;'s HiColor
> icon theme will always result in a much better quality than using the
> low color icon theme with double sized pixels.</para> 
> </para></listitem>
>@@ -79,13 +79,13 @@
> <varlistentry>
> <term><guilabel>Start with an empty session</guilabel></term>
> <listitem>
>-<para>If you choose this option, &kde; will never restore sessions that it has saved.</para>
>+<para>If you choose this option, &tde; will never restore sessions that it has saved.</para>
> </listitem>
> </varlistentry>
> </variablelist>
> 
> <para>You can configure what should happen by default when you log out of
>-&kde;.  These options are not possible on all operating systems, and some of
>+&tde;.  These options are not possible on all operating systems, and some of
> them may not appear unless you are using &tdm; as your login manager.</para>
> 
> <para>The options available are self explanatory, if you are in doubt,
>diff -urN tdebase/doc/kcontrol/kcmstyle/index.docbook tdebase.new/doc/kcontrol/kcmstyle/index.docbook
>--- tdebase/doc/kcontrol/kcmstyle/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/kcontrol/kcmstyle/index.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -29,7 +29,7 @@
> <title>Introduction</title>
> 
> <para>This module is used to configure how the individual widgets are
>-drawn by &kde;.</para>
>+drawn by &tde;.</para>
> 
> <note><para>A <emphasis>Widget</emphasis> is a commonly-used
> programmer's term for referring to User Interface elements such as
>@@ -131,18 +131,18 @@
> <listitem><para>If this option is set to <guilabel>Disable</guilabel>, then no menus can be separated 
> from the application. If <guilabel>Application Level</guilabel> is selected, then it is left up 
> to each individual application to determine which menus can be torn separated from the application.</para>
>-<note><para>Many applications do not have tear off menus.  You cannot tell &kde; to force an 
>+<note><para>Many applications do not have tear off menus.  You cannot tell &tde; to force an 
> application to allow tear off menus.  This is determined by the authors of the application.</para></note></listitem>
> </varlistentry>
> </variablelist>
> 
> <para>The next checkbox, labeled <guilabel>Menu drop shadow</guilabel> is used to toggle the drop shadow behind all 
>-&kde; menus.  A drop shadow is a dark, soft line on the bottom and right sides of the menu, which give the menus the 
>+&tde; menus.  A drop shadow is a dark, soft line on the bottom and right sides of the menu, which give the menus the 
> appearance that the menu is lifted off the application, and the menu is creating a shadow on the application.</para>
> 
> <para>The next section only applies if the combobox labeled <guilabel>Menu Effect</guilabel> is set to 
> <guilabel>Make Transparent</guilabel>.  You can use the combo box labeled <guilabel>Menu transparency type:</guilabel> 
>-to select the method &kde; uses to generate the transparency.  You can use the slider to determine the level of 
>+to select the method &tde; uses to generate the transparency.  You can use the slider to determine the level of 
> transparency in menus.  A preview is visible on the right side of this section.</para>
> 
> </sect3>
>diff -urN tdebase/doc/kcontrol/keyboard/index.docbook tdebase.new/doc/kcontrol/keyboard/index.docbook
>--- tdebase/doc/kcontrol/keyboard/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/kcontrol/keyboard/index.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -29,7 +29,7 @@
> 
> <para>The actual effect of setting these options depends upon the
> features provided by your keyboard hardware and the X server on which
>-&kde; is running.  As an example, you may find that changing the key
>+&tde; is running.  As an example, you may find that changing the key
> click volume has no effect because that feature is not available on your
> system. </para>
> 
>@@ -54,8 +54,8 @@
> <term><guilabel>NumLock on KDE Startup</guilabel></term>
> <listitem>
> <para>You can choose to either always <guilabel>Turn on</guilabel> or
>-<guilabel>Turn off</guilabel> the NumLock when &kde; starts, or you can
>-choose to have &kde; leave NumLock at whatever it was set to before KDE
>+<guilabel>Turn off</guilabel> the NumLock when &tde; starts, or you can
>+choose to have &tde; leave NumLock at whatever it was set to before KDE
> started up.</para>
> </listitem>
> </varlistentry>
>diff -urN tdebase/doc/kcontrol/keys/index.docbook tdebase.new/doc/kcontrol/keys/index.docbook
>--- tdebase/doc/kcontrol/keys/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/kcontrol/keys/index.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -32,7 +32,7 @@
> <sect2 id="key-bindings-intro"> 
> <title>Introduction</title> 
> 
>-<para>While most of the functionality offered by &kde; can be accessed
>+<para>While most of the functionality offered by &tde; can be accessed
> using a simple <quote>point and click</quote> interface, many people
> prefer using the keyboard for some tasks.  Pressing something like
> <keycombo action="simul"> &Ctrl;<keycap>F</keycap></keycombo> is often
>@@ -41,7 +41,7 @@
> <guimenuitem>Find</guimenuitem>.</para>
> 
> <para> As different people have different preferences about keyboard
>-shortcuts, &kde; offers full customization of <quote>key
>+shortcuts, &tde; offers full customization of <quote>key
> bindings.</quote> A key binding or shortcut is a combination of an
> action with a key or a combination of keys.</para>
> 
>@@ -102,8 +102,8 @@
> be associated with any key.</para></listitem>
> 
> <listitem><para><guilabel>Default key</guilabel>: the selected action
>-will be associated with &kde;'s default value. This is a good choice
>-for most actions, as &kde; comes with reasonable key bindings we have
>+will be associated with &tde;'s default value. This is a good choice
>+for most actions, as &tde; comes with reasonable key bindings we have
> thought about.  </para></listitem>
> 
> <listitem><para><guilabel>Custom key</guilabel>: if this option is
>@@ -125,14 +125,14 @@
> <title>Configuring Schemes</title>
> 
> <para>A key binding scheme is a set of key bindings that you can
>-select by name. &kde; comes with several pre-defined key binding
>+select by name. &tde; comes with several pre-defined key binding
> schemes. In addition to these bundled schemes, you will always see a scheme named
> <guilabel>Current scheme</guilabel> that represents the set of key
> bindings you are using right now (&ie; not the current settings you
> are playing with, but what you've been using up to now). </para>
> 
> <para>When you are playing with the key bindings for the first time
>-you don't have to be afraid of changing the default bindings: &kde;
>+you don't have to be afraid of changing the default bindings: &tde;
> won't let you overwrite the defaults, so you can always switch back to
> the factory presets. By choosing <guilabel>Current scheme</guilabel>
> you can return to the set of key bindings you've been using up to
>@@ -172,7 +172,7 @@
> of modifiers will change.</para>
> 
> <para>If you have enabled the &Mac; keyboard, you can further enable
>-<guilabel>MacOS-style modifier usage</guilabel>, to make &kde; behave
>+<guilabel>MacOS-style modifier usage</guilabel>, to make &tde; behave
> more like &MacOS;.</para>
> 
> <para>Finally, you can change what a keypress sends to the &X-Server;
>diff -urN tdebase/doc/kcontrol/khtml/index.docbook tdebase.new/doc/kcontrol/khtml/index.docbook
>--- tdebase/doc/kcontrol/khtml/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/kcontrol/khtml/index.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -30,7 +30,7 @@
> 
> <para>The &konqueror; Browser module of &kcontrol; allows you to select
> various options for the appearance and behavior of &konqueror;, the
>-integrated web browser of &kde;.</para>
>+integrated web browser of &tde;.</para>
> 
> <sect2 id="kbrowse-html">
> 
>@@ -226,7 +226,7 @@
> diagnosing problems with &Java; applications.</para>
> 
> <para><guilabel>Use KIO</guilabel> will cause the
>-<acronym>JVM</acronym>to use &kde;'s own <acronym>KIO</acronym>
>+<acronym>JVM</acronym>to use &tde;'s own <acronym>KIO</acronym>
> transports for network connections.</para>
> 
> <para><guilabel>Use security
>diff -urN tdebase/doc/kcontrol/khtml/nsplugin.docbook tdebase.new/doc/kcontrol/khtml/nsplugin.docbook
>--- tdebase/doc/kcontrol/khtml/nsplugin.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/kcontrol/khtml/nsplugin.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -30,11 +30,11 @@
> However, &konqueror; will not automatically use the installed plugins:
> it first has to scan a list of folders.  You can initiate the scan
> by clicking <guibutton>Scan for new plugins</guibutton>.  Alternatively,
>-you can enable <guilabel>Scan for new plugins at &kde; startup</guilabel>
>-so &konqueror; will scan the appropriate folders every time &kde; 
>+you can enable <guilabel>Scan for new plugins at &tde; startup</guilabel>
>+so &konqueror; will scan the appropriate folders every time &tde; 
> starts up, to see whether new plugins have been installed.</para>
> 
>-<note><para>Enabling <guilabel>Scan for new plugins at &kde;
>+<note><para>Enabling <guilabel>Scan for new plugins at &tde;
> startup</guilabel> can considerably slow down the startup procedure,
> and is known to give difficulty on certain installations.  Turn this
> option off if you experience problems.</para></note>
>diff -urN tdebase/doc/kcontrol/language/index.docbook tdebase.new/doc/kcontrol/language/index.docbook
>--- tdebase/doc/kcontrol/language/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/kcontrol/language/index.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -31,7 +31,7 @@
> 
> <title>Country and Language</title>
> 
>-<para>This module of the &kde; control center allows you select
>+<para>This module of the &tde; control center allows you select
> customization options that depend on the region of the world that you
> happen to live in. There are five different pages in this module, each
> of which is described in detail in the following sections.</para>
>diff -urN tdebase/doc/kcontrol/mouse/index.docbook tdebase.new/doc/kcontrol/mouse/index.docbook
>--- tdebase/doc/kcontrol/mouse/index.docbook	2012-01-26 15:03:48.000000000 -0600
>+++ tdebase.new/doc/kcontrol/mouse/index.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -18,7 +18,7 @@
> <releaseinfo>3.03.00</releaseinfo>
> 
> <abstract>
>-<para>This is the documentation for the &kde; &kcontrol; module that configures mice and other pointing devices.
>+<para>This is the documentation for the &tde; &kcontrol; module that configures mice and other pointing devices.
> </para>
> </abstract>
> 
>@@ -87,7 +87,7 @@
> <varlistentry>
> <term><guilabel>Single-click to open files and folders</guilabel></term>
> <listitem>
>-<para>This is the default setting for &kde;. Clicking once on an icon
>+<para>This is the default setting for &tde;. Clicking once on an icon
> will open it.  To select you can drag around the icon(s) or <keycombo
> action="simul">&Ctrl;<mousebutton>Right</mousebutton></keycombo> click,
> or simply click and hold to drag it. You can also enable automatic selection of icons using the <guilabel>Automatically select icons</guilabel> checkbox, discussed below.</para>
>@@ -121,7 +121,7 @@
> <term><guilabel>Visual feedback on activation</guilabel></term>
> <listitem>
> <para>When this option is
>-checked, &kde; gives you visual feedback whenever you click on something and activate it.</para></listitem>
>+checked, &tde; gives you visual feedback whenever you click on something and activate it.</para></listitem>
> </varlistentry>
> 
> </variablelist>
>@@ -198,11 +198,11 @@
> <varlistentry>
> <term><guilabel>Double click interval</guilabel></term>
> <listitem>
>-<para>This is the maximum amount of time between clicks for &kde; to
>+<para>This is the maximum amount of time between clicks for &tde; to
> register a double click.  If you click twice, and the time between those
>-two clicks is less than this number, &kde; recognizes that as a double
>+two clicks is less than this number, &tde; recognizes that as a double
> click.  If the time between these two clicks is greater than this
>-number, &kde; recognizes those as two <emphasis>separate</emphasis>
>+number, &tde; recognizes those as two <emphasis>separate</emphasis>
> single clicks.</para>
> </listitem>
> </varlistentry>
>@@ -222,7 +222,7 @@
> </listitem>
> </itemizedlist>
> 
>-&kde; will drag the selected item.</para>
>+&tde; will drag the selected item.</para>
> </listitem>
> </varlistentry>
> 
>diff -urN tdebase/doc/kcontrol/netpref/index.docbook tdebase.new/doc/kcontrol/netpref/index.docbook
>--- tdebase/doc/kcontrol/netpref/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/kcontrol/netpref/index.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -50,7 +50,7 @@
> If something stops this flow of data, the application will wait for
> more to come.  This could be a very long time, but you can configure a
> maximum time for an application to wait with this option.</para>
>-<para>This setting will only apply to &kde; applications, of course.</para>
>+<para>This setting will only apply to &tde; applications, of course.</para>
> </listitem>
> </varlistentry>
> 
>diff -urN tdebase/doc/kcontrol/panel/index.docbook tdebase.new/doc/kcontrol/panel/index.docbook
>--- tdebase/doc/kcontrol/panel/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/kcontrol/panel/index.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -27,14 +27,14 @@
> <sect1 id="panel">
> <title>Panel</title>
> 
>-<para> The &kde; panel (often referred to as &kicker;) is the bar that
>-you'll usually find at the bottom of the screen when you start up &kde;
>+<para> The &tde; panel (often referred to as &kicker;) is the bar that
>+you'll usually find at the bottom of the screen when you start up &tde;
> for the first time. For detailed help on &kicker;'s usage you can type
>  <ulink url="help:/kicker">help:/kicker</ulink> in &konqueror; to read
> the user manual.</para>
> 
> <para>The panel gives you quick access to applications and makes it
>-easier for you to organize your desktop. Using the &kde; panel you
>+easier for you to organize your desktop. Using the &tde; panel you
> can:</para>
> 
> <itemizedlist>
>@@ -215,7 +215,7 @@
> <listitem><para><guilabel>Show side image</guilabel> will add a small
> image to the side of the menu.  This is purely decorative.</para></listitem>
> 
>-<listitem><para>The <guibutton>Edit K Menu</guibutton> button launches the &kde; 
>+<listitem><para>The <guibutton>Edit K Menu</guibutton> button launches the &tde; 
> menu editor.</para></listitem>
> </itemizedlist>
> 
>diff -urN tdebase/doc/kcontrol/panelappearance/index.docbook tdebase.new/doc/kcontrol/panelappearance/index.docbook
>--- tdebase/doc/kcontrol/panelappearance/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/kcontrol/panelappearance/index.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -44,7 +44,7 @@
> <sect2 id="button-backgrounds">
> <title>Button Backgrounds</title>
> 
>-<para>The &kde; panel supports so-called <guilabel>Button
>+<para>The &tde; panel supports so-called <guilabel>Button
> Backgrounds</guilabel>. This means that the buttons shown on the panel
> will be drawn using configurable images. To enable button backgrounds,
> simply choose the button type from the list, and change the drop down
>diff -urN tdebase/doc/kcontrol/performance/index.docbook tdebase.new/doc/kcontrol/performance/index.docbook
>--- tdebase/doc/kcontrol/performance/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/kcontrol/performance/index.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -28,8 +28,8 @@
> <sect1 id="sys-performance">
> <title>Performance Settings</title>
> 
>-<para>&kde;, is used on a wide variety of computers by a wide variety of users.  Under the category of 
>-performance, this dialog box allows each user to adjust options which may make the computer that &kde; is 
>+<para>&tde;, is used on a wide variety of computers by a wide variety of users.  Under the category of 
>+performance, this dialog box allows each user to adjust options which may make the computer that &tde; is 
> installed on feel more responsive. </para>
> 
> <para>This module is divided into two tabs.</para>
>@@ -39,7 +39,7 @@
> <sect3><title>&konqueror; instances</title>
> <para>The first section of this dialog is labeled <guilabel>Minimize Memory Usage</guilabel> and has three options which determine maximum number of instances of &konqueror; that can be open on one machine at any one time.</para>
> 
>-<note><para>Do not confuse &konqueror; instances, with &konqueror; windows or tabs.  The number of konqueror instances is determined by &kde; not by the user.  You can think of instances as the hidden data of your &konqueror; windows and tabs.  One &konqueror; instance can contain the data for multiple windows or tabs. Your choice on the following radio buttons does not limit the number of windows you can open at one time, but rather, how many instances of &konqueror; you can have open.  </para>
>+<note><para>Do not confuse &konqueror; instances, with &konqueror; windows or tabs.  The number of konqueror instances is determined by &tde; not by the user.  You can think of instances as the hidden data of your &konqueror; windows and tabs.  One &konqueror; instance can contain the data for multiple windows or tabs. Your choice on the following radio buttons does not limit the number of windows you can open at one time, but rather, how many instances of &konqueror; you can have open.  </para>
> <para>The reason the choices you make in this dialog box are important is evident when something goes wrong and &konqueror; is forced to close an instance.  <emphasis>All &konqueror; windows associated with a &konqueror; instance must be closed immediatly (without time to save data or bookmark locations).</emphasis> Therefore, the more instances you can have open at one time, the less likely a problem in one instance will affect all of your work.  Each instance requires more memory which can be a problem on systems with less system memory.  </para></note>
> 
> <para>Your options are:</para>
>@@ -64,27 +64,27 @@
> <sect3><title>Preloading</title>
> <para>The subsection labeled <guilabel>Preloading</guilabel> also makes a tradeoff between memory and performance.</para>
> 
>-<para><emphasis>Preloading</emphasis> refers to loading an instance of &konqueror; into memory before a user asks to start &konqueror;.  The positive effect of this is that when a user asks &kde; to load &konqueror; the window appears instantly
>+<para><emphasis>Preloading</emphasis> refers to loading an instance of &konqueror; into memory before a user asks to start &konqueror;.  The positive effect of this is that when a user asks &tde; to load &konqueror; the window appears instantly
>  because most of the application has been preloaded.  The negative effect is that this instance of &konqueror; uses memory that 
>-could be used by other programs. By default, when a user closes &konqueror;, &kde; does not close the instance.
>+could be used by other programs. By default, when a user closes &konqueror;, &tde; does not close the instance.
> This means that the next time a user wants &konqueror; loaded, it is nearly instantanous again.</para>
> <para>The spinbox labeled <guilabel>Maximum number of instances kept preloaded:</guilabel> can be used to adjust the maximum number of preloaded instances.  This option does not affect instances when they are loaded.  It also does not limit the number of instances that can be used by active windows.  It only affects the number of preloaded instances.</para>
>-<para>The checkbox labeled <guilabel>Preload an instance after &kde; startup</guilabel> does just what it says.  It tells 
>-&kde; to preload one instance of &konqueror; at the startup of &kde;.</para>
>-<note><para>This does extend the startup time for &kde;.</para></note>
>-<para>The final checkbox labeled <guilabel>Always try to have at least one preloaded instance</guilabel> signals to &kde; that you always want &kde; to have one preloaded, but not used, instance of &konqueror; available.  This option will actually decrease performance on some machines (especially those with limited physical memory).</para>
>+<para>The checkbox labeled <guilabel>Preload an instance after &tde; startup</guilabel> does just what it says.  It tells 
>+&tde; to preload one instance of &konqueror; at the startup of &tde;.</para>
>+<note><para>This does extend the startup time for &tde;.</para></note>
>+<para>The final checkbox labeled <guilabel>Always try to have at least one preloaded instance</guilabel> signals to &tde; that you always want &tde; to have one preloaded, but not used, instance of &konqueror; available.  This option will actually decrease performance on some machines (especially those with limited physical memory).</para>
> </sect3>
> </sect2>
>-<sect2><title>&kde; system performance options</title>
>+<sect2><title>&tde; system performance options</title>
> <para>Click on the tab labeled <guilabel>System</guilabel>.</para>
> <para>Currently there is only one option labeled <guilabel>Disable system configuration startup check</guilabel>.
> </para>
>-<para>When &kde; starts, it checks several directories for changes to configuration.  Most of these changes relate to installation and uninstalling applications to the computer.  This scan extends the startup time for &kde;  and many times this scan is not needed as the configuration is current from the last time &kde; was started.  When the configuration has changed &kde; uses this scan to update various datafiles to ensure a smooth user experience.  </para>
>-<warning><para>You are given the option to skip this initial scan during startup.  &kde; developers strongly suggest you do not disable this scan because of the potential to introduce instability into your system.</para>
>+<para>When &tde; starts, it checks several directories for changes to configuration.  Most of these changes relate to installation and uninstalling applications to the computer.  This scan extends the startup time for &tde;  and many times this scan is not needed as the configuration is current from the last time &tde; was started.  When the configuration has changed &tde; uses this scan to update various datafiles to ensure a smooth user experience.  </para>
>+<warning><para>You are given the option to skip this initial scan during startup.  &tde; developers strongly suggest you do not disable this scan because of the potential to introduce instability into your system.</para>
> <para>If you do select this option:</para>
> <itemizedlist>
>-<listitem><para>&kde; will wait to perform the scan until after &kde; has started.  This scan will be performed after the desktop is loaded.</para></listitem>
>-<listitem><para>In the event of a crash, &kde; will not perform a backtrace because your problem may be related to the delayed scan.</para></listitem>
>+<listitem><para>&tde; will wait to perform the scan until after &tde; has started.  This scan will be performed after the desktop is loaded.</para></listitem>
>+<listitem><para>In the event of a crash, &tde; will not perform a backtrace because your problem may be related to the delayed scan.</para></listitem>
> <listitem><para>Switch this option off if any application is crashing as a delayed scan may be responsible for the crash.</para></listitem>
> </itemizedlist>
> 
>diff -urN tdebase/doc/kcontrol/proxy/socks.docbook tdebase.new/doc/kcontrol/proxy/socks.docbook
>--- tdebase/doc/kcontrol/proxy/socks.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/kcontrol/proxy/socks.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -14,7 +14,7 @@
> information about SOCKS, see the <ulink
> url="http://www.socks.nec.com">NEC</ulink> website</para>
> 
>-<para>With this module you can enable most of the network aware &kde;
>+<para>With this module you can enable most of the network aware &tde;
> applications to transparently use SOCKS.</para>
> 
> <para>Setting up of a SOCKS client is outside the scope of this
>@@ -28,7 +28,7 @@
> to you.</para>
> 
> <para>First, you should select which of the various SOCKS clients you
>-have installed on your computer.  &kde; will attempt to find this out by
>+have installed on your computer.  &tde; will attempt to find this out by
> itself, if you choose <guilabel>Auto detect</guilabel>.  If you know the
> client you have, you could choose either <guilabel>NEC
> Socks</guilabel> or <guilabel>Dante</guilabel>.  If you have a
>@@ -36,14 +36,14 @@
> library</guilabel> and then enter the path to it in the
> <guilabel>Path</guilabel> field.</para>
> 
>-<para>If you want &kde; to auto detect the SOCKS library in use, but you
>+<para>If you want &tde; to auto detect the SOCKS library in use, but you
> suspect it isn't looking in the right places or you have installed it in
> a non-standard location, then you can add further paths to be searched in
> the bottom of this panel.  Use the <guibutton>Add</guibutton> and
> <guibutton>Remove</guibutton> to add or remove paths.</para>
> 
> <para>At any time while filling in this module, you can press the
>-<guibutton>Test</guibutton> button, and &kde; will report immediately
>+<guibutton>Test</guibutton> button, and &tde; will report immediately
> with a message box to tell you if it could find and initialize SOCKS or
> not.</para>
> 
>diff -urN tdebase/doc/kcontrol/screensaver/index.docbook tdebase.new/doc/kcontrol/screensaver/index.docbook
>--- tdebase/doc/kcontrol/screensaver/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/kcontrol/screensaver/index.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -37,7 +37,7 @@
> 
> <para>In the <guilabel>Settings</guilabel> box is a check box
> labeled <guilabel>Start screen saver automatically</guilabel>.  This
>-box must have a mark in it, or &kde; will not launch any screen saver
>+box must have a mark in it, or &tde; will not launch any screen saver
> and it will not allow you to adjust the settings of your screen
> saver.</para>
> 
>@@ -92,11 +92,11 @@
> 
> </sect2>
> 
>-<sect2 id="ss-other"><title>Using a non-&kde; screen saver</title> 
>+<sect2 id="ss-other"><title>Using a non-&tde; screen saver</title> 
> 
>-<para>&kde; does not prevent another screen saver from working.  To use a
>+<para>&tde; does not prevent another screen saver from working.  To use a
> different screen saver, such as <application>xscreensaver</application>, simply
>-disable the &kde; Screen Saver, and set up your other screen saver program
>+disable the &tde; Screen Saver, and set up your other screen saver program
> normally.  </para>
> 
> </sect2>
>@@ -164,7 +164,7 @@
> begins before a  password is required even if <guilabel>Require
> password</guilabel> is checked.</para>
> <para>Locking the desktop manually, by clicking the lock icon
>-in the &kde; panel, causes the password protection to engage immediately with
>+in the &tde; panel, causes the password protection to engage immediately with
> no grace period.</para>
> <para>To alter the grace period setting, you need to manually edit the 
> configuration file.  To do so:</para>
>@@ -172,7 +172,7 @@
> <prompt>$</prompt> <command>cd <filename>~/.kde/share/config</filename>
> </command>
> </para>
>-<para>Now, using a text editor (the example uses &kate;, the &kde; text editor), 
>+<para>Now, using a text editor (the example uses &kate;, the &tde; text editor), 
> load the <filename>kdesktoprc</filename>.</para>
> <para>
> <prompt>$</prompt> <command>kate <filename>kdesktoprc</filename>
>diff -urN tdebase/doc/kcontrol/smb/index.docbook tdebase.new/doc/kcontrol/smb/index.docbook
>--- tdebase/doc/kcontrol/smb/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/kcontrol/smb/index.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -37,11 +37,11 @@
> <quote>shares</quote> (&ie; folders made available by the server)
> as well as printers.  </para>
> 
>-<para>&kde; comes with built-in support for the <acronym>SMB</acronym>
>-protocol. As &kde; is network-transparent that means you can access
>+<para>&tde; comes with built-in support for the <acronym>SMB</acronym>
>+protocol. As &tde; is network-transparent that means you can access
> <acronym>SMB</acronym> shares from everywhere you can access your
> local files, for example in the &konqueror; file manager and in the
>-file dialog. To make use of this you should provide &kde; with some
>+file dialog. To make use of this you should provide &tde; with some
> information on your <acronym>SMB</acronym> network. But don't worry,
> this is normally pretty simple as, for example, all the Windows
> clients in your network need and have the same information.</para>
>@@ -74,17 +74,17 @@
> <para>Although there are a lot of insecure <acronym>SMB</acronym>
> networks out there which allow access to anyone, in principle you have
> to authenticate yourself to access the services of an
>-<acronym>SMB</acronym> server.  By default, &kde; will use the data
>+<acronym>SMB</acronym> server.  By default, &tde; will use the data
> entered in the <guilabel>Default user name</guilabel> and
> <guilabel>Default password</guilabel> fields to authenticate itself on
> <acronym>SMB</acronym> hosts. If you leave the field <guilabel>Default
>-user name</guilabel> empty, &kde; will try to access
>+user name</guilabel> empty, &tde; will try to access
> <acronym>SMB</acronym> hosts without a username. If you leave the
>-default password empty, it will try without a password. If &kde; is
>+default password empty, it will try without a password. If &tde; is
> unsuccessful accessing the host using these settings, you will be
> asked for a username and a password.</para>
> 
>-<important><para>While it makes things more comfortable if &kde;
>+<important><para>While it makes things more comfortable if &tde;
> stores your <acronym>SMB</acronym> password, this may be a security
> problem. If you are using <acronym>SMB</acronym> in a security
> conscious environment, you should not store your password here but
>diff -urN tdebase/doc/kcontrol/spellchecking/index.docbook tdebase.new/doc/kcontrol/spellchecking/index.docbook
>--- tdebase/doc/kcontrol/spellchecking/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/kcontrol/spellchecking/index.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -29,7 +29,7 @@
> 
> <title>Spell Checker</title>
> 
>-<para>The configuration options available here are used by all &kde;
>+<para>The configuration options available here are used by all &tde;
> applications that use &kspell;, which is a front end to
> <command>ispell</command> or <command>aspell</command>.</para>
> 
>diff -urN tdebase/doc/kcontrol/tdm/index.docbook tdebase.new/doc/kcontrol/tdm/index.docbook
>--- tdebase/doc/kcontrol/tdm/index.docbook	2012-01-26 15:03:48.000000000 -0600
>+++ tdebase.new/doc/kcontrol/tdm/index.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -30,7 +30,7 @@
> <sect1 id="login-manager">
> <title>Login Manager</title>
> 
>-<para>Using this module, you can configure the &kde; graphical login
>+<para>Using this module, you can configure the &tde; graphical login
> manager, &tdm;.  You can change how the login screen looks, who has
> access using the login manager and who can shutdown the
> computer.</para>
>@@ -59,7 +59,7 @@
> <title>Appearance</title>
> 
> <para>From this page you can change the visual appearance of &tdm;,
>-&kde;'s graphical login manager.</para>
>+&tde;'s graphical login manager.</para>
> 
> <para>The greeting string is the title of the login screen. If the
> string contains the word <computeroutput>HOSTNAME</computeroutput> it
>@@ -90,7 +90,7 @@
> <filename>$<envar>TDEDIR</envar>/share/apps/tdm/pics/kdelogo.png</filename>
> will be displayed.</para>
> 
>-<para>While &kde;'s style depends on the settings of the user logged in,
>+<para>While &tde;'s style depends on the settings of the user logged in,
> the style used by &tdm; can be configured using the <guilabel>GUI
> Style</guilabel> option.</para>
> 
>@@ -165,14 +165,14 @@
> buttons). </para> <para>You then select a pattern by clicking
> <guilabel>Setup</guilabel>.  This opens a new dialog window, which gives you
> the opportunity to select a pattern.  Simply click once on the pattern of your
>-choice, then click on <guilabel>OK</guilabel>, and &kde; will render the pattern
>+choice, then click on <guilabel>OK</guilabel>, and &tde; will render the pattern
> you selected using the two colors you selected.  For more on patterns, see the
> section <ulink url="help:/kcontrol/background/index.html#bkgnd-patterns">Background: Adding, Removing and Modifying
> Patterns</ulink>.</para></listitem>
> </varlistentry>
> <varlistentry>
> <term>Background Program</term>
>-<listitem><para>By selecting this option, you can have &kde; use an external
>+<listitem><para>By selecting this option, you can have &tde; use an external
> program to determine the background.  This can be any program of your choosing.
> For more information on this option, see the section entitled <ulink
> url="help:/kcontrol/background/index.html#bkgnd-programs">Background: Using an external program</ulink>.</para></listitem>
>@@ -180,7 +180,7 @@
> <varlistentry>
> <term>Horizontal Gradient</term>
> <listitem><para>By choosing this mode, you select two colors (using both color
>-buttons).  &kde; will then start with the color selected by <guilabel>Color
>+buttons).  &tde; will then start with the color selected by <guilabel>Color
> 1</guilabel> on the left edge of the screen, and slowly transform into the
> color selected by <guilabel>Color 2</guilabel> by the time it gets to the
> right edge of the screen.</para></listitem>
>@@ -188,7 +188,7 @@
> <varlistentry>
> <term>Vertical Gradient</term>
> <listitem><para>By choosing this mode, you select two colors (using both color
>-buttons).  &kde; will then start with the color selected by <guilabel>Color
>+buttons).  &tde; will then start with the color selected by <guilabel>Color
> 1</guilabel> on the top edge of the screen, and slowly transform into the color
> selected by <guilabel>Color 2</guilabel> as it moves to the bottom of the
> screen.</para></listitem>
>@@ -196,7 +196,7 @@
> <varlistentry>
> <term>Pyramid Gradient</term>
> <listitem><para>By choosing this mode, you select two colors (using both color
>-buttons).  &kde; will then start with the color selected by <guilabel>Color
>+buttons).  &tde; will then start with the color selected by <guilabel>Color
> 1</guilabel> in each corner of the screen, and slowly transform into the color
> selected by <guilabel>Color 2</guilabel> as it moves to the center of the
> screen.</para></listitem> 
>@@ -204,7 +204,7 @@
> <varlistentry>
> <term>Pipecross Gradient</term>
> <listitem><para>By choosing this mode, you select two colors (using both color
>-buttons).  &kde; will then start with the color selected by <guilabel>Color
>+buttons).  &tde; will then start with the color selected by <guilabel>Color
> 1</guilabel> in each corner of the screen, and slowly transform into the color
> selected by <guilabel>Color 2</guilabel> as it moves to the center of the
> screen. The <quote>shape</quote> of this gradient is  different then the pyramid
>@@ -213,7 +213,7 @@
> <varlistentry>
> <term>Elliptic Gradient</term>
> <listitem><para>By choosing this mode, you select two colors (using both color
>-buttons).  &kde; will then start with the color selected by <guilabel>Color
>+buttons).  &tde; will then start with the color selected by <guilabel>Color
> 2</guilabel> in the center of the screen, and slowly transform into the color
> selected by <guilabel>Color 1</guilabel> as it moves to the edges, in an
> elliptical pattern.</para></listitem> 
>diff -urN tdebase/doc/kdcop/index.docbook tdebase.new/doc/kdcop/index.docbook
>--- tdebase/doc/kdcop/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/kdcop/index.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -51,11 +51,11 @@
> </bookinfo>
> 
> <chapter id="introduction"> <title>Introduction</title> <para>
>-The documentation for &kappname; was not finished when &kde; was installed on
>+The documentation for &kappname; was not finished when &tde; was installed on
> this computer.</para> <para>If you need help, please check <ulink
>-url="http://www.kde.org">The &kde; Website</ulink> for updates, or by
>+url="http://www.kde.org">The &tde; Website</ulink> for updates, or by
> submitting your question to <ulink url="mailto:kde@kde.org">The
>-&kde; User Mailing list</ulink>.</para> <para><emphasis>The &kde;
>+&tde; User Mailing list</ulink>.</para> <para><emphasis>The &tde;
> Team</emphasis></para>
> 
> &underFDL;
>diff -urN tdebase/doc/kfind/index.docbook tdebase.new/doc/kfind/index.docbook
>--- tdebase/doc/kfind/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/kfind/index.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -31,7 +31,7 @@
> 
> <abstract>
> <para>
>-&kfind; is &kde;'s file find utility.
>+&kfind; is &tde;'s file find utility.
> </para>
> </abstract>
> 
>@@ -48,7 +48,7 @@
> <title>Introduction</title>
> 
> <para>
>-&kfind; is the &kde; file find utility.
>+&kfind; is the &tde; file find utility.
> </para>
> 
> <sect1 id="starting">
>@@ -197,7 +197,7 @@
> you.</para>
> 
> <para>&kregexpeditor; is a very useful tool, and can be used from within
>-many &kde; applications other than &kfind;.  You can find more
>+many &tde; applications other than &kfind;.  You can find more
> information from within its own help file.</para>
> </listitem>
> </varlistentry>
>@@ -332,7 +332,7 @@
> <title>Requirements</title>
> 
> <para>
>-In order to successfully use &kfind;, you need &kde; 3.x.
>+In order to successfully use &kfind;, you need &tde; 3.x.
> </para>
> 
> </sect1>
>diff -urN tdebase/doc/kfind/man-kfind.1.docbook tdebase.new/doc/kfind/man-kfind.1.docbook
>--- tdebase/doc/kfind/man-kfind.1.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/kfind/man-kfind.1.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -8,7 +8,7 @@
> <title>KDE User's Manual</title>
> <author>&Lauri.Watts; &Lauri.Watts.mail;</author>
> <date>June 07, 2005</date>
>-<productname>K Desktop Environment</productname>
>+<productname>Trinity Desktop Environment</productname>
> </refentryinfo>
> 
> <refmeta>
>@@ -18,7 +18,7 @@
> 
> <refnamediv>
> <refname><command>kfind</command></refname>
>-<refpurpose>file find utility for &kde;</refpurpose>
>+<refpurpose>file find utility for &tde;</refpurpose>
> </refnamediv>
> 
> <refsynopsisdiv>
>diff -urN tdebase/doc/khelpcenter/contact.docbook tdebase.new/doc/khelpcenter/contact.docbook
>--- tdebase/doc/khelpcenter/contact.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/khelpcenter/contact.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -1,55 +1,33 @@
>-<chapter id="contact-the-kde-team">
>+<chapter id="contact-the-tde-team">
> <chapterinfo>
>-<date>2002-10-29</date>
>-<releaseinfo>3.5.5</releaseinfo>
>+<date>2012-02-01</date>
>+<releaseinfo>R14.0.0</releaseinfo>
> </chapterinfo>
>-<title>Contact the &kde; team</title>
>+<title>Contact the &tde; team</title>
> <anchor id="contact"/>
> 
> <sect1 id="contact-mailinglists">
> <title>Mailing lists</title>
> 
>-<para> &kde; has several mailing lists up. See below for some of the
>+<para> &tde; has some mailing lists. See below for some of the
> most useful. Older articles can be found in the <ulink
>-url="http://lists.kde.org">mailing list archive</ulink>.</para>
>+url="http://www.trinitydesktop.org/mailinglist.php">mailing list archive</ulink>.</para>
> 
> <variablelist>
> 
> <varlistentry>
>-<term><ulink url="http://mail.kde.org/mailman/listinfo/kde">kde</ulink></term>
>+<term><ulink url="http://www.trinitydesktop.org/mailinglist.php">tde-users</ulink></term>
> <listitem><para>For general discussion, users helping each other.</para></listitem>
> </varlistentry>
> 
> <varlistentry>
>-<term><ulink url="http://mail.kde.org/mailman/listinfo/kde-announce">kde-announce</ulink></term>
>-<listitem><para>Announcements of new &kde; applications</para></listitem>
>+<term><ulink url="http://www.trinitydesktop.org/mailinglist.php">tde-announce</ulink></term>
>+<listitem><para>Announcements of &tde; news</para></listitem>
> </varlistentry>
> 
> <varlistentry>
>-<term><ulink url="http://mail.kde.org/mailman/listinfo/kde-devel">kde-devel</ulink></term>
>-<listitem><para>For developers.</para></listitem>
>-</varlistentry>
>-
>-<varlistentry>
>-<term><ulink url="http://mail.kde.org/mailman/listinfo/kde-artists">kde-artists</ulink></term>
>-<listitem><para>Creating icons and other artwork</para></listitem>
>-</varlistentry>
>-
>-<varlistentry>
>-<term><ulink url="http://mail.kde.org/mailman/listinfo/kde-doc-english">kde-doc-english</ulink></term>
>-<listitem><para>For people interested in writing documentation for &kde;.</para></listitem>
>-</varlistentry>
>-
>-<varlistentry>
>-<term><ulink url="http://mail.kde.org/mailman/listinfo/tde-i18n-doc">tde-i18n-doc</ulink></term>
>-<listitem><para>Internationalization and documentation issues</para></listitem>
>-</varlistentry>
>-
>-<varlistentry>
>-<term><ulink url="http://l10n.kde.org/teams/">http://l10n.kde.org/teams/</ulink></term>
>-<listitem><para>For localized information, which may include user
>-email lists and websites, check the translation teams page at the
>-above &URL;.</para></listitem>
>+<term><ulink url="http://www.trinitydesktop.org/mailinglist.php">tde-devel</ulink></term>
>+<listitem><para>For developers, artists, documentation writers.</para></listitem>
> </varlistentry>
> 
> </variablelist>
>@@ -57,69 +35,42 @@
> </sect1>
> 
> <sect1 id="contact-developers">
>-<title>Contacting the &kde; developers</title>
>+<title>Contacting the &tde; developers</title>
> 
>-<para>On this page, you can find links to &kde; related web sites.</para>
>+<para>On this page, you can find links to &tde; related web sites.</para>
> 
>-<para>The K Desktop Environment is developed by a large group of people
>+<para>The Trinity Desktop Environment is developed by a large group of 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
> section</link>, and contact addresses for individual developers can be
> found in the documentation of their individual application.</para>
> 
>-<para>Please visit our <ulink
>-url="http://www.kde.org/contact/representatives.php">Official
>-Representatives</ulink> page for official enquiries regarding &kde;
>-(&eg; interviews).</para>
>+<para>More information about &tde; is available at &tde-http;.</para>
> 
>-<para>More information about &kde; is available at &kde-http;.</para>
>-
>-<para><anchor id="links" />Other &kde; websites include:</para>
>+<para><anchor id="links" />Other &tde; websites include:</para>
> 
> <variablelist>
> <varlistentry>
>-<term><ulink url="http://www.kde.org">www.kde.org</ulink></term>
>-<listitem><para>&kde;'s official website</para></listitem>
>-</varlistentry>
>-
>-<varlistentry>
>-<term><ulink url="http://developer.kde.org">developer.kde.org</ulink></term>
>-<listitem><para>The &kde; developers center</para></listitem>
>-</varlistentry>
>-
>-<varlistentry>
>-<term><ulink url="http://websvn.kde.org">websvn.kde.org</ulink></term>
>-<listitem><para>A web interface to the &kde; Subversion repository</para></listitem>
>-</varlistentry>
>-
>-<varlistentry>
>-<term><ulink url="http://l10n.kde.org">l10n.kde.org</ulink></term>
>-<listitem><para>&kde;'s internationalization and documentation server</para></listitem>
>+<term><ulink url="http://www.trinitydesktop.org">www.trinitydesktop.org</ulink></term>
>+<listitem><para>&tde;'s official website</para></listitem>
> </varlistentry>
> 
> <varlistentry>
>-<term><ulink url="ftp://ftp.kde.org">ftp.kde.org</ulink></term>
>-<listitem><para>The main &kde; &FTP; server. Please have a look at the link
>-below to find a mirror site in your geographic region.</para></listitem>
>+<term><ulink url="http://www.trinitydesktop.org/wiki">www.trinitydesktop.org/wiki</ulink></term>
>+<listitem><para>The &tde; Wiki</para></listitem>
> </varlistentry>
> 
> <varlistentry>
>-<term><ulink
>-url="http://www.kde.org/mirrors">www.kde.org/mirrors</ulink></term> 
>-<listitem><para>&kde; web and &FTP; mirror sites</para></listitem>
>+<term><ulink url="http://git.trinitydesktop.org/cgit/">git.trinitydesktop.org/cgit/</ulink></term>
>+<listitem><para>A web interface to the &tde; GIT repository</para></listitem>
> </varlistentry>
> 
> <varlistentry>
>-<term><ulink url="http://www.kde-apps.org">www.kde-apps.org</ulink></term>
>-<listitem><para>A directory of &kde; applications.</para></listitem>
>+<term><ulink url="http://git.trinitydesktop.org/cgit/">Internet Relay Chat</ulink></term>
>+<listitem><para>The freenode &tde; internet relay chat channel is #trinity-desktop.</para></listitem>
> </varlistentry>
> 
>-<varlistentry>
>-<term><ulink url="http://www.kde-look.org">www.kde-look.org</ulink></term>
>-<listitem><para>&kde; themes, icons, and other items to change the
>-look of your desktop.</para></listitem>
>-</varlistentry>
> </variablelist>
> 
> </sect1>
>diff -urN tdebase/doc/khelpcenter/help.docbook tdebase.new/doc/khelpcenter/help.docbook
>--- tdebase/doc/khelpcenter/help.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/khelpcenter/help.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -3,19 +3,19 @@
> <date>2002-02-03</date>
> <releaseinfo>0.08.00</releaseinfo>
> </chapterinfo>
>-<title>&kde; Help System User Manual</title>
>+<title>&tde; Help System User Manual</title>
> <anchor id="help"/>
> 
> <sect1 id="help-introduction">
>-<title>&kde; Help System</title>
>+<title>&tde; Help System</title>
> 	
>-<para>The &kde; help system is designed to make accessing the common
>+<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 &kde;
>+<application>info</application>) simple, as well as the native &tde;
> documentation (&XML;). 
> </para>
> 	
>-<para> All base &kde; applications come fully documented, thanks to
>+<para> All base &tde; applications come fully documented, thanks to
> the efforts of the Documentation team.  If you would like to help,
> please write to the Documentation coordinator, Lauri Watts, at
> <email>lauri@kde.org</email> for information.  No experience is
>@@ -23,7 +23,7 @@
> </para>
> 
> <para>
>-If you would like to help translating &kde; documentation to your native
>+If you would like to help translating &tde; documentation to your native
> language, the Translation coordinator is Thomas Diehl,
> <email>thd@kde.org</email>, and he would also welcome the help.  More
> information, including the coordinators for each language team, can be
>@@ -36,8 +36,8 @@
> <title>Installation</title>
> 
> <para>
>-&khelpcenter; is an integral part of the &kde; Base installation, and
>-is installed with every copy of &kde;.  It can be found in the tdebase
>+&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.
> </para>
>@@ -198,7 +198,7 @@
> The <guilabel>Contents</guilabel> pane is further divided into two
> tabs, one containing a <link linkend="contents-menu">menu</link>
> showing all the help information &khelpcenter; is aware of, and the
>-other contains the &kde; <link linkend="kde-glossary">glossary</link>
>+other contains the &tde; <link linkend="kde-glossary">glossary</link>
> of terms.
> </para>
> 
>@@ -213,25 +213,25 @@
> <variablelist>
> <varlistentry>
> <term><guilabel>Introduction</guilabel></term>
>-<listitem><para>Welcome to &kde; - an introduction to the K Desktop
>+<listitem><para>Welcome to &tde; - an introduction to the K Desktop
> Environment.</para></listitem>
> </varlistentry>
> 
> <varlistentry>
>-<term><guilabel>Introduction to &kde;</guilabel></term>
>+<term><guilabel>Introduction to &tde;</guilabel></term>
> <listitem>
> <para>
>-The &kde; Quickstart guide.  Contains a tour of the &kde;
>-Interface and specific help and tips on how to work smarter with &kde;.
>+The &tde; Quickstart guide.  Contains a tour of the &tde;
>+Interface and specific help and tips on how to work smarter with &tde;.
> </para>
> </listitem>
> </varlistentry>
> 
> <varlistentry>
>-<term><guilabel>&kde; User's manual</guilabel></term>
>+<term><guilabel>&tde; User's manual</guilabel></term>
> <listitem>
> <para>
>-The &kde; User's manual is an in-depth exploration of &kde;, including
>+The &tde; User's manual is an in-depth exploration of &tde;, including
> installation, configuration and customization, and use.
> </para>
> </listitem> 
>@@ -241,10 +241,10 @@
> <term><guilabel>Application manuals</guilabel></term>
> <listitem>
> <para>
>-Native &kde; application documentation. All &kde; applications have
>+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
>-&kde; applications with a brief description and a link to the full
>+&tde; applications with a brief description and a link to the full
> application documentation. 
> </para>
> <para>
>@@ -288,19 +288,19 @@
> </varlistentry>
> 
> <varlistentry>
>-<term><guilabel>The &kde; FAQ</guilabel></term>
>+<term><guilabel>The &tde; FAQ</guilabel></term>
> <listitem>
> <para>
>-Frequently asked questions about &kde;, and their answers.
>+Frequently asked questions about &tde;, and their answers.
> </para>
> </listitem>
> </varlistentry>
> 
> <varlistentry>
>-<term><guilabel>&kde; on the web</guilabel></term>
>+<term><guilabel>&tde; on the web</guilabel></term>
> <listitem>
> <para>
>-Links to &kde; on the web, both the official &kde; website, and other
>+Links to &tde; on the web, both the official &tde; website, and other
> useful sites.
> </para>
> </listitem>
>@@ -310,14 +310,14 @@
> <term><guilabel>Contact Information</guilabel></term>
> <listitem>
> <para>
>-Information on how to contact &kde; developers, and how to join the
>-&kde; mailing lists.
>+Information on how to contact &tde; developers, and how to join the
>+&tde; mailing lists.
> </para>
> </listitem>
> </varlistentry>
> 
> <varlistentry>
>-<term><guilabel>Supporting &kde;</guilabel></term>
>+<term><guilabel>Supporting &tde;</guilabel></term>
> <listitem>
> <para>
> How to help, and how to get involved.
>@@ -483,12 +483,12 @@
> </sect2>
> 
> <sect2 id="kde-glossary">
>-<title>The &kde; glossary</title>
>+<title>The &tde; glossary</title>
> 
> <para>
> The glossary provides a quick reference point, where you can look up
> the definitions of words that may be unfamiliar to you.  These range
>-from &kde; specific applications and technologies, through to general
>+from &tde; specific applications and technologies, through to general
> &UNIX; computing terms.
> </para>
> 
>diff -urN tdebase/doc/khelpcenter/index.docbook tdebase.new/doc/khelpcenter/index.docbook
>--- tdebase/doc/khelpcenter/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/khelpcenter/index.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -1,10 +1,10 @@
> <?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"
> "customization/dtd/kdex.dtd" [
>   <!ENTITY contact SYSTEM "contact.docbook">
>   <!ENTITY help SYSTEM "help.docbook">
>   <!ENTITY support SYSTEM "support.docbook">
>-  <!ENTITY whatiskde SYSTEM "whatiskde.docbook">
>+  <!ENTITY whatiskde SYSTEM "whatistde.docbook">
>   <!ENTITY welcome SYSTEM "welcome.docbook">
>   <!ENTITY quickstart SYSTEM "quickstart/index.docbook" NDATA SGML>
>   <!ENTITY userguide SYSTEM "userguide/index.docbook" NDATA SGML>
>@@ -16,17 +16,17 @@
>   <!ENTITY kde-quickstart-doc SYSTEM "quickstart/index.docbook" NDATA SGML>
>   <!ENTITY kde-userguide-doc SYSTEM "userguide/index.docbook" NDATA SGML>
>   <!ENTITY kde-faq-doc SYSTEM "faq/index.docbook" NDATA SGML>
>-  
>   <!ENTITY kde-kpanel-doc SYSTEM "../kpanel/index.html" NDATA SGML>
>   <!ENTITY kde-kcontrol-doc SYSTEM "../kcontrol/index.html" NDATA SGML>
>   <!ENTITY kde-kfm-doc SYSTEM "../konqueror/index.html" NDATA SGML>
>   <!ENTITY kde-kwm-doc SYSTEM "../kwm/index.html" NDATA SGML>
>-  
>   <!ENTITY kappname "&khelpcenter;">
>   <!ENTITY % English "INCLUDE" > 
>@@ -37,27 +37,28 @@
> <bookinfo>
> <title>The &khelpcenter;</title>
> <authorgroup>
>-<corpauthor>The &kde; Team</corpauthor>
>+<corpauthor>The &tde; Team</corpauthor>
> 
> </authorgroup>
> <date>2002-01-18</date>
> <releaseinfo>3.00.00</releaseinfo>
> 
> <abstract>
>-<para>&kde; is a powerful graphical desktop environment for &UNIX;
>-workstations.  A &kde; desktop combines ease of use, contemporary
>-functionality and outstanding graphical design with the technological
>-superiority of the &UNIX; operating system.</para>
>+<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>
> </abstract>
> 
> <keywordset>
> <keyword>KDE</keyword>
>+<keyword>TDE</keyword>
> <keyword>tdebase</keyword>
> <keyword>khelpcenter</keyword>
> <keyword>kdehelp</keyword>
> <keyword>help</keyword>
> <keyword>help center</keyword>
>-<keyword>KDE help center</keyword>
>+<keyword>TDE help center</keyword>
> </keywordset>
> </bookinfo>
> 
>diff -urN tdebase/doc/khelpcenter/support.docbook tdebase.new/doc/khelpcenter/support.docbook
>--- tdebase/doc/khelpcenter/support.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/khelpcenter/support.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -1,18 +1,18 @@
>-<chapter id="supporting-kde">
>+<chapter id="supporting-tde">
> <chapterinfo>
> <date>2002-03-04</date>
> <releaseinfo>2.02.00</releaseinfo>
> </chapterinfo>
>-<title>Supporting &kde;</title>
>+<title>Supporting &tde;</title>
> <anchor id="support"/>
> 
>-<sect1 id="supporting-kde-introduction">
>-<title>Supporting &kde;</title>
>+<sect1 id="supporting-tde-introduction">
>+<title>Supporting &tde;</title>
> 
>-<para> If you are new to &kde;, the &kde; project might look like big
>-machinery to you. Undoubtedly, &kde; is no longer a small project,
>+<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,
> nevertheless it is very important to realize that it is easy to
>-<quote>make a difference</quote> in the &kde; world.  </para>
>+<quote>make a difference</quote> in the &tde; world.  </para>
> 
> <para> There is always a need for dedicated developers, graphic
> artists, sound engineers, translators and documentation
>@@ -23,79 +23,57 @@
> all over the world. Also, the satisfaction that stems from doing
> actual hands-on work, that will benefit an uncountable number of users
> world-wide, and from seeing an unparalleled project grow, is hard to
>-beat. Please consider joining and supporting &kde; and hop aboard this
>+beat. Please consider joining and supporting &tde; and hop aboard this
> exciting journey towards a free and open alternative computing
> platform.  </para>
> 
> </sect1>
> 
>-<sect1 id="supporting-kde-get-started">
>+<sect1 id="supporting-tde-get-started">
> <title>How to get started</title>
> 
> <itemizedlist>
> 
> <listitem><para>
>-Subscribe to the <link linkend="contact">&kde; mailing lists</link>
>+Subscribe to the <link linkend="contact">&tde; mailing lists</link>
> that interest you.
> </para></listitem>
> 
> <listitem><para>
>-Read the <ulink url="http://lists.kde.org">mailing list</ulink> archives in
>-order to get a feel for &kde; development.
>+Read the <ulink url="trinity-devel@lists.pearsoncomputing.net">&tde;
>+developer mailing list</ulink> archives to get a feel for &tde; development.
> </para></listitem>
> 
> <listitem><para>
>-Learn how to program using the &kde; application framework and join the
>-friendly &kde; developers' community.
>+Learn to program using the &tde; application framework and join the
>+&tde; developers' community.
> </para></listitem>
> 
> </itemizedlist>
> 
> </sect1>
> 
>-<sect1 id="supporting-kde-financial-support">
>+<sect1 id="supporting-tde-financial-support">
> <title>Supporting financially</title>
> 
>-<para> The &kde; team is working very hard on providing you with the
>-best desktop available for the &UNIX; operating system. &kde; is
>+<para> The &tde; team is working very hard on providing you with the
>+best desktop available for the &UNIX; operating system. &tde; is
> available for free and will always be available for free, including
> each and every line of its source code, for everyone to modify and
>-distribute. If you enjoy and use &kde; please consider supporting the
>-&kde; Project financially.  &kde; is in constant need of funds in
>-order to finance its operations.  </para>
>+distribute. If you enjoy and use &tde; please consider supporting the
>+&tde; Project financially.  &tde; is in constant need of funds in
>+order to finance its operations.</para>
> 
> <para> If your busy schedule or skills do not permit you to be
>-actively involved in &kde; development, please consider supporting
>-&kde; financially by sending a donation to: </para>
>+actively involved in &tde; development, please consider supporting
>+&tde; financially by sending a donation to:</para>
> 
>-<para> You can send regular US checks to the following address: </para>
>-
>-<literallayout>
>-K Desktop Environment e.V.
>-Mirko Boehm
>-2029 Chadds Ford Drive
>-Reston, VA 20191
>-USA
>-</literallayout>
>-
>-<para> Use "KDE e.V. - Mirko Boehm" in the "Pay to the order of..." line. 
>+<para><ulink url="http://www.trinitydesktop.org/donate.php">Support</ulink>
> </para>
> 
>-<para>
>-From Europe, you may remit your donation to (be aware of a fee if wiring from outside of Germany): 
>-</para>
>-
>-<literallayout>
>-K Desktop Environment e.V.
>-Account-Nr. 0 66 64 46
>-BLZ 200 700 24
>-Deutsche Bank 24
>-</literallayout>
>-
>-<para> Please contact Mirko Boehm
>-<email>kde-ev-treasurer@kde.org</email> if you have any questions.  </para>
>+<para>Please contact the Trinity team if you have questions.</para>
> 
>-<para> Your contribution is very much appreciated. Thank you!  </para>
>+<para>Your contribution is appreciated. Thank you!</para>
> 
> </sect1>
> </chapter>
>diff -urN tdebase/doc/khelpcenter/welcome.docbook tdebase.new/doc/khelpcenter/welcome.docbook
>--- tdebase/doc/khelpcenter/welcome.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/khelpcenter/welcome.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -1,46 +1,46 @@
>-<chapter id="welcome-to-kde">
>+<chapter id="welcome-to-tde">
> <chapterinfo>
> <date>2002-01-18</date>
> <releaseinfo>3.00.00</releaseinfo>
> </chapterinfo>
>-<title>Welcome to &kde;</title>
>+<title>Welcome to the Trinity Desktop Environment (&tde;)</title>
> <anchor id="welcome"/>
> 
>-<para> <emphasis>The &kde; team welcomes you to user-friendly &UNIX;
>-computing.</emphasis> </para>
>+<para> <emphasis>The &tde; team welcomes you to user-friendly &UNIX;
>+desktop computing.</emphasis> </para>
> 
> <sect1 id="welcome-page">
>-<title>Welcome to the K Desktop Environment</title>
>+<title>Welcome to the Trinity Desktop Environment (&tde;)</title>
> 
>-<sect2 id="welcome-information-about-kde">
>-<title>Information about &kde;</title>
>+<sect2 id="welcome-information-about-tde">
>+<title>Information about &tde;</title>
> 
>-<para>&kde; is a powerful graphical desktop environment for &UNIX;
>-workstations.  A &kde; desktop combines ease of use, contemporary
>-functionality and outstanding graphical design with the technological
>-superiority of the &UNIX; operating system.  </para>
>+<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>
> 
>-<para><link linkend="what-is-kde">What is the K Desktop Environment?</link></para>
>+<para><link linkend="what-is-tde">What is the Trinity Desktop Environment?</link></para>
> 
>-<para><link linkend="contact">Contacting the &kde; Project</link></para>
>+<para><link linkend="contact">Contacting the &tde; Project Team Members</link></para>
> 
>-<para><link linkend="support">Supporting the &kde; Project</link></para>
>+<para><link linkend="support">Supporting the &tde; Project</link></para>
> 
> <para><link linkend="links">Useful links</link></para>
> 
> </sect2>
> 
>-<sect2 id="welcome-getting-the-most-out-of-kde">
>-<title>Getting the most out of &kde;</title>
>+<sect2 id="welcome-getting-the-most-out-of-tde">
>+<title>Getting the most out of &tde;</title>
> 
> <sect3 id="welcome-general-documentation">
> <title>General documentation</title>
> 
> <para><ulink url="help:/khelpcenter/quickstart">A Quick Start Guide to the Desktop</ulink></para>
> 
>-<para><ulink url="help:/khelpcenter/userguide">&kde; User's guide</ulink></para>
>+<para><ulink url="help:/khelpcenter/userguide">&tde; User's guide</ulink></para>
> 
>-<para><ulink url="help:/khelpcenter/faq">Frequently asked questions</ulink></para>
>+<para><ulink url="help:/khelpcenter/faq">Frequently Asked Questions</ulink></para>
> 
> </sect3>
> 
>diff -urN tdebase/doc/khelpcenter/whatiskde.docbook tdebase.new/doc/khelpcenter/whatiskde.docbook
>--- tdebase/doc/khelpcenter/whatiskde.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/khelpcenter/whatiskde.docbook	1969-12-31 19:00:00.000000000 -0500
>@@ -1,129 +0,0 @@
>-<chapter id="what-is-kde">
>-<chapterinfo>
>-<date>2002-01-18</date>
>-<releaseinfo>3.00.00</releaseinfo>
>-</chapterinfo>
>-<title>What is &kde;?</title>
>-<anchor id="whatiskde"/>
>-
>-<sect1 id="what-is-kde-introduction">
>-<title>What is &kde;?</title>
>-
>-<para>&kde; is a desktop environment. In other words, &kde; is a
>-collection of programs, technologies and documentation that attempt to
>-make life easier for computer users. &kde; is targeted at &UNIX;
>-workstations. It features network transparency and a contemporary work
>-philosophy. </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>
>-
>-<para>&kde; seeks to fill the need for an easy to use desktop for
>-&UNIX; workstations, similar to the desktop environments found under
>-&MacOS; or &Windows; 95/NT. &kde; meets the requirement
>-of users for an easy to use work environment. Tools used to reach
>-this end are: enhanced inter-application communication, component
>-reuse, generalized drag and drop, uniform look and feel and many
>-more. Thus, &kde; offers much more than the traditional &UNIX; window
>-managers.</para>
>-
>-<para>Stability, scaleability and openness are qualities which have
>-made &UNIX; the undisputed choice for the information technology
>-professional for many years.  &kde; builds on top of this excellent
>-base framework and brings new, much needed qualities: usability, user
>-friendliness and beauty! &kde; was the first, and stays the forefront
>-player in bringing these qualities to &UNIX;, which constituted for
>-years, the premier platform for server computers and scientific
>-institutions, but wasn't very attractive for desktop users.</para>
>-
>-<para>Without &UNIX; the Internet would not exist, or at least would
>-have a vastly different form. &UNIX; has not, until now, addressed the
>-needs of the average computer user. This fact is particularly
>-unfortunate, since a number of implementations of &UNIX; (<ulink
>-url="http://www.linux.org">&Linux;</ulink>, <ulink
>-url="http://www.freebsd.org">FreeBSD</ulink>, <ulink
>-url="http://www.netbsd.org">NetBSD</ulink>, &etc;) are freely
>-available on the Internet, all of which are of exceptional quality and
>-stability.  </para>
>-
>-</sect1>
>-
>-<sect1 id="what-is-kde-the-desktop">
>-<title>&kde; The Desktop Environment</title>
>-
>-<para>In combination with a free implementation of &UNIX;, &kde;
>-provides to the world an open and completely free desktop computing
>-platform either at home or at work.</para>
>-
>-<para> This platform is available to anyone free of charge including
>-its source code for anyone to modify.</para>
>-
>-<para>While there will always be room for improvement we believe we
>-have now delivered a viable alternative to some of the more commonly
>-found and commercial operating systems/desktops combinations available
>-today. It is our hope that the combination of &UNIX; and &kde; will
>-finally bring the same open, reliable, stable, and monopoly free
>-computing to the average computer user that scientists and computing
>-professionals world-wide have enjoyed for years.  </para>
>-
>-</sect1>
>-
>-<sect1 id="what-is-kde-the-development-framework">
>-<title>&kde; The Application Development Framework</title>
>-
>-<para>&kde; focuses on the user's needs, but it's obvious that this
>-focus is more easily achieved by also giving developers the best
>-tools.  &kde; code contains, and comes with, some of the best
>-development technologies of the modern computing age.</para>
>-
>-<para>Authoring applications under &UNIX;/X11 used to be an extremely
>-tedious and labor intensive process. &kde; recognizes the fact that a
>-computing platform is only as good as the number of first class
>-applications available to the users of that particular
>-platform.</para>
>-
>-<para>&kde; defines new technologies in &DCOP; and KParts, created to
>-offer a component document model and technology.  Together with the
>-complete &kde; libraries programming interface, &DCOP;/KParts are set
>-in direct competition with other similar technologies like &Microsoft;
>-<abbrev>MFC</abbrev>/<abbrev>COM</abbrev>/ActiveX technologies. The
>-excellent quality and the high level of refinement of &kde;'s
>-application programming interface (<acronym>API</acronym>) enables
>-developers to focus on original and interesting issues and avoid
>-reinventing the wheel.</para>
>-
>-</sect1>
>-
>-<sect1 id="what-is-kde-the-office-suite">
>-<title>&kde; The Office Application Suite</title>
>-
>-<para>In its current form, &kde; provides, apart from the essential desktop
>-component applications, a suite of powerful office programs known to the
>-world by the name &koffice;.</para>
>-
>-<para>&koffice; is based on the &kde; &DCOP;/KParts
>-technologies. It currently contains: a word processor with desktop
>-publishing capabilities (&kword;), a spreadsheet application (&kspread;)
>-and accompanying charting program (&kchart;), a presentation program
>-(&kpresenter;) and a vector drawing program (&kontour;).  Tying things
>-together is the <application>KOffice Workspace</application>, an
>-integrated shell to ease the use of the &koffice; components in
>-conjunction with each other.  Additional components include an email
>-client, a news reader, and a powerful <abbrev>PIM</abbrev> (Personal
>-Information Manager - an organizer).</para>
>-
>-<para>While some of those components are still in alpha development,
>-others are already extremely powerful.  For example, &kpresenter;,
>-&kde;'s presentation application, was successfully used at the 5th
>-International &Linux; Congress in Cologne, Germany to deliver a &kde;
>-presentation.  </para>
>-
>-<para>We would like to invite you to <ulink
>-url="http://www.kde.org">learn more about &kde;</ulink> and <ulink
>-url="http://koffice.kde.org">&koffice;</ulink>.</para>
>-
>-</sect1>
>-</chapter>
>-
>diff -urN tdebase/doc/khelpcenter/whatistde.docbook tdebase.new/doc/khelpcenter/whatistde.docbook
>--- tdebase/doc/khelpcenter/whatistde.docbook	1969-12-31 19:00:00.000000000 -0500
>+++ tdebase.new/doc/khelpcenter/whatistde.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -0,0 +1,125 @@
>+<chapter id="what-is-tde">
>+<chapterinfo>
>+<date>2002-01-18</date>
>+<releaseinfo>3.00.00</releaseinfo>
>+</chapterinfo>
>+<title>What is &tde;?</title>
>+<anchor id="whatistde"/>
>+
>+<sect1 id="what-is-tde-introduction">
>+<title>What is &tde;?</title>
>+
>+<para>&tde; is a desktop environment. In other words, &tde; is a
>+collection of programs, technologies and documentation that attempt to
>+make life easier for computer users. &tde; is targeted at &UNIX;
>+workstations. &tde; features network transparency and a contemporary work
>+philosophy.</para>
>+
>+<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>
>+
>+<para>The &tde; developers continue the tradition of KDE 3.5.</para>
>+
>+<para>&tde; seeks to fill the need for an easy to use desktop for
>+&UNIX; workstations, similar to the desktop environments found under
>+&MacOS; or &Windows; 95/NT. &tde; meets the requirement
>+of users for an easy to use work environment. Tools used to reach
>+this end are: enhanced inter-application communication, component
>+reuse, generalized drag and drop, uniform look and feel and many
>+more. Thus, &tde; offers much more than the traditional &UNIX; window
>+managers.</para>
>+
>+<para>Stability, scaleability and openness are qualities which have
>+made &UNIX; the undisputed choice for the information technology
>+professional for many years.  &tde; builds on top of this excellent
>+base framework and brings new, much needed qualities: usability, user
>+friendliness and beauty! &tde; was the first, and stays the forefront
>+player in bringing these qualities to &UNIX;, which constituted for
>+years, the premier platform for server computers and scientific
>+institutions, but wasn't very attractive for desktop users.</para>
>+
>+<para>Without &UNIX; the Internet would not exist, or at least would
>+have a vastly different form. &UNIX; has not, until now, addressed the
>+needs of the average computer user. This fact is particularly
>+unfortunate, since a number of implementations of &UNIX; (<ulink
>+url="http://www.linux.org">&Linux;</ulink>, <ulink
>+url="http://www.freebsd.org">FreeBSD</ulink>, <ulink
>+url="http://www.netbsd.org">NetBSD</ulink>, &etc;) are freely
>+available on the Internet, all of which are of exceptional quality and
>+stability.  </para>
>+
>+</sect1>
>+
>+<sect1 id="what-is-tde-the-desktop">
>+<title>&tde; The Desktop Environment</title>
>+
>+<para>In combination with a free implementation of &UNIX;, &tde;
>+provides to the world an open and completely free desktop computing
>+platform either at home or at work.</para>
>+
>+<para> This platform is available to anyone free of charge including
>+its source code for anyone to modify.</para>
>+
>+<para>While there will always be room for improvement we believe we
>+have now delivered a viable alternative to some of the more commonly
>+found and commercial operating systems/desktops combinations available
>+today. It is our hope that the combination of &UNIX; and &tde; will
>+finally bring the same open, reliable, stable, and monopoly free
>+computing to the average computer user that scientists and computing
>+professionals world-wide have enjoyed for years.  </para>
>+
>+</sect1>
>+
>+<sect1 id="what-is-tde-the-development-framework">
>+<title>&tde; The Application Development Framework</title>
>+
>+<para>&tde; focuses on the user's needs, but it's obvious that this
>+focus is more easily achieved by also giving developers the best
>+tools.  &tde; code contains, and comes with, some of the best
>+development technologies of the modern computing age.</para>
>+
>+<para>Authoring applications under &UNIX;/X11 used to be an extremely
>+tedious and labor intensive process. &tde; recognizes the fact that a
>+computing platform is only as good as the number of first class
>+applications available to the users of that particular
>+platform.</para>
>+
>+<para>&tde; defines new technologies in &DCOP; and KParts, created to
>+offer a component document model and technology.  Together with the
>+complete &tde; libraries programming interface, &DCOP;/KParts are set
>+in direct competition with other similar technologies like &Microsoft;
>+<abbrev>MFC</abbrev>/<abbrev>COM</abbrev>/ActiveX technologies. The
>+excellent quality and the high level of refinement of &tde;'s
>+application programming interface (<acronym>API</acronym>) enables
>+developers to focus on original and interesting issues and avoid
>+reinventing the wheel.</para>
>+
>+</sect1>
>+
>+<sect1 id="what-is-tde-the-office-suite">
>+<title>&tde; The Office Application Suite</title>
>+
>+<para>In its current form, &tde; provides, apart from the essential desktop
>+component applications, a suite of powerful office programs known to the
>+world by the name &koffice;.</para>
>+
>+<para>&koffice; is based on the &tde; &DCOP;/KParts
>+technologies. It currently contains: a word processor with desktop
>+publishing capabilities (&kword;), a spreadsheet application (&kspread;)
>+and accompanying charting program (&kchart;), a presentation program
>+(&kpresenter;) and a vector drawing program (&kontour;).  Tying things
>+together is the <application>KOffice Workspace</application>, an
>+integrated shell to ease the use of the &koffice; components in
>+conjunction with each other.  Additional components include an email
>+client, a news reader, and a powerful <abbrev>PIM</abbrev> (Personal
>+Information Manager - an organizer).</para>
>+
>+</sect1>
>+</chapter>
>+
>diff -urN tdebase/doc/kicker/index.docbook tdebase.new/doc/kicker/index.docbook
>--- tdebase/doc/kicker/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/kicker/index.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -39,7 +39,7 @@
> 
> <abstract>
> <para>
>-&kicker; is the &kde; application starter panel and is also capable of
>+&kicker; is the &tde; application starter panel and is also capable of
> some useful applets and extensions. It usually resides on the bottom of
> the desktop.
> </para>
>@@ -61,7 +61,7 @@
> 
> 
> <para>
>-&kicker; is the application launcher panel of the K Desktop Environment.
>+&kicker; is the application launcher panel of the Trinity Desktop Environment.
> Besides the <guimenu>K</guimenu> Menu, where you can start applications,
> &kicker; is also capable of running docked applets like the pager, the
> taskbar or the clock, and extensions, such as child panels.
>@@ -70,7 +70,7 @@
> <para>
> &kicker; usually resides on the bottom of the desktop, but it can also
> be moved to any other border.  Please report any problems or feature
>-requests to the &kde; mailing lists.
>+requests to the &tde; mailing lists.
> </para>
> 
> </chapter>
>@@ -79,7 +79,7 @@
> <title>Using &kicker;</title>
> 
> <para>
>-This is what you see on a freshly installed &kde;, assuming that you
>+This is what you see on a freshly installed &tde;, assuming that you
> skipped <application>KPersonalizer</application>. If you are using
> lower resolution, some of the icons may not appear immediately. To
> cater for those smaller resolutions, the screenshot below is divided
>@@ -124,7 +124,7 @@
> </para>
> 
> <sect1 id="newbie">
>-<title>A quick tour for new &kde; users</title>
>+<title>A quick tour for new &tde; users</title>
> 
> <para>
> If you are experienced with this kind of application launcher, you can
>@@ -283,7 +283,7 @@
> </varlistentry>
> 
> <varlistentry>
>-<term>Using the context menu to add a &kde; application</term>
>+<term>Using the context menu to add a &tde; application</term>
> <listitem>
> <para>
> Click the &RMB; on any free space
>@@ -296,10 +296,10 @@
> 
> <varlistentry>
> <term>Using the context menu to add a
>-non-&kde;-application</term>
>+non-&tde;-application</term>
> <listitem>
> <para>
>-Non-&kde;-applications &eg;
>+Non-&tde;-applications &eg;
> <application>xosview</application> or <application>xemacs</application>.
> </para>
> 
>@@ -395,7 +395,7 @@
> <para>
> File manager &URL;s can also be configured from the
> context menu, just like any other folder anywhere in
>-&kde;.
>+&tde;.
> </para>
> 
> </sect2>
>@@ -515,16 +515,16 @@
> </varlistentry>
> 
> <varlistentry>
>-<term>The <guilabel>Non-&kde; Application Launcher</guilabel></term>
>+<term>The <guilabel>Non-&tde; Application Launcher</guilabel></term>
> <listitem>
> <para>
> 
> 
> 
>-The <guilabel>Non-&kde; Application Launcher</guilabel> lets you add an
>+The <guilabel>Non-&tde; Application Launcher</guilabel> lets you add an
> application which doesn't appear in the <guimenu>K</guimenu> menu to &kicker;.
> Refer to <link linkend="adding-apps">Adding Applications</link> for more
>-information about Non-&kde; Applications.
>+information about Non-&tde; Applications.
> </para>
> </listitem>
> </varlistentry>
>@@ -550,18 +550,18 @@
> <guiicon><inlinemediaobject><imageobject><imagedata
> fileref="printsys_icon.png"
> format="PNG"/></imageobject></inlinemediaobject></guiicon>This icon gives
>-direct access to &kde;'s printing system. &kde; is able to utilize various printing
>+direct access to &tde;'s printing system. &tde; is able to utilize various printing
> systems according to users' wishes. The options shown below will vary depending
> on the printing system in use. Clicking the &LMB; on the icon opens
> a menu which gives the following options:
> 
> <itemizedlist>
> <listitem><para>
>-<guimenuitem>Add Printer...</guimenuitem> This will start &kde;'s Add Printer
>+<guimenuitem>Add Printer...</guimenuitem> This will start &tde;'s Add Printer
> Wizard which allows you to simply add a new printer to your system.</para>
> </listitem>
> <listitem><para>
>-<guimenuitem>&kde; Print Settings</guimenuitem> This item will open the &kde; Print
>+<guimenuitem>&tde; Print Settings</guimenuitem> This item will open the &tde; Print
> Configuration dialog.</para>
> </listitem>
> 
>@@ -574,7 +574,7 @@
> 
> <listitem><para>
> <guimenuitem>Print Manager</guimenuitem> This item starts the Printing Manager,
>-&kde;'s main printing control center.</para>
>+&tde;'s main printing control center.</para>
> </listitem>
> 
> <listitem><para>
>@@ -951,7 +951,7 @@
> 
> <para>
> In the <guilabel>Arrangement</guilabel> tab you can configure some basic
>-functionality of the &kde; panel (&ie; functionality you'd find in other
>+functionality of the &tde; panel (&ie; functionality you'd find in other
> panel applications as well; later we'll come to the more interesting
> features).
> </para>
>@@ -1044,7 +1044,7 @@
> configure the <guimenu>K</guimenu> menu's functionality. The
> <guilabel>Bookmarks</guilabel> and <guilabel>Recent Documents</guilabel> options
> will enable submenus showing your <application>konqueror</application>
>-bookmarks and the last documents you've opened using &kde; applications
>+bookmarks and the last documents you've opened using &tde; applications
> respectively. The <guilabel>Quick Browser</guilabel> option will enable a browser menu.
> Enabling the <guilabel>Show side image</guilabel> check box will display a neat
> image on the left side of the <guimenu>K</guimenu> menu.
>@@ -1103,7 +1103,7 @@
> </para>
> 
> <para>
>-The &kde; panel supports so-called <quote>tiled buttons</quote>. This
>+The &tde; panel supports so-called <quote>tiled buttons</quote>. This
> means that the buttons shown on the panel will be drawn using
> configurable images/colors.
> </para>
>@@ -1194,7 +1194,7 @@
> <title>Applets</title>
> 
> <para>
>-Applets are small plugins that extend the panel's functionality. &kde;
>+Applets are small plugins that extend the panel's functionality. &tde;
> comes with some applets but they may be provided by third parties as
> well.</para>
> 
>@@ -1220,7 +1220,7 @@
> <listitem>
> <para>
> <guilabel>Load startup config applets internal</guilabel>: The applets
>-shown on &kde; startup will be loaded internally, others will be loaded
>+shown on &tde; startup will be loaded internally, others will be loaded
> using an external wrapper application.</para></listitem>
> <listitem><para><guilabel>Load all applets internal</guilabel>: will
> load all applets internally, regardless of whether they are trusted or
>@@ -1232,7 +1232,7 @@
> <para>
> For stability and security reasons, we recommend using one of the first
> two options and that you mark only those applets as 'trusted' that come
>-with the &kde; base packages.
>+with the &tde; base packages.
> </para>
> 
> <para>
>@@ -1437,10 +1437,10 @@
> </para>
> 
> <sect1 id="kde-group">
>-<title>The &kde; Group</title>
>+<title>The &tde; Group</title>
> 
> <para>
>-This group is for the common &kde; things in the <guimenu>K</guimenu>
>+This group is for the common &tde; things in the <guimenu>K</guimenu>
> Menu.
> </para>
> 
>@@ -1449,7 +1449,7 @@
> <term><guimenuitem>Log Out...</guimenuitem></term>
> <listitem>
> <para>
>-This entry is used to finish the &kde; session. It also shuts down the
>+This entry is used to finish the &tde; session. It also shuts down the
> &X-Window; session.
> </para>
> </listitem>
>@@ -1588,7 +1588,7 @@
> <term><guisubmenu>Recent Documents</guisubmenu></term>
> <listitem>
> <para>
>-This menu shows the most recently used documents (works only with &kde;
>+This menu shows the most recently used documents (works only with &tde;
> applications for the moment). Clicking the element <guimenuitem>Clear
> History</guimenuitem> will remove those entries, what may be useful for
> privacy reasons.
>@@ -1945,7 +1945,7 @@
> <listitem>
> <para>In the <guilabel>Display</guilabel> section you can check if you
> want to have the date and/or the seconds shown. In
>-<guilabel>Time</guilabel> you can choose if you want the common &kde;
>+<guilabel>Time</guilabel> you can choose if you want the common &tde;
> look or your own custom colors and font.
> </para>
> </listitem>
>@@ -2032,8 +2032,8 @@
> <para>
> This little applet contains two buttons.
> The <guibutton>Lock the session</guibutton> is used to lock the session if you
>-ever want to leave your &kde; unattended and don't want anybody to access it.
>-The <guibutton>Log out</guibutton> is used to close your &kde; session.
>+ever want to leave your &tde; unattended and don't want anybody to access it.
>+The <guibutton>Log out</guibutton> is used to close your &tde; session.
> </para>
> </sect1>
> 
>@@ -2197,7 +2197,7 @@
> <qandaentry>
> <question>
> <para>
>-Can I have an external Taskbar just like in &kde; 1?
>+Can I have an external Taskbar just like in &tde; 1?
> </para>
> </question>
> <answer>
>@@ -2366,7 +2366,7 @@
> </para>
> 
> <para>
>-Program copyright 1999-2000 The &kde; Team <ulink
>+Program copyright 1999-2000 The &tde; Team <ulink
> url="http://www.kde.org"> (www.kde.org)</ulink>.
> </para>
> 
>diff -urN tdebase/doc/kicker/man-appletproxy.1.docbook tdebase.new/doc/kicker/man-appletproxy.1.docbook
>--- tdebase/doc/kicker/man-appletproxy.1.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/kicker/man-appletproxy.1.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -12,7 +12,7 @@
> </personname>
> &Lauri.Watts.mail;</author>
> <date>Feb 25, 2005</date>
>-<productname>K Desktop Environment</productname>
>+<productname>Trinity Desktop Environment</productname>
> </refentryinfo>
> 
> <refmeta>
>@@ -22,7 +22,7 @@
> 
> <refnamediv>
> <refname><command>appletproxy</command></refname>
>-<refpurpose>&kde; panel applet proxy</refpurpose>
>+<refpurpose>&tde; panel applet proxy</refpurpose>
> </refnamediv>
> 
> <refsynopsisdiv>
>@@ -39,7 +39,7 @@
> <refsect1>
> <title>Description</title>
> <para><application>appletproxy</application> is a small application that
>-allows you to run a &kicker; (&kde; panel) applet outside of &kicker;
>+allows you to run a &kicker; (&tde; panel) applet outside of &kicker;
> itself.  The applet will appear in it's own window, making this a convenient
> way to debug panel applets.</para>
> </refsect1>
>@@ -94,7 +94,7 @@
> <para>&kappname; was written by &Matthias.Elter; and &Matthias.Ettrich; and
> is maintained by &Aaron.J.Seigo; &Aaron.J.Seigo.mail;</para>
> 
>-<para>This man page was written for &kde; 3.4 by &Lauri.Watts;
>+<para>This man page was written for &tde; 3.4 by &Lauri.Watts;
> &Lauri.Watts.mail;</para>
> </refsect1>
> 
>diff -urN tdebase/doc/kicker/man-kicker.1.docbook tdebase.new/doc/kicker/man-kicker.1.docbook
>--- tdebase/doc/kicker/man-kicker.1.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/kicker/man-kicker.1.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -9,7 +9,7 @@
> <title>KDE User's Manual</title>
> <author>&Lauri.Watts;&Lauri.Watts.mail;</author>
> <date>February 27, 2005</date>
>-<productname>K Desktop Environment</productname>
>+<productname>Trinity Desktop Environment</productname>
> </refentryinfo>
> 
> <refmeta>
>@@ -19,7 +19,7 @@
> 
> <refnamediv>
> <refname><command>kicker</command></refname>
>-<refpurpose>&kicker; is the &kde; panel</refpurpose>
>+<refpurpose>&kicker; is the &tde; panel</refpurpose>
> </refnamediv>
> 
> <refsynopsisdiv>
>@@ -32,7 +32,7 @@
> 
> <refsect1>
> <title>Description</title>
>-<para>&kicker; is the &kde; panel. It normally contains application
>+<para>&kicker; is the &tde; panel. It normally contains application
> starters, applets, and a clock.</para> 
> 
> </refsect1>
>@@ -80,7 +80,7 @@
> <para>&kappname; was written by &Matthias.Elter; and &Matthias.Ettrich; and
> is maintained by &Aaron.J.Seigo; &Aaron.J.Seigo.mail;</para>
> 
>-<para>This man page was written for &kde; 3.4 by &Lauri.Watts;
>+<para>This man page was written for &tde; 3.4 by &Lauri.Watts;
> &Lauri.Watts.mail;</para>
> 
> </refsect1>
>diff -urN tdebase/doc/kinfocenter/index.docbook tdebase.new/doc/kinfocenter/index.docbook
>--- tdebase/doc/kinfocenter/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/kinfocenter/index.docbook	2012-02-17 22:41:06.000000000 -0600
>@@ -22,7 +22,7 @@
> <releaseinfo>3.10.00</releaseinfo>
> 
> <abstract>
>-<para>This documentation describes &kde;'s information center.</para>
>+<para>This documentation describes &tde;'s information center.</para>
> </abstract>
> 
> <keywordset>
>@@ -41,7 +41,7 @@
> <para>
> The &infocenter; (from now on referred to simply as <quote>the
> information center</quote>) provides you with a centralized and convenient
>-overview of your &kde; and system settings.
>+overview of your &tde; and system settings.
> </para>
> 
> <para>
>@@ -73,7 +73,7 @@
> <para>
> By selecting <menuchoice><guimenu>K
> Button</guimenu><guisubmenu>System</guisubmenu><guimenuitem>Info
>-Center</guimenuitem></menuchoice> from the &kde; Panel.
>+Center</guimenuitem></menuchoice> from the &tde; Panel.
> 
> </para>
> </listitem>
>@@ -114,7 +114,7 @@
> <para>
> Across the top is a menubar.  The menubar will provide you with quick
> access to most of &infocenter;'s features.  The menus are detailed in
>-<link linkend="info-center-menus">The &kde; Info Center
>+<link linkend="info-center-menus">The &tde; Info Center
> Menus</link>.
> </para>
> 
>@@ -131,7 +131,7 @@
> 
> 
> </authorgroup>
> </articleinfo>
>diff -urN tdebase/doc/kioslave/rlogin.docbook tdebase.new/doc/kioslave/rlogin.docbook
>--- tdebase/doc/kioslave/rlogin.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/kioslave/rlogin.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -17,7 +17,7 @@
> session, prompting you for your password.</para>
> 
> <para>The <command>rlogin</command> kioslave uses the username of the
>-account you are currently using in &kde;.</para>
>+account you are currently using in &tde;.</para>
> 
> <para>After you have successfully entered your password, you can begin
> your remote session.</para>
>diff -urN tdebase/doc/kioslave/thumbnail.docbook tdebase.new/doc/kioslave/thumbnail.docbook
>--- tdebase/doc/kioslave/thumbnail.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/kioslave/thumbnail.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -6,7 +6,7 @@
> 
> </authorgroup>
> </articleinfo>
>-<para>The thumbnail kioslave is used by &kde; for network transparent
>+<para>The thumbnail kioslave is used by &tde; for network transparent
> and persistent generation of thumbnails.</para>
> 
> <para>The thumbnail kioslave uses plugins to generate the actual
>diff -urN tdebase/doc/klipper/index.docbook tdebase.new/doc/klipper/index.docbook
>--- tdebase/doc/klipper/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/klipper/index.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -34,7 +34,7 @@
> <releaseinfo>2.92.00</releaseinfo>
> 
> <abstract>
>-<para>&klipper; is the &kde; clipboard cut &amp; paste utility.</para>
>+<para>&klipper; is the &tde; clipboard cut &amp; paste utility.</para>
> </abstract>
> 
> <keywordset>
>@@ -47,7 +47,7 @@
>  
> <chapter id="introduction">
> <title>Introduction</title>
>-<para>&klipper; is the &kde; clipboard utility. It stores clipboard
>+<para>&klipper; is the &tde; clipboard utility. It stores clipboard
> history, and allows you to link clipboard contents to application
> actions. Please report any problems or feature requests to Esben Mose
> Hansen (see <ulink
>@@ -74,11 +74,11 @@
> </screenshot>
> 
> <para>To display the clipboard history, click on the &klipper; icon in
>- the &kde; panel, or press <keycombo
>+ the &tde; panel, or press <keycombo
>  action="simul">&Ctrl;&Alt;<keycap>V</keycap> </keycombo>. Previous
>  clipboard entries are shown at the top of the pop-up menu which
>  appears. Selecting one of these copies it to the clipboard, from
>- where it can be pasted into any &kde; or X application as
>+ where it can be pasted into any &tde; or X application as
>  usual.</para>
> 
> <para>You can search through the clipboard history by opening it
>@@ -141,7 +141,7 @@
> <title>General</title>
> <para>
> &klipper; can be used to set the behavior of the clipboard and selection in
>-&kde;. 
>+&tde;. 
> </para>
> 
> <note><para>The &X-Window; uses two separate clipboard buffers: the
>@@ -157,7 +157,7 @@
> </menuchoice>.</para>
> </note>
> 
>-
>@@ -464,16 +464,16 @@
> <glossterm>Legacy Application</glossterm>
> <glossdef>
> 
>-<para>An X-window application which was not written with &kde; in
>-mind. Such applications run fine in &kde;. However, they are not
>-warned automatically when you shut down your &kde; session. You
>+<para>An X-window application which was not written with &tde; in
>+mind. Such applications run fine in &tde;. However, they are not
>+warned automatically when you shut down your &tde; session. You
> therefore must not forget to save documents open in these applications
>-before you log out from &kde;. </para> <para>Additionally, many of
>+before you log out from &tde;. </para> <para>Additionally, many of
> these applications do not support copying and pasting from
>-&kde; compliant applications. &Netscape; 4.x browser is a prominent
>+&tde; compliant applications. &Netscape; 4.x browser is a prominent
> example of such application <footnote><para>Some <ulink
> url="http://www.gnome.org">GNOME</ulink> applications may provide
>-limited interoperability with the &kde;.</para></footnote>.</para>
>+limited interoperability with the &tde;.</para></footnote>.</para>
> </glossdef>
> </glossentry>
> 
>@@ -482,18 +482,18 @@
> <glossdef>
> 
> <para>Application originally written for non-graphic, text oriented
>-environment. Such applications run fine in &kde;. They must run within
>+environment. Such applications run fine in &tde;. They must run within
> console emulator, like &konsole;. They are not warned automatically
>-when you shut down your &kde; session. You therefore must not forget
>+when you shut down your &tde; session. You therefore must not forget
> to save documents open in these applications before you log out from
>-the &kde;.</para>
>+the &tde;.</para>
> 
> <para>Console applications support copying and pasting from
>-&kde;-compliant applications.Simply mark the text in the console
>-application with your mouse, switch to the &kde;-compliant application
>+&tde;-compliant applications.Simply mark the text in the console
>+application with your mouse, switch to the &tde;-compliant application
> and press <keycombo action="simul">&Ctrl;
> <keycap>V</keycap></keycombo> to paste the text. If you want to copy
>-from &kde; application to a console application, first mark the text
>+from &tde; application to a console application, first mark the text
> with your mouse, press <keycombo action="simul">&Ctrl;
> <keycap>C</keycap></keycombo>, switch to the console application and
> press the middle button on your mouse<footnote><para>If your mouse
>diff -urN tdebase/doc/knetattach/index.docbook tdebase.new/doc/knetattach/index.docbook
>--- tdebase/doc/knetattach/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/knetattach/index.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -39,7 +39,7 @@
> <abstract>
> <para>
> &knetattach; is an application which makes it easier to integrate your 
>-network resources with your &kde; Desktop.
>+network resources with your &tde; Desktop.
> </para>
> </abstract>
> 
>@@ -64,8 +64,8 @@
> <para>
> The &knetattach; program, affectionately and hereafter known as the 
> Network Folder Wizard, allows easy addition and integration of various 
>-network folders with your &kde; desktop. Please report any problems or 
>-feature requests for it to the &kde; bugs website.
>+network folders with your &tde; desktop. Please report any problems or 
>+feature requests for it to the &tde; bugs website.
> </para>
> </chapter>
> 
>diff -urN tdebase/doc/konqueror/basics.docbook tdebase.new/doc/konqueror/basics.docbook
>--- tdebase/doc/konqueror/basics.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/konqueror/basics.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -12,17 +12,17 @@
> 
> <title>&konqueror; Basics</title>
> 
>-<important><para>Like all &kde; applications, &konqueror; is highly
>+<important><para>Like all &tde; applications, &konqueror; is highly
>  configurable. This document describes how &konqueror; behaves with the normal,
>  default settings.</para>
> <para> A three button mouse can be useful when you are running
>-&konqueror; or any other &kde; application. If your mouse only has two buttons
>+&konqueror; or any other &tde; application. If your mouse only has two buttons
> then you should be able to set your system up so that you can simulate a &MMB;
> by pressing both buttons at the same time.</para>
> <para>You can read more about mouse usage in <xref
> linkend="lmb-mmb"/></para>
> <para>If you are used to having to double-click to perform an action,
>-then take care, because in common with the rest of &kde;, &konqueror; defaults
>+then take care, because in common with the rest of &tde;, &konqueror; defaults
> to single-clicking.</para></important>
> 
> <sect1 id="konq-start">
>@@ -80,7 +80,7 @@
> </mediaobject>
> 
> <para>The <interface>Titlebar</interface> is the strip across the top of
>-&konqueror;'s window, and operates in the same way as for other &kde;
>+&konqueror;'s window, and operates in the same way as for other &tde;
> applications. <mousebutton>Right</mousebutton> click on the central portion to
> bring up the neat Titlebar menu.</para>
> 
>@@ -168,7 +168,7 @@
>  the 
> <guimenuitem>What's This?</guimenuitem> feature.</para>
> 
>-<para>If <guilabel>Tooltips</guilabel> have been enabled in &kde; (K menu
>+<para>If <guilabel>Tooltips</guilabel> have been enabled in &tde; (K menu
>  <menuchoice><guimenu>Control Center</guimenu><guisubmenu>Appearance &amp;
>  Themes</guisubmenu><guisubmenu>Style</guisubmenu></menuchoice>,
>  <guilabel>Style</guilabel> dialog) then when you hover the mouse pointer
>@@ -276,7 +276,7 @@
> <term>On the Titlebar</term>
> <listitem><para><mousebutton>Right</mousebutton> clicking on any free area of
> the Titlebar brings up the Titlebar Menu, allowing you to control the position
>-of &konqueror;'s window as well as the decoration applied to all &kde; program
>+of &konqueror;'s window as well as the decoration applied to all &tde; program
> windows. </para></listitem>
> </varlistentry>
> 
>@@ -341,11 +341,11 @@
> <sect1 id="man-info">
> <title>Viewing Help, Man and Info Pages</title>
> 
>-<para>You can view &kde; Help and &UNIX; Man and Info pages directly in 
>+<para>You can view &tde; Help and &UNIX; Man and Info pages directly in 
> &konqueror;, without having to start up <application>KHelpCenter</application>.
> </para>
> 
>-<para>To view a &kde; Help page, enter
>+<para>To view a &tde; Help page, enter
> <userinput>help:/<replaceable>application name</replaceable></userinput> (for
> example <userinput>help:/kmail</userinput> to view the &kmail; documentation.)
> into &konqueror;'s Location Toolbar window.
>@@ -363,7 +363,7 @@
> want. Alternatively, use <userinput>info:/<replaceable>command
> name</replaceable></userinput> to go straight to the Info page you want.</para>
> 
>-<note><para>Unfortunately, &kde; Help pages are stored in such a way that they 
>+<note><para>Unfortunately, &tde; Help pages are stored in such a way that they 
> cannot be viewed in other browsers. If you really need to do this your only 
> recourse is to go online and visit <ulink url="http://docs.kde.org">
> http://docs.kde.org</ulink>.</para></note>
>diff -urN tdebase/doc/konqueror/bookmarks.docbook tdebase.new/doc/konqueror/bookmarks.docbook
>--- tdebase/doc/konqueror/bookmarks.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/konqueror/bookmarks.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -47,7 +47,7 @@
> Bookmarks</guimenuitem> </menuchoice> option opens the <guilabel>Bookmark
> Editor</guilabel>.</para>
> <para>This shows a tree view of your bookmarks and bookmark subfolders. 
>-As is usual for tree views in &kde;, subfolders are shown with a small square 
>+As is usual for tree views in &tde;, subfolders are shown with a small square 
> at the left of the folder name; if the square contains a <keycap>+</keycap> 
> sign <mousebutton>left</mousebutton> clicking on it will expand the view to 
> show the contents of that subfolder and the <keycap>+</keycap> sign will 
>diff -urN tdebase/doc/konqueror/browser.docbook tdebase.new/doc/konqueror/browser.docbook
>--- tdebase/doc/konqueror/browser.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/konqueror/browser.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -394,7 +394,7 @@
> </screen>
> 
> <para>into the Location Toolbar and press &Enter;. As long as 
>-you are connected to the Internet, and as long as the &kde;'s &FTP; site is 
>+you are connected to the Internet, and as long as the &tde;'s &FTP; site is 
> not too busy, you should end up seeing the <filename
> class="directory">/pub/kde</filename> folder at &kde-ftp;</para>
> 
>diff -urN tdebase/doc/konqueror/commands.docbook tdebase.new/doc/konqueror/commands.docbook
>--- tdebase/doc/konqueror/commands.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/konqueror/commands.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -962,7 +962,7 @@
> <guimenu>Help</guimenu>
> <guimenuitem>About KDE...</guimenuitem>
> </menuchoice></term>
>-<listitem><para>Show some information about the version of &kde; that
>+<listitem><para>Show some information about the version of &tde; that
> you are running.</para></listitem>
> </varlistentry>
> 
>diff -urN tdebase/doc/konqueror/config.docbook tdebase.new/doc/konqueror/config.docbook
>--- tdebase/doc/konqueror/config.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/konqueror/config.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -13,14 +13,14 @@
> 
> <title>Configuring &konqueror;</title>
> 
>-<para>In common with the rest of &kde;, &konqueror; is highly configurable, so
>+<para>In common with the rest of &tde;, &konqueror; is highly configurable, so
> you can really get the look and feel that best fits your needs and
> wishes.</para>
> 
> <sect1 id="configure-bars">
> <title>Toolbars</title>
> 
>-<para>When &kde; is newly installed, &konqueror;'s window contains a Menubar, 
>+<para>When &tde; is newly installed, &konqueror;'s window contains a Menubar, 
> Main and Location Toolbars and possibly a Bookmark Toolbar.</para>
> 
> <para>Maybe you don't need all these toolbars. To hide one of them, go into 
>diff -urN tdebase/doc/konqueror/credits.docbook tdebase.new/doc/konqueror/credits.docbook
>--- tdebase/doc/konqueror/credits.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/konqueror/credits.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -163,7 +163,7 @@
> <listitem><para>&Pamela.Roberts; &Pamela.Roberts.mail;</para></listitem>
> </itemizedlist>
> 
>-<para>Documentation updated for &kde; 3.2 by &Philip.Rodrigues; &Philip.Rodrigues.mail;.</para>
>+<para>Documentation updated for &tde; 3.2 by &Philip.Rodrigues; &Philip.Rodrigues.mail;.</para>
> 
> 
> &underFDL;
>diff -urN tdebase/doc/konqueror/faq.docbook tdebase.new/doc/konqueror/faq.docbook
>--- tdebase/doc/konqueror/faq.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/konqueror/faq.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -28,7 +28,7 @@
> 
> <answer><para>Just install &Qt;, tdelibs and tdebase, and from your favorite
> window manager, launch &konqueror;. It should work just fine, but if it
>-doesn't (&kde; developers don't test that case often), report it to <ulink
>+doesn't (&tde; developers don't test that case often), report it to <ulink
> url="http://bugs.kde.org">http://bugs.kde.org</ulink> and try running
> <application>tdeinit</application> before running &konqueror;; it usually
> helps.</para></answer>
>@@ -38,7 +38,7 @@
> <question><para>Where does &konqueror; keep all its configuration
> data?</para></question>
> <answer><para>Generally in the <filename>~/.kde</filename> folder (this may 
>-be <filename>~/.trinity</filename> on your system, depending on how &kde; 3 
>+be <filename>~/.trinity</filename> on your system, depending on how &tde; 3 
> was installed). Don't alter these files unless you really know what you are 
> doing.</para>
> 
>diff -urN tdebase/doc/konqueror/filemanager.docbook tdebase.new/doc/konqueror/filemanager.docbook
>--- tdebase/doc/konqueror/filemanager.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/konqueror/filemanager.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -642,7 +642,7 @@
> 
> <para>To make the application icon appear on your desktop, create the link in
> your <filename class="directory">~/Desktop</filename> folder (this may be 
>-called something slightly different depending on how &kde; was installed on 
>+called something slightly different depending on how &tde; was installed on 
> your system) or get to the
> <guisubmenu>Create New...</guisubmenu> sub menu by
> <mousebutton>right</mousebutton> clicking on a free area of the desktop 
>@@ -829,7 +829,7 @@
> 
> 
> 
>-<para>&kde; provides many applications which can open many different
>+<para>&tde; provides many applications which can open many different
> types of file. Most of the time, the defaults will work with no
> problems, but &konqueror; provides a powerful system to allow you to
> change the applications used to open each file type. For more details,
>diff -urN tdebase/doc/konqueror/index.docbook tdebase.new/doc/konqueror/index.docbook
>--- tdebase/doc/konqueror/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/konqueror/index.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -47,7 +47,7 @@
> <date>2002-09-22</date>
> <releaseinfo>3.1</releaseinfo>
> 
>-<abstract><para>&konqueror; is &kde;'s advanced File Manager, Web Browser and
>+<abstract><para>&konqueror; is &tde;'s advanced File Manager, Web Browser and
>  Universal Viewing Application.</para>
> </abstract>
> 
>@@ -82,9 +82,9 @@
> <title>Installation</title>
> 
> <para>&konqueror; is part of the tdebase package which an essential part of
>-&kde;.</para>
>+&tde;.</para>
> 
>-<para>For instructions on acquiring &kde; please see <ulink
>+<para>For instructions on acquiring &tde; please see <ulink
> url="http://www.kde.org">http://www.kde.org</ulink>.</para>
> 
> <para>For further information about &konqueror; you might like to visit 
>diff -urN tdebase/doc/konqueror/introduction.docbook tdebase.new/doc/konqueror/introduction.docbook
>--- tdebase/doc/konqueror/introduction.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/konqueror/introduction.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -13,7 +13,7 @@
> 
> <para><emphasis>&konqueror;</emphasis> is an advanced  
> <link linkend="filemanager">file manager</link> for the 
>-K Desktop Environment, providing file management functions ranging from simple 
>+Trinity Desktop Environment, providing file management functions ranging from simple 
> cut/copy and paste operations to advanced local and remote network file 
> browsing. Folder contents can be displayed in a variety of text and icon 
> <link linkend="viewmode">view modes</link>, which can include thumbnail 
>@@ -35,7 +35,7 @@
> 
> <para><emphasis>&konqueror;</emphasis> is a universal viewing application, 
> capable of displaying images and documents without having to launch another 
>-application. It does this by embedding components (&kde; Parts) provided by 
>+application. It does this by embedding components (&tde; Parts) provided by 
> other applications; from &kview; for image viewing, &kdvi; for 
> <acronym>DVI</acronym> viewing, &kghostview; for &PostScript; documents and 
> from the various &koffice; applications for their document types.
>diff -urN tdebase/doc/konqueror/man-kbookmarkmerger.1.docbook tdebase.new/doc/konqueror/man-kbookmarkmerger.1.docbook
>--- tdebase/doc/konqueror/man-kbookmarkmerger.1.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/konqueror/man-kbookmarkmerger.1.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -13,7 +13,7 @@
> 		&Frerich.Raabe.mail;
> 	</author>
> 	<date>February 1st, 2005</date>
>-	<productname>K Desktop Environment</productname>
>+	<productname>Trinity Desktop Environment</productname>
> </refentryinfo>
> 
> <refmeta>
>@@ -43,8 +43,8 @@
> yet, a new bookmark list is created and the given bookmarks are inserted into
> it. While doing this, &kbookmarkmerger; keeps track of which files were
> merged in a previous run already, so no bookmark will get installed to the
>-user's bookmarks more than once. In case &kde; is running while
>-&kbookmarkmerger; is executed, the &kde; bookmark subsystem will be informed
>+user's bookmarks more than once. In case &tde; is running while
>+&kbookmarkmerger; is executed, the &tde; bookmark subsystem will be informed
> of any changes to the user's bookmarks, so that all applications accessing
> that information (&ie; &konqueror;) will pick the changes up instantly.</para>
> 
>diff -urN tdebase/doc/konqueror/plugins.docbook tdebase.new/doc/konqueror/plugins.docbook
>--- tdebase/doc/konqueror/plugins.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/konqueror/plugins.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -23,20 +23,20 @@
> </menuchoice> will give you a dialog box with two tabbed pages;
> <guilabel>Scan</guilabel> and <guilabel>Plugins</guilabel>.</para>
> 
>-<para>The <guilabel>Scan</guilabel> page controls how &kde; scans for new
>+<para>The <guilabel>Scan</guilabel> page controls how &tde; scans for new
> &Netscape; plugins, either manually by pressing the <guibutton>Scan for New
>-Plugins</guibutton> button or automatically each time &kde; starts up.</para>
>+Plugins</guibutton> button or automatically each time &tde; starts up.</para>
> 	
> <para>The scan is done by looking through the folders listed in the
> <guilabel>Scan Folders</guilabel> list for <literal
> role="extension">.so</literal> files containing plugin code. It examines every
> such file to find out which <acronym>MIME</acronym> types the plugin
>-supports. It then creates <acronym>MIME</acronym> type definitions for &kde; in
>+supports. It then creates <acronym>MIME</acronym> type definitions for &tde; in
> the user's <filename class="directory"> ~/.kde/share/mimelnk</filename>
> folder to make other applications aware of them.</para>
> 
> <para>The <guilabel>Plugins</guilabel> page shows you the &Netscape; plugins
>-that &kde; has found, and for each plugin it lists the <acronym>MIME</acronym>
>+that &tde; has found, and for each plugin it lists the <acronym>MIME</acronym>
> types and the filename suffixes it uses to recognize them.</para>
> 
> <para>The dialog box also contains a checkbox <guilabel>
>@@ -52,7 +52,7 @@
> <para>The package tdeaddons contains several useful plugins that interact with
> &konqueror; in various ways. These are explained briefly below, more detailed 
> information may be obtained by looking through the <guimenuitem>Konqueror 
>-Plugins</guimenuitem> section in the &kde; Help Center.</para>
>+Plugins</guimenuitem> section in the &tde; Help Center.</para>
> 
> <variablelist>
> 
>diff -urN tdebase/doc/konqueror/sidebar.docbook tdebase.new/doc/konqueror/sidebar.docbook
>--- tdebase/doc/konqueror/sidebar.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/konqueror/sidebar.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -118,7 +118,7 @@
> <para>The <guilabel>LAN Browser</guilabel> allows you to browse other 
> machines connected to your Local Area Network.</para>
> <para>The <guilabel>Print System Browser</guilabel> tree gives you quick 
>-access to &kde;'s print manager <application>Kprinter</application>.</para>
>+access to &tde;'s print manager <application>Kprinter</application>.</para>
> </listitem>
> </varlistentry>
> </variablelist>
>diff -urN tdebase/doc/konsole/index.docbook tdebase.new/doc/konsole/index.docbook
>--- tdebase/doc/konsole/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/konsole/index.docbook	2012-02-17 22:41:03.000000000 -0600
>@@ -49,7 +49,7 @@
> 
> <abstract><para>This document is the user handbook for the &konsole;
>  application.</para>
>-<para>&konsole; is an X terminal emulator for &kde;.</para></abstract>
>+<para>&konsole; is an X terminal emulator for &tde;.</para></abstract>
> 
> <keywordset>
> <keyword>KDE</keyword>
>@@ -69,7 +69,7 @@
> <para>&UNIX; operating systems were
> originally designed as text-only systems, controlled by keyboard
> commands -- what is known as a command-line interface
>-(<acronym>CLI</acronym>). The &X-Window; and &kde; and other projects
>+(<acronym>CLI</acronym>). The &X-Window; and &tde; and other projects
> have since added the graphical interface you are now using. However,
> the underlying <acronym>CLI</acronym> system is still there, and is
> frequently the easiest, fastest and most powerful way to perform many
>@@ -88,7 +88,7 @@
> beyond the scope of this document, as it would require a lengthy
> book. Fortunately, many such books are available in every language in
> any good bookstore or library. There are also tutorials available on
>-the Internet. Enjoy &kde;, but don't be shy about learning to use the
>+the Internet. Enjoy &tde;, but don't be shy about learning to use the
> command-line! You will find that even learning just the basics will
> make your computer use much more efficient and enjoyable.</para>
> </sect1>
>@@ -244,7 +244,7 @@
> <title>Sessions</title>
> <para>If you often have to log into remote machines, or always run a similar set of
> terminal applications, you can use &konsole;'s <quote>Session</quote> feature
>-along with &kde;'s session management to automate a lot of this for you.
>+along with &tde;'s session management to automate a lot of this for you.
> Let's take the following example:
> You often have open an <application>ssh</application> session to the machine
> <replaceable>administration</replaceable> ready for generic administration
>@@ -302,10 +302,10 @@
> running application will close the shell session as well.</para>
> 
> <para>One really nice use of this feature is if you find you always have the
>-same set of open sessions, &kde; can open them all for you automatically
>-when you start a new &kde; session.  Simply have them open as you like
>-when you exit &kde;, and they will be saved with your &kde; session, and
>-restored just like any other application when you restart &kde;.</para>
>+same set of open sessions, &tde; can open them all for you automatically
>+when you start a new &tde; session.  Simply have them open as you like
>+when you exit &tde;, and they will be saved with your &tde; session, and
>+restored just like any other application when you restart &tde;.</para>
> 
> <note><para>You can assign 
> <link linkend="settings-menu">shortcuts</link> 
>@@ -340,7 +340,7 @@
> from the <guimenu>Edit</guimenu> menu to copy the marked text to the clipboard for further use
> within &konsole; or another application. The selected text can also be
> dragged and dropped into compatible applications. Click on the selected
>-text and drag it to the desired location. Depending on your &kde; settings,
>+text and drag it to the desired location. Depending on your &tde; settings,
> you may need to hold the &Ctrl; key while dragging.</para>
> 
> <para>Normally, new-line characters are inserted at the end of each
>@@ -695,7 +695,7 @@
> in History...</guimenuitem></menuchoice></term>
> <listitem><para><action>Find a word or string of text</action> in the current
> history. Options allow case sensitive or backwards searches, and the use of regular
>-expressions in searches. Press the <guibutton>Edit</guibutton> button to use the &kde;
>+expressions in searches. Press the <guibutton>Edit</guibutton> button to use the &tde;
> graphical editor to create a regular expression.</para></listitem>
> </varlistentry>
> 
>@@ -1062,7 +1062,7 @@
> <varlistentry>
> <term><menuchoice><guimenu>Help</guimenu><guimenuitem>About
> KDE</guimenuitem></menuchoice></term>
>-<listitem><para><action>Information about the &kde;
>+<listitem><para><action>Information about the &tde;
> project</action></para></listitem>
> </varlistentry>
> </variablelist>
>@@ -1327,7 +1327,7 @@
> </para>
> </informalexample>
> 
>-<para>&konsole; also accepts generic &Qt; and &kde; options:</para>
>+<para>&konsole; also accepts generic &Qt; and &tde; options:</para>
> 
> <variablelist>
> <varlistentry>
>@@ -1372,7 +1372,7 @@
> <variablelist>
> <varlistentry>
> <term><option>--help-kde</option></term>
>-<listitem><para><action>List &kde;-specific options</action></para></listitem>
>+<listitem><para><action>List &tde;-specific options</action></para></listitem>
> </varlistentry>
> <varlistentry>
> <term><option>--help-all</option></term>
>@@ -1409,7 +1409,7 @@
> <chapter id="credits">
> <title>Credits and Copyright</title>
> 
>-<para>As of &kde; 3.4, &konsole; is maintained by &Kurt.Hindenburg; &Kurt.Hindenburg.mail;</para>
>+<para>As of &tde; 3.4, &konsole; is maintained by &Kurt.Hindenburg; &Kurt.Hindenburg.mail;</para>
> 
> <para>Previously, &konsole; was maintained by &Waldo.Bastian; &Waldo.Bastian.mail;</para>
> 
>@@ -1419,7 +1419,7 @@
> <para>This document was written by &Jonathan.Singer;
> &Jonathan.Singer.mail;</para>
> 
>-<para>This document was updated for &kde; 3.4 by
>+<para>This document was updated for &tde; 3.4 by
> &Kurt.Hindenburg; &Kurt.Hindenburg.mail;</para>
> 
> <para>Originally converted to DocBook <acronym>SGML</acronym> by
>@@ -1442,9 +1442,9 @@
> 
> <para>For more infomation please visit these websites:</para>
> <itemizedlist>
>-<listitem><para><ulink url="http://freebsd.kde.org/">&kde; on 
>+<listitem><para><ulink url="http://freebsd.kde.org/">&tde; on 
> FreeBSD</ulink></para></listitem>
>-<listitem><para><ulink url="http://solaris.kde.org/">&kde; on &Solaris;</ulink></para></listitem>
>+<listitem><para><ulink url="http://solaris.kde.org/">&tde; on &Solaris;</ulink></para></listitem>
> </itemizedlist>
> 
> </appendix>
>diff -urN tdebase/doc/kpager/index.docbook tdebase.new/doc/kpager/index.docbook
>--- tdebase/doc/kpager/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/kpager/index.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -354,7 +354,7 @@
> <title>Requirements</title>
> 
> <para>As &kpager; is part of the &package; package, you will just need an
>-installation of the main &kde; packages.</para>
>+installation of the main &tde; packages.</para>
> 
> </sect1>
> 
>diff -urN tdebase/doc/ksplashml/index.docbook tdebase.new/doc/ksplashml/index.docbook
>--- tdebase/doc/ksplashml/index.docbook	2012-01-26 15:03:48.000000000 -0600
>+++ tdebase.new/doc/ksplashml/index.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -64,7 +64,7 @@
> 
> <para>&ksplash; is a nice splash screen that shows the progress of an
> application that is loading. Please report any problems or feature
>-requests to the &kde; mailing lists. The principal features of
>+requests to the &tde; mailing lists. The principal features of
> &ksplash;:
> </para>
> <simplelist>
>@@ -92,7 +92,7 @@
> to make them available to all users of your system.</para>
> 
> <para>You can also use the <guilabel>Splash Screen</guilabel> module under
>-<guilabel>Appearance</guilabel> in the &kde; control center to do this
>+<guilabel>Appearance</guilabel> in the &tde; control center to do this
> automatically.</para>
> 
> <sect1 id="using-kcontrol-module">
>@@ -573,18 +573,18 @@
> <title>Using &ksplash; From Within Your Own Application</title>
> 
> <para> In this chapter, we describe a simple method for using
>-&ksplash; as the splash screen for your &kde; application. If you do
>-not develop applications for &kde;, you can skip this chapter.</para>
>+&ksplash; as the splash screen for your &tde; application. If you do
>+not develop applications for &tde;, you can skip this chapter.</para>
> 
> <sect1 id="basic-other-reqs">
> <title>Basic Requirements</title>
> 
>-<para> Your &kde; application must be &DCOP;-aware. &DCOP; is the &kde;
>+<para> Your &tde; application must be &DCOP;-aware. &DCOP; is the &tde;
> technology used to communicate between applications. If you use the
>-standard <ulink url="http://developer.kde.org">&kde; application
>+standard <ulink url="http://developer.kde.org">&tde; application
> framework</ulink>, this is taken care of automatically. For
>-information about &DCOP; and related &kde; technologies, please visit
>-the <ulink url="http://developer.kde.org">&kde; developers'
>+information about &DCOP; and related &tde; technologies, please visit
>+the <ulink url="http://developer.kde.org">&tde; developers'
> corner</ulink>.</para>
> </sect1>
> 
>@@ -619,7 +619,7 @@
> <title>Showing messages</title>
> 
> <para>Before you show any messages, you need to set up the number of
>-steps you will show. For example, the &kde; startup procedure uses 7
>+steps you will show. For example, the &tde; startup procedure uses 7
> steps.</para>
> 
> <programlisting>
>@@ -706,7 +706,7 @@
> </sect1>
> <sect1 id="skeleton">
> <title>Building the skeleton framework</title>
>-<para>We will use the &kde; application framework which will take care of
>+<para>We will use the &tde; application framework which will take care of
> building the plugin
> and will provide us with platform independence without any work on our part. To
> do that,
>@@ -962,7 +962,7 @@
> </sect1>
> <sect1 id="compilingfile">
> <title>Compiling the plugin</title>
>-<para>Since we decided to use the &kde; framework for compiling the plugin, we
>+<para>Since we decided to use the &tde; framework for compiling the plugin, we
> need to create a
> <filename>Makefile.am</filename>. It should look like this:</para>
> <example>
>@@ -988,8 +988,8 @@
> </programlisting>
> </example>
> <para>For more information on writing <filename>Makefile.am</filename> files for
>-&kde;, please see
>-the &kde; developers' <ulink
>+&tde;, please see
>+the &tde; developers' <ulink
> url="http://developer.kde.org/documentation/other/makefile_am_howto.html">
> website</ulink>.
> The only thing of note is that we provide a default theme based on this plugin,
>@@ -1061,7 +1061,7 @@
> <sect1 id="requirements">
> <title>Requirements</title>
> 
>-<para>In order to successfully use &ksplash;, you need &kde; version 3.2 or
>+<para>In order to successfully use &ksplash;, you need &tde; version 3.2 or
> higher. Some themes may require specific plugins. If a theme does not
> work, please contact the theme author to find out where to obtain the
> appropriate plugin.</para>
>diff -urN tdebase/doc/ksysguard/index.docbook tdebase.new/doc/ksysguard/index.docbook
>--- tdebase/doc/ksysguard/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/ksysguard/index.docbook	2012-02-17 22:41:06.000000000 -0600
>@@ -56,7 +56,7 @@
> <chapter id="introduction">
> <title>Introduction</title>
> 
>-<para>&ksysguard; is the &kde; Task Manager and Performance Monitor. It features 
>+<para>&ksysguard; is the &tde; Task Manager and Performance Monitor. It features 
> 
> a
> client/server architecture that allows monitoring of local as well as remote
>@@ -141,7 +141,7 @@
> so your regular <envar>PATH</envar> setting will not be available.
> Instead it uses a default <envar>PATH</envar> like
> <parameter>/bin:/usr/bin</parameter>.
>-Since it is very likely that &kde; is not installed in these folders you need
>+Since it is very likely that &tde; is not installed in these folders you need
> to create or update a file in your home folder. The file is called
> <filename>environment</filename> and needs to be in a hidden folder called
> <filename>.ssh</filename>. See the manual page for
>@@ -168,7 +168,7 @@
> 
> <note><para>For experts: <application>ksysguardd</application> is a
> very small program that is only linked against the libc. So it can
>-also be used on machines that do not have a full blown &kde;
>+also be used on machines that do not have a full blown &tde;
> installed, such as servers. If you choose the custom command option in
> the host connector you need to specify the complete command to start
> <application>ksysguardd</application>.</para></note>
>@@ -427,7 +427,7 @@
> <chapter id="multiple-platforms">
> <title>Configuring <application>ksysguardd</application></title>
> 
>-<para>The graphical front-end is available on any platform that &kde; runs
>+<para>The graphical front-end is available on any platform that &tde; runs
> on. The back-end is at the moment available on the following flavors of
> &UNIX;:</para>
> 
>diff -urN tdebase/doc/kwrite/index.docbook tdebase.new/doc/kwrite/index.docbook
>--- tdebase/doc/kwrite/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/kwrite/index.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -44,7 +44,7 @@
> <releaseinfo>4.5.0</releaseinfo>
> 
> <abstract>
>-<para>&kwrite; is a text editor for &kde;</para>
>+<para>&kwrite; is a text editor for &tde;</para>
> </abstract>
> 
> <keywordset>
>@@ -60,7 +60,7 @@
> <title>Introduction</title>
> 
> <para>
>-&kwrite; is more than a text editor for the &kde; Desktop. It is meant
>+&kwrite; is more than a text editor for the &tde; Desktop. It is meant
> to be a programmer's editor, and could be considered as at least a
> partial alternative to more powerful editors.  It may be best used in
> conjunction with &konqueror; for source file browsing for different
>@@ -84,7 +84,7 @@
> <title>Drag and Drop</title>
> 
> <para>
>-&kwrite; uses the &kde; Drag and Drop protocol. Files may be dragged and
>+&kwrite; uses the &tde; Drag and Drop protocol. Files may be dragged and
> dropped onto &kwrite; from the Desktop, &konqueror; or some remote &FTP;
> site opened in one of &konqueror;'s windows.
> </para>
>@@ -94,7 +94,7 @@
> <title>Command Line Options</title>
> 
> <para>
>-Though &kwrite; may most often be started from the &kde; program menu, or
>+Though &kwrite; may most often be started from the &tde; program menu, or
> a desktop icon, it can also be opened at the command line prompt of a
> terminal window.  There are a few useful options that are available when
> doing this.
>@@ -152,7 +152,7 @@
> <term><userinput><command>kwrite</command>
> <option>--help-kde</option></userinput></term>
> <listitem><para>This lists the options available for changing the way
>-&kwrite; interacts with &kde;.</para></listitem>
>+&kwrite; interacts with &tde;.</para></listitem>
> </varlistentry>
> <varlistentry>
> <term><userinput><command>kwrite</command>
>@@ -168,7 +168,7 @@
> <varlistentry>
> <term><userinput><command>kwrite</command>
> <option>--version</option></userinput></term>
>-<listitem><para>Lists version information for &Qt;, &kde;, and &kwrite;. Also
>+<listitem><para>Lists version information for &Qt;, &tde;, and &kwrite;. Also
> available through <userinput><command>kwrite</command>
> <option>-v</option></userinput> </para></listitem>
> </varlistentry>
>@@ -579,11 +579,11 @@
> dropdown box with a list of some commonly frequented folders.
> </para>
> -->
>-<para>Displays a standard &kde; <guilabel>Open File</guilabel>
>+<para>Displays a standard &tde; <guilabel>Open File</guilabel>
> dialog. Use the file view to select the file you want to open, and
> click on <guibutton>Open</guibutton> to open it. You can find more
>-information about the &kde; <guilabel>Open File</guilabel> dialog in
>-the &kde; User Guide.</para>
>+information about the &tde; <guilabel>Open File</guilabel> dialog in
>+the &tde; User Guide.</para>
> 
> </listitem>
> </varlistentry>
>@@ -774,7 +774,7 @@
> <listitem>
> <para>This command deletes the current selection and places it on the
> clipboard.
>-The  clipboard is a feature of &kde; that works invisibly to provide a way to
>+The  clipboard is a feature of &tde; that works invisibly to provide a way to
> transfer data between applications.</para>
> </listitem>
> </varlistentry>
>@@ -786,7 +786,7 @@
> <guimenu>Edit</guimenu><guimenuitem>Copy</guimenuitem></menuchoice></term>
> <listitem>
> <para>This copies the currently selected text to the clipboard so that it may
>-be pasted elsewhere.  The clipboard is a feature of &kde; that works invisibly
>+be pasted elsewhere.  The clipboard is a feature of &tde; that works invisibly
> to provide a way to transfer data between applications.</para>
> </listitem>
> </varlistentry>
>@@ -807,7 +807,7 @@
> <guimenu>Edit</guimenu><guimenuitem>Paste</guimenuitem></menuchoice></term>
> <listitem>
> <para>This will insert the contents of the clipboard at the cursor position.
>-The clipboard is feature of &kde; that works invisibly to provide a way to
>+The clipboard is feature of &tde; that works invisibly to provide a way to
> transfer data between applications.</para>
> </listitem>
> </varlistentry>
>@@ -1408,7 +1408,7 @@
> <variablelist>
> <varlistentry>
> <term><guibutton>Help</guibutton></term>
>-<listitem><para> This invokes the &kde; help system starting at the &kwrite; help
>+<listitem><para> This invokes the &tde; help system starting at the &kwrite; help
> pages (this document).</para></listitem>
> </varlistentry>
> 
>@@ -1679,12 +1679,12 @@
> have a 'default' shortcut.)  Selecting the Custom Key option activates the three
> check boxes and key button at the bottom of the dialog. The user may then select
> a key combination for the command in question by means of the check boxes and
>-key button. For example, with the About &kde; command selected in the display
>+key button. For example, with the About &tde; command selected in the display
> window, the user could select &Ctrl; and <keycap>Alt</keycap>, click on  the key
> button, and then press the <keycap>K</keycap> key on the keyboard.  This would
> mean that anytime he or she held down the &Ctrl; and  <keycap>Alt</keycap>
> buttons and pressed <keycap>K</keycap> (while using
>-&kwrite;) the About &kde; display box would be called. </para>
>+&kwrite;) the About &tde; display box would be called. </para>
> </listitem>
> </varlistentry>
> 
>@@ -1963,7 +1963,7 @@
> <varlistentry id="pref-colors-selected-text">
> <term><guilabel>Selected Text</guilabel></term>
> <listitem><para>This is the background for selected text. The default is
>-the global selection color, as set in your &kde; color preferences.
>+the global selection color, as set in your &tde; color preferences.
> </para></listitem>
> </varlistentry>
> 
>diff -urN tdebase/doc/kxkb/index.docbook tdebase.new/doc/kxkb/index.docbook
>--- tdebase/doc/kxkb/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/kxkb/index.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -55,7 +55,7 @@
> <chapter id="introduction">
> <title>Introduction</title>
> 
>-<para>&kxkb; is the &kde; keyboard layout switching utility.
>+<para>&kxkb; is the &tde; keyboard layout switching utility.
> It is based on X11 xkb extension and allows to use different keyboard 
> layouts for inputing text. &kxkb; features keyboard layout indicator.
> </para>
>diff -urN tdebase/doc/quickstart/index.docbook tdebase.new/doc/quickstart/index.docbook
>--- tdebase/doc/quickstart/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/quickstart/index.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -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; Quick Start Guide">
>+  <!ENTITY kappname "&tde; Quick Start Guide">
>   <!ENTITY package "tdebase">
>   <!ENTITY % addindex "IGNORE">
>   <!ENTITY % English "INCLUDE" > 
>@@ -10,12 +10,12 @@
> <book lang="&language;">
> <bookinfo>
> 	
>-<title>An Introduction to &kde;</title>
>+<title>An Introduction to &tde;</title>
> 
> <authorgroup>
> 
> <author>
>-<surname>The &kde; Team</surname>
>+<surname>The &tde; Team</surname>
> </author>
> 
> </authorgroup>
>@@ -25,14 +25,14 @@
> 
> <copyright>
> <year>1999</year><year>2000</year><year>2001</year><year>2002</year>
>-<holder>The &kde; Team</holder>
>+<holder>The &tde; Team</holder>
> </copyright>
> 
> <legalnotice>&FDLNotice;</legalnotice>
> 
> <abstract>
>-<para>An introduction to the K Desktop Environment</para>
>-<para>Quick Start Guide to &kde;</para></abstract>
>+<para>An introduction to the Trinity Desktop Environment</para>
>+<para>Quick Start Guide to &tde;</para></abstract>
> 
> <keywordset>
> <keyword>KDE</keyword>
>@@ -45,8 +45,8 @@
> <title>Introduction</title>
> 
> <para>
>-This document is a brief introduction to the K Desktop Environment. It
>-will familiarize you with some of the basic features of &kde;.
>+This document is a brief introduction to the Trinity Desktop Environment. It
>+will familiarize you with some of the basic features of &tde;.
> </para>
> 
> <para>
>@@ -67,7 +67,7 @@
> </chapter>
> 
> <chapter id="an-overview-of-kde">
>-<title>An Overview of &kde;</title>
>+<title>An Overview of &tde;</title>
> 
> <para>
> This section is for users who prefer to learn by exploring and want
>@@ -80,21 +80,21 @@
> 
> <note>
> <para>
>-&kde; provides a highly configurable desktop environment. This
>+&tde; provides a highly configurable desktop environment. This
> overview assumes that you are using the default environment.
> </para>
> </note>
> 
> <sect1 id="the-kde-desktop">
>-<title>The &kde; Desktop</title>
>+<title>The &tde; Desktop</title>
> 
>-<para>A typical &kde; desktop consists of several parts:</para>
>+<para>A typical &tde; desktop consists of several parts:</para>
> 
> <itemizedlist>
> <listitem>
> <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 &kicon;
>+contains the &kmenu;, a large &ticon;
> which displays a menu of applications to start when clicked. 
> </para>
> </listitem>
>@@ -110,7 +110,7 @@
> <listitem>
> <para>
> The <interface>desktop</interface> itself, on which frequently used
>-files and folders may be placed. &kde; provides multiple desktops,
>+files and folders may be placed. &tde; provides multiple desktops,
> each of which has its own windows. Click on the numbered buttons on
> the panel to switch between desktops.
> </para>
>@@ -127,7 +127,7 @@
> <itemizedlist>
> <listitem>
> <para>
>-To start an application, click on the &kicon; button on
>+To start an application, click on the &ticon; button on
> the panel (called the <link linkend="starter">&kmenu;</link>)
> and choose an item from the menu.
> </para>
>@@ -136,7 +136,7 @@
> <para>
> Click the icon that looks like a picture of a house on
> the panel to access the files in your home folder using
>-&konqueror;, &kde;'s File Manager utility.
>+&konqueror;, &tde;'s File Manager utility.
> </para>
> </listitem>
> <listitem>
>@@ -153,7 +153,7 @@
> <para>
> Choose the <menuchoice><guimenuitem>Control Center</guimenuitem>
> </menuchoice>item on the &kmenu;
>-to configure &kde;.
>+to configure &tde;.
> </para>
> </listitem> 
> 
>@@ -169,7 +169,7 @@
> <listitem>
> <para>
> Use the &RMB; mouse button to access context menus for the panel,
>-desktop, and most &kde; applications.
>+desktop, and most &tde; applications.
> </para>
> </listitem> 
> </itemizedlist>
>@@ -186,13 +186,13 @@
> <para>
> At the bottom of the screen you will find the desktop panel, which is called
> &kicker;.  You use the panel to launch applications. Have a look at the
>-button on the left with a large &kicon;.
>+button on the left with a large &ticon;.
> </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 &kde;
>+click on it. Just do it! The popup offers you easy access to all &tde;
> applications installed on your computer system.
> </para>
> 
>@@ -213,7 +213,7 @@
> 
> 	
> <para>
>-You can add an entire menu this way, or one of the &kicon;
>+You can add an entire menu this way, or one of the &ticon;
> button sub-menus.  For example, if you have &koffice; installed and
> want quick access to all the &koffice; applications, without having to
> navigate through the &kmenu;, then instead of choosing an
>@@ -285,8 +285,8 @@
> </para>
> 
> <para>
>-By the way, if you are not sure what a certain button does in &kde;,
>-just move the mouse pointer over it and wait for a short while: &kde;
>+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.  
> </para>
>@@ -299,15 +299,15 @@
> <title>But I want my command line back!</title>
> 
> <para>
>-Just calm down, there is nothing to fear. &kde; does not want to take your
>+Just calm down, there is nothing to fear. &tde; does not want to take your
> beloved (and sometimes very effective) command line away from you. You can move
> your files with the desktop, but you can also use the &UNIX; commands you are
>-accustomed to. In fact,&kde; puts command line power at your fingertips,
>+accustomed to. In fact,&tde; puts command line power at your fingertips,
> in perhaps some surprising places.
> </para>
> 
> <para>
>-&kde; provides a very sophisticated command line window called
>+&tde; provides a very sophisticated command line window called
> &konsole;.  Choose <menuchoice><guimenu>K menu</guimenu> 
> <guisubmenu>System</guisubmenu>
> <guimenuitem>Konsole</guimenuitem></menuchoice> to start it. This may
>@@ -378,7 +378,7 @@
> 
> <para>
> So, in conclusion, the command line is never far from view when you're
>-using &kde;.
>+using &tde;.
> </para>
> 
> </sect1>
>@@ -464,7 +464,7 @@
> <title>Titlebar buttons</title>
> 
> <para>
>-&kde; windows have some pretty standard buttons on their titlebars which
>+&tde; windows have some pretty standard buttons on their titlebars which
> give you fast access to some common operations. The default button
> layout looks like this:
> </para>
>@@ -513,20 +513,20 @@
> Now that we know how to deal with windows, we encourage you to open
> some other windows using the panel, since we will now discuss how to
> switch between different windows. Since this is such a common
>-activity, &kde; offers several ways to do it; pick your favorite!
>+activity, &tde; offers several ways to do it; pick your favorite!
> </para>
> 
> <para>
> Many window systems require you to click the mouse in another window
>-to begin using it. This is &kde;'s default behavior, termed
>+to begin using it. This is &tde;'s default behavior, termed
> <quote>Click To Focus</quote> focus policy. But you can also configure
> your desktop in a way that moving the mouse pointer on to a window will
> activate it. This is called <quote>Focus Follows Mouse</quote>. If you
>-select this policy using the <link linkend="configure">&kde; Control
>+select this policy using the <link linkend="configure">&tde; Control
> Center</link>, the window under the mouse pointer is always the active
> one. It does not necessarily come to the front automatically, but you
> can still click on to the titlebar or the border of a window or, a
>-&kde; special, you can use the &Alt; key and click the &MMB;
>+&tde; special, you can use the &Alt; key and click the &MMB;
> anywhere on the window to raise it.
> </para>
> 
>@@ -567,7 +567,7 @@
> 
> <para>
> The <interface>taskbar</interface> displays a list of small icons, one
>-for each window on the desktop. In the default &kde; setup the taskbar
>+for each window on the desktop. In the default &tde; setup the taskbar
> is located inside the panel, but it can also be located at the top or
> the bottom of the screen.  </para>
> 
>@@ -643,7 +643,7 @@
> </orderedlist>
> 
> <para>
>-The third option is the way to go! &kde; can handle several different desktops,
>+The third option is the way to go! &tde; can handle several different desktops,
> each with its own windows. The default configuration provides four
> desktops.  You can switch between the virtual desktops easily with a
> click on one of the desktop buttons on the panel. Also <keycombo
>@@ -683,7 +683,7 @@
> <para>
> A common metaphor of graphical desktops is the use of folders to
> represent folders on your hard disk. Folders contain files and
>-other folders. A &kde; application called &konqueror;, the K File
>+other folders. A &tde; application called &konqueror;, the K File
> Manager, uses this metaphor to help you manage your files.
> </para>
> 
>@@ -691,7 +691,7 @@
> <title>Using &konqueror;</title>
> 
> <para>
>-The first time you start &kde;, a window with lots of icons in it
>+The first time you start &tde;, a window with lots of icons in it
> appears. This is a &konqueror; window displaying the files in your
> home folder (the area where your personal files are stored). The
> pathname of the folder is displayed under the window's tool bar. If
>@@ -712,7 +712,7 @@
> <title>Opening Files</title>
> 
> <para>
>-&kde; comes with a set of applications to view and edit files of many
>+&tde; comes with a set of applications to view and edit files of many
> common types, and when you click a file containing, say, a document
> or image, &konqueror; will start the appropriate application to
> display the file. If it does not know what application to start to open
>@@ -742,14 +742,14 @@
> 
> <note>
> <para>
>-Note that if you choose to create a link, &kde; creates a &UNIX;
>+Note that if you choose to create a link, &tde; creates a &UNIX;
> symbolic link (not a hard link), so if you move or delete the original
> file, the link will be broken.
> </para>
> </note>
> 
> <para>
>-Most &kde; applications also support drag and drop operations: you can
>+Most &tde; applications also support drag and drop operations: you can
> drag an icon on to a window of a running application, or on to an icon of
> an application that is not started, to have the application open the
> file. Try it!
>@@ -778,7 +778,7 @@
> </para>
> 
> <para>
>-&kde; supports a technology called <quote>Network Transparent
>+&tde; supports a technology called <quote>Network Transparent
> Access</quote> (<acronym>NTA</acronym>) which allows you to work with
> files on the other side of the world as easily as those on your local
> hard disk.</para>
>@@ -790,7 +790,7 @@
> the <acronym>URL</acronym> of an &FTP; server.  You can drag and drop
> files to and from the folders on the server just as if they were on
> your local disk. You'll even be able to open files on the &FTP; server
>-without having to manually copy them to your local disk (&kde; does it for you
>+without having to manually copy them to your local disk (&tde; does it for you
> when necessary).
> </para>
> 
>@@ -812,7 +812,7 @@
> <para>
> If you are used to the
> <trademark><application>WinZip</application></trademark> utility on
>-&Microsoft; &Windows;, then you will be happy to hear that &kde; can
>+&Microsoft; &Windows;, then you will be happy to hear that &tde; can
> look into tar archives, too. It treats such archives just like a
> normal folder, and you can browse into the archive, open files, &etc; In
> general, accessing files on the Internet and in archives should look
>@@ -825,9 +825,9 @@
> <title>Using Templates to access Applications and Devices</title>
> 
> <para>
>-In &kde; it's easy to put icons on the panel or the desktop to access
>+In &tde; it's easy to put icons on the panel or the desktop to access
> your applications.  It's just as easy to add icons to access other
>-items of interest.  &kde; has templates for shortcuts to:
>+items of interest.  &tde; has templates for shortcuts to:
> </para>
> 
> <itemizedlist>
>@@ -854,7 +854,7 @@
> </listitem>
> <listitem>
> <para>
>-Documents for some of &kde;'s &koffice; applications.
>+Documents for some of &tde;'s &koffice; applications.
> </para>
> </listitem>
> </itemizedlist>
>@@ -916,7 +916,7 @@
> <para>
> &UNIX; provides access to storage devices other than the primary
> <hardware>hard disk</hardware> through a process called
>-<emphasis>mounting</emphasis>. &kde; uses <literal
>+<emphasis>mounting</emphasis>. &tde; uses <literal
> role="extension">.desktop</literal> files to allow you to easily
> mount, unmount, and access files on secondary storage devices such as
> <hardware>floppy</hardware> drives and &cdrom; drives.
>@@ -982,7 +982,7 @@
> 
> <para>
> Now, place a properly formatted floppy in the drive and click the
>-<guiicon>Floppy</guiicon> icon to have &kde; mount the floppy drive and display
>+<guiicon>Floppy</guiicon> icon to have &tde; mount the floppy drive and display
> the files on the disk. Before removing the disk from the drive, &RMB;
> click the <guiicon>Floppy</guiicon> icon and choose
> <guimenuitem>Unmount</guimenuitem> from the menu.
>@@ -997,7 +997,7 @@
> 
> <para>
> If you do not like something about the way the desktop looks or
>-operates, you can probably change it. &kde; is very configurable and you
>+operates, you can probably change it. &tde; is very configurable and you
> can change almost every aspect of the appearance and the behavior of
> your desktop. Unlike many other &UNIX; desktop environments, you do not
> have to edit cryptic configuration files either (but you can if you
>@@ -1006,7 +1006,7 @@
> </para>
> 
> <sect1 id="using-kde-control">
>-<title>Using the <application>&kde; Control Center</application></title>
>+<title>Using the <application>&tde; Control Center</application></title>
> 
> <para>
> Launch the &kcontrolcenter; from the <link linkend="starter">&kmenu;</link>.
>@@ -1044,7 +1044,7 @@
> <listitem>
> <para>
> Sets all the options in the current module back to the default at the
>-time &kde; was installed.
>+time &tde; was installed.
> </para>
> </listitem>
> </varlistentry>
>@@ -1088,7 +1088,7 @@
> <title>Logging out</title>
> 
> <para>
>-We sincerely hope that using &kde; gives you so much fun and
>+We sincerely hope that using &tde; gives you so much fun and
> pleasure that you never want to log out. But if you do, simply choose
> <menuchoice><guimenu>K menu</guimenu>
> <guimenuitem>Logout</guimenuitem></menuchoice>.
>@@ -1104,16 +1104,16 @@
> <title>Session Management</title>
> 
> <para>
>-When you log out, &kde; can remember which applications you had open, as
>+When you log out, &tde; can remember which applications you had open, as
> well as where all the windows were located, so that it can open them
> for you the next time you log in. This feature is termed
>-<emphasis>Session Management</emphasis>. &kde;-aware applications will
>+<emphasis>Session Management</emphasis>. &tde;-aware applications will
> restore themselves to the state they were in when you logged out.  For
> example, &kate; remembers which files you were editing.  </para>
> 
> <para>
>-Non-&kde; applications do not memorize their state on logout, and
>-&kde; will warn you to make sure that you have saved any important
>+Non-&tde; applications do not memorize their state on logout, and
>+&tde; will warn you to make sure that you have saved any important
> data in them when you start to log out.
> </para>
> 
>@@ -1135,7 +1135,7 @@
> </chapter>
> 
> <chapter id="kde-an-exciting-journey">
>-<title>&kde;, an exciting Journey</title>
>+<title>&tde;, an exciting Journey</title>
> 
> <para>
> We hope you enjoyed this brief tour of the K Desktop environment and
>@@ -1144,20 +1144,20 @@
> </para>
> 
> <para>
>-Please remember that the &kde; project is not a commercial venture,
>+Please remember that the &tde; project is not a commercial venture,
> but rather a project run by volunteers from all over the world. We
>-would like to invite you to join the &kde; project and become part of
>+would like to invite you to join the &tde; project and become part of
> this unique network of people. If you are a programmer you might
>-consider helping us write &kde; applications. If you are an artist or
>+consider helping us write &tde; applications. If you are an artist or
> have experience with graphic design, consider creating icons sets,
>-color schemes, sound schemes and logos for &kde;.  If you enjoy
>+color schemes, sound schemes and logos for &tde;.  If you enjoy
> writing we would love for you to join our documentation project.
> </para>
> 
> <para>
> As you can see there are many ways in which you can help. You are
> cordially invited to join this world-wide network of people dedicated
>-to making &kde; the best desktop environment for any computer. Please
>+to making &tde; the best desktop environment for any computer. Please
> visit <ulink url="http://www.kde.org">www.kde.org</ulink> for more
> information.
> </para>
>@@ -1166,7 +1166,7 @@
> <emphasis>Welcome aboard on this exciting journey, </emphasis>
> </para>
> <para>
>-<literal>Your &kde; Team</literal>
>+<literal>Your &tde; Team</literal>
> </para>
> </chapter>
> 
>@@ -1181,7 +1181,7 @@
> <title>&MIME; Types</title>
> 
> <para>
>-&kde; comes with a number of &MIME; types predefined, but you can add
>+&tde; comes with a number of &MIME; types predefined, but you can add
> your own &MIME; types by choosing
> <menuchoice><guimenu>Settings</guimenu>
> <guisubmenu>Configure Konqueror...</guisubmenu>
>@@ -1190,7 +1190,7 @@
> </para>
> 
> <para>
>-&kde;'s handling of &MIME; types is very powerful, and very
>+&tde;'s handling of &MIME; types is very powerful, and very
> configurable.  On the one hand, you can set a default action to be
> performed when you click on a file in &konqueror;.  Just as usefully,
> you can add many more actions, which are then available with a &RMB;
>diff -urN tdebase/doc/tdeprint/cups-config.docbook tdebase.new/doc/tdeprint/cups-config.docbook
>--- tdebase/doc/tdeprint/cups-config.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/tdeprint/cups-config.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -50,7 +50,7 @@
> 
> <para>For the best, most detailed and most recent information you should
> always refer to the original &CUPS; documentation.  &CUPS; is, much like
>-&kde; in a rapid development process.  There are constantly new features
>+&tde; in a rapid development process.  There are constantly new features
> being added. New features might for times be only configurable by
> directly editing the configuration files. The &tdeprint; &GUI; might not
> have caught up with &CUPS; development.</para>
>diff -urN tdebase/doc/tdeprint/final-word.docbook tdebase.new/doc/tdeprint/final-word.docbook
>--- tdebase/doc/tdeprint/final-word.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/tdeprint/final-word.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -45,7 +45,7 @@
> squeezed me into writing a series on the subject myself.  And this is
> how some people started to give me the nickname <quote>CUPS
> Evangelist</quote>. I will not get rid of this nick anytime soon, now
>-that even the &kde; people wedged me into their timeframe of
>+that even the &tde; people wedged me into their timeframe of
> releases. Oh, boy...</para>
> 
> <para>Anyway, &CUPS; is now making its way around the world and it
>@@ -56,7 +56,7 @@
> users than you are skeptical about it, and even if your programming
> skills are next to zero (like mine) - there are a lot of tasks and
> jobs and ideas, and talent that you can contribute to the Free Software
>-community. Not least within the &kde; project... ;-)
>+community. Not least within the &tde; project... ;-)
> </para>
> 
> </sect1>
>@@ -82,7 +82,7 @@
> </listitem>
> <listitem>
> <para>Sven Guckes for teaching me a few things about the art of <quote>survival
>-on the terminal</quote> (just in case &kde; is not there ;-) )</para>
>+on the terminal</quote> (just in case &tde; is not there ;-) )</para>
> </listitem>
> <listitem>
> <para>...too numerous others to mention who also let me snatch bits
>diff -urN tdebase/doc/tdeprint/getting-started.docbook tdebase.new/doc/tdeprint/getting-started.docbook
>--- tdebase/doc/tdeprint/getting-started.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/tdeprint/getting-started.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -22,7 +22,7 @@
> <guisubmenu>Preferences</guisubmenu> <guisubmenu>System</guisubmenu>
> <guimenuitem>Printing Manager</guimenuitem></menuchoice>.  At the bottom
> you can see a button that lets you select which printing subsystem you
>-want to use.  In &kde; 2.2 you can choose from the following
>+want to use.  In &tde; 2.2 you can choose from the following
> alternatives:</para>
> 
> <itemizedlist>
>@@ -75,7 +75,7 @@
> &CUPS;.</para>
> 
> <para>Once autodetected, chosen, or changed, the active print
>-subsystem will take effect for all &kde; applications.  Different
>+subsystem will take effect for all &tde; applications.  Different
> users may have different print subsystems in use, if those do exist on
> the computer and are compliant with each other.  Their settings are
> stored in the <filename>tdeprintrc</filename>.  This file is unique to
>diff -urN tdebase/doc/tdeprint/highlights.docbook tdebase.new/doc/tdeprint/highlights.docbook
>--- tdebase/doc/tdeprint/highlights.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/tdeprint/highlights.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -49,7 +49,7 @@
> <title>Full Print Job Control</title>
> 
> <para>The Print Job Viewer is automatically started by &kprinter;.  It
>-may be docked into the &kde; panel (in the system tray).  The Print Job
>+may be docked into the &tde; panel (in the system tray).  The Print Job
> Viewer allows full job management, if supported by the print
> subsystem.</para>
> 
>@@ -142,9 +142,9 @@
> <acronym>PPR</acronym> and <acronym>PDQ</acronym> may be available
> later.</para>
> 
>-<para>&tdeprint; makes &kde; much more flexible.  It gives freedom of
>-choice to &kde; 2.2 users.  To use different available print subsystems,
>-these must, of course, be installed independently from &kde;.  In
>+<para>&tdeprint; makes &tde; much more flexible.  It gives freedom of
>+choice to &tde; 2.2 users.  To use different available print subsystems,
>+these must, of course, be installed independently from &tde;.  In
> former versions, users were stuck with the old <acronym>LPD</acronym>
> style print subsystems.  Now they can even use &CUPS;. In the future,
> there will be easy integration of new subsystems, as they
>@@ -159,7 +159,7 @@
> <para>Some specific features of &tdeprint; depend on the chosen print
> subsystem.  This dependency might exist because those features are only
> implemented there; remember, &tdeprint; is an intermediate layer between
>-&kde; applications, and the print subsystem, but it's no replacement for
>+&tde; applications, and the print subsystem, but it's no replacement for
> any print subsystem by itself.  Such dependency may exist for another
> reason: that &tdeprint; has not yet implemented an interface to all the
> features of all the subsystems.</para>
>@@ -327,11 +327,11 @@
> printing. &CUPS; is clearly the print system of choice for Michael
> Goffioul, the principal &tdeprint; developer.</para>
> 
>-<para>Experienced &kde; users may already be familiar with Michael's
>+<para>Experienced &tde; users may already be familiar with Michael's
> utilities <application>qtcups</application> and
> <application>kups</application> (co-developed with Jean-Eric Cuendet).
> These were, up until now, the graphical
>-&GUI; front ends for &CUPS; with a strong relation to &kde;.</para>
>+&GUI; front ends for &CUPS; with a strong relation to &tde;.</para>
> 
> <sect2>
> <title><application>qtcups</application> and
>@@ -364,7 +364,7 @@
> 
> <para>The &CUPS; Module in &tdeprint; now contains all (and more)
> functions that were provided by <application>qtcups</application> and
>-<application>kups</application> in former &kde; versions.</para>
>+<application>kups</application> in former &tde; versions.</para>
> 
> <para>Instead of <command>qtcups</command> you can now use the
> <command>kprinter</command> command.  And in place of
>@@ -389,10 +389,10 @@
> print command</quote>, like <application>qtcups</application> did
> before.</para>
> 
>-<para>Use &kprinter; in any application, even a non-&kde;
>+<para>Use &kprinter; in any application, even a non-&tde;
> application, that lets you configure your print command.  Examples of
> these are &Netscape; and <application>StarOffice</application>, but
>-<emphasis>not</emphasis> most pre-&kde; 2.2 programs.</para>
>+<emphasis>not</emphasis> most pre-&tde; 2.2 programs.</para>
> 
> <para>A screenshot how to use the new <command>kprinter</command>
> print command instead of the old-fashioned <command>lpr</command>...
>diff -urN tdebase/doc/tdeprint/index.docbook tdebase.new/doc/tdeprint/index.docbook
>--- tdebase/doc/tdeprint/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/tdeprint/index.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -73,8 +73,8 @@
> 
> <abstract>
> <para>This handbook describes &tdeprint;. &tdeprint; is not a standalone
>-program. It is the new printing framework for &kde; 2.2. &tdeprint;
>-is an intermediate layer between &kde; (or other) applications and the selected
>+program. It is the new printing framework for &tde; 2.2. &tdeprint;
>+is an intermediate layer between &tde; (or other) applications and the selected
> (and installed) print subsystem of your OS (&OS;).</para>
> </abstract>
> 
>@@ -94,8 +94,8 @@
> <title>Introduction</title>
> 
> <para>This handbook describes &tdeprint;. &tdeprint; is not a standalone
>-program. It is the new printing framework for &kde; 2.2. &tdeprint;
>-is an intermediate layer between &kde; (or other) applications and the selected
>+program. It is the new printing framework for &tde; 2.2. &tdeprint;
>+is an intermediate layer between &tde; (or other) applications and the selected
> (and installed) print subsystem of your OS (&OS;).</para>
> 
> <para>It should be noted that both the developer of this application,
>@@ -113,7 +113,7 @@
> operation to hopefully be fairly self evident, no matter what printing
> subsystem you use.</para>
> 
>-<para>Lauri Watts, &kde; documentation team</para>
>+<para>Lauri Watts, &tde; documentation team</para>
> 
> 
> 
>diff -urN tdebase/doc/tdeprint/lprng.docbook tdebase.new/doc/tdeprint/lprng.docbook
>--- tdebase/doc/tdeprint/lprng.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/tdeprint/lprng.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -2,6 +2,6 @@
> <title><application>LPRng</application></title>
> 
> <para>An <application>LPRng</application> module for &tdeprint; is in
>-development, and hopefully available for the &kde; 2.3 release.</para>
>+development, and hopefully available for the &tde; 2.3 release.</para>
> 
> </chapter>
>diff -urN tdebase/doc/tdeprint/tech-overview.docbook tdebase.new/doc/tdeprint/tech-overview.docbook
>--- tdebase/doc/tdeprint/tech-overview.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/tdeprint/tech-overview.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -5,7 +5,7 @@
> non-programmers can comprehend.</para>
> 
> <para>&tdeprint; is a new and revolutionary tool to give easy access to
>-printing services for both &kde; users and &kde; developers.</para>
>+printing services for both &tde; users and &tde; developers.</para>
> 
> <sect1 id="brief-description">
> <title>A Brief Description of &tdeprint;</title>
>@@ -30,17 +30,17 @@
> <title>What it <emphasis>is</emphasis></title>
> <para>&tdeprint; is an intermediate layer between the spooling and the
> data processing print subsystem (as installed), and the application that
>-seeks to print.  &tdeprint; provides a common interface for &kde;
>-developers and &kde; users, to various supported print subsystems.  At
>+seeks to print.  &tdeprint; provides a common interface for &tde;
>+developers and &tde; users, to various supported print subsystems.  At
> the same time, it is customizable, and highly configurable.</para>
> 
>-<para>&tdeprint; is easy to use for both &kde; developers and end-users.
>+<para>&tdeprint; is easy to use for both &tde; developers and end-users.
> Developers can port their applications, with minimal changes, to use
> &tdeprint; instead of the old &Qt; print <quote>system</quote>. Users
> can easily choose and configure their print subsystem.</para>
> 
>-<para>For a reference to new &kde; users: &Qt; is the basic library and
>-graphical toolkit, which is used by all &kde; applications; &Qt; is
>+<para>For a reference to new &tde; users: &Qt; is the basic library and
>+graphical toolkit, which is used by all &tde; applications; &Qt; is
> developed by TrollTech, a Norwegian software company.</para>
> 
> </sect2>
>@@ -58,7 +58,7 @@
> <para>&tdeprint; allows users and/or administrators, depending on their
> rights, access to printing subsystems (&CUPS;, <acronym>LPD</acronym>,
> <acronym>RLPR</acronym>, <application>LPRng</application>,
>-<application>PDQ</application> &etc;) through a &kde; graphical user
>+<application>PDQ</application> &etc;) through a &tde; graphical user
> interface (&GUI;).  Using &tdeprint;, they can print, administer jobs,
> printers and the printing daemon, all in a comfortable manner.</para>
> 
>@@ -72,10 +72,10 @@
> 
> 
> <sect2 id="what-developers-can-do">
>-<title>What &kde; developers can do with it...</title>
>+<title>What &tde; developers can do with it...</title>
> 
>-<para>If a &kde; developer needs printing access for his application, he
>-does not code the printing functions from scratch. Before &kde; 2.2 this
>+<para>If a &tde; developer needs printing access for his application, he
>+does not code the printing functions from scratch. Before &tde; 2.2 this
> service was provided by the <classname>QPrinter</classname> class, a
> library function of the &Qt; Toolkit. The
> <classname>QPrinter</classname> class relied on the out-moded
>@@ -86,7 +86,7 @@
> elaborate, print systems. It also <quote>leaves the door open</quote>
> for any new development that might occur.</para>
> 
>-<para>For &kde; developers to use the new &tdeprint; class in their
>+<para>For &tde; developers to use the new &tdeprint; class in their
> applications, they require only minimal changes to their code: for every
> call of <classname>QPrinter</classname>, they just need to change this to
> <classname>KPrinter</classname>.  Replacing one (!) letter in a few
>@@ -101,7 +101,7 @@
> 
> 
> <para>This last mentioned feature has not been used widely inside
>-&kde; so far, as developers are not yet fully aware of &tdeprint;'s
>+&tde; so far, as developers are not yet fully aware of &tdeprint;'s
> power. Expect more of this in the near future. One example I
> discovered is the &kcron; application. It lets you edit the crontab
> through a &GUI;. The developers have implemented a printing feature
>@@ -113,7 +113,7 @@
> <para>This shot shows a sample from the &kcron; utility.
> <screenshot>
> <screeninfo>&kcron; utility: a small sample of a system's cronjobs as
>-shown through the &kde; <acronym>GUI</acronym>&GUI;.</screeninfo>
>+shown through the &tde; <acronym>GUI</acronym>&GUI;.</screeninfo>
> <mediaobject>
> <imageobject>
> <imagedata fileref="kcron_to_be_printed.png"
>diff -urN tdebase/doc/tdeprint/theory.docbook tdebase.new/doc/tdeprint/theory.docbook
>--- tdebase/doc/tdeprint/theory.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/tdeprint/theory.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -564,12 +564,12 @@
> 
> 
>@@ -582,10 +582,10 @@
> advance what to expect.</para>
> 
> <para>Imagine you as the administrator of a <quote>LAN</quote>.  For
>-testing purposes you fully installed one &kde;/&CUPS; box on your net,
>+testing purposes you fully installed one &tde;/&CUPS; box on your net,
> complete with a dozen printers configured and functional:
> &PostScript;, LaserJets, InkJets and BubbleJets, and so on.  Your
>-&kde; users on that box are very happy, they can print like never
>+&tde; users on that box are very happy, they can print like never
> before, <quote>ringing all the bells and whistles</quote> of every
> printer.  It took you 2 hours to make everything run perfectly... and
> now all the other 100 users on the network want the same.  Two hours
>diff -urN tdebase/doc/tdesu/index.docbook tdebase.new/doc/tdesu/index.docbook
>--- tdebase/doc/tdesu/index.docbook	2012-01-26 15:03:48.000000000 -0600
>+++ tdebase.new/doc/tdesu/index.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -44,7 +44,7 @@
> <title>Introduction</title>
> 
> <para>Welcome to &tdesu;! &tdesu; is a graphical front end for the
>-&UNIX; <command>su</command> command for the K Desktop Environment.
>+&UNIX; <command>su</command> command for the Trinity Desktop Environment.
> It allows you to run a program as different user by supplying the
> password for that user. &tdesu; is an unprivileged program; it uses
> the system's <command>su</command>.</para>
>@@ -90,7 +90,7 @@
> </cmdsynopsis>
> <cmdsynopsis>
> <command>tdesu</command>
>-<arg choice="opt">&kde; Generic Options</arg>
>+<arg choice="opt">&tde; Generic Options</arg>
> <arg choice="opt">Qt Generic Options</arg>
> </cmdsynopsis>
> 
>@@ -119,7 +119,7 @@
> <para><parameter>file</parameter> is evaluated like this: if
> <parameter>FILE</parameter> starts with a <literal>/</literal>, it is
> taken as an absolute filename. Otherwise, it is taken as the name of a
>-global &kde; configuration file. For example: to configure the K display
>+global &tde; configuration file. For example: to configure the K display
> manager, <application>tdm</application>, you could issue
> <command>tdesu <option>-c tdmconfig -f
> tdmrc</option></command></para></listitem>
>diff -urN tdebase/doc/tdesu/man-tdesu.1.docbook tdebase.new/doc/tdesu/man-tdesu.1.docbook
>--- tdebase/doc/tdesu/man-tdesu.1.docbook	2012-01-26 15:03:48.000000000 -0600
>+++ tdebase.new/doc/tdesu/man-tdesu.1.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -8,7 +8,7 @@
> <title>KDE User's Manual</title>
> <author>&Lauri.Watts; &Lauri.Watts.mail;</author>
> <date>Jun 7, 2005</date>
>-<productname>K Desktop Environment</productname>
>+<productname>Trinity Desktop Environment</productname>
> </refentryinfo>
> 
> <refmeta>
>@@ -52,7 +52,7 @@
> <refsect1>
> <title>Description</title>
> <para>&tdesu; is a graphical front end for the
>-&UNIX; <command>su</command> command for the K Desktop Environment.
>+&UNIX; <command>su</command> command for the Trinity Desktop Environment.
> It allows you to run a program as different user by supplying the
> password for that user. &tdesu; is an unprivileged program; it uses
> the system's <command>su</command>.</para>
>@@ -91,7 +91,7 @@
> <para><parameter>file</parameter> is evaluated like this: if
> <parameter>file</parameter> starts with a <literal>/</literal>, it is
> taken as an absolute filename. Otherwise, it is taken as the name of a
>-global &kde; configuration file. For example: to configure the K display
>+global &tde; configuration file. For example: to configure the K display
> manager, <application>tdm</application>, you could issue
> <command>tdesu <option>-c tdmconfig -f
> tdmrc</option></command></para></listitem>
>diff -urN tdebase/doc/tdm/index.docbook tdebase.new/doc/tdm/index.docbook
>--- tdebase/doc/tdm/index.docbook	2012-01-26 15:03:48.000000000 -0600
>+++ tdebase.new/doc/tdm/index.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -53,7 +53,7 @@
> <releaseinfo>0.05.02</releaseinfo>
> 
> <abstract>
>-<para>This document describes &tdm; the &kde; Display Manager. &tdm;
>+<para>This document describes &tdm; the &tde; Display Manager. &tdm;
> is also known as the <quote>Login Manager</quote>.</para>
> </abstract>
> 
>@@ -125,7 +125,7 @@
> <para>If one does not already exist, add a line to the
> <filename>~/.xinitrc</filename> to start your preferred window manager
> or desktop environment.</para>
>-<para>For &kde; you should enter:</para>
>+<para>For &tde; you should enter:</para>
> <screen><userinput>starttde</userinput></screen>
> <para>For other window managers or desktop environments, you should
> look in their documentation for the correct command.</para>
>@@ -136,7 +136,7 @@
> </procedure>
> 
> <para>At this point, typing <userinput><command>startx</command></userinput>
>-on the commandline should start X, with a &kde; session.  The next task is
>+on the commandline should start X, with a &tde; session.  The next task is
> to try &tdm;.</para>
> 
> <para>As <systemitem class="username">root</systemitem>, type
>@@ -147,7 +147,7 @@
> 
> <para>Typing your normal username and password in the fields provided, and
> leaving <option>default</option> selected as the session type should now
>-open a &kde; session for your user.</para>
>+open a &tde; session for your user.</para>
> 
> <para>If you have other users to configure, you should repeat the procedure
> above for each of them.</para>
>@@ -345,7 +345,7 @@
> 
> <title>The Login Manager &kcontrolcenter; Module</title>
> 
>-<para>Using this module, you can configure the &kde; graphical login
>+<para>Using this module, you can configure the &tde; graphical login
> manager, &tdm;.  You can change how the login screen looks, who has
> access using the login manager and who can shutdown the
> computer.</para>
>@@ -385,7 +385,7 @@
> <title>Appearance</title>
> 
> <para>From this page you can change the visual appearance of &tdm;,
>-&kde;'s graphical login manager.</para>
>+&tde;'s graphical login manager.</para>
> 
> <para>The <guilabel>Greeting:</guilabel> is the title of the login
>  screen.  Setting this is especially useful if you have many servers users
>@@ -427,7 +427,7 @@
> <link linkend="option-greeterpos"><option>GreeterPos</option></link>
> in &tdmrc;.</para>
> 
>-<para>While &kde;'s style depends on the settings of the user logged
>+<para>While &tde;'s style depends on the settings of the user logged
> in, the style used by &tdm; can be configured using the <guilabel>GUI
> Style:</guilabel> and <guilabel>Color Scheme:</guilabel> options.
> These correspond to the keys <link
>@@ -509,14 +509,14 @@
> buttons). </para> <para>You then select a pattern by clicking
> <guilabel>Setup</guilabel>.  This opens a new dialog window, which gives you
> the opportunity to select a pattern.  Simply click once on the pattern of your
>-choice, then click on <guilabel>OK</guilabel>, and &kde; will render the pattern
>+choice, then click on <guilabel>OK</guilabel>, and &tde; will render the pattern
> you selected using the two colors you selected.  For more on patterns, see the
> section <ulink url="help:/kcontrol/background/index.html#bkgnd-patterns">Background: Adding, Removing and Modifying
> Patterns</ulink>.</para></listitem>
> </varlistentry>
> <varlistentry>
> <term>Background Program</term>
>-<listitem><para>By selecting this option, you can have &kde; use an external
>+<listitem><para>By selecting this option, you can have &tde; use an external
> program to determine the background.  This can be any program of your choosing.
> For more information on this option, see the section entitled <ulink
> url="help:/kcontrol/background/index.html#bkgnd-programs">Background: Using an external program</ulink>.</para></listitem>
>@@ -524,7 +524,7 @@
> <varlistentry>
> <term>Horizontal Gradient</term>
> <listitem><para>By choosing this mode, you select two colors (using both color
>-buttons).  &kde; will then start with the color selected by <guilabel>Color
>+buttons).  &tde; will then start with the color selected by <guilabel>Color
> 1</guilabel> on the left edge of the screen, and slowly transform into the
> color selected by <guilabel>Color 2</guilabel> by the time it gets to the
> right edge of the screen.</para></listitem>
>@@ -532,7 +532,7 @@
> <varlistentry>
> <term>Vertical Gradient</term>
> <listitem><para>By choosing this mode, you select two colors (using both color
>-buttons).  &kde; will then start with the color selected by <guilabel>Color
>+buttons).  &tde; will then start with the color selected by <guilabel>Color
> 1</guilabel> on the top edge of the screen, and slowly transform into the color
> selected by <guilabel>Color 2</guilabel> as it moves to the bottom of the
> screen.</para></listitem>
>@@ -540,7 +540,7 @@
> <varlistentry>
> <term>Pyramid Gradient</term>
> <listitem><para>By choosing this mode, you select two colors (using both color
>-buttons).  &kde; will then start with the color selected by <guilabel>Color
>+buttons).  &tde; will then start with the color selected by <guilabel>Color
> 1</guilabel> in each corner of the screen, and slowly transform into the color
> selected by <guilabel>Color 2</guilabel> as it moves to the center of the
> screen.</para></listitem> 
>@@ -548,7 +548,7 @@
> <varlistentry>
> <term>Pipecross Gradient</term>
> <listitem><para>By choosing this mode, you select two colors (using both color
>-buttons).  &kde; will then start with the color selected by <guilabel>Color
>+buttons).  &tde; will then start with the color selected by <guilabel>Color
> 1</guilabel> in each corner of the screen, and slowly transform into the color
> selected by <guilabel>Color 2</guilabel> as it moves to the center of the
> screen. The <quote>shape</quote> of this gradient is  different then the pyramid
>@@ -557,7 +557,7 @@
> <varlistentry>
> <term>Elliptic Gradient</term>
> <listitem><para>By choosing this mode, you select two colors (using both color
>-buttons).  &kde; will then start with the color selected by <guilabel>Color
>+buttons).  &tde; will then start with the color selected by <guilabel>Color
> 2</guilabel> in the center of the screen, and slowly transform into the color
> selected by <guilabel>Color 1</guilabel> as it moves to the edges, in an
> elliptical pattern.</para></listitem> 
>@@ -861,10 +861,10 @@
> 
> <para>If you get a &tdm; login dialog and you are able to log in,
> things are going well.  The main thing that can go wrong here is that
>-the run-time linker might not find the shared &Qt; or &kde; libraries.
>-If you have a binary distribution of the &kde; libraries, make sure
>-&tdm; is installed where the libraries believe &kde; is installed and
>-try setting some environment variables to point to your &kde; and &Qt;
>+the run-time linker might not find the shared &Qt; or &tde; libraries.
>+If you have a binary distribution of the &tde; libraries, make sure
>+&tdm; is installed where the libraries believe &tde; is installed and
>+try setting some environment variables to point to your &tde; and &Qt;
> libraries.</para>
> 
> <para>For example:</para>
>@@ -954,7 +954,7 @@
> 
> <para>If this step is unsuccessful the most likely problem is that the
> environment used at boot time differs from the environment that you used for
>-testing at the command line.  If you are trying to get two versions of &kde;
>+testing at the command line.  If you are trying to get two versions of &tde;
> to co-exist, be particularly careful that the settings you use for your
> <envar>PATH</envar> and <envar>LD_LIBRARY_PATH</envar> environment variables
> are consistent, and that the startup scripts are not over-riding them in
>@@ -1004,7 +1004,7 @@
> <term>default</term>
> <listitem>
> <para>
>-The default session for &tdm; is normally &kde; but can be configured by the
>+The default session for &tdm; is normally &tde; but can be configured by the
> system administrator.
> </para>
> </listitem>
>@@ -1050,8 +1050,8 @@
> resources to run multiple X sessions.  For example, &XDMCP; is a good
> way to reuse old computers - a Pentium or even 486 computer with 16 Mb
> RAM is sufficient to run X itself, and using &XDMCP; such a computer can
>-run a full modern &kde; session from a server.  For the server part,
>-once a single &kde; (or other environment) session is running, running
>+run a full modern &tde; session from a server.  For the server part,
>+once a single &tde; (or other environment) session is running, running
> another one requires very few extra resources.</para>
> 
> <para>However, allowing another method of login to your machine
>@@ -1405,9 +1405,9 @@
> <para>&tdm; is derived from, and includes code from,
> &xdm; (C) Keith Packard, MIT X Consortium.</para>
> 
>-<para>&tdm; 0.1 was written by &Matthias.Ettrich;.  Later versions till &kde;
>-2.0.x were written by &Steffen.Hansen;.  Some new features for &kde; 2.1.x and
>-a major rewrite for &kde; 2.2.x made by &Oswald.Buddenhagen;.</para>
>+<para>&tdm; 0.1 was written by &Matthias.Ettrich;.  Later versions till &tde;
>+2.0.x were written by &Steffen.Hansen;.  Some new features for &tde; 2.1.x and
>+a major rewrite for &tde; 2.2.x made by &Oswald.Buddenhagen;.</para>
> 
> <para>Other parts of the &tdm; code are copyright by the authors, and
> licensed under the terms of the <ulink url="common/gpl-license.html">&GNU;
>@@ -1426,9 +1426,9 @@
> Zumstein<email>zumstein@ssd.ethz.ch</email>. Last update August 9,
> 1998</para></listitem>
> 
>-<listitem><para>Documentation revised for &kde; 2 by &Neal.Crook; &Neal.Crook.mail;. Last update August 6, 2000</para></listitem>
>+<listitem><para>Documentation revised for &tde; 2 by &Neal.Crook; &Neal.Crook.mail;. Last update August 6, 2000</para></listitem>
> 
>-<listitem><para>Documentation extended and revised for &kde; 2.2 by &Oswald.Buddenhagen; &Oswald.Buddenhagen.mail;.  Last update August,
>+<listitem><para>Documentation extended and revised for &tde; 2.2 by &Oswald.Buddenhagen; &Oswald.Buddenhagen.mail;.  Last update August,
> 2001</para></listitem>
> 
> </itemizedlist></para>
>diff -urN tdebase/doc/tdm/tdmrc-ref.docbook tdebase.new/doc/tdm/tdmrc-ref.docbook
>--- tdebase/doc/tdm/tdmrc-ref.docbook	2012-01-26 15:03:48.000000000 -0600
>+++ tdebase.new/doc/tdm/tdmrc-ref.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -999,7 +999,7 @@
> If enabled, &tdm; will automatically restart a session after an &X-Server;
> crash (or if it is killed by Alt-Ctrl-BackSpace). Note that enabling this
> feature opens a security hole: a secured display lock can be circumvented
>-(unless &kde;'s built-in screen locker is used).
>+(unless &tde;'s built-in screen locker is used).
> </para>
> <para>The default is <quote>false</quote>.</para>
> </listitem>
>@@ -1860,7 +1860,7 @@
> </para><para>
> Conversation plugins are modules for the greeter which obtain authentication
> data from the user. Currently only the <literal>classic</literal> plugin is
>-shipped with &kde;; it presents the well-known username and password form.
>+shipped with &tde;; it presents the well-known username and password form.
> </para>
> <para>The default is <quote>classic</quote>.</para>
> </listitem>
>@@ -1989,7 +1989,7 @@
> <para>The displays specified in <option>ReserveServers</option> will not be
> started when &tdm; starts up, but when it is explicitly requested via
> the command socket (or <acronym>FiFo</acronym>).
>-If reserve displays are specified, the &kde; menu will have a
>+If reserve displays are specified, the &tde; menu will have a
> <guilabel>Start New Session</guilabel> item near the bottom; use that to
> activate a reserve display with a new login session. The monitor will switch
> to the new display, and you will have a minute to login. If there are no more
>diff -urN tdebase/doc/userguide/accessibility.docbook tdebase.new/doc/userguide/accessibility.docbook
>--- tdebase/doc/userguide/accessibility.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/userguide/accessibility.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -14,7 +14,7 @@
> 
> <indexterm><primary>Accessibility</primary></indexterm>
> 
>-<para><acronym>KDEAP</acronym> (the &kde; Accessibility Project) aims to ensure that &kde;, as a desktop environment, is accessible to all users, including those of us with physical disabilities. In addition to the accessibility aids in the <link linkend="kcontrol-regional-and-accessibility">Control Center</link>, &kde; has several other accessibility tools, which are available in the &kde;-Accessibility package. This package may not be installed on your computer; if it is not, you can download it from here:</para>
>+<para><acronym>KDEAP</acronym> (the &tde; Accessibility Project) aims to ensure that &tde;, as a desktop environment, is accessible to all users, including those of us with physical disabilities. In addition to the accessibility aids in the <link linkend="kcontrol-regional-and-accessibility">Control Center</link>, &tde; has several other accessibility tools, which are available in the &tde;-Accessibility package. This package may not be installed on your computer; if it is not, you can download it from here:</para>
> 
> <para><itemizedlist>
> <listitem><para><ulink url="ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/accessibility/tdeaccessibility-1.0.0.tar.gz">tdeaccessibility-1.0.0.tar.gz</ulink>, or 
>@@ -23,7 +23,7 @@
> <listitem><para><ulink url="ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/accessibility/tdeaccessibility-1.0.0.lsm">lsm file</ulink></para></listitem>
> </itemizedlist></para>
> 
>-<para>For more information on the project, visit the <ulink url="http://accessibility.kde.org/">&kde; Accessibility Home Page</ulink>.</para>
>+<para>For more information on the project, visit the <ulink url="http://accessibility.kde.org/">&tde; Accessibility Home Page</ulink>.</para>
> 
> <sect1 id="kmousetool">
> <title><application>KMouseTool</application></title>
>@@ -32,7 +32,7 @@
> automatically</secondary></indexterm>
> 
> <para>
>-  <application>KMouseTool</application> is a   &kde; program, which clicks the mouse for you, so you
>+  <application>KMouseTool</application> is a   &tde; program, which clicks the mouse for you, so you
>   do not have to. <application>KMouseTool</application> works with any mouse or pointing device.
> </para>
> <para>
>@@ -87,7 +87,7 @@
> 
> <indexterm><primary>Speech</primary></indexterm>
> 
>-<para><application>KMouth</application> is a KDE program which enables people who cannot speak to let their
>+<para><application>KMouth</application> is a TDE program which enables people who cannot speak to let their
>  computer speak, &eg; mutal people or people who have lost their voice.
>  It has a text-input field and speaks the sentences that you enter. It also has
>  support for user-defined phrasebooks.
>@@ -134,9 +134,9 @@
> <sect1 id="ktts">
> <title><application>KTTS</application> - Text-to-Speech</title>
> 
>-<para><application>KTTS</application> is a &kde; application for the conversion of text into audible speech. Currently, since &kde; 3.4, you can use <application>KTTS</application> to speak any text from the &klipper;, the &kde; clipboard, any text from a plain text file (using &kate; or otherwise), speak any portion of text from a &HTML; page in &konqueror;, and much more.</para>
>+<para><application>KTTS</application> is a &tde; application for the conversion of text into audible speech. Currently, since &kde; 3.4, you can use <application>KTTS</application> to speak any text from the &klipper;, the &tde; clipboard, any text from a plain text file (using &kate; or otherwise), speak any portion of text from a &HTML; page in &konqueror;, and much more.</para>
> 
>-<para>To get <application>KTTS</application> up-and-running you will need to start by running <command>kttsmgr</command>, the &kde; Text-to-Speech manager.</para>
>+<para>To get <application>KTTS</application> up-and-running you will need to start by running <command>kttsmgr</command>, the &tde; Text-to-Speech manager.</para>
> 
> 
> 
>diff -urN tdebase/doc/userguide/base-kde-applications.docbook tdebase.new/doc/userguide/base-kde-applications.docbook
>--- tdebase/doc/userguide/base-kde-applications.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/userguide/base-kde-applications.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -9,9 +9,9 @@
> </authorgroup>
> </chapterinfo>
> 
>-<title>The Base &kde; Applications</title>
>+<title>The Base &tde; Applications</title>
> 
>-<para>What follows is a brief description of a few of the base &kde; applications. For more information on any of the applications you should check the links recommended with each respective entry. </para>
>+<para>What follows is a brief description of a few of the base &tde; applications. For more information on any of the applications you should check the links recommended with each respective entry. </para>
> 
> 
> 
>@@ -23,7 +23,7 @@
> <variablelist>
> <varlistentry>
> <term>&konqueror;</term>
>-	<listitem><para>&kde;'s file manager, web browser, <acronym>FTP</acronym> client and much more. &konqueror; is the canvas for all the latest &kde; technology, from KIO slaves (which provide mechanisms for file access) to component embedding, allowing it to be a universal viewing application, capable of displaying various image files as well as documents.</para>
>+	<listitem><para>&tde;'s file manager, web browser, <acronym>FTP</acronym> client and much more. &konqueror; is the canvas for all the latest &tde; technology, from KIO slaves (which provide mechanisms for file access) to component embedding, allowing it to be a universal viewing application, capable of displaying various image files as well as documents.</para>
> 	
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://konqueror.org">http://konqueror.org</ulink></para></listitem>
>@@ -35,7 +35,7 @@
> 
> <varlistentry>
> <term>&kate;</term>
>-	<listitem><para>&kde;'s advanced multi-view text editor. &kate; is excellent for things such as viewing the &HTML; source of a webpage to handling advanced coding in <acronym>C++</acronym>, <acronym>PHP</acronym> and <acronym>XML</acronym> with its powerful syntax highlighting engine and code folding capabilities. &kate; is a very speedy application, being capable of opening huge text files in a matter of seconds, as well as allowing you to view a hefty amount of multiple views in order to see more instances of the same document and/or more documents at any particular time.</para>
>+	<listitem><para>&tde;'s advanced multi-view text editor. &kate; is excellent for things such as viewing the &HTML; source of a webpage to handling advanced coding in <acronym>C++</acronym>, <acronym>PHP</acronym> and <acronym>XML</acronym> with its powerful syntax highlighting engine and code folding capabilities. &kate; is a very speedy application, being capable of opening huge text files in a matter of seconds, as well as allowing you to view a hefty amount of multiple views in order to see more instances of the same document and/or more documents at any particular time.</para>
> 	
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://kate.kde.org">http://kate.kde.org</ulink></para></listitem>
>@@ -51,7 +51,7 @@
> 
> <varlistentry>
> <term>&konsole;</term>
>-	<listitem><para>The X terminal emulator for &kde;. &konsole;, like many &kde; applications, is extremely customizable; while you can create your own user sessions, you can also of course open &Linux; console sessions, shell sessions, as well as standard <systemitem class="username">root</systemitem> and sudo sessions.</para>
>+	<listitem><para>The X terminal emulator for &tde;. &konsole;, like many &tde; applications, is extremely customizable; while you can create your own user sessions, you can also of course open &Linux; console sessions, shell sessions, as well as standard <systemitem class="username">root</systemitem> and sudo sessions.</para>
> 	
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://konsole.kde.org">http://konsole.kde.org</ulink></para></listitem>
>@@ -66,7 +66,7 @@
> 
> <varlistentry>
> <term>&kicker;</term>
>-	<listitem><para>The &kde; Panel, used for handling your currently running applications, a pager allowing you to switch between desktops, quick launch buttons to act as application launchers and much more.</para>
>+	<listitem><para>The &tde; Panel, used for handling your currently running applications, a pager allowing you to switch between desktops, quick launch buttons to act as application launchers and much more.</para>
> 	
> 		<itemizedlist>
> 			<listitem><para>See <xref linkend="panel-and-desktop"/> for altering some of its settings.</para></listitem>
>@@ -80,7 +80,7 @@
> <varlistentry>
> <term><application>kdcop</application></term>
> 
>-	<listitem><para>A <acronym>GUI</acronym> front-end to the powerful &DCOP; (Desktop COmmunications Protocol). &DCOP; provides a comprehensive protocol for interprocess communication between &kde; applications. While this is increasingly useful to &kde; programmers, it is also beneficial to the ordinary user who would want to create a script, or, say, a <application>SuperKaramba</application> theme.</para>
>+	<listitem><para>A <acronym>GUI</acronym> front-end to the powerful &DCOP; (Desktop COmmunications Protocol). &DCOP; provides a comprehensive protocol for interprocess communication between &tde; applications. While this is increasingly useful to &tde; programmers, it is also beneficial to the ordinary user who would want to create a script, or, say, a <application>SuperKaramba</application> theme.</para>
> 	
> 		<itemizedlist>
> 			<listitem><para>In the User Guide <xref linkend="scripting-the-desktop"/> and <xref linkend="kdialog"/></para></listitem>
>@@ -93,7 +93,7 @@
> 
> <varlistentry>
> <term>&kcontrol;</term>
>-	<listitem><para>The control center for the K Desktop Environment. You can alter a myriad of different things, ranging from themes, fonts and screensavers, to Internet, security and system administration.</para>
>+	<listitem><para>The control center for the Trinity Desktop Environment. You can alter a myriad of different things, ranging from themes, fonts and screensavers, to Internet, security and system administration.</para>
> 	
> 		<itemizedlist>
> 			<listitem><para>See <xref linkend="control-center"/>.</para></listitem>
>@@ -106,12 +106,12 @@
> 
> <varlistentry>
> <term>&khelpcenter;</term>
>-	<listitem><para>The &kde; help system is used to provide access to the base &UNIX; help pages (man or info) as well as the native &kde; documentation provided by the &kde; documentation team or the application authors. You should be able to access all of the &kde; application handbooks from here.</para>
>+	<listitem><para>The &tde; help system is used to provide access to the base &UNIX; help pages (man or info) as well as the native &tde; documentation provided by the &tde; documentation team or the application authors. You should be able to access all of the &tde; application handbooks from here.</para>
> 
> 		<itemizedlist>
> 			<listitem><para><ulink
> 	url="help:/khelpcenter">&khelpcenter; Handbook</ulink></para></listitem>
>-			<listitem><para>For information on the &kde; Documentation team, how to possibly join and help &kde;, see: <ulink url="http://kde.org/documentation">http://kde.org/documentation</ulink></para></listitem>
>+			<listitem><para>For information on the &tde; Documentation team, how to possibly join and help &tde;, see: <ulink url="http://kde.org/documentation">http://kde.org/documentation</ulink></para></listitem>
> 		</itemizedlist>
> 	
> 	</listitem>
>@@ -121,9 +121,9 @@
> 
> <itemizedlist>
> <title>Related Information</title>
>-	<listitem><para><ulink url="http://kde-apps.org">http://kde-apps.org</ulink> -- The largest directory of third-party &kde; applications.</para></listitem>
>+	<listitem><para><ulink url="http://kde-apps.org">http://kde-apps.org</ulink> -- The largest directory of third-party &tde; applications.</para></listitem>
> 	<listitem><para>As you may have noticed, a wealth of information is accessible from the respective handbooks themselves, which can be accessed either by using the help KIO slave in &konqueror; (that is, type <userinput>help:/<replaceable>application</replaceable></userinput> in the Location toolbar), or by selecting it in the &khelpcenter;.</para></listitem>
>-	<listitem><para>You can also likely find out quite a bit of information from the &kde; website, itself, at <ulink url="http://kde.org">http://kde.org</ulink>.</para></listitem>
>+	<listitem><para>You can also likely find out quite a bit of information from the &tde; website, itself, at <ulink url="http://kde.org">http://kde.org</ulink>.</para></listitem>
> </itemizedlist>
> 
> </sect1>
>@@ -140,12 +140,12 @@
> 
> <title>Personal Information Management</title>
> 
>-<para>&kde; <acronym>PIM</acronym> (Personal Information Manager) is a sub-project of &kde;, and it aims to provide an application suite to manage personal information. It has several components, but these can all be brought under one application -- &kontact;, which is the personal information manager. Below is an overview of a few of its popular components; that is, a few of the applications that integrate into it.</para>
>+<para>&tde; <acronym>PIM</acronym> (Personal Information Manager) is a sub-project of &tde;, and it aims to provide an application suite to manage personal information. It has several components, but these can all be brought under one application -- &kontact;, which is the personal information manager. Below is an overview of a few of its popular components; that is, a few of the applications that integrate into it.</para>
> 
> <variablelist>
> <varlistentry>
> <term>&kontact;</term>
>-	<listitem><para>This serves as the medium by which the rest of the applications in &kde; <acronym>PIM</acronym> can integrate with one another. All of the applications in &kde; <acronym>PIM</acronym> can be displayed inside here, and you can easily choose which ones to display. It also contains a Summary page by which you can get a brief overview of events and information in the other components.</para>
>+	<listitem><para>This serves as the medium by which the rest of the applications in &tde; <acronym>PIM</acronym> can integrate with one another. All of the applications in &tde; <acronym>PIM</acronym> can be displayed inside here, and you can easily choose which ones to display. It also contains a Summary page by which you can get a brief overview of events and information in the other components.</para>
> 	
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://kontact.kde.org">http://kontact.kde.org</ulink></para></listitem>
>@@ -181,7 +181,7 @@
> 
> <varlistentry>
> <term>&kaddressbook;</term>
>-	<listitem><para>The contacts component. &kaddressbook; enables you to manage your contacts efficiently and comfortably; contacts can be easily exported and imported from a plethora of different address book standards, and it can be efficiently integrated with &kopete;, &kde;'s multi-protocol instant messenger. Other features include support for all international character sets and advanced search functions.</para>
>+	<listitem><para>The contacts component. &kaddressbook; enables you to manage your contacts efficiently and comfortably; contacts can be easily exported and imported from a plethora of different address book standards, and it can be efficiently integrated with &kopete;, &tde;'s multi-protocol instant messenger. Other features include support for all international character sets and advanced search functions.</para>
> 	
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://pim.kde.org/components/kaddressbook.php">http://pim.kde.org/components/kaddressbook.php</ulink></para></listitem>
>@@ -239,7 +239,7 @@
> 
> <title>Network</title>
> 
>-<para>There are several network-related applications in &kde;. Below is a description of a few of these.</para>
>+<para>There are several network-related applications in &tde;. Below is a description of a few of these.</para>
> 
> <variablelist>
> <varlistentry>
>@@ -277,7 +277,7 @@
> 
> <itemizedlist>
> <title>Related Information</title>
>-	<listitem><para>Several more &kde; network applications can be found in the &kde; Extragear; see <xref linkend="extragear-network"/>, under <xref linkend="extragear-components"/>.</para></listitem>
>+	<listitem><para>Several more &tde; network applications can be found in the &tde; Extragear; see <xref linkend="extragear-network"/>, under <xref linkend="extragear-components"/>.</para></listitem>
> </itemizedlist>
> 
> </sect1>
>@@ -294,7 +294,7 @@
> 
> <title>Graphics</title>
> 
>-<para>&kde; has several graphics-related applications, ranging from <acronym>PDF</acronym> viewers to applications enabling you to take screenshots. Below is a delineation, as well as some related links, for a few of them.</para>
>+<para>&tde; has several graphics-related applications, ranging from <acronym>PDF</acronym> viewers to applications enabling you to take screenshots. Below is a delineation, as well as some related links, for a few of them.</para>
> 
> <variablelist>
> 
>@@ -310,7 +310,7 @@
> 
> <varlistentry>
> <term><application>KPDF</application></term>
>-	<listitem><para>An advanced <acronym>PDF</acronym> viewer, based on <application>xpdf</application>, for &kde;. <application>KPDF</application> contains a number of ways to search through the document (standard find dialog, thumbnail filter, etc.) and has other features such as hands-free reading.</para>
>+	<listitem><para>An advanced <acronym>PDF</acronym> viewer, based on <application>xpdf</application>, for &tde;. <application>KPDF</application> contains a number of ways to search through the document (standard find dialog, thumbnail filter, etc.) and has other features such as hands-free reading.</para>
> 	
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://kpdf.kde.org">http://kpdf.kde.org</ulink></para></listitem>
>@@ -321,7 +321,7 @@
> 
> <varlistentry>
> <term><application>KView</application></term>
>-	<listitem><para>An image viewer program which supports a number of different image filetypes including <acronym>JPEG</acronym>, <acronym>GIF</acronym>, <acronym>PNG</acronym>, <acronym>TIFF</acronym> and many others. <application>Kview</application> has full integration with &kde; and it can be embedded into &konqueror; for viewing image files on your diskdrive as well as your <acronym>FTP</acronym> site or webserver, using its &URL; open support. Other features include a few image manipulations such as zoom, rotate, grayscale and flip. </para>
>+	<listitem><para>An image viewer program which supports a number of different image filetypes including <acronym>JPEG</acronym>, <acronym>GIF</acronym>, <acronym>PNG</acronym>, <acronym>TIFF</acronym> and many others. <application>Kview</application> has full integration with &tde; and it can be embedded into &konqueror; for viewing image files on your diskdrive as well as your <acronym>FTP</acronym> site or webserver, using its &URL; open support. Other features include a few image manipulations such as zoom, rotate, grayscale and flip. </para>
> 	
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://www.ph.unimelb.edu.au/~ssk/kde/kview/">http://www.ph.unimelb.edu.au/~ssk/kde/kview/</ulink></para></listitem>
>@@ -368,7 +368,7 @@
> 
> <itemizedlist>
> <title>Related Information</title>
>-	<listitem><para>Several more advanced &kde; graphics applications can be found in the &kde; Extragear; under the <xref linkend="extragear-components"/>, see <xref linkend="extragear-graphics"/> for a list of a few of them.</para></listitem>
>+	<listitem><para>Several more advanced &tde; graphics applications can be found in the &tde; Extragear; under the <xref linkend="extragear-components"/>, see <xref linkend="extragear-graphics"/> for a list of a few of them.</para></listitem>
> </itemizedlist>
> 
> </sect1>
>@@ -381,7 +381,7 @@
> <variablelist>
> <varlistentry>
> <term>&juk;</term>
>-	<listitem><para>An easy-to-use music player for &kde;. &juk; is playlist and meta-data focused, allowing you to quickly search through the dynamic playlist provided. Some of the features include &CD; cover-art fetching from <trademark class="registered">Google</trademark> images, <application>MusicBrainz</application> integration for file identification over the Internet, and multiple audio backends, including &arts;, <application>GStreamer</application> and <application>aKode</application>.  </para>
>+	<listitem><para>An easy-to-use music player for &tde;. &juk; is playlist and meta-data focused, allowing you to quickly search through the dynamic playlist provided. Some of the features include &CD; cover-art fetching from <trademark class="registered">Google</trademark> images, <application>MusicBrainz</application> integration for file identification over the Internet, and multiple audio backends, including &arts;, <application>GStreamer</application> and <application>aKode</application>.  </para>
> 	
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://developer.kde.org/~wheeler/juk.html">http://developer.kde.org/~wheeler/juk.html</ulink></para></listitem>
>@@ -415,7 +415,7 @@
> 
> <itemizedlist>
> <title>Related Information</title>
>-	<listitem><para>Several more advanced &kde; multimedia applications can be found in the &kde; Extragear; under the <xref linkend="extragear-components"/>, see <xref linkend="extragear-multimedia"/> for a list of a few of them.</para></listitem>
>+	<listitem><para>Several more advanced &tde; multimedia applications can be found in the &tde; Extragear; under the <xref linkend="extragear-components"/>, see <xref linkend="extragear-multimedia"/> for a list of a few of them.</para></listitem>
> </itemizedlist>
> 
> </sect1>
>diff -urN tdebase/doc/userguide/browser-fine-tuning.docbook tdebase.new/doc/userguide/browser-fine-tuning.docbook
>--- tdebase/doc/userguide/browser-fine-tuning.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/userguide/browser-fine-tuning.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -36,7 +36,7 @@
> <guilabel>Customize</guilabel> tab, and choose the settings you prefer.</para>
> </listitem>
> <listitem><para>Close all &konqueror; windows (you may need to restart
>-&kde; to be sure) and when you re-open them, your settings should be applied.</para>
>+&tde; to be sure) and when you re-open them, your settings should be applied.</para>
> </listitem>
> </orderedlist>
> 
>diff -urN tdebase/doc/userguide/control-center.docbook tdebase.new/doc/userguide/control-center.docbook
>--- tdebase/doc/userguide/control-center.docbook	2012-01-26 15:03:48.000000000 -0600
>+++ tdebase.new/doc/userguide/control-center.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -6,7 +6,7 @@
> <chapterinfo>
> <authorgroup>Here you can set up different profiles for your Wireless card,
> to be able to quickly switch settings if you connect to multiple
>-networks. You can select a profile to be loaded on KDE startup.
>+networks. You can select a profile to be loaded on TDE startup.
> <author>
> <firstname>Your First Name here</firstname>
> <surname>Your Surname here </surname>
>@@ -31,7 +31,7 @@
> </mediaobject>
> 
> <para>The &kcontrolcenter; is the place to go to change any settings that
>-affect the whole of your &kde; environment. You can open it using the
>+affect the whole of your &tde; environment. You can open it using the
> <guimenuitem>Control Center</guimenuitem> item in the &kmenu;, or with its
> command-line name, <filename>kcontrol</filename>.</para>
> 
>@@ -62,9 +62,9 @@
> </authorgroup>
> </sect1info>
> 
>-<title>Appearance &amp; Themes</title> 
>+<title>Appearance &amp; Themes</title>
> 
>-<para>Here you will find settings that change the way your &kde; desktop and
>+<para>Here you will find settings that change the way your &tde; desktop and
> applications look.</para>
> 
> <variablelist>
>@@ -74,7 +74,7 @@
> <para>This section controls the color or image that is set as your desktop
> background. These settings can be applied to all virtual workspaces, or to
> only a specific one. There are a range of background wallpapers that come
>-with &kde; or you can supply your own.</para>
>+with &tde; or you can supply your own.</para>
> </listitem>
> </varlistentry>
> 
>@@ -82,9 +82,9 @@
> <term><guilabel>Colors</guilabel></term>
> <listitem>
> <para>This is where you can modify the colors for your kde applications.
>-There are a variety of color schemes installed with &kde; by default, and
>+There are a variety of color schemes installed with &tde; by default, and
> you can find others at kde-look.org. You can also create your own. Here you
>-can also modify the contrast and choose whether you want your &kde; colors
>+can also modify the contrast and choose whether you want your &tde; colors
> to be applied to non-kde applications, for a more consistant overall
> appearance.</para>
> </listitem>
>@@ -93,7 +93,7 @@
> <varlistentry>
> <term><guilabel>Fonts</guilabel></term>
> <listitem>
>-<para>Here you can control the various font settings for &kde; applications.
>+<para>Here you can control the various font settings for &tde; applications.
> You can also modify here anti-aliasing settings, including what range of
> fonts to exclude from anti-aliasing settings.</para>
> </listitem>
>@@ -106,7 +106,7 @@
> settings related to icons. New icon themes can be downloaded from
> kde-look.org, and installed here. Conversely, you can remove icon themes by
> highlighting them in the list and clicking remove. You can also set icon
>-sizes for various uses in &kde; and effects to apply to icons.</para>
>+sizes for various uses in &tde; and effects to apply to icons.</para>
> </listitem>
> </varlistentry>
> 
>@@ -134,7 +134,7 @@
> <term><guilabel>Splash Screen</guilabel></term>
> <listitem>
> <para>This is where you can install, remove and test the splash screens that
>-display on &kde; startup. More splash screens can be downloaded from
>+display on &tde; startup. More splash screens can be downloaded from
> <ulink
> url="http://www.kde-look.org">
> 
>@@ -146,7 +146,7 @@
> <term><guilabel>Style</guilabel></term>
> <listitem>
> <para>This section allows you to modify your widget style. A variety of
>-styles come with &kde;, and more can be downloaded from <ulink url="http://www.kde-look.org">http://www.kde-look.org</ulink>.  This is also
>+styles come with &tde;, and more can be downloaded from <ulink url="http://www.kde-look.org">http://www.kde-look.org</ulink>.  This is also
> where you would enable or disable interface options such as transparent
> menus, showing icons on buttons and tooltips. Some styles have more
> configuration options than others.</para>
>@@ -157,7 +157,7 @@
> <term><guilabel>Theme Manager</guilabel></term>
> <listitem>
> <para>This is where you can create and manage themes that are made up of
>-personalized settings. They are a combination of desktop background, colors, &kde; widget styles, icons, fonts and what Screensaver you'd like to display . This allows you to save your favorite
>+personalized settings. They are a combination of desktop background, colors, &tde; widget styles, icons, fonts and what Screensaver you'd like to display . This allows you to save your favorite
> <quote>looks</quote> and apply them with the click of a mouse button.</para>
> </listitem>
> </varlistentry>
>@@ -180,7 +180,7 @@
> information about how to do this.</para>
> </listitem>
> 
>-<listitem><para>If you enjoy modifying the appearance of your &kde; desktop,
>+<listitem><para>If you enjoy modifying the appearance of your &tde; desktop,
> you can find plenty of themes and styles at <ulink url="http://kde-look.org">kde-look.org</ulink>.</para>
> </listitem>
> 
>@@ -201,7 +201,7 @@
> <title>Desktop</title>
> 
> <para>This is where you will find settings to configure the appearance and
>-behavior of your &kde; desktop.</para>
>+behavior of your &tde; desktop.</para>
> 
> <variablelist>
> <varlistentry>
>@@ -220,7 +220,7 @@
> <listitem>
> <para>This is where you would configure the number of virtual desktops or
> workspaces you would like to have, and what you would like them to be
>-called. By default &kde; has 4 virtual desktops, and you can configure up to
>+called. By default &tde; has 4 virtual desktops, and you can configure up to
> 20. You can also enable switching between virtual desktops using the scroll
> button on your mouse.</para>
> </listitem>
>@@ -229,7 +229,7 @@
> <varlistentry>
> <term><guilabel>Panels</guilabel></term>
> <listitem>
>-<para>Here you can modify options to do with &kicker; and other &kde;
>+<para>Here you can modify options to do with &kicker; and other &tde;
> panels. Among the options are size, position, length and hiding. You can
> also modify the appearance of the panel with transparency, background images
> and icon zooming. This is also where you would configure various menu
>@@ -252,7 +252,7 @@
> <term><guilabel>Window Behavior</guilabel></term>
> <listitem>
> <para>This is where you would configure options related to the behavior of
>-&kde;'s window manager, &twin;. &twin; is extremely configurable and has
>+&tde;'s window manager, &twin;. &twin; is extremely configurable and has
> advanced features such as focus stealing prevention and different focus
> policies such as focus follows mouse. You can also configure what actions
> you would like to bind to certain keys and mouse events.</para>
>@@ -291,10 +291,10 @@
> </author>
> </authorgroup>
> </sect1info>
>-<title>Internet &amp; Network</title> 
>+<title>Internet &amp; Network</title>
> 
> <para>This section is where you would configure settings to do with internet
>-and networking under &kde;.</para>
>+and networking under &tde;.</para>
> 
> <variablelist>
> <varlistentry>
>@@ -311,7 +311,7 @@
> <listitem>
> <para>Desktop Sharing allows you to invite someone to share your session
> with you, or can enable you to log in remotely to your machine from another
>-location.  You would then use a VNC client like &kde;'s Remote Desktop
>+location.  You would then use a VNC client like &tde;'s Remote Desktop
> Connection application to control your desktop over the network. This is
> extremely useful if you want someone to help you perform a task. </para>
> 
>@@ -363,7 +363,7 @@
> <varlistentry>
> <term><guilabel>Proxy</guilabel></term>
> <listitem>
>-<para>This is where you would configure &kde; to connect to a proxy server
>+<para>This is where you would configure &tde; to connect to a proxy server
> rather than directly to the internet. Once again you would generally leave
> these options at their defaults unless you really knew what you were
> doing. If you do use a proxy server your network administrator will be able
>@@ -408,7 +408,7 @@
> <listitem>
> <para>Here you can set up different profiles for your Wireless card, to be
> able to quickly switch settings if you connect to multiple networks. You can
>-select a profile to be loaded on &kde; startup.</para>
>+select a profile to be loaded on &tde; startup.</para>
> </listitem>
> </varlistentry>
> </variablelist>
>@@ -436,9 +436,9 @@
> </authorgroup>
> </sect1info>
> 
>-<title>&kde; Components</title>
>+<title>&tde; Components</title>
> 
>-<para>This section is where you can modify advanced &kde; options such as
>+<para>This section is where you can modify advanced &tde; options such as
> file associations and default applications.</para>
> 
> <variablelist>
>@@ -475,18 +475,18 @@
> </listitem>
> </varlistentry>
> 
>-<varlistentry><term><guilabel>KDE Performance</guilabel></term>
>+<varlistentry><term><guilabel>TDE Performance</guilabel></term>
> 
> <listitem><para>Here are settings related to the memory usage of
> &konqueror;. <guilabel>Minimize Memory Usage</guilabel> allows you to
> control whether separate instances of &konqueror; will open or whether all
> new &konqueror; windows connect to the same instance. This has the effect of
> reducing memory usage. You can also select whether to pre-load &konqueror;
>-after &kde; startup, to reduce start times.</para>
>+after &tde; startup, to reduce start times.</para>
> </listitem>
> </varlistentry>
> 
>-<varlistentry><term><guilabel>KDE Resources Configuration</guilabel></term>
>+<varlistentry><term><guilabel>TDE Resources Configuration</guilabel></term>
> 
> <listitem><para><remark>To be written</remark></para>
> </listitem>
>@@ -505,8 +505,8 @@
> 
> <varlistentry><term><guilabel>Session Manager</guilabel></term>
> 
>-<listitem><para>Here you can configure how you would like &kde; to handle
>-sessions. You can configure &kde; to remember your previous session and
>+<listitem><para>Here you can configure how you would like &tde; to handle
>+sessions. You can configure &tde; to remember your previous session and
> restore the applications you were using the next time you log in.  You can
> also specify individual applications to exclude from being restored, or
> disable restoring sessions on login entirely.</para>
>@@ -515,9 +515,9 @@
> 
> <varlistentry><term><guilabel>Spell Checker</guilabel></term>
> 
>-<listitem><para>This module allows you to configure the &kde; Spell
>+<listitem><para>This module allows you to configure the &tde; Spell
> checker. It allows you to modify what spell checker to use, what types of
>-error to check for and also what default dictionary to use. &kde; supports
>+error to check for and also what default dictionary to use. &tde; supports
> the use of both <application>ASpell</application> and
> <application>ISpell.</application></para>
> </listitem>
>@@ -566,7 +566,7 @@
> 
> <listitem><para>Here you can modify settings to do with the size,
> orientation and refresh rate of your display, and whether you would like
>-these settings to be applied on &kde; startup. On the <guilabel>Power
>+these settings to be applied on &tde; startup. On the <guilabel>Power
> Control</guilabel> tab, you can configure your power management options for
> this screen such as blanking.  </para></listitem>
> </varlistentry>
>@@ -583,7 +583,7 @@
> 
> <listitem><para>This module allows you to configure basic keyboard settings.
> These include keyboard repeat delay and rate, and what state you would
>-prefer numlock to be on KDE startup.</para></listitem>
>+prefer numlock to be on TDE startup.</para></listitem>
> </varlistentry>
> 
> <varlistentry><term><guilabel>Mouse</guilabel></term>
>@@ -629,7 +629,7 @@
> 
> <para>This section has a single module, <guilabel>Laptop Battery</guilabel>.
> Here you can configure the appearance and behaviour of the <application>Klaptopdaemon</application>
>-battery monitor. You can select battery icons to represent different power states, and set up 
>+battery monitor. You can select battery icons to represent different power states, and set up
> notification of certain events. In the case that your battery runs down to a critical level, you can
> configure the daemon to suspend or shutdown your laptop, to save you from losing data.
> </para>
>@@ -662,8 +662,8 @@
> 
> <varlistentry><term><guilabel>Accessibility</guilabel></term>
> 
>-<listitem><para>Here is where you can configure options for users who have 
>-difficulty hearing system sounds or using a keyboard. You can configure the 
>+<listitem><para>Here is where you can configure options for users who have
>+difficulty hearing system sounds or using a keyboard. You can configure the
> system bell to use a visual signal, such as flashing the screen or inverting
> screen colors. You can also configure keyboard accessibility options such
> as sticky keys and slow keys.</para></listitem>
>@@ -697,7 +697,7 @@
> 
> <varlistentry><term><guilabel>Keyboard Shortcuts</guilabel></term>
> 
>-<listitem><para>Here you can configure global &kde; keyboard
>+<listitem><para>Here you can configure global &tde; keyboard
> shortcuts. There are several predefined shortcut schemes you can use if you
> are more used to another windowing environment, like &Windows; or
> &MacOS;. If you prefer, you can customise your own scheme and modifier keys.
>@@ -735,29 +735,29 @@
> <title>Security &amp; Privacy</title>
> 
> <para>This section is where you can configure options related to
>-security and privacy such as the use of cryptography, enabling the KDE
>+security and privacy such as the use of cryptography, enabling the TDE
> wallet, setting your identity and managing caches.</para>
> 
> <variablelist>
> <varlistentry><term><guilabel>Crypto</guilabel></term>
> <listitem><para>This module allows you to configure SSl for use with most
>-KDE applications, as well as manage your personal certificates
>+TDE applications, as well as manage your personal certificates
> and the known certificate authorities.</para></listitem>
> </varlistentry>
> 
>-<varlistentry><term><guilabel>KDE Wallet</guilabel></term>
>+<varlistentry><term><guilabel>TDE Wallet</guilabel></term>
> <listitem><para>
>-Here you can change your KDE Wallet Manager settings.</para>
>+Here you can change your TDE Wallet Manager settings.</para>
> 
>-<para>KDE Wallet aims to provide secure storage for passwords and web form data.
>+<para>TDE Wallet aims to provide secure storage for passwords and web form data.
> You can group different passwords in different wallets, and each one will only
> be opened with a master password (which you should never forget!). The
>-default wallet is named "kdewallet", and you can either create a new wallet 
>-for your local passwords or accept the default wallet for all data in 
>+default wallet is named "kdewallet", and you can either create a new wallet
>+for your local passwords or accept the default wallet for all data in
> the "Automatic Wallet Selection" section.</para>
> 
>-<para>KDE programs like Konqueror, Kmail and Kopete are fully compatible with
>-the KDE Wallet Manager. All of them will ask at least once for permission to
>+<para>TDE programs like Konqueror, Kmail and Kopete are fully compatible with
>+the TDE Wallet Manager. All of them will ask at least once for permission to
> access to actual wallet. You can give different access levels, such as "always
> allow", "allow once", etc. If you want to change that access level, you can do
> it from the "Access Control" tab by deleting the program entry and selecting a
>@@ -765,22 +765,22 @@
> wallet.</para>
> 
> 	<variablelist>
>-	
>+
> 	<varlistentry><term><guilabel>Wallet Preferences</guilabel></term>
>-	
>-	<listitem><para>To enable the KDE wallet subsystem, check the <guilabel>
>-Enable the KDE wallet subsystem</guilabel> box.
>-Unchecking this box will disable the KDE Wallet on your system.</para>
> 
>-<para>By default, KDE Wallet Manager is kept opened until the
>+	<listitem><para>To enable the TDE wallet subsystem, check the <guilabel>
>+Enable the TDE wallet subsystem</guilabel> box.
>+Unchecking this box will disable the TDE Wallet on your system.</para>
>+
>+<para>By default, TDE Wallet Manager is kept opened until the
> user session is closed, but you can change that in the <guilabel>Close
> Wallet</guilabel> section to close it when unused for a time, when a screen
> saver starts or when the last application stops using it.</para>
> 
> <para>As you can have several wallets, <guilabel>Automatic Wallet
>-Selection</guilabel> allows you start KDE with a given wallet.</para>
>+Selection</guilabel> allows you start TDE with a given wallet.</para>
> 
>-<para>KDE Wallet will appear in your system tray by default, but you can hide
>+<para>TDE Wallet will appear in your system tray by default, but you can hide
> it. Uncheck <guilabel>Show manager in the system tray</guilabel> to keep it
> always hidden, or check <guilabel>Hide system tray icon when last wallet
> closes</guilabel> to hide it only when all wallets are closed. These items are
>@@ -791,7 +791,7 @@
> <varlistentry><term><guilabel>Access Control</guilabel></term>
> 
> <listitem><para>You can set here what policy you want for your
>-KDE applications, regarding to the wallet use.</para></listitem>
>+TDE applications, regarding to the wallet use.</para></listitem>
> </varlistentry>
> </variablelist>
> 
>@@ -808,7 +808,7 @@
> 
> <varlistentry><term><guilabel>Privacy</guilabel></term>
> <listitem><para>This module allows you to erase traces which
>-KDE leaves on your system such as command histories or
>+TDE leaves on your system such as command histories or
> browser caches.</para></listitem>
> </varlistentry>
> 
>@@ -846,7 +846,7 @@
> <variablelist>
> <varlistentry>
> <term><guilabel>Boot Manager (LILO)</guilabel></term>
>-<listitem><para>If you use the popular bootloader 
>+<listitem><para>If you use the popular bootloader
> <acronym>LILO</acronym> this section will allow you to configure it.
> You can configure the location to install the bootloader to, set the timeout
> on the <acronym>LILO</acronym> boot screen as well as add or modify
>@@ -862,8 +862,8 @@
> 
> <varlistentry>
> <term><guilabel>Font Installer</guilabel></term>
>-<listitem><para>Here is where you would configure both personal and system-wide fonts. 
>-This dialog allows you to install new fonts, delete old ones and preview the fonts you 
>+<listitem><para>Here is where you would configure both personal and system-wide fonts.
>+This dialog allows you to install new fonts, delete old ones and preview the fonts you
> have installed. By default, it displays personal fonts. To modify system-wide fonts click the <guibutton>Administrator Mode</guibutton> button.</para> </listitem>
> </varlistentry>
> <varlistentry>
>@@ -873,22 +873,22 @@
> </varlistentry>
> <varlistentry>
> <term><guilabel>Linux Kernel</guilabel></term>
>-<listitem><para>If you run &kde; on &Linux; there is a &kcontrol; module to create or modify
>+<listitem><para>If you run &tde; on &Linux; there is a &kcontrol; module to create or modify
> configuration files for a &Linux; kernel. This configurator is compatible with kernels previous to 2.5.</para></listitem>
> </varlistentry>
> <varlistentry>
> <term><guilabel>Login Manager</guilabel></term>
>-<listitem><para>This module allows you to configure the &kde; login manager, &tdm;. &tdm; is
>+<listitem><para>This module allows you to configure the &tde; login manager, &tdm;. &tdm; is
> a powerful login manager with a large range of options. It supports user switching, remote graphical logins and has a fully customizable appearance. For more information, see the &tdm; handbook. </para></listitem>
> </varlistentry>
> <varlistentry>
> <term><guilabel>Paths</guilabel></term>
> <listitem><para>This dialog allows you to configure the default locations where certain
>-important files are kept. The <guilabel>Desktop</guilabel> directory contains all the files on your desktop. The <guilabel>Autostart</guilabel> directory contains files or links to files that you want run when &kde; starts, and the <guilabel>Documents</guilabel> directory is the default location &kde; applications will open or save documents to.</para></listitem>
>+important files are kept. The <guilabel>Desktop</guilabel> directory contains all the files on your desktop. The <guilabel>Autostart</guilabel> directory contains files or links to files that you want run when &tde; starts, and the <guilabel>Documents</guilabel> directory is the default location &tde; applications will open or save documents to.</para></listitem>
> </varlistentry>
> <varlistentry>
> <term><guilabel>Sony Vaio Laptop</guilabel></term>
>-<listitem><para>This configuration module allows you to configure features specific to 
>+<listitem><para>This configuration module allows you to configure features specific to
> Sony Vaio laptops. If you have a Sony Vaio, you will have to install the <quote>sonypi</quote>
> driver to use this section.</para></listitem>
> </varlistentry>
>diff -urN tdebase/doc/userguide/creating-graphics.docbook tdebase.new/doc/userguide/creating-graphics.docbook
>--- tdebase/doc/userguide/creating-graphics.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/userguide/creating-graphics.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -15,7 +15,7 @@
> 
> <title>Creating Graphics</title>
> 
>-<para>How to create graphics with &kde; apps.. (ok, maybe not)</para>
>+<para>How to create graphics with &tde; apps.. (ok, maybe not)</para>
> 
> 
> 
>diff -urN tdebase/doc/userguide/credits-and-license.docbook tdebase.new/doc/userguide/credits-and-license.docbook
>--- tdebase/doc/userguide/credits-and-license.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/userguide/credits-and-license.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -1,15 +1,14 @@
> <sect1 id="credits">
> <title>Credits</title>
> <para>
>-&kde; is written by and copyright The &kde; Team.
>+The &tde; Team thanks and acknowledges the original &kde; contributors of this guide.
> </para>
> 
>-<para>This document is copyright 2006 The &kde; Documentation
>-Team. Individual credits are as follows:
>+<para>Individual credits:
> <variablelist>
> 
> <varlistentry>
>-<term>Tom Albers <email>tomalbers@kde.nl</email></term>
>+<term>Tom Albers</term>
> <listitem>
> 
> <itemizedlist>
>@@ -21,7 +20,7 @@
> </varlistentry>
> 
> <varlistentry>
>-<term>Waldo Bastian <email>bastian@kde.org</email></term>
>+<term>Waldo Bastian</term>
> <listitem>
> 
> <itemizedlist>
>@@ -33,7 +32,7 @@
> </varlistentry>
> 
> <varlistentry>
>-<term>Gardner Bell <email>gbell72@rogers.com</email></term>
>+<term>Gardner Bell</term>
> <listitem>
> 
> <itemizedlist>
>@@ -47,7 +46,7 @@
> </varlistentry>
> 
> <varlistentry>
>-<term>Gary Cramblitt <email>garycramblitt@comcast.net</email></term>
>+<term>Gary Cramblitt</term>
> <listitem>
> 
> <itemizedlist>
>@@ -59,7 +58,7 @@
> </varlistentry>
> 
> <varlistentry>
>-<term>David Faure <email>faure@kde.org</email></term>
>+<term>David Faure</term>
> <listitem>
> 
> <itemizedlist>
>@@ -71,7 +70,7 @@
> </varlistentry>
> 
> <varlistentry>
>-<term>Nicolas Goutte <email>goutte@kde.org</email></term>
>+<term>Nicolas Goutte</term>
> <listitem>
> 
> <itemizedlist>
>@@ -83,7 +82,7 @@
> </varlistentry>
> 
> <varlistentry>
>-<term>&Francis.Giannaros; &Francis.Giannaros.mail;</term>
>+<term>&Francis.Giannaros;</term>
> <listitem>
> 
> <itemizedlist>
>@@ -100,7 +99,7 @@
> </varlistentry>
> 
> <varlistentry>
>-<term>Adriaan de Groot <email>groot@kde.org</email></term>
>+<term>Adriaan de Groot</term>
> <listitem>
> 
> <itemizedlist>
>@@ -114,7 +113,7 @@
> </varlistentry>
> 
> <varlistentry>
>-<term>J Hall <email>jes.hall@kdemail.net</email></term>
>+<term>J Hall</term>
> <listitem>
> 
> <itemizedlist>
>@@ -140,7 +139,7 @@
> </varlistentry>
> 
> <varlistentry>
>-<term>&Anne-Marie.Mahfouf; &Anne-Marie.Mahfouf.mail;</term>
>+<term>&Anne-Marie.Mahfouf;</term>
> <listitem>
> 
> <itemizedlist>
>@@ -151,7 +150,7 @@
> </varlistentry>
> 
> <varlistentry>
>-<term>&Richard.J.Moore; &Richard.J.Moore.mail;</term>
>+<term>&Richard.J.Moore;</term>
> <listitem>
> 
> <itemizedlist>
>@@ -165,7 +164,7 @@
> </varlistentry>
> 
> <varlistentry>
>-<term>Peter Nuttall <email>p.s.nuttall@dur.ac.uk</email></term>
>+<term>Peter Nuttall</term>
> <listitem>
> 
> <itemizedlist>
>@@ -177,7 +176,7 @@
> </varlistentry>
> 
> <varlistentry>
>-<term>Steven Robson <email>s.a.robson@sms.ed.ac.uk</email></term>
>+<term>Steven Robson</term>
> <listitem>
> 
> <itemizedlist>
>@@ -190,24 +189,25 @@
> </listitem>
> </varlistentry>
> 
>-<varlistentry><term>&Philip.Rodrigues; &Philip.Rodrigues.mail;</term>
>+<varlistentry><term>&Philip.Rodrigues;</term>
> <listitem>
> 
> <itemizedlist>
> <listitem><para>Reviewing and proofreading.</para>
> </listitem>
>-<listitem><para>Wrote <xref linkend="logging-in"
>-/>.</para>
>+<listitem><para>Wrote <xref linkend="windows-how-to-work"/>.</para>
> </listitem>
>-<listitem><para>Wrote <xref linkend="using-the-clipboard" />.</para>
>+<listitem><para>Wrote <xref linkend="panel-and-desktop"/>.</para>
> </listitem>
>-<listitem><para>Wrote <xref
>-linkend="configuring-programs" />.</para>
>+<listitem><para>Wrote <xref linkend="logging-in"/>.</para>
> </listitem>
>-<listitem><para>Wrote <xref linkend="menus" />.</para>
>+<listitem><para>Wrote <xref linkend="using-the-clipboard"/>.</para>
> </listitem>
>-<listitem><para>Marked up parts of <xref
>-linkend="kde-for-administrators"/>.</para>
>+<listitem><para>Wrote <xref linkend="configuring-programs"/>.</para>
>+</listitem>
>+<listitem><para>Wrote <xref linkend="menus"/>.</para>
>+</listitem>
>+<listitem><para>Marked up parts of <xref linkend="kde-for-administrators"/>.</para>
> </listitem>
> </itemizedlist>
> 
>@@ -215,7 +215,7 @@
> </varlistentry>
> 
> <varlistentry>
>-<term>Deepak Sarda <email>antrix@gmail.com</email></term>
>+<term>Deepak Sarda</term>
> <listitem>
> 
> <itemizedlist>
>@@ -227,7 +227,7 @@
> </varlistentry>
> 
> <varlistentry>
>-<term>Robert Stoffers <email>robert_angie@ozemail.com.au</email></term>
>+<term>Robert Stoffers</term>
> <listitem>
> 
> <itemizedlist>
>@@ -239,7 +239,7 @@
> </varlistentry>
> 
> <varlistentry>
>-<term>Juan Carlos Torres <email>carlosdgtorres@gmail.com</email></term>
>+<term>Juan Carlos Torres</term>
> <listitem>
> 
> <itemizedlist>
>@@ -251,7 +251,7 @@
> </varlistentry>
> 
> <varlistentry>
>-<term>Simon Vermeersch <email>titeuf@ph34rus.org</email></term>
>+<term>Simon Vermeersch</term>
> <listitem>
> 
> <itemizedlist>
>@@ -262,7 +262,7 @@
> </listitem>
> </varlistentry>
> 
>-<varlistentry><term>&Lauri.Watts; &Lauri.Watts.mail;</term>
>+<varlistentry><term>&Lauri.Watts;</term>
> <listitem>
> 
> <itemizedlist>
>@@ -278,8 +278,7 @@
> </listitem>
> </varlistentry>
> 
>-<varlistentry><term>Christian Weickhmann
>-<email>christian.weickhmann@gmx.de</email></term>
>+<varlistentry><term>Christian Weickhmann</term>
> <listitem>
> 
> <itemizedlist>
>diff -urN tdebase/doc/userguide/customizing-desktop.docbook tdebase.new/doc/userguide/customizing-desktop.docbook
>--- tdebase/doc/userguide/customizing-desktop.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/userguide/customizing-desktop.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -8,12 +8,12 @@
> </authorgroup>
> </chapterinfo>
> 
>-<title>Customizing the Appearance of your &kde; Desktop</title>
>+<title>Customizing the Appearance of your &tde; Desktop</title>
> 
>-<para>Changing the appearance of your &kde; desktop can be done quite easily and
>+<para>Changing the appearance of your &tde; desktop can be done quite easily and
> flexibly by either individually controlling different parts of the visual
> appearance or by using a predefined theme. This guide explains the various
>-customizable parts of &kde; and how to control their appearance.</para>
>+customizable parts of &tde; and how to control their appearance.</para>
> 
> <sect1 id="background">
> <title>Background</title>
>@@ -22,7 +22,7 @@
> found in the &kcontrolcenter;, or by <mousebutton>right</mousebutton>-clicking
> on the desktop and selecting <guilabel>Configure Desktop...</guilabel>.</para>
> 
>-<para>In &kde;, you have the option to use no picture, a single picture, or a
>+<para>In &tde;, you have the option to use no picture, a single picture, or a
> slideshow of images. If <guilabel>No picture</guilabel> is chosen to be the
> desktop background, the <guilabel>Colors</guilabel> options are used instead.
> You can also choose whether to use a single
>@@ -86,12 +86,12 @@
> <imageobject>
> <imagedata fileref="splash-screen.png" format="PNG" />
> </imageobject>
>-<textobject><phrase>The default &kde; splash screen</phrase></textobject>
>-<caption><para>The default &kde; splash screen</para></caption>
>+<textobject><phrase>The default &tde; splash screen</phrase></textobject>
>+<caption><para>The default &tde; splash screen</para></caption>
> </mediaobject>
> 
> <para>The splash screen is the animated image or screen that is displayed while
>-&kde; loads after you log in. Each user can have a different splash screen.
>+&tde; loads after you log in. Each user can have a different splash screen.
> Changing the splash screen for the current user can be done in the Splash
> Screen module of the &kcontrolcenter;. Select the splash screen you want to
> use and click on <guibutton>Apply</guibutton>. You can also test what a splash
>@@ -113,12 +113,12 @@
> <sect1 id="win-deco">
> <title>Window Decorations</title>
> <para>You can change the appearance of window borders, titlebars and buttons in
>-&kde; using window decorations. Some window decorations even have the capability
>+&tde; using window decorations. Some window decorations even have the capability
> to apply effects such as translucency. Window decorations must be able to do all
> these without sacrificing speed and performance. This is the reason why window
> decorations come in source code that must be compiled, or as binary packages
> that must be installed. Basically, Window decorations are plugins or small
>-programs that instruct &twin;, &kde;'s Window Manager,
>+programs that instruct &twin;, &tde;'s Window Manager,
> how to display window frames.</para>
> 
> <para>In order to add a new window decoration, you need to compile it from
>@@ -141,7 +141,7 @@
> 
> <para>While all window decorations need to be compiled from source code, some
> window decorations can load pixmap-based theme files that do not need to be
>-compiled. &kde; ships with a pixmap-based window decoration called the IceWM
>+compiled. &tde; ships with a pixmap-based window decoration called the IceWM
> window decoration. Another pixmap-based window decoration is <ulink
> url="http://www.kde-look.org/content/show.php?content=31447">deKorator</ulink>,
> which can be found on kde-look.org. Please refer to your distribution's
>@@ -151,7 +151,7 @@
> while this may be unnoticeable on very fast systems.</para>
> 
> <para>To add an IceWM theme, select IceWM as the window decoration and click on
>-the <guilabel>Open &kde;'s IceWM theme folder</guilabel> link in the window
>+the <guilabel>Open &tde;'s IceWM theme folder</guilabel> link in the window
> decoration description area. This will open a &konqueror; window
> to <filename>$<envar>TDEHOME</envar>/share/apps/twin/icewm-themes</filename>.
> Extract your IceWM theme to this folder. The theme will then be added to
>@@ -169,9 +169,9 @@
> 
> <para>Some more window decorations are available at kde-look.org under <ulink
> url="http://www.kde-look.org/index.php?xcontentmode=17">the
>-Native &kde; 3.x</ulink> and <ulink
>+Native &tde; 3.x</ulink> and <ulink
> url="http://www.kde-look.org/index.php?xcontentmode=20">the
>-Native &kde; 3.2+</ulink> subsections. Themes for the <ulink
>+Native &tde; 3.2+</ulink> subsections. Themes for the <ulink
> url="http://www.kde-look.org/index.php?xcontentmode=18">IceWM</ulink> and
> <ulink
> url="http://www.kde-look.org/index.php?xcontentmode=21">deKorator</ulink> window
>@@ -183,7 +183,7 @@
> <title>Style</title>
> <para>Widgets are the basic elements of a graphical user interface, such as
> buttons, scrollbars, tabs, and menus. A widget style is a plugin or a small
>-program that instructs &kde; how widgets are displayed. Since widgets are the
>+program that instructs &tde; how widgets are displayed. Since widgets are the
> very basic parts of an interface, they are frequently accessed and must be able
> to respond very quickly. This is why widget styles must come as source code to
> be compiled or as binary packages to be installed, just like window decorations.
>@@ -202,29 +202,29 @@
> 
> <para>Additional widget styles can be found in <ulink
> url="http://www.kde-look.org/index.php?xcontentmode=
>-8x9x10x11x12x13x14x15x16">the different &kde; subsections of the
>+8x9x10x11x12x13x14x15x16">the different &tde; subsections of the
> Themes/Styles</ulink> of kde-look.org. Take note that styles come in source
>-code or binary package forms. They are not &kde; theme files.</para>
>+code or binary package forms. They are not &tde; theme files.</para>
> </sect1>
> 
> <sect1 id="kde-theme">
>-<title>&kde; Theme</title>
>-<para>&kde; allows you to save the different changes you made to your desktop's
>+<title>&tde; Theme</title>
>+<para>&tde; allows you to save the different changes you made to your desktop's
> appearance in one file, using the Theme Manager in &kcontrolcenter;. Once you
> have set up your desktop the way you want, click on <guibutton>Create New
> Theme...</guibutton>. Enter the details you want to give your theme, such as theme
> name, author, version, &etc;, then click <guibutton>OK</guibutton> when done.
> This will add your theme to the list of available themes and save your settings
>-in a &kde; theme. A &kde; theme (<literal role="extension">.kth</literal> file)
>-instructs &kde; on what window decoration, style, or color scheme to use for
>-that particular theme. To add a &kde; theme from an outside source, click on
>-<guibutton>Install New Theme...</guibutton> and locate the &kde; theme file.
>+in a &tde; theme. A &tde; theme (<literal role="extension">.kth</literal> file)
>+instructs &tde; on what window decoration, style, or color scheme to use for
>+that particular theme. To add a &tde; theme from an outside source, click on
>+<guibutton>Install New Theme...</guibutton> and locate the &tde; theme file.
> Removing a theme is easily done by clicking on <guibutton>Remove
> Theme</guibutton>. If you made changes to your theme, you have to either create
> a new theme name for it, or remove the previous version first to be able to use
> the same theme name.</para>
> 
>-<para>The following are the settings that are saved and indicated in a &kde;
>+<para>The following are the settings that are saved and indicated in a &tde;
> Theme:</para>
> 
> <itemizedlist>
>@@ -273,14 +273,14 @@
> </listitem>
> </itemizedlist>
> 
>-<para>One very important thing to consider when using or installing a &kde;
>-Theme is that it only indicates what settings to use for the above. A &kde;
>+<para>One very important thing to consider when using or installing a &tde;
>+Theme is that it only indicates what settings to use for the above. A &tde;
> Theme includes only system notifications, desktop background, panel background,
> &konqueror; background, and  the color scheme in its package. The other
> components must be installed separately if they do not already come with
>-&kde;.</para>
>+&tde;.</para>
> 
>-<para>&kde; Themes can be downloaded from the <ulink
>+<para>&tde; Themes can be downloaded from the <ulink
> url="http://www.kde-look.org/index.php?xcontentmode=8">Theme-Manager
> subsection</ulink> of
> kde-look.org, under the Themes/Styles section.</para>
>@@ -311,7 +311,7 @@
> 
> <glossentry id="gloss-splash-screen">
> <glossterm>Splash Screen</glossterm>
>-<glossdef><para>Animated image or screen that displays while &kde;
>+<glossdef><para>Animated image or screen that displays while &tde;
> loads after logging in</para></glossdef>
> </glossentry>
> 
>@@ -323,12 +323,12 @@
> 
> <glossentry id="gloss-style">
> <glossterm>Style</glossterm>
>-<glossdef><para>Plugin or a small program that instructs &kde;
>+<glossdef><para>Plugin or a small program that instructs &tde;
> how widgets are displayed</para></glossdef>
> </glossentry>
> 
> <glossentry id="gloss-kde-theme">
>-<glossterm>&kde; Theme</glossterm>
>+<glossterm>&tde; Theme</glossterm>
> <glossdef><para>(<literal role="extension">.kth</literal>)
> A file that contains instructions on what settings to use for
> different GUI components</para></glossdef>
>diff -urN tdebase/doc/userguide/email.docbook tdebase.new/doc/userguide/email.docbook
>--- tdebase/doc/userguide/email.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/userguide/email.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -20,7 +20,7 @@
> 
> <indexterm><primary>&kmail;</primary></indexterm>
> 
>-<para>&kde; features a powerful and easy-to-use email client called
>+<para>&tde; features a powerful and easy-to-use email client called
> &kmail;, which allows you to send, receive, and organize your email
> quickly and efficiently. Let us look at how to set it up. If you have
> any problems with this procedure, refer to the full &kmail; manual.</para>
>diff -urN tdebase/doc/userguide/extragear-applications.docbook tdebase.new/doc/userguide/extragear-applications.docbook
>--- tdebase/doc/userguide/extragear-applications.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/userguide/extragear-applications.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -9,12 +9,12 @@
> </authorgroup>
> </chapterinfo>
> 
>-<title>&kde; Extragear Applications</title>
>+<title>&tde; Extragear Applications</title>
> 
>-<para>These are applications that are directly associated with &kde;, the project, but do not appear and are not shipped with the main &kde; distribution. This can be down to a number of reasons, but a common case is either down to a duplication of functionality, or because they're simply too specialised. Perhaps the most popular occurence however is that the developers themselves may not want it to appear in the main &kde; distribution; choosing, rather, to handle their own release schedules. Nevertheless, the applications in Extragear are distinguished by &kde;, and many are increasingly popular. </para>
>+<para>These are applications that are directly associated with &tde;, the project, but do not appear and are not shipped with the main &tde; distribution. This can be down to a number of reasons, but a common case is either down to a duplication of functionality, or because they're simply too specialised. Perhaps the most popular occurence however is that the developers themselves may not want it to appear in the main &tde; distribution; choosing, rather, to handle their own release schedules. Nevertheless, the applications in Extragear are distinguished by &tde;, and many are increasingly popular. </para>
> 
> <sect1 id="extragear-components">
>-<title>Available in the &kde; Extragear</title>
>+<title>Available in the &tde; Extragear</title>
> 
> 
> <sect2 id="extragear-multimedia">
>@@ -23,7 +23,7 @@
> <variablelist>
> <varlistentry>
> <term>&amarok;</term>
>-	<listitem><para>An advanced and comprehensive music player with the capability to play <acronym>MP3</acronym>, <acronym>WAV</acronym>, and <acronym>OGG</acronym> audio filetypes and others. There is not room here to mention all of &amarok;'s features, but by default, &amarok; can automatically fetch cover art, embed song lyrics, and display aesthetically pleasing visualizations. &amarok; remains, as much of &kde; does, highly customizable; it contains a powerful scripting interface, and the context browser can be stylised easily using &CSS;. &amarok; also supports several backends, including  <application>GStreamer</application>, <application>xine</application>, <acronym>NMM</acronym>, <acronym>MAS</acronym>, <application>aKode</application> and &arts;.</para>
>+	<listitem><para>An advanced and comprehensive music player with the capability to play <acronym>MP3</acronym>, <acronym>WAV</acronym>, and <acronym>OGG</acronym> audio filetypes and others. There is not room here to mention all of &amarok;'s features, but by default, &amarok; can automatically fetch cover art, embed song lyrics, and display aesthetically pleasing visualizations. &amarok; remains, as much of &tde; does, highly customizable; it contains a powerful scripting interface, and the context browser can be stylised easily using &CSS;. &amarok; also supports several backends, including  <application>GStreamer</application>, <application>xine</application>, <acronym>NMM</acronym>, <acronym>MAS</acronym>, <application>aKode</application> and &arts;.</para>
> 	
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://amarok.kde.org">http://amarok.kde.org</ulink></para></listitem>
>@@ -38,7 +38,7 @@
> 
> <varlistentry>
> <term><application>K3b</application></term>
>-	<listitem><para>The definitive &CD;/<acronym>DVD</acronym> burning application for &kde;. With <application>K3b</application> you can create data, video, and audio (it comes with plugins for <acronym>WAV</acronym>, <acronym>MP3</acronym>, <acronym>FLAC</acronym>, and <application>Ogg Vorbis</application>) &CD;s. Projects can be saved and loaded, &CD;-ripping is supported, and you can appropriately make &CD;/<acronym>DVD</acronym> copies. </para>
>+	<listitem><para>The definitive &CD;/<acronym>DVD</acronym> burning application for &tde;. With <application>K3b</application> you can create data, video, and audio (it comes with plugins for <acronym>WAV</acronym>, <acronym>MP3</acronym>, <acronym>FLAC</acronym>, and <application>Ogg Vorbis</application>) &CD;s. Projects can be saved and loaded, &CD;-ripping is supported, and you can appropriately make &CD;/<acronym>DVD</acronym> copies. </para>
> 	
> 		<itemizedlist>
> 			<listitem><para>Extragear Summary: <ulink url="http://extragear.kde.org/apps/k3b/">http://extragear.kde.org/apps/k3b/</ulink></para></listitem>
>@@ -58,7 +58,7 @@
> <variablelist>
> <varlistentry>
> <term>&digikam;</term>
>-	<listitem><para>A photo management application which can conveniently organize and import digital photos. Features include complete tagging functionality, a plugin system, and a fully-featured comment system. &digikam; also makes use of <acronym>KIPI</acronym> (&kde; Image Plugin Interface), therefore contributing to the initiative to create a common plugin infrastructure, which allows development of image plugins that can be shared among graphical applications in &kde; (others include <application>Gwenview</application>, <application>ShowImg</application> and <application>KimDaBa</application>).</para>
>+	<listitem><para>A photo management application which can conveniently organize and import digital photos. Features include complete tagging functionality, a plugin system, and a fully-featured comment system. &digikam; also makes use of <acronym>KIPI</acronym> (&tde; Image Plugin Interface), therefore contributing to the initiative to create a common plugin infrastructure, which allows development of image plugins that can be shared among graphical applications in &tde; (others include <application>Gwenview</application>, <application>ShowImg</application> and <application>KimDaBa</application>).</para>
> 	
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://digikam.org">http://digikam.org</ulink></para></listitem>
>@@ -70,7 +70,7 @@
> 
> <varlistentry>
> <term><application>Gwenview</application></term>
>-	<listitem><para>Another advanced image viewer which can load and save all image formats supported by &kde;, as well as being able to display the <application>GIMP</application> (*.<acronym>xcf</acronym>) image filetype. <application>Gwenview</application> can perform a few graphical manipulations (rotate, mirroring) and has full support for KIO slaves (allowing you to use it via &FTP;). Other features also include file management operations, such as copy, paste, move and delete.</para>
>+	<listitem><para>Another advanced image viewer which can load and save all image formats supported by &tde;, as well as being able to display the <application>GIMP</application> (*.<acronym>xcf</acronym>) image filetype. <application>Gwenview</application> can perform a few graphical manipulations (rotate, mirroring) and has full support for KIO slaves (allowing you to use it via &FTP;). Other features also include file management operations, such as copy, paste, move and delete.</para>
> 	
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://gwenview.sourceforge.net/">http://gwenview.sourceforge.net/</ulink></para></listitem>
>@@ -83,7 +83,7 @@
> 
> <varlistentry>
> <term><application>ShowImg</application></term>
>-	<listitem><para>A feature-rich image viewer, written for &kde;, which can display numerous formats, including <acronym>JPEG</acronym>, <acronym>PNG</acronym>, [animated] <acronym>GIF</acronym> and <acronym>MNG</acronym>. It consists of a tree-view frame, a directory/preview frame, and a view frame. The (larger) view frame can be exchanged with the (smaller) directory/preview frame. It can preview and display images from multiple directories and search for identical images. <application>ShowImg</application> also features a full-screen mode, zooming, sorting, drag and drop with &konqueror;, and support for images in compressed archives.</para>
>+	<listitem><para>A feature-rich image viewer, written for &tde;, which can display numerous formats, including <acronym>JPEG</acronym>, <acronym>PNG</acronym>, [animated] <acronym>GIF</acronym> and <acronym>MNG</acronym>. It consists of a tree-view frame, a directory/preview frame, and a view frame. The (larger) view frame can be exchanged with the (smaller) directory/preview frame. It can preview and display images from multiple directories and search for identical images. <application>ShowImg</application> also features a full-screen mode, zooming, sorting, drag and drop with &konqueror;, and support for images in compressed archives.</para>
> 	
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://www.jalix.org/projects/showimg/">http://www.jalix.org/projects/showimg/</ulink></para></listitem>
>@@ -95,7 +95,7 @@
> 
> <varlistentry>
> <term><application>KimDaBa</application></term>
>-	<listitem><para><application>KimDaBa</application> (&kde; Image Database) attempts to provide an efficient solution for the organization of hundreds (or even thousands) of images. Having been highly optimized for annotating images, <application>KimDaBa</application> can help you locate an image in a matter of seconds.</para>
>+	<listitem><para><application>KimDaBa</application> (&tde; Image Database) attempts to provide an efficient solution for the organization of hundreds (or even thousands) of images. Having been highly optimized for annotating images, <application>KimDaBa</application> can help you locate an image in a matter of seconds.</para>
> 	
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://ktown.kde.org/kimdaba/">http://ktown.kde.org/kimdaba/</ulink></para></listitem>
>@@ -115,7 +115,7 @@
> <variablelist>
> <varlistentry>
> <term>&konversation;</term>
>-	<listitem><para>A fully-featured <acronym>IRC</acronym> client which supports per channel encoding, downloading and resuming file transfers, nick completion and highlighting, as well as tight integration with &kontact; and the rest of &kde;.</para>
>+	<listitem><para>A fully-featured <acronym>IRC</acronym> client which supports per channel encoding, downloading and resuming file transfers, nick completion and highlighting, as well as tight integration with &kontact; and the rest of &tde;.</para>
> 	
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://konversation.kde.org">http://konversation.kde.org</ulink></para></listitem>
>@@ -127,7 +127,7 @@
> 
> <varlistentry>
> <term><application>KMldonkey</application></term>
>-	<listitem><para>A &kde; frontend for <application>MLDonkey</application>, a powerful <acronym>P2P</acronym> file-sharing tool. Highly configurable, real-time graphical bandwidth and network statistics, and much more.</para>
>+	<listitem><para>A &tde; frontend for <application>MLDonkey</application>, a powerful <acronym>P2P</acronym> file-sharing tool. Highly configurable, real-time graphical bandwidth and network statistics, and much more.</para>
> 	
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://kmldonkey.org/">http://kmldonkey.org/</ulink></para></listitem>
>@@ -142,7 +142,7 @@
> 	<listitem><para>Displays for every network interface an icon in the systray. Tooltips and an info dialog provide further information about the interface. Passive popups inform about interface changes and a traffic plotter is also integrated.</para>
> 	
> 		<itemizedlist>
>-			<listitem><para><ulink url="http://kde-apps.org">&kde;-apps</ulink> entry: <ulink url="http://kmldonkey.org/">http://www.kde-apps.org/content/show.php?content=12956</ulink></para></listitem>
>+			<listitem><para><ulink url="http://kde-apps.org">&tde;-apps</ulink> entry: <ulink url="http://kmldonkey.org/">http://www.kde-apps.org/content/show.php?content=12956</ulink></para></listitem>
> 		</itemizedlist>
> 		
> 	</listitem>
>@@ -171,7 +171,7 @@
> 
> <varlistentry>
> <term><application>Krecipes</application></term>
>-	<listitem><para>A &kde; recipe tool that can manage a recipe database with an easy-to-use interface. Full support for creating and removing ingredients as well as units; helps with diets, can calculate the amount of calories, vitamins, carbohydrates etc. Other advantages are its flexilibity and potential to extend further.</para>
>+	<listitem><para>A &tde; recipe tool that can manage a recipe database with an easy-to-use interface. Full support for creating and removing ingredients as well as units; helps with diets, can calculate the amount of calories, vitamins, carbohydrates etc. Other advantages are its flexilibity and potential to extend further.</para>
> 	
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://krecipes.sourceforge.net">http://http://krecipes.sourceforge.net</ulink></para></listitem>
>@@ -190,9 +190,9 @@
> <title>Related Information</title>
> <itemizedlist>
> <title>Related Information and Links</title>
>-	<listitem><para>It should be stressed that the above is but a preview of what is available in the &kde; extragear. To view all of the applications and utilities available there visit <ulink url="http://extragear.kde.org">http://extragear.kde.org</ulink>, where a briefer summary of each application is provided.</para></listitem>
>+	<listitem><para>It should be stressed that the above is but a preview of what is available in the &tde; extragear. To view all of the applications and utilities available there visit <ulink url="http://extragear.kde.org">http://extragear.kde.org</ulink>, where a briefer summary of each application is provided.</para></listitem>
> 	<listitem><para>The handbooks for the majority of applications in extragear can be viewed from <ulink url="http://docs.kde.org">http://docs.kde.org</ulink>.</para></listitem>
>-	<listitem><para>Once again, you can find a plethora of other [third-party] &kde; applications at the popular <ulink url="http://kde-apps.org">http://kde-apps.org</ulink>.</para></listitem>
>+	<listitem><para>Once again, you can find a plethora of other [third-party] &tde; applications at the popular <ulink url="http://kde-apps.org">http://kde-apps.org</ulink>.</para></listitem>
> </itemizedlist>
> </sect1>
> 
>diff -urN tdebase/doc/userguide/font-installation.docbook tdebase.new/doc/userguide/font-installation.docbook
>--- tdebase/doc/userguide/font-installation.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/userguide/font-installation.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -16,7 +16,7 @@
> 
> <indexterm><primary>Fonts</primary></indexterm>
> 
>-<para>Fonts are really easy to configure in &kde;. Open up the Control
>+<para>Fonts are really easy to configure in &tde;. Open up the Control
> Center (with <menuchoice><guimenu>K-Menu</guimenu><guimenuitem>Control
> Center</guimenuitem></menuchoice>) and choose
> <guilabel>Font Installer</guilabel> in <guilabel>System
>diff -urN tdebase/doc/userguide/getting-help.docbook tdebase.new/doc/userguide/getting-help.docbook
>--- tdebase/doc/userguide/getting-help.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/userguide/getting-help.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -1,25 +1,17 @@
> <sect1 id="getting-help">
> 
>-<sect1info>
>-<authorgroup>
>-<author>&Lauri.Watts;
>-</author>
>-</authorgroup>
>-</sect1info>
>-
>-
> <title>Getting Help</title>
> 
> <sect2 id="user-manuals">
> <title>User Manuals</title>
> 
> <indexterm><primary>User Manual</primary></indexterm>
>-<para>Most applications come with a comprehensive user manual<indexterm><primary>User Manual</primary><secondary>Handbook</secondary></indexterm>, which you can
>-reach various ways:</para>
>+<para>Most applications come with a user manual<indexterm><primary>User Manual</primary><secondary>Handbook
>+</secondary></indexterm>, which can be reached in various ways:</para>
> 
> <itemizedlist>
> <listitem>
>-<para>By pressing <keycap>F1</keycap> inside the application.</para>
>+<para>By pressing <keycap>F1</keycap> while inside the application.</para>
> </listitem>
> <listitem>
> <para>From the menu bar:
>@@ -27,16 +19,12 @@
> </replaceable></guimenuitem></menuchoice></para>
> </listitem>
> <listitem>
>-<para>By browsing to it in &khelpcenter;<indexterm><primary>&khelpcenter;</primary></indexterm></para>
>+<para>By browsing in &khelpcenter;<indexterm><primary>&khelpcenter;</primary></indexterm></para>
> </listitem>
> <listitem>
>-<para>By using the help KIOslave in &konqueror;. So, in the Location Toolbar, simply type <userinput>help:/<replaceable>Application name</replaceable></userinput>
>+<para>By using the help KIOslave in &konqueror;. For example, in the Location bar, type <userinput>help:/<replaceable>Application name</replaceable></userinput>, where <replaceable>Application name</replaceable> is the name of the application.
> </para>
> </listitem>
>-<listitem>
>-<para>Online at <ulink
>-url="http://docs.kde.org">http://docs.kde.org</ulink></para>
>-</listitem>
> </itemizedlist>
> 
> </sect2>
>@@ -45,25 +33,26 @@
> <title>Context and <quote>What's This</quote> Help</title>
> 
> <para>Many applications also provide context help in two forms:
>-Tooltips, and <quote>What's This</quote> help.</para>
>+Tooltips and <quote>What's This</quote> help.</para>
> 
> <sect3 id="tooltips">
> <title>Tooltips</title>
> 
> <indexterm><primary>Tooltips</primary></indexterm>
>-<para>Tooltips are small informational windows or balloons that display when
>-you hover the mouse over an item on your screen without clicking.</para>
>+<para>Tooltips are small informational windows or balloons that appear when
>+hovering the mouse over an item.</para>
> 
>-<para>&kde; uses tooltips in many places to provide brief help or
>-information about an item on your screen.  For instance, most toolbar buttons
>-inside applications will display their name in a tooltip if you rest or hover
>-your mouse over them.</para>
>+<para>&tde; uses tooltips in many places to provide brief help or
>+information about an item on the screen. For instance, most toolbar buttons
>+inside applications will display their name in a tooltip when resting or hovering
>+the mouse pointer over them.</para>
> 
> <para>Tooltips have another function, which is not specifically tied to
>-help.  In the &konqueror; file manager and on your Desktop, tooltips can
>-provide information about files.  This is commonly referred to as <quote>meta information</quote>.</para>
>+help. In the &konqueror; file manager and on the Desktop, tooltips can
>+provide information about files. This information is commonly referred to as
>+<quote>meta information</quote>.</para>
> 
>-<para>You can find out more about meta-information tooltips in the section
>+<para>Learn more about meta-information tooltips in the section
> about <link linkend="file-manager">the &konqueror; file manager</link>.</para>
> 
> </sect3>
>@@ -73,12 +62,12 @@
> 
> <indexterm><primary>What's This?</primary></indexterm>
> 
>-<para><quote>What's This?</quote> help is usually more detailed than tooltips.
>-You can access <quote>What's This?</quote> help in two ways:</para>
>+<para><quote>What's This?</quote> help usually is more detailed than tooltips.
>+Access <quote>What's This?</quote> help in two ways:</para>
> 
> <itemizedlist>
> <listitem>
>-<para>By pressing the <guibutton>?</guibutton> button in the titlebar of the
>+<para>By selecting the <guibutton>?</guibutton> button in the titlebar of the
> window.</para>
> </listitem>
> <listitem>
>@@ -87,69 +76,48 @@
> </listitem>
> </itemizedlist>
> 
>-<para>The cursor will change to a pointer with a question mark next to it.
>-Click on the item you want to know about, and a small window will
>+<para>The mouse pointer will change to a pointer with a question mark.
>+Select an item to learn more, and a small window will
> pop up displaying information.</para>
> 
> </sect3>
> </sect2>
> 
> <sect2 id="mailing-lists-newsgroups-and-irc">
>-<title>Mailing Lists, Newsgroups and <acronym>IRC</acronym></title>
>+<title>Mailing Lists, Newsgroups, and <acronym>IRC</acronym></title>
> 
> <sect3 id="mailing-lists">
> <title>Mailing Lists</title>
> 
> <indexterm><primary>Mailing Lists</primary></indexterm>
>-<para>&kde; provides many mailing lists which can provide you with help
>-and guidance in using and configuring your Desktop.</para>
>-
>-<para>Some of the lists you might find useful are:</para>
>+<para>The &tde; Team provides some mailing lists to provide help
>+and guidance with using and configuring &tde;:</para>
> 
> <variablelist>
> <varlistentry>
>-<term>The &kde; User List
>-<indexterm><primary>&kde; User Mailing List</primary></indexterm></term>
>+<term>The &tde; User List
>+<indexterm><primary>&tde; User Mailing List</primary></indexterm></term>
> <listitem>
>-<para>This mailing list focuses specifically on <acronym>OS</acronym>-independent questions
>-and discussions regarding using &kde;. Operating-system-specific questions and
>-discussion are off-topic here. For
>-example, the question <quote>How do I change the margin size for KWord
>-documents</quote> is appropriate for this list; whereas <quote>How do I set
>-up my printer using &kde; under UnixOS X.Y</quote> is not. Questions asked and
>-discussions here should apply to all &kde; users using the applicable &kde;
>-software, not just those using the same operating system.</para>
>-<para>You can subscribe to this list at <ulink
>-url="https://mail.kde.org/mailman/listinfo/kde">https://mail.kde.org/mailman/listinfo/kde</ulink>.</para>
>-<para>You can find archives at <ulink
>-url="http://lists.kde.org/?l=kde">http://lists.kde.org/?l=kde</ulink>.</para>
>+<para>This mailing list focuses specifically on questions
>+and discussions about using &tde;. For example,
>+the question <quote>How do I change the margin size for KWord
>+documents</quote> is appropriate for this list.</para>
>+<para>Subscribe to this list at <ulink
>+url="http://www.trinitydesktop.org/mailinglist.php">http://www.trinitydesktop.org/mailinglist.php</ulink>.</para>
>+<para>Find archives at <ulink
>+url="http://trinity-users.pearsoncomputing.net/">http://trinity-users.pearsoncomputing.net/</ulink>.</para>
> </listitem>
> </varlistentry>
> 
>-<varlistentry>
>-<term>The &kde;-&Linux; List
>-<indexterm><primary>kde-linux Mailing List</primary></indexterm></term>
>-<listitem>
>-<para>This mailing list focusses specifically on questions and discussions
>-regarding using &kde; on &Linux;. Questions and discussions can involve any
>-issue confronting desktop users who run &kde; on a &Linux; system. Hence,
>-questions such as <quote>How do I setup a networked printer for printing from
>-&kde; on LinuxDistro X.Y</quote> are appropriate here. If you prefer a list
>-limited to <acronym>OS</acronym>-independent questions and discussions
>-concerning &kde;, please use the general &kde; mailing list.</para>
>-<para>You can subscribe to this list at <ulink
>-url="https://mail.kde.org/mailman/listinfo/kde-linux">https://mail.kde.org/mailman/listinfo/kde-linux</ulink>.</para>
>-<para>You can find archives at <ulink
>-url="http://lists.kde.org/?l=kde-linux">http://lists.kde.org/?l=kde-linux</ulink>.</para>
>-</listitem>
>-</varlistentry>
> </variablelist>
> </sect3>
> 
> <sect3>
> <title>IRC</title>
> 
>-<para>There is a #kde channel on Freenode (irc.freenode.net) for support and other general talk about &kde;. As usual, you can access this channel by using any of &kde;'s popular IRC clients which include <application>konversation</application>, &ksirc;, as well as &kopete;. For more information, check the <xref linkend="irc"/> section.</para>
>+<para>There is a #trinity channel on Freenode (irc.freenode.net) for support and other general talk about &tde;.
>+Access this channel by using any of &tde;'s popular IRC clients, which include <application>Konversation</application>,
>+&ksirc; and &kopete;. For more information, check the <xref linkend="irc"/> section.</para>
> 
> </sect3>
> </sect2>
>@@ -158,34 +126,26 @@
> <sect2 id="more-resources">
> <title>More Resources</title>
> 
>-<para>There are many other resources which you may found useful; some of these are listed below:</para>
>-
>-<variablelist>
>-<varlistentry>
>-<term>dot.kde.org
>-<indexterm><primary>&kde; News Resource</primary></indexterm></term>
>-<listitem>
>-<para>This website has a searchable &kde; news resource where you can find out about a superfluity of innovations in the world of &kde;.</para>
>-</listitem>
>-</varlistentry>
>-</variablelist>
>+<para>Other resources that might prove useful:</para>
> 
> <variablelist>
> <varlistentry>
>-<term>kde-look.org
>-<indexterm><primary>icandy for &kde;</primary></indexterm></term>
>+<term>trinitydesktop.org/rss.php (RSS Feed)
>+<indexterm><primary>&tde; News Resource</primary></indexterm></term>
> <listitem>
>-<para>The paramount resource for &kde; icandy, including themes, window decorations, wallpapers, mouse themes and icons for your &kde; desktop. Note also that the site contains a howto section on how to install the most common of these.</para>
>+<para>The RSS feed news resource to stay informed about &tde;.</para>
> </listitem>
> </varlistentry>
> </variablelist>
> 
> <variablelist>
> <varlistentry>
>-<term>wiki.kde.org
>-<indexterm><primary>&kde; wiki</primary></indexterm></term>
>+<term><ulink
>+url="http://www.trinitydesktop.org/wiki">http://www.trinitydesktop.org/wiki</ulink>
>+<indexterm><primary>The &tde; Wiki</primary></indexterm></term>
> <listitem>
>-<para>The official &kde; Wiki. From here you can have access to a plethora of information ranging from frequently asked questions and HOWTOs to tips and tricks. The wiki should never, however, be used as a substitute for the respective application's handbook or the official &kde; documentation.</para>
>+<para>The &tde; Wiki. The wiki should not be used as a substitute for the
>+respective application's handbook or official &tde; documentation.</para>
> </listitem>
> </varlistentry>
> </variablelist>
>diff -urN tdebase/doc/userguide/glossary.docbook tdebase.new/doc/userguide/glossary.docbook
>--- tdebase/doc/userguide/glossary.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/userguide/glossary.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -15,7 +15,7 @@
> 
> <title>Glossary of Terms</title>
> 
>-<para>KDE/GUI/UNIX terms that are worth explaining.</para>
>+<para>TDE/GUI/UNIX terms that are worth explaining.</para>
> 
> </chapter>
> 
>diff -urN tdebase/doc/userguide/groupware-kontact.docbook tdebase.new/doc/userguide/groupware-kontact.docbook
>--- tdebase/doc/userguide/groupware-kontact.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/userguide/groupware-kontact.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -21,14 +21,14 @@
> 
> <para>For my small office, I was looking for a long time for a
> <acronym>PIM</acronym> solution that let me share data, so my secretary and
>-I can share contacts, appointments and so on. Being a &kde; user, I've heard
>+I can share contacts, appointments and so on. Being a &tde; user, I've heard
> about the Kroupware project and wait its completion. But when I saw how
> complicated is the architecture and setup of the
> <application>Kolab</application> server 1.0 (the server side of the
> project), I gave up, waiting for an easier to deploy
> <application>Kolab</application> 2.0. In any case, the
> <application>Kolab</application> stuff was clearly too much for my
>-needs. Fortunately in the &kde; wiki I've found some piece of
>+needs. Fortunately in the &tde; wiki I've found some piece of
> <acronym>IRC</acronym> conversation where they were talking about sharing
> data without the <application>Kolab</application> infrastructure... mmm so
> interesting!</para>
>@@ -38,12 +38,12 @@
> or another groupware backend. It can work with just an
> <acronym>IMAP</acronym> server, that can be easily set up.</para>
> 
>-<para>My scenario is a server with Debian unstable and &kde; 3.4. I access
>+<para>My scenario is a server with Debian unstable and &tde; 3.4. I access
> &kontact; and other fabulous GNU/Linux apps from windows using Cygwin/X,
> while waiting Wine project to be able to run the last Windows programs I
> need (and that are not available under GNU/Linux). I want to share contacts,
> events, todo, notes with my secretary.</para>
>-  
>+
> </sect1>
> 
> <sect1 id="kontact-imap-whatis">
>@@ -57,27 +57,27 @@
> rename mailboxes; get new messages; delete messages; and perform search
> functions on mail. A separate protocol is required for sending mail. Also
> called Internet Mail Access Protocol.</para></blockquote> </para>
>-  
>+
> <para>So it can be considered a data storage. To use it you you need an
> <acronym>IMAP</acronym> server, such as <application>Cyrus</application>,
> <application>Courier</application> or <application>UW</application>.</para>
>-  
>+
> </sect1>
> 
> <sect1 id="kontact-kolab-or-imap">
> <title><application>Kolab</application> or <acronym>IMAP</acronym>?</title>
>-  
>+
> <para><application>Kolab</application> brings the ability to share data
> between different clients. It makes possible for your secretary to use
> <application>Outlook</application> and you use &kontact;, for
> instance.</para>
>-  
>+
> <para>You will have a configuration interface which does user management, mail
> account setup, a central <acronym>LDAP</acronym> config data and addressbook
> server, spam and virus filtering, vacation scripts, free busy list handling,
> resource handling (rooms, cars), groups, distribution lists, automatic
> invitation handling, &etc;</para>
>-  
>+
> <para>But that can cause initial setup troubles. For a newbie like me it
> means: a long long frustrating nightmare, and too much complexity to manage
> once working. So no, thanks, I'll go to simple
>@@ -87,15 +87,15 @@
> 
> <sect1 id="kontact-imap-cyrus">
> <title>How to set up <acronym>IMAP</acronym> server <application>Cyrus</application></title>
>-   
>+
> <para>My choice is <application>Cyrus</application>, that is part of the
> <application>Kolab</application> set of software, so if l will go for
> <application>Kolab</application> in the future, at least I'm acquainted with
> it.</para> <para>Let's start the installation and the setup!</para>
>-  
>+
> <para>Become <systemitem class="username">root</systemitem>.</para>
> 
>-<screen># <userinput><command>apt-get</command> <command>install</command> cyrus21-imapd cyrus21-common cyrus21-admin cyrus21-client sasl-bin sasl2-bin</userinput> 
>+<screen># <userinput><command>apt-get</command> <command>install</command> cyrus21-imapd cyrus21-common cyrus21-admin cyrus21-client sasl-bin sasl2-bin</userinput>
> <computeroutput>Installing cyrus21-imapd...</computeroutput><lineannotation>The installer asks something I've not understood about an search address... I just pressed <keycap>Enter</keycap></lineannotation>.</screen>
> 
> <para>The installer also created the user <systemitem
>@@ -222,7 +222,7 @@
> 
> <sect1 id="kontact-imap-clients">
> <title>How to setup &kontact; clients</title>
>-  
>+
> <para>I connect to my GNU/Linux office server PC (a sort of "black box"
> without monitor and keyboard) from 2 &Windows; 2000 PC with
> <application>Cygwin/X</application>, using them as a X-Window server (in the
>@@ -230,7 +230,7 @@
> LTSP). With this setup every user runs &kontact; on the same machine where
> <application>Cyrus</application> is installed and running
> (localhost).</para>
>-  
>+
> <para>To have &kontact; work with <acronym>IMAP</acronym>, there are these
> steps to complete:</para>
> 
>@@ -254,8 +254,8 @@
> <application>Cyrus</application> IMAP</para></step>
> 
> </procedure>
>-  
>-<para>So login to &kde; with the first <quote>real user</quote> account you
>+
>+<para>So login to &tde; with the first <quote>real user</quote> account you
> want to provide groupware functionality to.</para>
> 
> <para>Let's create the IMAP account in &kmail;.</para>
>@@ -275,7 +275,7 @@
> <listitem>
> <para>A name that will be used for the <quote>local</quote> folder that
> points to this <acronym>IMAP</acronym> account.</para>
>-</listitem> 
>+</listitem>
> </varlistentry>
> <varlistentry>
> <term><guilabel>Login:</guilabel> <userinput>groupware</userinput></term>
>@@ -304,12 +304,12 @@
> </listitem>
> </varlistentry>
> </variablelist>
>-  
>+
> <para>Check <guilabel>store IMAP password</guilabel>
> so you will not be asked for it next time you run &kontact;. Check the
> <guilabel>Enable interval mail checking</guilabel> and set a value in
> minutes.</para>
>-  
>+
> <para>Note that we have checked the <guilabel>disconnected IMAP</guilabel>
> type account. This has the effect that a copy of the groupware data is
> stored <quote>locally</quote> to the client (under the home folder), and it
>@@ -320,7 +320,7 @@
> and have &korganizer; and &kaddressbook; interpret it. If you use
> <quote>disconnected IMAP</quote> data is cached locally, and only the
> <quote>delta</quote> (&ie; the data that has changed) is sent.</para>
>-  
>+
> <para>On the other end, if your users run &korganizer; on the same PC that
> runs the <acronym>IMAP</acronym> server, it seems reasonable to use
> <acronym>IMAP</acronym> (that is called <quote>online IMAP</quote>) to save
>@@ -332,7 +332,7 @@
> folder). In addition, at start up when it does read
> <guilabel>Calendar</guilabel> folders, you may see a tremendous flicker and
> slow data updates.</para>
>-  
>+
> <para>Now we have to tell &kontact; to use <acronym>IMAP</acronym> as the
> data source for it's various components. From the &kmenu;, choose
> <guimenuitem>Run command</guimenuitem>, run <userinput><command>kcmshell
>@@ -341,7 +341,7 @@
> button, and choose <guilabel>Addressbook on IMAP Server via KMail</guilabel>. Then select that new line and
> press <guibutton>Use as Standard</guibutton> button. Do the same for
> <guilabel>Calendar</guilabel> and <guilabel>Notes</guilabel>.</para>
>-  
>+
> <para>Now we have to enable the &kmail; (and as a consequence, the whole
> &kontact;) groupware functionality:</para>
> 
>@@ -369,7 +369,7 @@
> is clear.</para>
> </step>
> <step>
>-<para>When you press OK you are prompted with: 
>+<para>When you press OK you are prompted with:
> <computeroutput>&kmail; will now create the required folders for the IMAP
> resource as subfolders of Inbox</computeroutput> </para>
> <para>If you do not want this, press <guibutton>No</guibutton>, and the
>@@ -411,7 +411,7 @@
> application does not show subitems below the <guilabel>Imap
> resource</guilabel>.</para>
> 
>-<para>You can now login to &kde; with a different username and set up
>+<para>You can now login to &tde; with a different username and set up
> his/her &kontact; client in a very similar manner:</para>
> 
> <procedure>
>@@ -446,7 +446,7 @@
> <acronym>IMAP</acronym> implementation in &kontact; prior to version 1.01 is
> broken, so this setup will not work for them, so you want to use them, you
> need to use the previous setup.</para></note>
>-    
>+
> <para>In the previous setup, we have the same <quote>fake</quote> user, named
> <systemitem class="username">groupware</systemitem>, that is used by all the
> <quote>real</quote> &kontact; users (&ie; <systemitem
>@@ -458,10 +458,10 @@
> everyone connects as the user <systemitem
> class="username">groupware</systemitem> to the <acronym>IMAP</acronym>
> server.</para>
>-    
>+
> <para>To limit access to some users (typically, providing read-only access),
> we can use the <acronym>ACL</acronym> (Access Control Lists).</para>
>-    
>+
> <para>Select in &kmail; a subfolder of <guilabel>office_gwdata</guilabel>
> inbox, for instance <guilabel>Calendar</guilabel>, and right click the
> mouse. Select <guilabel>Properties</guilabel><guilabel>Access
>@@ -503,7 +503,7 @@
> folders are subfolders of</guilabel> put the
> <guimenuitem>inbox</guimenuitem> that is subfolder of
> <guisubmenu>office_gwdata</guisubmenu>.</para>
>-  
>+
> <para>Now you have two branches of folder under
> <quote>office_gwdata</quote>:</para>
> 
>@@ -544,7 +544,7 @@
> <title>Special thanks to:</title>
> <listitem>
> <para>For the <application>Cyrus</application> <acronym>IMAP</acronym> part
>-in #cyrus channel:</para> 
>+in #cyrus channel:</para>
> <itemizedlist>
> <listitem>
> <para>[protagonist] Andy Morgan <email>morgan@orst.edu</email></para>
>@@ -582,10 +582,10 @@
> 
> <itemizedlist>
> <title>Reference</title>
>-<listitem><para>KDE: <ulink url="http://www.kde.org">http://www.kde.org</ulink></para></listitem>
>+<listitem><para>TDE: <ulink url="http://www.kde.org">http://www.kde.org</ulink></para></listitem>
> <listitem><para>&kontact; website: <ulink url="http://www.kontact.org">http://www.kontact.org</ulink></para></listitem>
> <listitem><para>Kroupware project: <ulink url="http://www.kroupware.org">http://www.kroupware.org</ulink></para></listitem>
>-<listitem><para>&kde; Community Wiki: <ulink url="http://wiki.kde.org">http://wiki.kde.org</ulink></para></listitem>
>+<listitem><para>&tde; Community Wiki: <ulink url="http://wiki.kde.org">http://wiki.kde.org</ulink></para></listitem>
> <listitem><para>Wine project: <ulink url="http://www.winehq.org">http://www.winehq.org</ulink></para></listitem>
> <listitem><para>Cygwin/X project <ulink url="http://x.cygwin.com">http://x.cygwin.com</ulink></para></listitem>
> <listitem><para>LTSP project: <ulink url="http://www.ltsp.org">http://www.ltsp.org</ulink></para></listitem>
>diff -urN tdebase/doc/userguide/index.docbook tdebase.new/doc/userguide/index.docbook
>--- tdebase/doc/userguide/index.docbook	2012-01-26 15:03:48.000000000 -0600
>+++ tdebase.new/doc/userguide/index.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -2,7 +2,7 @@
>   <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
>   <!ENTITY kappname "<replaceable>KApp</replaceable>">
>   <!ENTITY % addindex "INCLUDE">
>- <!ENTITY % imageobjectco.module "INCLUDE">
>+  <!ENTITY % imageobjectco.module "INCLUDE">
>   <!ENTITY getting-help SYSTEM "getting-help.docbook">
>   <!ENTITY programs-controlling SYSTEM "programs-controlling.docbook">
>   <!ENTITY troubleshooting-no-open SYSTEM "troubleshooting-no-open.docbook">
>@@ -56,11 +56,11 @@
> 
> <book lang="&language;">
> <bookinfo>
>-<title>The &kde; User Guide</title>
>+<title>The &tde; (Trinity Desktop Environment) User Guide</title>
> 
> <authorgroup>
> <corpauthor>
>-The &kde; Documentation Team
>+The &tde; Documentation Team
> </corpauthor>
> 
> 
>@@ -70,23 +70,28 @@
> <year>2004</year><year>2005</year>
> <holder>The &kde; Documentation Team</holder>
> </copyright>
>+<copyright>
>+<year>2012</year>
>+<holder>The &tde; Documentation Team</holder>
>+</copyright>
> 
> <legalnotice>&FDLNotice;</legalnotice>
> 
>-<date>2004-06-16</date>
>-<releaseinfo>0.0.1</releaseinfo>
>+<date>2012-02-01</date>
>+<releaseinfo>0.2</releaseinfo>
> 
> <abstract>
>-<para>A general user guide to &kde;
>+<para>A general user guide to the Trinity Desktop Environment.
> </para>
> 
>-<para>Please report any problems with this document to
>-<email>kde-doc-english@kde.org</email>.
>+<para>Please report problems with this document to
>+<email>trinity-devel@lists.pearsoncomputing.net</email>.
> </para>
> </abstract>
> 
> <keywordset>
> <keyword>KDE</keyword>
>+<keyword>TDE</keyword>
> <keyword>desktop</keyword>
> <keyword>handbook</keyword>
> <keyword>tutorial</keyword>
>@@ -98,58 +103,53 @@
> <title>Introduction</title>
> 
> <chapter id="welcome">
>-<title>Welcome to the &kde; User Guide</title>
>+<title>Welcome to the &tde; User Guide</title>
> 
>-<para>This User Guide aims to provide an overview of the entire &kde; experience.  We
>-assume here that you have a standard, working installation of a complete &kde;
>-desktop environment, and the accompanying packages.  This book should be
>-your first point of reference for any simple &kde; configuration question, or
>-to find out how to perform a common task.</para>
>+<para>This User Guide provides an overview of &tde;. Use this
>+guide after installing &tde; and accompanying packages. This guide should be
>+a first point of reference for basic &tde; configuration questions, or
>+to learn to perform common tasks.</para>
> 
> <sect1 id="what-the-ug-is">
>-<title>What this book aims to be</title>
>+<title>What this guide aims to be</title>
> 
>-<para>The first place to look and a one stop shop for all questions you have
>-regarding your &kde; experience.</para>
>+<para>The first place to look and a one-stop location for questions
>+regarding &tde;.</para>
> 
>-<para>A Quick Start Guide to commonly performed tasks - In most cases, you do not
>-need to know the details of how to configure every option in an application,
>-in order to get down to work.  You will find step-by-step guides which
>-will work in most common situations, along with links to sources of
>-further information in case you have any problems.</para>
>+<para>A quick guide to commonly performed tasks. In most cases, learning
>+basic functions does not require configuring every option in an application.
>+Provided in this guide is information that works
>+for most common situations, along with links to sources of
>+further information.</para>
> 
>-<para>There are also some tips and tricks showing you the most useful and
>-impressive features of &kde;, and ways to save you time and effort.</para>
>+<para>There are also some tips and tricks showing useful features
>+of &tde; and ways to save time and effort.</para>
> 
> </sect1>
> 
> <sect1 id="what-the-ug-is-not">
> <title>What this book is not</title>
> 
>-<para>The User Guide is not intended to be a replacement for the application
>-manuals.  You should turn to the handbook for help with specific program
>-configuration and troubleshooting issues not covered in this book. If the
>-answer is outside the scope of this book, we will tell you here precisely
>-where to look for further help.</para>
>-
>-<para>You may also have a variety of third party packages, and some of these
>-applications are mentioned briefly here, but we normally cover only the
>-applications provided as part of a &kde; release.  This is not a judgment on
>-the value of third party applications, and in fact many of them are
>-excellent.</para>
>-
>-<para>The User Guide is not specific to a distribution, and covers a default &kde;
>-installation.  Your local installation may be customized by your
>-distribution provider, or by yourself, and so our advice here is
>-generic. You may have to adjust paths in order to locate the files that are
>-discussed.</para>
>+<para>This guide is not intended to replace the individual application
>+handbook help manuals. Use the appropriate handbook to help with specific program
>+configuration and troubleshooting issues not covered in this guide. Where to find
>+additional information is provided when answers are outside the scope of this guide.</para>
>+
>+<para>Several applications provided outside the main &tde; suite
>+are mentioned in this guide, but mostly this guide covers only the
>+applications provided as part of the main suite.</para>
>+
>+<para>The user guide is not specific to a distribution and covers a default &tde;
>+installation. Local installations might be customized by
>+distribution providers, or end-users. Therefore advice provided in this guide is
>+generic. For example, file paths used to run files might be different than
>+described in this guide.</para>
> </sect1>
> 
> <sect1 id="typographic-conventions">
> <title>Conventions used in this book</title>
> 
>-<para>We'll use the following formatting conventions to make it clear what
>-we're referring to:
>+<para>The following formatting conventions are used:
> <informaltable>
> <tgroup cols="3">
> 
>@@ -191,7 +191,7 @@
> <row>
> <entry>Text you should enter</entry>
> <entry>Bold, fixed width font</entry>
>-<entry><userinput>ls -al kde/</userinput></entry>
>+<entry><userinput>ls -al tde/</userinput></entry>
> </row>
> 
> <row>
>@@ -205,30 +205,39 @@
> </informaltable>
> </para>
> 
>+<para>Mouse buttons often are referred to as the left mouse button and right mouse button.
>+Traditionally, the left mouse button is used the primary button to select items and the right
>+mouse button is used as the secondary button to open popup context menus. Within that context,
>+terms such as "left-click" and "right-click" have become common. Unfortunately, that terminology
>+describes the buttons from a right-handed perspective. For people using a mouse configured
>+for left-handed use, the roles of the buttons are reversed. That is, the right mouse button
>+becomes the primary button and the left mouse button becomes the secondary button. To avoid
>+confusion in this guide, that traditional terminology will be used as little as possible.
>+Although this guide is revised periodically, those traditional terms might still be used.</para>
>+
> </sect1>
> 
> <sect1 id="system-locations">
> <title>System Locations</title>
> 
>-<para>You may need to know the following system locations:
>+<para>The following system location information might be useful:
> 
> <variablelist>
> 
> <varlistentry>
>-<term>&kde; prefix</term>
>-<listitem><para>&kde; installs into its own folder tree, which you can find by
>+<term>&tde; prefix</term>
>+<listitem><para>&tde; installs into its own folder tree, which is found by
> running the command <userinput><command>kde-config</command> <option>--prefix</option></userinput>. This folder is referred to
>-by the environment variables  $<envar>TDEDIRS</envar> and possibly
>-$<envar>TDEDIR</envar>.</para>
>+by the environment variable $<envar>TDEDIR</envar> and possibly
>+$<envar>TDEDIRS</envar>.</para>
> </listitem>
> </varlistentry>
> 
> <varlistentry>
>-<term>&kde; user-specific settings</term>
>+<term>&tde; user-specific settings</term>
> <listitem><para>The environment variable $<envar>TDEHOME</envar>
>-points to the folder where &kde; should find user-specific settings.  If it is not
>-set, the default value of <filename
>-class="directory">~/.kde</filename> is used.</para>
>+points to the folder where &tde; should find user-specific settings.
>+The default location is <filename class="directory">$HOME/.trinity</filename>.</para>
> </listitem>
> </varlistentry>
> 
>@@ -243,36 +252,34 @@
> <para>Here's an overview of what's in the User Guide:</para>
> 
> <para><xref linkend="desktop"/> contains an introduction to the basic
>-use of &kde;, such as <xref linkend="windows-how-to-work"/>,  and the tools
>-that you'll be using in all &kde; applications, like <xref
>-linkend="programs-save-open" />. If you're new to &kde; or even
>-computers in general, you will probably find this section
>-helpful.</para>
>+use of &tde;, such as <xref linkend="windows-how-to-work"/>, and the tools
>+used in all &tde; applications, like <xref
>+linkend="programs-save-open" />. Those users new to &tde; or
>+computers in general, will find this section helpful.</para>
> 
> <para><xref linkend="components"/> explains some important components
>-of a &kde; installation and how they fit together: &kde;'s multimedia
>-and networking capabilities are extensive, and not covered thoroughly
>+of a &tde; installation and how they fit together. &tde;'s multimedia
>+and networking capabilities are extensive and not covered thoroughly
> here, but there's a taster of both of them in this part of the User
>-Guide. At the end of this part, you'll find a guide to tweaking &kde;
>-just that little bit more, in <xref
>-linkend="tinkering-under-the-hood"/>.</para>
>+Guide. At the end of this part are suggestions for tweaking &tde;
>+in <xref linkend="tinkering-under-the-hood"/>.</para>
> 
>-<para><xref linkend="kde-online"/> highlights &kde;'s suite of
>-Internet applications. &kde; includes a powerful web browser,
>+<para><xref linkend="kde-online"/> highlights &tde;'s suite of
>+Internet applications. &tde; includes a powerful web browser,
> &konqueror;, a full-featured email client, &kmail;, a news reader,
>-&knode;, and many more applications to make your Internet experience
>-easier and more productive. This part of the User Guide contains
>-information about setting up these applications.</para>
>+&knode;, and many more applications to use the Internet.
>+This part of the User Guide contains
>+information about configuring these applications.</para>
> 
> <para><xref linkend="kde-for-administrators"/> is a reference guide to
>-some &kde; features which will be useful to administrators setting up
>-multi-user systems. This part also has information that may be useful
>-to &kde; users with single-user systems: where configuration files are
>-stored, what environment variables affect &kde;, and so on. The KIOSK
>-framework is the &kde; system which allows administrators to limit
>-what users can do in &kde;. It is potentially useful in many
>+some &tde; features that are useful to administrators configuring
>+multi-user systems. This part also has information that might be useful
>+to &tde; users with single-user systems: where configuration files are
>+stored, what environment variables affect &tde;, and so on. The KIOSK
>+framework is the &tde; system which allows administrators to limit
>+what users can do in &tde;. That framework is potentially useful in many
> situations, but especially for running single-function kiosks with,
>-for example, just a web browser, hence the name.</para>
>+for example, only a web browser, hence the name.</para>
> 
> </sect1>
> </chapter>
>@@ -284,11 +291,9 @@
> <chapter id="basics">
> <title>The Basics</title>
> <para>The <quote>desktop</quote><indexterm><primary>Desktop</primary>
>-</indexterm> is just the name for the layout of
>-the screen when you start &kde;. It looks something like this (on your
>-own system, it might look slightly different, but the main features
>-should be the
>-same):</para>
>+</indexterm> is the name for the layout of
>+the screen when starting &tde;. The desktop might look slightly different,
>+but the main features should be the same as the following image.</para>
> 
> <screenshot>
> <mediaobject>
>@@ -300,118 +305,118 @@
> </mediaobject>
> </screenshot>
> 
>-<para>Let us look at the most important parts: 
>+<para>Let us look at the most important parts:
> <itemizedlist>
> <listitem><para>Most of the screen is
>-taken up by the background<indexterm><primary>Background</primary></indexterm>. At the moment, there is a picture making up
>-the background. This picture is usually referred to as the
>-<quote>wallpaper,</quote><indexterm><primary>Wallpaper</primary></indexterm> and you can change it to make &kde; suit your
>-taste.</para>
>+occupied by the background<indexterm><primary>Background</primary></indexterm>. With some distributions,
>+there might be a picture for the background. This picture is referred to as the
>+<quote>wallpaper,</quote><indexterm><primary>Wallpaper</primary></indexterm> and can be changed by every user.</para>
> </listitem>
> 
>-<listitem><para>In the top left-hand corner are two icons:
>-<guiicon>Trash</guiicon> and <guiicon>Home</guiicon>. Clicking on
>-these will open your <filename>Trash</filename> folder and Home
>-folder, respectively. You can add more icons to the desktop so that
>-you can open your favorite programs, or access removable media, with
>-just one click.</para>
>+<listitem><para>In the left-hand side are two icons:
>+<guiicon>Trash</guiicon> and <guiicon>Home</guiicon>. Selecting
>+these will open the <filename>Trash</filename> folder and Home
>+folder, respectively. Add more icons to the desktop as desired
>+to open favorite programs, or access removable media.</para>
> </listitem>
> 
>-<listitem><para>At the bottom is the &kde; Panel<indexterm><primary>Panel</primary></indexterm>, also known as
>+<listitem><para>At the bottom is the &tde; Panel<indexterm><primary>Panel</primary></indexterm>, also known as
> <quote>&kicker;</quote>. The Panel contains several useful ways of
>-interacting with &kde;. It houses the &kmenu;, from where you can open
>-any &kde; application installed on your computer, it shows all the
>-programs that are currently running, as well as the time, and more.  
>-Take a look at  <xref linkend="panel-and-desktop"/> for more
>-information about the &kde; Panel.</para>
>+interacting with &tde;. The Panel houses the &kmenu; button, from where
>+any &tde; application can be started. The Panel can be configured to show all the
>+programs that are running, as well as the date and time, and more.
>+Read <xref linkend="panel-and-desktop"/> for more
>+information about the &tde; Panel.</para>
> </listitem>
> </itemizedlist></para>
> 
> 
> 
> 
> 
> <sect1 id="logging-in">
>-<sect1info>
>-<authorgroup>
>-<author>
>-&Philip.Rodrigues;
>-</author>
>-</authorgroup>
>-</sect1info>
> 
> <title>Logging In and Logging Out</title>
>-<para>Basic TDM &amp; starttde stuff.</para>
>-
>-
>-<para>There are two ways to log into &kde;: graphically and via the
>-command line. We'll look at them both briefly:</para>
>+<para>There are two ways to log into &tde;: graphically and via the
>+command line.</para>
> 
> <sect2 id="logging-in-graphically">
> <title>Logging in Graphically</title>
> <indexterm><primary>login</primary></indexterm>
> <indexterm><primary>&tdm;</primary></indexterm>
> 
>-<para>If you see a screen a little bit like the one below when you
>-start up your computer, then you are all set for logging in
>-graphically. Just enter your username in the
>-<guilabel>Login</guilabel> text box and your password in the
>-<guilabel>Password</guilabel> text box. Your password will not be shown
>-as you type it; it will probably be shown as asterisks. When you have
>-entered that information, click on the <guibutton>Login</guibutton>
>-button, and &kde; will start up. The &kde; splash screen will appear,
>-and keep you informed about the progress of &kde; startup, and when
>-it is done, &kde; will be ready to use.</para>
>+<para>A screen similar to the one shown below means
>+the computer is ready for logging in graphically.</para>
>+
>+<screenshot>
>+<mediaobject>
>+<imageobject>
>+<imagedata fileref="tdm.png" format="PNG"/>
>+</imageobject>
>+<textobject><phrase>A typical TDM display</phrase>
>+</textobject>
>+</mediaobject>
>+</screenshot>
>+
>+<para> Enter a username in the
>+<guilabel>Username</guilabel> text box and password in the
>+<guilabel>Password</guilabel> text box. The password will not be shown
>+while typing; instead displaying as asterisks or dots. When finished,
>+select the <guibutton>Login</guibutton> button, or press the Enter key,
>+and &tde; will start. A &tde; splash image will appear,
>+and provide &tde; startup information. When done
>+&tde; will be ready to use.</para>
> </sect2>
> 
> <sect2 id="logging-in-via-cmdline">
>-<title>Logging in via the Command Line</title>
>+<title>Logging in at the Command Line</title>
> <indexterm><primary><command>starttde</command></primary></indexterm>
> <indexterm><primary><command>startx</command></primary></indexterm>
> 
>-<para>If you prefer using the command line, you can log in to &kde;
>-with the <command>startx</command> command. Add the line
>-<userinput>exec starttde</userinput> to the
>-<filename>.xinitrc</filename> file in your home folder (create it
>-if it does not exist), save the file, and then run
>-<command>startx</command>. &kde; should start in the same way as if
>-you had logged in graphically.</para>
>+<para>For those preferring the command line, log in to &tde;
>+with the <command>startx</command> command. If necessary then in the
>+system or user <filename>.xinitrc</filename> file, add the line
>+<userinput>exec starttde</userinput>. &tde; should start the same way as
>+when logging in graphically.</para>
> </sect2>
> 
> <sect2 id="logging-out">
> <title>Logging Out</title>
> <indexterm><primary>logout</primary></indexterm>
> 
>-<para>Once you have finished using &kde; for the moment, you will
>-want to log out until next time. The easiest way to do this is to
>-click on the &kmenu; at the bottom left of your screen, and then
>-select the <guimenuitem>Log Out...</guimenuitem> item. A dialog with the
>-text <guilabel>End session for
>-<replaceable>username</replaceable></guilabel> will appear. To confirm
>-that you want to log out, click on the <guibutton>End Current Session</guibutton>
>-button. If you change your mind, and decide to carry on using &kde;
>-for now, hit <guibutton>Cancel</guibutton>.</para>
>+<para>When finished using &tde; for the moment, then
>+log out until next time. The easiest way to do this is to
>+select the &kmenu; button
>+<guiicon>
>+<inlinemediaobject>
>+<imageobject>
>+<imagedata fileref="../common/kmenu.png" format="PNG"/>
>+</imageobject>
>+</inlinemediaobject>
>+</guiicon>
>+at the bottom left of the screen, and then
>+select the <guimenuitem>Log Out...</guimenuitem> item.</para>
> 
> <itemizedlist>
> <title>Related Information</title>
>-<listitem><para>The &tdm; Handbook has information about using and setting up
>-the &kde; graphical login manager. You can read it in &khelpcenter; or
>+<listitem><para>The &tdm; Handbook has information about using and configuring
>+the &tde; graphical login manager. Read more in &khelpcenter; or
> by entering <userinput>help:/tdm</userinput> in &konqueror;'s
> <guilabel>Location</guilabel> bar.</para>
> </listitem>
>@@ -435,7 +440,7 @@
> </part>
> 
> <part id="components">
>-<title>&kde; Components</title>
>+<title>&tde; Components</title>
> 
> &control-center;
> 
>@@ -444,7 +449,7 @@
> &extragear-applications;
> 
> <chapter id="multimedia">
>-<title>Multimedia With &kde;</title>
>+<title>Multimedia With &tde;</title>
> 
> &removable-disks;
> 
>@@ -457,7 +462,7 @@
> </chapter>
> 
> <chapter id="multiuser-kde">
>-<title>&kde; the Multiuser Desktop</title>
>+<title>&tde; the Multiuser Desktop</title>
> 
> &your-kde-account;
> 
>@@ -467,7 +472,7 @@
> </chapter>
> 
> <chapter id="networking">
>-<title>Networking with &kde;</title>
>+<title>Networking with &tde;</title>
> 
> &file-sharing;
> 
>@@ -502,7 +507,7 @@
> </part>
> 
> <part id="kde-online">
>-<title>&kde; and the Internet</title>
>+<title>&tde; and the Internet</title>
> 
> &net-connection-setup;
> 
>@@ -561,10 +566,10 @@
> </chapter>
> 
> <chapter id="contributing">
>-<title>Contributing to &kde;</title>
>+<title>Contributing to &tde;</title>
> 
> <para>Some basic information to get encourage people to contribute to
>-&kde;, information about what's available, and how to get
>+&tde;, information about what's available, and how to get
> started.</para>
> 
> </chapter>
>diff -urN tdebase/doc/userguide/internet-shortcuts.docbook tdebase.new/doc/userguide/internet-shortcuts.docbook
>--- tdebase/doc/userguide/internet-shortcuts.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/userguide/internet-shortcuts.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -24,7 +24,7 @@
> <userinput>gg:kde</userinput> in the <guilabel>Location</guilabel>
> bar.</para>
> 
>-<para>You will go to Google, searching for &kde;.</para> 
>+<para>You will go to Google, searching for &tde;.</para> 
> 
> <para>They are many such shortcuts like <userinput>ggl:</userinput> (Google
> I'm feeling lucky), <userinput>bug:</userinput> (bugs.kde.org) and so
>@@ -37,7 +37,7 @@
> search engine</guilabel>, you don't have to type the shortcut anymore. For
> instance if you set it to Google, you can just type
> <userinput>kde</userinput> in the <guilabel>Location</guilabel> bar,
>-and it will search Google for <quote>&kde;</quote>.</para>
>+and it will search Google for <quote>&tde;</quote>.</para>
> 
> <para>In <guilabel>Keyword delimiter</guilabel> you can choose if you want
> to separate a shortcut with a colon (<userinput>gg: kde</userinput>) or a
>@@ -48,7 +48,7 @@
> or with <keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo>) and
> type your shortcut, &eg; <userinput>gg: kde</userinput>, and press
> &Enter;. It will automatically open &konqueror; with a Google
>-search for &kde;.</para>
>+search for &tde;.</para>
> 
> 
> 
> 
>-<title>&kde; Edutainment</title>
>+<title>&tde; Edutainment</title>
> 
>-<para>The &kde; Edutainment Project offers children, families, and teachers some
>+<para>The &tde; Edutainment Project offers children, families, and teachers some
> educational programs. You can find applications to help you improve
> your language skills and train your vocabulary, like &kvoctrain; and
> &kwordquiz;; or Scientific programs, like the
> very advanced &kstars; (a planetarium) and &kig; (interactive
> geometry), which will bring you to the edge of knowledge. Have fun learning
> touch-typing with &ktouch;. Teachers will find an easy way to make
>-their lessons with &keduca;.  You can find a complete list of &kde;
>-educational software on <ulink url="http://edu.kde.org">the KDE-Edu
>+their lessons with &keduca;.  You can find a complete list of &tde;
>+educational software on <ulink url="http://edu.kde.org">the TDE-Edu
> website</ulink>. What follows is an overview of a few of them.
> </para>
> <para>View the handbook of each application by typing <userinput>help:/&lt;appname&gt;</userinput> in &konqueror;'s Location Toolbar, or by selecting it in &khelpcenter;. </para>
>@@ -32,65 +32,65 @@
> <varlistentry>
> <term>&khangman;</term>
> 	<listitem><para>An easy-to-use application which implements the classical hangman game. You can choose for the words to be from a particular topic and even choose from a selection of difficulty levels. The program comes in twenty-four languages, and is therefore quite ideal for learning the spelling of basic nouns in other languages.</para>
>-	
>+
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://edu.kde.org/khangman">http://edu.kde.org/khangman</ulink></para></listitem>
> 			<listitem><para><ulink
> 	url="help:/khangman">&khangman; Handbook</ulink></para></listitem>
> 		</itemizedlist>
>-		
>+
> 	</listitem>
> </varlistentry>
> 
> <varlistentry>
> <term>&klettres;</term>
> 	<listitem><para>An application specially designed to help the user learn the alphabet of a new language and then to learn to read simple syllables. Ideal for children, or any person attempting to learn and familiarize themselves with a foreign language's alphabet. A number of alphabets are currently supported.</para>
>-	
>+
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://edu.kde.org/klettres">http://edu.kde.org/klettres</ulink></para></listitem>
> 			<listitem><para><ulink
> 	url="help:/klettres">&klettres; Handbook</ulink></para></listitem>
> 		</itemizedlist>
>-		
>+
> 	</listitem>
> </varlistentry>
> 
> <varlistentry>
> <term>&kanagram;</term>
> 	<listitem><para>A simple mind-training game, in which you have to figure out the word that has been given in the program. The letters from the word are disordered, and from the given words you have to solve which word the letters might make, if rearranged. Similar to the popular Countdown game as seen on Television.</para>
>-	
>+
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://edu.kde.org/kanagram">http://edu.kde.org/kanagram</ulink></para></listitem>
> 			<listitem><para><ulink
> 	url="help:/kanagram">&kanagram; Handbook</ulink></para></listitem>
> 		</itemizedlist>
>-		
>+
> 	</listitem>
> </varlistentry>
> 
> <varlistentry>
> <term>&kverbos;</term>
> 	<listitem><para>A simple way to learn and study Spanish verb forms. The program suggests a verb and a tense and the user enters the different forms. The program corrects the user input and gives feedback.  The user can edit the list of the verbs that can be studied and the program can build regular verb forms, and the forms of the most important verb groups, by itself. Irregular verb forms can be entered by the user.</para>
>-	
>+
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://edu.kde.org/kverbos">http://edu.kde.org/kverbos</ulink></para></listitem>
> 			<listitem><para><ulink
> 	url="help:/kverbos">&kverbos; Handbook</ulink></para></listitem>
> 		</itemizedlist>
>-		
>+
> 	</listitem>
> </varlistentry>
> 
> <varlistentry>
> <term>&kvoctrain;</term>
> 	<listitem><para>Another advanced vocabulary training application, using the flash card approach. <ulink url="http://edu.kde.org/contrib/kvtml.php">Vocabulary files</ulink> and be downloaded and loaded into the application.</para>
>-	
>+
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://edu.kde.org/kvoctrain">http://edu.kde.org/kvoctrain</ulink></para></listitem>
> 			<listitem><para><ulink
> 	url="help:/kvoctrain">&kvoctrain; Handbook</ulink></para></listitem>
> 		</itemizedlist>
>-		
>+
> 	</listitem>
> </varlistentry>
> 
>@@ -98,26 +98,26 @@
> <varlistentry>
> <term>&kiten;</term>
> 	<listitem><para>A Japanese reference and learning tool. Words from both English and Japanese can be looked up, and filtered, using the <application>Edict</application> and <application>Kanjidic</application> dictionary protocols. Other features in &kiten; include a few comprehensive search functions, a history of searches, and a learning section which contains various different learning modes.</para>
>-	
>+
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://edu.kde.org/kiten">http://edu.kde.org/kiten</ulink></para></listitem>
> 			<listitem><para><ulink
> 	url="help:/kiten">&kiten; Handbook</ulink></para></listitem>
> 		</itemizedlist>
>-		
>+
> 	</listitem>
> </varlistentry>
> 
> <varlistentry>
> <term>&klatin;</term>
> 	<listitem><para>A program to help revise Latin. There are vocabulary, grammar, and verb testing sections. In addition there is a set of revision notes that can be used for self-guided revision.</para>
>-	
>+
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://edu.kde.org/klatin">http://edu.kde.org/klatin</ulink></para></listitem>
> 			<listitem><para><ulink
> 	url="help:/klatin">&klatin; Handbook</ulink></para></listitem>
> 		</itemizedlist>
>-		
>+
> 	</listitem>
> </varlistentry>
> 
>@@ -134,39 +134,39 @@
> <varlistentry>
> <term>&kbruch;</term>
> 	<listitem><para>An application with several exercise types in order to enhance your calculating with fractions. Different tasks include exercises to find the sum of two fractions, the conversion of fractions into the respective decimal, the comparison (with less than, more than) of fractions, and more. </para>
>-	
>+
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://edu.kde.org/kbruch">http://edu.kde.org/kbruch</ulink></para></listitem>
> 			<listitem><para><ulink
> 	url="help:/kbruch">&kbruch; Handbook</ulink></para></listitem>
> 		</itemizedlist>
>-		
>+
> 	</listitem>
> </varlistentry>
> 
> <varlistentry>
> <term>&kig;</term>
> 	<listitem><para>A great application with interactive geometry. Ideal for teachers attempting to draw a graph on the computer, or students who wish to find out more and investigate with graphs and curves. Currently many things are supported, and you can very easily construct several things from parabolas and hyperbolas, to ellipses. </para>
>-	
>+
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://edu.kde.org/kig">http://edu.kde.org/kig</ulink></para></listitem>
> 			<listitem><para><ulink
> 	url="help:/kig">&kig; Handbook</ulink></para></listitem>
> 		</itemizedlist>
>-		
>+
> 	</listitem>
> </varlistentry>
> 
> <varlistentry>
> <term>&kpercentage;</term>
> 	<listitem><para>Essentially an application to help you improve your skills in calculating percentages. Different exercises are included, and there are varying difficulty levels to target persons with varying abilities.</para>
>-	
>+
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://edu.kde.org/kpercentage">http://edu.kde.org/kpercentage</ulink></para></listitem>
> 			<listitem><para><ulink
> 	url="help:/kpercentage">&kpercentage; Handbook</ulink></para></listitem>
> 		</itemizedlist>
>-		
>+
> 	</listitem>
> 
> </varlistentry>
>@@ -174,13 +174,13 @@
> <varlistentry>
> <term>&kmplot;</term>
> 	<listitem><para>A mathematical function plotter. It has built in a powerful parser. You can plot different functions simultaneously and combine their function terms to build new functions. &kmplot; supports functions with parameters and functions in polar coordinates. Several grid modes are possible and plots may be printed with high precision in correct scale.</para>
>-	
>+
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://edu.kde.org/kmplot">http://edu.kde.org/kmplot</ulink></para></listitem>
> 			<listitem><para><ulink
> 	url="help:/kmplot">&kmplot; Handbook</ulink></para></listitem>
> 		</itemizedlist>
>-		
>+
> 	</listitem>
> </varlistentry>
> 
>@@ -194,26 +194,26 @@
> <variablelist>
> <varlistentry>
> <term>&kstars;</term>
>-	<listitem><para>A desktop Planetarium for &kde;. It provides an accurate graphical simulation of the night sky, from any location on Earth, at any date and time. The display includes 130,000 stars, 13,000 deep-sky objects,all 8 planets, the Sun and Moon, and thousands of comets and asteroids.</para>
>-	
>+	<listitem><para>A desktop Planetarium for &tde;. It provides an accurate graphical simulation of the night sky, from any location on Earth, at any date and time. The display includes 130,000 stars, 13,000 deep-sky objects,all 8 planets, the Sun and Moon, and thousands of comets and asteroids.</para>
>+
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://edu.kde.org/kstars">http://edu.kde.org/kstars</ulink></para></listitem>
> 			<listitem><para><ulink
> 	url="help:/kstars">&kstars; Handbook</ulink></para></listitem>
> 		</itemizedlist>
>-		
>+
> 	</listitem>
> </varlistentry>
> 
> <varlistentry>
> 	<term>&kalzium;</term>
> 	<listitem><para>A fully-featured periodic table, with the full list of all elements, and extended information about each individual element is accessible. As well as being able to view a basic overview, other features include being able to view its chemical data, atomic model, energies, as well as a picture of the element.</para>
>-		
>+
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://edu.kde.org/kalzium">http://edu.kde.org/kalzium</ulink></para></listitem>
> 			<listitem><para><ulink url="help:/kalzium">&kalzium; Handbook</ulink></para></listitem>
> 		</itemizedlist>
>-		
>+
> 	</listitem>
> 
> 
>@@ -226,12 +226,12 @@
> <varlistentry>
> 	<term>&keduca;</term>
> 	<listitem><para>A flash card application, which allows you to make interactive form-based tests. It also currently comes with support to add servers from which you can fetch tests from. Several languages supported.</para>
>-		
>+
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://edu.kde.org/keduca">http://edu.kde.org/keduca</ulink></para></listitem>
> 			<listitem><para><ulink url="help:/keduca">&keduca; Handbook</ulink></para></listitem>
> 		</itemizedlist>
>-		
>+
> 	</listitem>
> 
> 
>@@ -244,12 +244,12 @@
> <varlistentry>
> 	<term>&ktouch;</term>
> 	<listitem><para>An application for learning touch-typing. &ktouch; displays the keyboard on the screen, and the color of the keys changes when they need to be depressed. Text appears on the screen, and the user is asked to type it out. A few default lectures are contained in the program by default, with various different difficulty levels.</para>
>-		
>+
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://edu.kde.org/ktouch">http://edu.kde.org/ktouch</ulink></para></listitem>
> 			<listitem><para><ulink url="help:/ktouch">&ktouch; Handbook</ulink></para></listitem>
> 		</itemizedlist>
>-		
>+
> 	</listitem>
> 
> 
>@@ -258,12 +258,12 @@
> <varlistentry>
> 	<term>&kwordquiz;</term>
> 	<listitem><para>A flash card application, which allows you to make interactive form-based tests. It also currently comes with support to add servers from which you can fetch tests from. Several languages supported.</para>
>-		
>+
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://edu.kde.org/kwordquiz">http://edu.kde.org/kwordquiz</ulink></para></listitem>
> 			<listitem><para><ulink url="help:/kwordquiz">&kwordquiz; Handbook</ulink></para></listitem>
> 		</itemizedlist>
>-		
>+
> 	</listitem>
> 
> </varlistentry>
>@@ -271,38 +271,38 @@
> <varlistentry>
> 	<term>&kturtle;</term>
> 	<listitem><para>An educational programming environment using the Logo programming language, with several languages currently supported.</para>
>-		
>+
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://edu.kde.org/kturtle">http://edu.kde.org/kturtle</ulink></para></listitem>
> 			<listitem><para><ulink url="help:/kturtle">&kturtle; Handbook</ulink></para></listitem>
> 		</itemizedlist>
>-		
>+
> 	</listitem>
> 
> </varlistentry>
> 
> <varlistentry>
> 	<term><application>&kgeography;</application></term>
>-	<listitem><para>&kgeography; is a geography learning tool for &kde;. You can browse the maps by clicking in a map division to see its name and you can also answer several types of questions where the program shows you a map division or a capital for example and you have to guess its name.</para>
>-		
>+	<listitem><para>&kgeography; is a geography learning tool for &tde;. You can browse the maps by clicking in a map division to see its name and you can also answer several types of questions where the program shows you a map division or a capital for example and you have to guess its name.</para>
>+
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://kgeography.berlios.de/">http://kgeography.berlios.de/</ulink> and <ulink url="http://edu.kde.org/kgeography">http://edu.kde.org/kgeography</ulink></para></listitem>
> 			<listitem><para><ulink url="help:/kgeography"><application>&kgeography;</application> Handbook</ulink></para></listitem>
> 		</itemizedlist>
>-		
>+
> 	</listitem>
> 
> </varlistentry>
> 
> <varlistentry>
> 	<term><application>&blinken;</application></term>
>-	<listitem><para>&blinken; is a Simon Says game for &kde;. The player should remember the sequence of lights in the correct order and is then presented with an identical sequence with one extra step.</para>
>-		
>+	<listitem><para>&blinken; is a Simon Says game for &tde;. The player should remember the sequence of lights in the correct order and is then presented with an identical sequence with one extra step.</para>
>+
> 		<itemizedlist>
> 			<listitem><para>Website: <ulink url="http://edu.kde.org/blinken">http://edu.kde.org/blinken</ulink></para></listitem>
> 			<listitem><para><ulink url="help:/blinken"><application>&blinken;</application> Handbook</ulink></para></listitem>
> 		</itemizedlist>
>-		
>+
> 	</listitem>
> 
> </varlistentry>
>@@ -313,9 +313,9 @@
> <sect1 id="edu-related">
> <title>Related Information</title>
> <itemizedlist>
>-<listitem><para>The &kde;-Edu website at <ulink
>+<listitem><para>The &tde;-Edu website at <ulink
> url="http://edu.kde.org">http://edu.kde.org</ulink> has news and
>-information about all the &kde; Edutainment applications.</para>
>+information about all the &tde; Edutainment applications.</para>
> </listitem>
> </itemizedlist>
> </sect1>
>diff -urN tdebase/doc/userguide/kde-for-admins.docbook tdebase.new/doc/userguide/kde-for-admins.docbook
>--- tdebase/doc/userguide/kde-for-admins.docbook	2012-02-15 13:26:30.000000000 -0600
>+++ tdebase.new/doc/userguide/kde-for-admins.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -1,24 +1,9 @@
> <part id="kde-for-administrators">
>-<partinfo>
>-<authorgroup>
>-<author>
>-<personname>
>-<firstname>Waldo</firstname>
>-<surname>Bastian</surname>
>-</personname>
>-<email>bastian@kde.org</email>
>-</author>
>-<othercredit role="reviewer">
>-&Philip.Rodrigues;
>-&Philip.Rodrigues.mail;
>-</othercredit>
>-</authorgroup>
>-</partinfo>
> 
>-<title>&kde; for Administrators</title>
>+<title>&tde; for Administrators</title>
> 
> <chapter id="kde-internals">
>-<title>&kde; Internals</title>
>+<title>&tde; Internals</title>
> 
> <sect1 id="kde-for-admins-overview">
> <title>Overview</title>
>@@ -28,12 +13,12 @@
> <sect1 id="directory-layout">
> <title>Directory Layout</title>
> 
>-<para>&kde; defines a filesystem hierarchy which is used by the &kde;
>-environment itself as well as all &kde; applications. In general &kde;
>+<para>&tde; defines a filesystem hierarchy which is used by the &tde;
>+environment itself as well as all &tde; applications. In general &tde;
> stores all its files in a directory tree with a fixed structure.
> </para>
> 
>-<para>By default &kde; uses two directory trees:</para>
>+<para>By default &tde; uses two directory trees:</para>
> 
> <itemizedlist>
> <listitem><para>One at the system level (for example <filename
>@@ -68,8 +53,8 @@
> <option>--check</option></userinput></para>
> </informalexample>
> 
>-<para>&kde; and &kde; applications look up files by scanning all the
>-&kde; directory trees.  The directory trees are checked in order of
>+<para>&tde; and &tde; applications look up files by scanning all the
>+&tde; directory trees.  The directory trees are checked in order of
> precedence. When a file is present in multiple directory trees, the
> file from the last tree takes precedence.  Normally, the tree
> located in the user's home directory has the highest precedence. This
>@@ -160,7 +145,7 @@
> <seg><filename class="directory">/opt/trinity</filename>, <filename
> class="directory">/usr</filename>, <filename
> class="directory">/usr/trinity</filename></seg>
>-<seg>Vendor dependent. Used by &kde; 2. If not set, falls back to
>+<seg>Vendor dependent. Used by &tde; 2. If not set, falls back to
> compiled-in default.</seg>
> </seglistitem>
> 
>@@ -169,15 +154,15 @@
> <seg><filename class="directory">/opt/trinity</filename>, <filename
> class="directory">/usr</filename>, <filename
> class="directory">/usr/trinity</filename></seg>
>-<seg>New in &kde;3. Can list multiple locations separated by a
>+<seg>New in &tde;3. Can list multiple locations separated by a
> colon. If not set, falls back to $<envar>TDEDIR</envar></seg>
> </seglistitem>
> 
> </segmentedlist>
> </para>
> <para>Don't <emphasis>need</emphasis> to be set, defaults work just fine.</para>
>-<para>Running &kde;2 next to &kde;3? Point $<envar>TDEDIR</envar> to
>-&kde; 2 and $<envar>TDEDIRS</envar> to &kde; 3.</para>
>+<para>Running &tde;2 next to &tde;3? Point $<envar>TDEDIR</envar> to
>+&tde; 2 and $<envar>TDEDIRS</envar> to &tde; 3.</para>
> 
> <informalexample>
> <para>A staff member at a university could have the following
>@@ -222,7 +207,7 @@
> </programlisting>
> 
> <para>It is now possible to assign a profile based on either the user name
>-or based on the &UNIX; group the user is part of.</para> 
>+or based on the &UNIX; group the user is part of.</para>
> 
> <para>To assign the staff profile to all users that are a member of the
> &UNIX; group staff_members add the following to
>@@ -247,7 +232,7 @@
> <sect1 id="directory-layout-revisited">
> <title>Directory Layout Revisited</title>
> 
>-<para>Each directory tree used by &kde; has a fixed directory structure.
>+<para>Each directory tree used by &tde; has a fixed directory structure.
> Directories that are not relevant for a certain tree, or simply not used can
> be left out though. For example, directories used for temporary files are
> usually only found under <filename
>@@ -264,20 +249,20 @@
> <variablelist>
> <varlistentry>
> <term><filename class="directory">bin</filename></term>
>-<listitem><para>Used for &kde; executables.</para></listitem>
>+<listitem><para>Used for &tde; executables.</para></listitem>
> </varlistentry>
> 
> <varlistentry>
> <term><filename class="directory">lib</filename></term>
>-<listitem><para>Used for &kde; libraries.</para>
>+<listitem><para>Used for &tde; libraries.</para>
> </listitem>
> </varlistentry>
> 
> <varlistentry>
> <term><filename class="directory">lib/trinity</filename></term>
> <listitem><para>This directory contains components, plugins, and other
>-runtime loadable objects for use by &kde; 3.<replaceable>x</replaceable>
>-applications.</para></listitem> 
>+runtime loadable objects for use by &tde; 3.<replaceable>x</replaceable>
>+applications.</para></listitem>
> </varlistentry>
> </variablelist>
> 
>@@ -293,13 +278,13 @@
> <varlistentry>
> <term><filename class="directory">share/applnk</filename></term>
> <listitem><para><literal role="extension">.desktop</literal> files for
>-&kde;-menu (old)</para></listitem>
>+&tde;-menu (old)</para></listitem>
> </varlistentry>
> 
> <varlistentry>
> <term><filename class="directory">share/applications</filename></term>
> <listitem><para><literal role="extension">.desktop</literal> files for
>-&kde;-menu (since &kde; 3.2)</para>
>+&tde;-menu (since &kde; 3.2)</para>
> </listitem>
> </varlistentry>
> 
>@@ -314,8 +299,8 @@
> <term><filename class="directory">share/config</filename></term>
> <listitem><para>Configuration files. Configuration files are normally
> named after the application they belong to plus the letters
>-<quote>rc</quote>. A special case is <filename>kdeglobals</filename>. 
>-This file is read by all &kde; applications.</para></listitem>
>+<quote>rc</quote>. A special case is <filename>kdeglobals</filename>.
>+This file is read by all &tde; applications.</para></listitem>
> </varlistentry>
> 
> <varlistentry>
>@@ -324,7 +309,7 @@
> <listitem><para>This directory is used by session management and is
> normally only available under <filename
> class="directory">$<envar>TDEHOME</envar></filename>. At the end of a
>-session &kde; applications store their state here. The file names
>+session &tde; applications store their state here. The file names
> consist of the name of the application followed by a number. The
> session manager <command>ksmserver</command> stores references to
> these numbers when saving a session in
>@@ -333,7 +318,7 @@
> 
> <varlistentry>
> <term><filename class="directory">share/doc/HTML</filename></term>
>-<listitem><para>This directory contains documentation for &kde;
>+<listitem><para>This directory contains documentation for &tde;
> applications. Documentation is categorized by language and the
> application it belongs to. Normally at least two files can be found in
> a directory: <filename>index.docbook</filename>, which contains the
>@@ -356,7 +341,7 @@
> <term><filename class="directory">share/mimelnk</filename></term>
> <listitem><para>In this directory,<literal
> role="extension">.desktop</literal> files that describe &MIME; types
>-are stored. &kde; uses &MIME; types to identify the type of a
>+are stored. &tde; uses &MIME; types to identify the type of a
> file.</para>
> </listitem>
> </varlistentry>
>@@ -366,7 +351,7 @@
> <listitem><para>This directory contains <literal
> role="extension">.desktop</literal> files that describe services. Services
> are like applications but are usually launched by other applications instead
>-of the user. Services do not appear in the &kde; menu.</para>
>+of the user. Services do not appear in the &tde; menu.</para>
> </listitem>
> </varlistentry>
> 
>@@ -408,7 +393,7 @@
> </sect1>
> 
> <sect1 id="host-specific-directories">
>-<title>Host-specific Directories</title> 
>+<title>Host-specific Directories</title>
> 
> <para>There are three host-specific directories that are usually
> symlinked to other locations. If the directories do not already exist,
>@@ -451,9 +436,9 @@
> </sect1>
> 
> <sect1 id="configuration-files">
>-<title>Configuration Files</title> <para>&kde; uses a simple
>+<title>Configuration Files</title> <para>&tde; uses a simple
> text-based file format for all its configuration files. It consists of
>-key-value pairs that are placed in groups.  All &kde; configuration
>+key-value pairs that are placed in groups.  All &tde; configuration
> files use <acronym>UTF</acronym>-8 encoding for text outside the
> <acronym>ASCII</acronym> range.</para>
> 
>@@ -471,7 +456,7 @@
> and <varname>Sort by</varname>:</para>
> 
> <programlisting>
>-[KDE]
>+[TDE]
> LargeCursor=false
> SingleClick=true
> </programlisting>
>@@ -527,13 +512,13 @@
> 
> <para>Empty lines in configuration files are ignored, as are lines that
> start with a hash mark (<quote>#</quote>). The hash mark can be used to add
>-comments to configuration files. It should be noted that when a &kde;
>+comments to configuration files. It should be noted that when a &tde;
> application updates a configuration file the comments are
> <emphasis>not</emphasis> preserved.</para>
> 
> <para>There can be multiple configuration files with the same name in the
> <filename class="directory">share/config</filename> sub-directory of the
>-various &kde; directory trees. In this case the information of all these
>+various &tde; directory trees. In this case the information of all these
> configuration files is combined on a key-by-key basis.  If the same key
> within a certain group is defined in more than one place, the key value read
> from the directory tree with the highest precedence will be used.
>@@ -698,7 +683,7 @@
> not locked down.</para>
> 
> <programlisting>
>-[Mail Settings] 
>+[Mail Settings]
> Host[$ie]=$(hostname)
> Email[$e]=${USER}@${HOST}
> </programlisting>
>@@ -739,11 +724,11 @@
> </informalexample>
> 
> <para>In general the entries that can appear in a configuration file are not
>-documented.  With &kde; 3.2 a start has been made to change this. In
>+documented.  With &tde; 3.2 a start has been made to change this. In
> <filename
> class="directory">$<envar>TDEDIR</envar>/share/config.kcfg</filename>, files
> can be found that provide a formal description of the possible entries in a
>-configuration file. These are used by the new &kde; Configuration Editor
>+configuration file. These are used by the new &tde; Configuration Editor
> when available.</para>
> 
> <informalexample>
>@@ -779,7 +764,7 @@
> </sect1>
> 
> <sect1 id="kde-startup-sequence">
>-<title>&kde; Startup Sequence</title>
>+<title>&tde; Startup Sequence</title>
> 
> <sect2 id="tdm">
> <title>&tdm;</title>
>@@ -811,7 +796,7 @@
> Session - <filename>/etc/X11/xdm/Xsession</filename> - starts session as user
> </member>
> <member>
>-= For a KDE session: <command>kde</command> or <command>starttde</command>
>+= For a TDE session: <command>kde</command> or <command>starttde</command>
> </member>
> <member>
> = If present <filename>~/.xsession</filename> or <filename>~/.xinitrc</filename>
>@@ -824,9 +809,9 @@
> </sect2>
> 
> <sect2 id="starttde">
>-<title>The &kde; Startup Script: <command>starttde</command></title>
>+<title>The &tde; Startup Script: <command>starttde</command></title>
> 
>-<para>The &kde; startup sequence starts with the
>+<para>The &tde; startup sequence starts with the
> <filename>starttde</filename> script. In most cases this script gets called
> from the display manager (&tdm;) once the user has been authenticated. Their
> are two very important lines in the <filename>starttde</filename>
>@@ -839,7 +824,7 @@
> 
> <para>The first line starts the <command>tdeinit</command> master process.
> The <command>tdeinit</command> master process is used to start all other
>-&kde; processes.  It show up in the output of <command>ps
>+&tde; processes.  It show up in the output of <command>ps
> <option>aux</option></command> as <computeroutput>tdeinit:
> Running...</computeroutput>. The arguments after <command>tdeinit</command>
> are the names of additional processes to be started.  The <token>+</token>
>@@ -859,7 +844,7 @@
> <sect1 id="background-processes">
> <title>Background Processes</title>
> 
>-<para>All &kde; background services are user-specific: unlike system daemons
>+<para>All &tde; background services are user-specific: unlike system daemons
> they are not shared between users. As well as being unique per user they are
> also unique per X-server display. The processes are:</para>
> 
>@@ -912,7 +897,7 @@
> 
> <sect2 id="tdeinit">
> <title><command>tdeinit</command></title>
>-<para><command>tdeinit</command> is used to start all other &kde;
>+<para><command>tdeinit</command> is used to start all other &tde;
> programs. <command>tdeinit</command> can start normal binary program files
> as well as <command>tdeinit</command> loadable modules
> (<acronym>KLM</acronym>s).  <acronym>KLM</acronym>s work just like binary
>@@ -954,9 +939,9 @@
> <title><command>dcopserver</command></title>
> 
> <para><command>dcopserver</command> is a daemon which provides inter-process
>-communication (&DCOP;) facilities to all &kde; applications. The &DCOP;
>+communication (&DCOP;) facilities to all &tde; applications. The &DCOP;
> facilities are accessible from the command shell via the
>-<command>dcop</command> command line tool. &DCOP; is essential for all &kde;
>+<command>dcop</command> command line tool. &DCOP; is essential for all &tde;
> applications.</para>
> 
> <para>Some related files:</para>
>@@ -1018,8 +1003,8 @@
> <title><command>klauncher</command></title>
> 
> <para><command>klauncher</command> is a daemon which is responsible for
>-service activation within &kde;. It operates in close connection with the
>-<command>tdeinit</command> master process to start new processes. &kde;
>+service activation within &tde;. It operates in close connection with the
>+<command>tdeinit</command> master process to start new processes. &tde;
> applications communicate with <command>klauncher</command> over &DCOP; in
> order to start new applications or services.</para>
> 
>@@ -1050,7 +1035,7 @@
> <sect1 id="ksmserver">
> <title>KSMServer</title>
> 
>-<para><command>ksmserver</command> is &kde;'s session manager. On startup
>+<para><command>ksmserver</command> is &tde;'s session manager. On startup
> the session manager launches auto-start applications and restores
> applications from the previous session.  The applications to auto-start are
> indicated by <literal role="extension">.desktop</literal> files in the
>@@ -1084,13 +1069,13 @@
> 
> <varlistentry>
> <term><command>kdesktop</command></term>
>-<listitem><para>The &kde; desktop</para>
>+<listitem><para>The &tde; desktop</para>
> </listitem>
> </varlistentry>
> 
> <varlistentry>
> <term><command>&kicker;</command></term>
>-<listitem><para>The &kde; panel</para>
>+<listitem><para>The &tde; panel</para>
> </listitem>
> </varlistentry>
> 
>@@ -1127,7 +1112,7 @@
> documents, binary files or applications in the form of <literal
> role="extension">.desktop</literal> files.</para>
> 
>-<para>The &kde; session manager also restores one of the previous
>+<para>The &tde; session manager also restores one of the previous
> sessions. A session contains a collection of applications as well as
> application-specific information that reflects the state of the applications
> at the time the session was saved.  Sessions are stored in the
>@@ -1144,7 +1129,7 @@
> <sect1 id="environment-variables">
> <title>Environment variables</title>
> 
>-<para>Some important environment variables used by &kde;:</para>
>+<para>Some important environment variables used by &tde;:</para>
> 
> <variablelist>
> 
>@@ -1152,30 +1137,30 @@
> <term>$<envar>TDEDIR</envar></term>
> <listitem><para>Has to be set if
> <envar>TDEDIRS</envar> is not set and has to point to the root of the
>-&kde; installation tree. Allows &kde; to find its data like icons,
>+&tde; installation tree. Allows &tde; to find its data like icons,
> menus and libraries.</para>
> </listitem>
> </varlistentry>
> 
> <varlistentry><term>$<envar>TDEDIRS</envar></term>
> <listitem><para>Overrides <envar>TDEDIR</envar> and allows you to specify
>-multiple directories where &kde; searches for its data. Useful if you want
>+multiple directories where &tde; searches for its data. Useful if you want
> or have to install some programs to a different prefix than the rest of
>-&kde;.</para> 
>+&tde;.</para>
> </listitem>
> </varlistentry>
> 
> <varlistentry><term><envar>$TDEHOME</envar></term><listitem><para>If
>-not set, &kde; uses <filename class="directory">~/.kde</filename> as
>+not set, &tde; uses <filename class="directory">~/.kde</filename> as
> the directory where personal data is stored.</para>
> </listitem>
> </varlistentry>
> 
> <varlistentry><term>$<envar>TDEROOTHOME</envar></term><listitem><para>If
>-not set, &kde; uses <filename class="directory">~root/.kde</filename>
>+not set, &tde; uses <filename class="directory">~root/.kde</filename>
> as the directory for <systemitem class="username">root</systemitem>'s
>-personal data. Was introduced to prevent &kde; from accidently
>-overwriting user data with root permissions when the user runs a &kde;
>+personal data. Was introduced to prevent &tde; from accidently
>+overwriting user data with root permissions when the user runs a &tde;
> program after switching with <command>su</command> to <systemitem
> class="username">root</systemitem>.</para>
> </listitem>
>@@ -1183,25 +1168,25 @@
> 
> <varlistentry><term>$<envar>TDEWM</envar></term><listitem><para>If the
> <envar>TDEWM</envar> environment variable has been set, then it will
>-be used as &kde;'s window manager within the
>+be used as &tde;'s window manager within the
> <command>starttde</command> script instead of &twin;.</para>
> </listitem>
> </varlistentry>
> 
>-<varlistentry><term>$<envar>KDE_LANG</envar></term><listitem><para>Overrides
>-the &kde; language configuration, &eg; <userinput>KDE_LANG=fr kprogram
>+<varlistentry><term>$<envar>TDE_LANG</envar></term><listitem><para>Overrides
>+the &tde; language configuration, &eg; <userinput>TDE_LANG=fr kprogram
> &amp;</userinput> starts a program with French translation if the
> necessary files are installed.</para>
> </listitem>
> </varlistentry>
> 
> <varlistentry><term>$<envar>TDE_MULTIHEAD</envar></term><listitem><para>Set
>-this variable to <literal>true</literal> to indicate that &kde; is running
>+this variable to <literal>true</literal> to indicate that &tde; is running
> on a multi-head system.</para>
> </listitem>
> </varlistentry>
> 
>-<varlistentry><term>$<envar>KDE_FORK_SLAVES</envar></term>
>+<varlistentry><term>$<envar>TDE_FORK_SLAVES</envar></term>
> <listitem><para>(Since &kde; 3.2.3) Set this variable to spawn
> <acronym>KIO</acronym>-slaves directly from the application process
> itself. By default <acronym>KIO</acronym>-slaves are spawned using
>@@ -1212,35 +1197,35 @@
> </listitem>
> </varlistentry>
> 
>-<varlistentry><term>$<envar>KDE_HOME_READONLY</envar></term>
>+<varlistentry><term>$<envar>TDE_HOME_READONLY</envar></term>
> <listitem><para>Set this variable to indicate that your home directory is
> mounted as read-only.</para>
> </listitem>
> </varlistentry>
> 
>-<varlistentry><term>$<envar>KDE_NO_IPV6</envar></term><listitem><para>
>+<varlistentry><term>$<envar>TDE_NO_IPV6</envar></term><listitem><para>
> (Since &kde; 3.2.3) - Set this variable to disable <acronym>IPv6</acronym>
> support and <acronym>IPv6</acronym> <acronym>DNS</acronym>
> lookups.</para>
> </listitem>
> </varlistentry>
> 
>-<varlistentry><term>$<envar>KDE_IS_PRELINKED</envar></term><listitem><para>
>+<varlistentry><term>$<envar>TDE_IS_PRELINKED</envar></term><listitem><para>
> (Since &kde; 3.2) - Set this variable to indicate that you have prelinked
>-your &kde; binaries and libraries. This will turn off
>+your &tde; binaries and libraries. This will turn off
> <command>tdeinit</command>.</para>
> </listitem>
> </varlistentry>
> 
>-<varlistentry><term>$<envar>KDE_UTF8_FILENAMES</envar></term><listitem><para>If
>-this environment variable is set, &kde; assumes all filenames are in
>+<varlistentry><term>$<envar>TDE_UTF8_FILENAMES</envar></term><listitem><para>If
>+this environment variable is set, &tde; assumes all filenames are in
> <acronym>UTF-8</acronym> encoding regardless of the current C
> locale.</para>
> </listitem>
> </varlistentry>
> 
> <varlistentry><term>$<envar>TDE_FULL_SESSION</envar></term><listitem><para>
>-(Since &kde; 3.2)  Automatically set to true by &kde; startup, it is used
>+(Since &kde; 3.2)  Automatically set to true by &tde; startup, it is used
> by &eg; &konqueror; to know if it should consider remaining in memory
> for future re-use when being closed. If not set, &konqueror; will exit
> after being closed (&eg; &tdesu; does that, it's also useful for
>@@ -1248,22 +1233,22 @@
> </listitem>
> </varlistentry>
> 
>-<varlistentry><term>$<envar>KDESYCOCA</envar></term><listitem><para>Allows
>-you to specify the path and the name of the generated &kde; system
>+<varlistentry><term>$<envar>TDESYCOCA</envar></term><listitem><para>Allows
>+you to specify the path and the name of the generated &tde; system
> configuration cache file.</para>
> </listitem>
> </varlistentry>
> 
> <varlistentry><term>$<envar>TDETMP</envar></term><listitem><para>Allows
> to specify another path than <filename
>-class="directory">/tmp</filename> where &kde; stores its temporary
>+class="directory">/tmp</filename> where &tde; stores its temporary
> files.</para>
> </listitem>
> </varlistentry>
> 
> <varlistentry><term>$<envar>TDEVARTMP</envar></term><listitem><para>Allows
> to specify another path than <filename
>-class="directory">/var/tmp</filename> where &kde; stores its variable
>+class="directory">/var/tmp</filename> where &tde; stores its variable
> files.</para>
> </listitem>
> </varlistentry>
>@@ -1282,11 +1267,11 @@
> directory. Default is
> <literal>/usr/local/share/:/usr/share/</literal></para>
> 
>-<para>&kde; adds locations from $<envar>TDEDIRS</envar> and profiles
>+<para>&tde; adds locations from $<envar>TDEDIRS</envar> and profiles
> as well.  Used for <literal role="extension">.desktop</literal> and
> <literal role="extension">.directory</literal> menu files. <literal
> role="extension">.desktop</literal> files under <filename
>-class="directory">$<envar>XDG_DATA_DIRS</envar>/applications</filename>. 
>+class="directory">$<envar>XDG_DATA_DIRS</envar>/applications</filename>.
> <literal
> role="extension">.directory</literal> files under
> $XDG_DATA_DIRS/desktop-directories
>@@ -1295,16 +1280,16 @@
> </varlistentry>
> 
> <varlistentry><term>$<envar>XDG_CONFIG_HOME</envar></term><listitem><para>
>-(&kde; 3.2) - Defines the base directory relative to which user
>+(&tde; 3.2) - Defines the base directory relative to which user
> specific configuration files should be stored. Default is
> <filename class="directory">$<envar>HOME</envar>/.config</filename>.</para>
> </listitem>
> </varlistentry>
> 
> <varlistentry><term>$<envar>XDG_CONFIG_DIRS</envar></term><listitem><para>
>-(&kde; 3.2) - Defines the preference-ordered set of base directories
>+(&tde; 3.2) - Defines the preference-ordered set of base directories
> to search for configuration files in addition to the $<envar>XDG_CONFIG_HOME</envar>
>-base directory. The default is <filename class="directory">/etc/xdg</filename> &kde; adds locations from
>+base directory. The default is <filename class="directory">/etc/xdg</filename> &tde; adds locations from
> $<envar>TDEDIRS</envar> and profiles as well. Used by <literal role="extension">.menu</literal> descriptions in
> <filename class="directory">$<envar>XDG_CONFIG_DIRS</envar>/menus</filename>.
> </para>
>@@ -1319,7 +1304,7 @@
> 
> 
> 
>-<para><command>tdeinit</command> is used to start all other &kde;
>+<para><command>tdeinit</command> is used to start all other &tde;
> programs. <command>tdeinit</command> can start normal binary program f iles
> as well as <command>tdeinit</command> loadable modules
> (<acronym>KLM</acronym>s).  <acronym>KLM</acronym>s work just like binary
>@@ -1354,7 +1339,7 @@
> 
> <para>You might be tempted to try <userinput><command>killall
> tdeinit</command></userinput>, but killing all tdeinit processes will have
>-the effect of shutting down all of &kde;. In effect, total
>+the effect of shutting down all of &tde;. In effect, total
> destruction!</para>
> 
> <para>There are two simple solutions to this:</para>
>@@ -1362,7 +1347,7 @@
> <screen><prompt>%</prompt> <userinput><command>kdekillall kdesktop</command></userinput>
> or good old
> <prompt>%</prompt> <userinput><command>kill 26195</command></userinput></screen>
>-<para><command>kdekillall</command> is part of the &kde; <acronym>SDK</acronym>
>+<para><command>kdekillall</command> is part of the &tde; <acronym>SDK</acronym>
> package.</para>
> 
> </sect1>
>@@ -1370,13 +1355,13 @@
> </chapter>
> 
> <chapter id="customizing-kde">
>-<title>Customizing &kde;</title>
>+<title>Customizing &tde;</title>
> 
> 
> <sect1 id="desktop-icons">
> <title>Desktop Icons</title>
> 
>-<para>&kde; uses several types of icons:</para>
>+<para>&tde; uses several types of icons:</para>
> <itemizedlist>
> <listitem><para>Documents</para>
> </listitem>
>@@ -1423,7 +1408,7 @@
> role="extension">.desktop</literal> file: <menuchoice><guimenu>Create
> New</guimenu><guisubmenu>File</guisubmenu><guimenuitem>Link to
> Application</guimenuitem></menuchoice>. You must provide details
>-yourself. Drag from &kde; Menu: Either copy or link (creates symlink),
>+yourself. Drag from &tde; Menu: Either copy or link (creates symlink),
> much easier</para>
> 
> 
>@@ -1496,7 +1481,7 @@
> <callout arearefs="co-x-dcop-servicetype"><para>Has app started ok?
> Remove if it doesn't work</para>
> </callout>
>-<callout arearefs="co-categories"><para>Categories for &kde; Menu, not
>+<callout arearefs="co-categories"><para>Categories for &tde; Menu, not
> used on desktop</para>
> </callout>
> </calloutlist>
>@@ -1528,7 +1513,7 @@
> <varlistentry>
> <term>%u</term>
> <listitem><para>A single &URL;: if the app can
>-handle &eg; &FTP; or &HTTP; &URL;s itself, otherwise &kde;.</para>
>+handle &eg; &FTP; or &HTTP; &URL;s itself, otherwise &tde;.</para>
> </listitem>
> </varlistentry>
> 
>@@ -1554,8 +1539,8 @@
> </varlistentry>
> 
> <varlistentry>
>-<term>%i</term> 
>-<listitem><para>The icon; <option>--icon</option> option; &kde; app
>+<term>%i</term>
>+<listitem><para>The icon; <option>--icon</option> option; &tde; app
> will use icon from <varname>Icon</varname>= line in taskbar.</para>
> </listitem>
> </varlistentry>
>@@ -1567,8 +1552,8 @@
> </varlistentry>
> 
> <varlistentry>
>-<term>%c</term> 
>-<listitem><para>The caption; <option>--caption</option> option; &kde;
>+<term>%c</term>
>+<listitem><para>The caption; <option>--caption</option> option; &tde;
> app will use name from <varname>Name</varname>= line in
> taskbar.</para>
> </listitem>
>@@ -1635,15 +1620,15 @@
> </sect1>
> 
> <sect1 id="kde-menu">
>-<title>&kde; Menu</title>
>+<title>&tde; Menu</title>
> 
> <sect2 id="how-it-works">
> <title>How it Works</title>
> 
>-<para>In &kde; 3.2 a common menu format is introduced at
>+<para>In &tde; 3.2 a common menu format is introduced at
> <ulink
> url="http://freedesktop.org/Standards/menu-spec/">http://freedesktop.org/Standards/menu-spec/</ulink></para>
>-<para>Before &kde; 3.2:
>+<para>Before &tde; 3.2:
> <itemizedlist>
> 
> <listitem><para>Directory structure under <filename
>@@ -1658,12 +1643,12 @@
> </itemizedlist>
> </para>
> 
>-<para>It was difficult to rearrange the structure in &kde; 3.2 so the
>+<para>It was difficult to rearrange the structure in &tde; 3.2 so the
> new menu format:
> <itemizedlist>
> <listitem><para>Defines structure in a single .menu file</para></listitem>
> <listitem><para>Is based on categories</para></listitem>
>-<listitem><para>is shared between <acronym>GNOME</acronym> and &kde;</para></listitem>
>+<listitem><para>is shared between <acronym>GNOME</acronym> and &tde;</para></listitem>
> <listitem><para>Supports applnk style menus as well</para></listitem>
> </itemizedlist>
> </para>
>@@ -1781,10 +1766,10 @@
> 
> <para>Applications <emphasis>not</emphasis> in the menu do
> <emphasis>not</emphasis> exist with regard to other applications or
>-file associations: If you remove an application from the menu, &kde; assumes you don't want to use it.</para>
>+file associations: If you remove an application from the menu, &tde; assumes you don't want to use it.</para>
> 
> <para>When applications are unwanted in the menu, either place them in
>-<filename>.hidden</filename> menu or a dedicated menu with 
>+<filename>.hidden</filename> menu or a dedicated menu with
> <programlisting>
> NoDisplay=true
> </programlisting> in the <literal
>@@ -1797,7 +1782,7 @@
> <para><filename
> class="directory">$<envar>TDEDIR</envar>/etc/xdg/menus/applications-merged/</filename>
> contains <filename>kde-essential.menu</filename> which includes some
>-essential menus that are normally not shown in the &kde; menu itself:
>+essential menus that are normally not shown in the &tde; menu itself:
> <itemizedlist>
> <listitem><para>Control Center has a hidden Settings menu whose
> contents are defined by <filename>kde-settings.menu</filename> and
>@@ -1826,7 +1811,7 @@
> <sect2 id="old-style-menus">
> <title>Old-Style Menus</title>
> 
>-<para>&kde; continues to support old-style menus that are defined by
>+<para>&tde; continues to support old-style menus that are defined by
> the directory structures in <filename
> class="directory">$<envar>TDEDIR</envar>/share/applnk</filename>
> (system wide) and <filename
>@@ -1843,7 +1828,7 @@
> which is built lives in <filename
> class="directory">/var/tmp/kdecache-${<envar>USER</envar>}/ksycoca</filename>.
> It is automatically updated by <application>KDED</application>,
>-checked during &kde; login, and <application>KDED</application>
>+checked during &tde; login, and <application>KDED</application>
> watches for changes while logged in.</para>
> 
> <para>To disable watching for changes (since it may hurt over NFS) add
>@@ -1878,9 +1863,9 @@
> 
> 
> <sect1 id="kde-panel">
>-<title>&kde; Panel</title>
>+<title>&tde; Panel</title>
> 
>-<para>The &kde; panel is also known as &kicker;. It is modular and
>+<para>The &tde; panel is also known as &kicker;. It is modular and
> consists of the following components:
> <itemizedlist>
> <listitem><para>Applets</para></listitem>
>@@ -1898,7 +1883,7 @@
> </itemizedlist>
> and the following special buttons:
> <itemizedlist>
>-<listitem><para>&kde; menu</para></listitem>
>+<listitem><para>&tde; menu</para></listitem>
> <listitem><para>Desktop Button</para></listitem>
> </itemizedlist>
> </para>
>@@ -1917,7 +1902,7 @@
> 
> <para>File associations associate a file type with an application or
> applications. The type of a file is established by determining its
>-&MIME; type. &MIME; types known by &kde; are stored in <filename
>+&MIME; type. &MIME; types known by &tde; are stored in <filename
> class="directory">$<envar>TDEDIR</envar>/share/mimelnk</filename> and
> each application's <literal role="extension">.desktop</literal> file
> contains a list of &MIME; types supported by that application.</para>
>@@ -1962,7 +1947,7 @@
> &kcontrolcenter;. These changes are stored in
> <filename>$<envar>HOME</envar>/.kde/share/config/profilerc</filename>.
> To use the same settings for multiple users, store these settings in
>-user profile directory or the global &kde; config directory to use as
>+user profile directory or the global &tde; config directory to use as
> default for multiple users.</para>
> 
> </informalexample>
>@@ -1972,12 +1957,12 @@
> </chapter>
> 
> <chapter id="locking-down-kde">
>-<title>Locking Down &kde;</title>
>+<title>Locking Down &tde;</title>
> 
> <sect1 id="how-it-works-the-basics">
> <title>How It Works - The Basics</title>
> 
>-<para>&kde;'s lock down features are centered around the following
>+<para>&tde;'s lock down features are centered around the following
> options:</para>
> 
> <itemizedlist>
>@@ -1995,7 +1980,7 @@
> 
> <sect1 id="immutable-configuration-options">
> <title>Immutable Configuration Options</title>
>-<subtitle>Locking Down &kde;</subtitle>
>+<subtitle>Locking Down &tde;</subtitle>
> 
> <para>Immutable options allow system administrator to provide default
> settings that can not be changed by the user.</para>
>@@ -2020,7 +2005,7 @@
> <sect1 id="action-restrictions">
> <title>Action Restrictions</title>
> 
>-<para>&kde; applications are built around the action-concept. Actions can be
>+<para>&tde; applications are built around the action-concept. Actions can be
> activated in various ways, typically via the menu-bar, one of the toolbars
> or a keyboard shortcut. <action>Save Document</action> is an example of an
> action.  If you know the internal action name it is possible to restrict an
>@@ -2038,17 +2023,17 @@
> <para>In order to prevent the user access to a command shell we can restrict
> the <option>shell_access</option> action by adding the following to
> <filename>kdeglobals</filename>:
>-</para> 
>+</para>
> 
>-<screen>[KDE Action Restrictions]
>+<screen>[TDE Action Restrictions]
> shell_access=false</screen>
> 
>-<para>Since this affects the &kde; menu and the available applications, we
>+<para>Since this affects the &tde; menu and the available applications, we
> must force an update of the sycoca database:</para>
> 
> <screen><userinput><command>touch</command> <filename>$<envar>TDEDIR</envar>/share/services/update_ksycoca</filename></userinput></screen>
> 
>-<para>Now re-login to &kde; and check the following points:</para>
>+<para>Now re-login to &tde; and check the following points:</para>
> 
> <itemizedlist>
> <listitem><para>The &kmenu;</para></listitem>
>@@ -2159,7 +2144,7 @@
> <area id="url_rule1" coords="3"/>
> <area id="url_rule2" coords="4"/>
> </areaspec>
>-<screen>[KDE URL Restrictions]
>+<screen>[TDE URL Restrictions]
> rule_count=2
> rule_1=open,,,,http,,,false
> rule_2=open,,,,http,*.ourcompany.com,,true</screen></screenco>
>@@ -2168,7 +2153,7 @@
> <callout arearefs="url_commas">
> <para>The first four commas skip over the selection criteria with respect to
> the originating &URL;. This part is only needed with redirect type
>-rules.</para> 
>+rules.</para>
> </callout>
> <callout arearefs="url_rule1"><para><option>rule_1</option> forbids the
> opening of any http or https &URL;</para></callout>
>@@ -2186,7 +2171,7 @@
> <area id="home_rule1" coords="3"/>
> <area id="home_rule2" coords="4"/>
> </areaspec>
>-<screen>[KDE URL Restrictions]
>+<screen>[TDE URL Restrictions]
> rule_count=2
> rule_1=list,,,,file,,,false
> rule_2=list,,,,file,,$HOME,true</screen></screenco>
>@@ -2200,7 +2185,7 @@
> </calloutlist>
> 
> <para>$<envar>HOME</envar> and $<envar>TMP</envar> are special values to
>-indicate the users home directory and the &kde; temporary directory of the
>+indicate the users home directory and the &tde; temporary directory of the
> user, &eg; <filename class="directory">/tmp/kde-bastian</filename></para>
> 
> <para>The following rules makes that the user can no longer open local files
>@@ -2211,7 +2196,7 @@
> <area id="local_rule2" coords="4"/>
> <area id="local_rule3" coords="5"/>
> </areaspec>
>-<screen>[KDE URL Restrictions]
>+<screen>[TDE URL Restrictions]
> rule_count=3
> rule_1=open,,,,file,,,false
> rule_2=open,,,,file,,$HOME,true
>@@ -2223,8 +2208,8 @@
> <callout arearefs="local_rule2"><para><option>rule_2</option> allows opening
> files under the users own $<envar>HOME</envar> directory.</para></callout>
> <callout arearefs="local_rule3"><para><option>rule_3</option> allows opening
>-files in the &kde; temporary directory of the user.  This is needed by
>-certain &kde; applications that first download a file or document to the
>+files in the &tde; temporary directory of the user.  This is needed by
>+certain &tde; applications that first download a file or document to the
> temporary directory and then open it in an application.</para></callout>
> </calloutlist>
> 
>@@ -2239,7 +2224,7 @@
> class="systemname">www.mycompany.com</systemitem> the possibility to refer
> to local files we could add the following rule:</para>
> 
>-<screen>[KDE URL Restrictions]
>+<screen>[TDE URL Restrictions]
> rule_count=1
> rule_1=redirect,http,www.mycompany.com,,file,,,true</screen>
> 
>@@ -2286,8 +2271,8 @@
> <sect1 id="configuration-modules">
> <title>Configuration Modules</title>
> 
>-<para>&kde; has configuration modules to configure various aspects of the
>-&kde; environment. Configuration modules appear in the Control Center, in the
>+<para>&tde; has configuration modules to configure various aspects of the
>+&tde; environment. Configuration modules appear in the Control Center, in the
> Configuration dialog of an application or in both.</para>
> 
> <informalexample>
>@@ -2310,7 +2295,7 @@
> itself.</para></note></para>
> </informalexample>
> 
>-<para>All configuration modules are strictly speaking part of the &kde;
>+<para>All configuration modules are strictly speaking part of the &tde;
> menu.</para>
> 
> <itemizedlist>
>@@ -2319,7 +2304,7 @@
> have a <literal role="extension">.desktop</literal> file in <filename
> class="directory">$<envar>TDEDIR</envar>/share/applications/kde</filename>
> and are sorted under the hidden <guimenu>Settings-Modules</guimenu> menu by
>-the <filename>kde-settings.menu</filename>, included from 
>+the <filename>kde-settings.menu</filename>, included from
> <filename>kde-essential.menu</filename></para>
> <screen><userinput><command>kbuildsycoca</command> <option>--menutest</option> 2&gt; /dev/null | <command>grep</command> Settings-Modules</userinput></screen>
> </listitem>
>@@ -2330,12 +2315,12 @@
> <markup>&lt;KDELegacyDirs/&gt;</markup></para>
> <screen><userinput><command>kbuildsycoca</command> <option>--menutest</option> 2&gt; /dev/null | <command>grep</command> .hidden</userinput></screen>
> </listitem>
>-<listitem><para>In &kde; 3.3 it is possible to edit the Control Center with
>+<listitem><para>In &tde; 3.3 it is possible to edit the Control Center with
> <application>kcontroledit</application>.
> <application>kcontroledit</application> works just like
> <application>kmenuedit</application>, changes for current user only. Use
> <application>kiosktool</application> to make changes for
>-everyone.</para></listitem> 
>+everyone.</para></listitem>
> </itemizedlist>
> 
> <para>Individual configuration modules can be disables by adding the
>@@ -2351,12 +2336,12 @@
> there.</para>
> 
> </sect1>
>-
>diff -urN tdebase/doc/userguide/messaging-intro.docbook tdebase.new/doc/userguide/messaging-intro.docbook
>--- tdebase/doc/userguide/messaging-intro.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/userguide/messaging-intro.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -20,7 +20,7 @@
> <title>Introduction to messaging</title>
> 
> 
>-<para>The default way to send instant messages in &kde; is to use the <acronym>IM</acronym>
>+<para>The default way to send instant messages in &tde; is to use the <acronym>IM</acronym>
> client, &kopete;. This is a multi-protocol <acronym>IM</acronym> client, meaning that it
> handles several different protocols including <acronym>MSN</acronym>,
> Jabber, <acronym>AOL</acronym> and <acronym>IRC</acronym>. It also has
>@@ -28,15 +28,15 @@
> encryption support and lots more.</para>
> 
> <screenshot> 
>-<screeninfo>&kopete;, the &kde; IM client.</screeninfo> 
>+<screeninfo>&kopete;, the &tde; IM client.</screeninfo> 
> <mediaobject> 
> <imageobject> 
> <imagedata fileref="kopete.png" format="PNG"/> </imageobject> 
> <textobject> 
>-<phrase>&kopete;, the &kde; IM client.</phrase> 
>+<phrase>&kopete;, the &tde; IM client.</phrase> 
> </textobject> 
> <caption> 
>-<para>&kopete;, the &kde; IM client.</para> 
>+<para>&kopete;, the &tde; IM client.</para> 
> </caption> 
> </mediaobject> 
> </screenshot> 
>@@ -87,7 +87,7 @@
> <para>Internet Relay Chat (<acronym>IRC</acronym>) has been around far longer than most <acronym>IM</acronym>
> systems, and is still widely used. It is mainly designed for group (many-to-many) communication in discussion forums called channels, but also allows one-to-one communication.</para>
> 
>-<para>The #kde channel is under Freenode, the <acronym>IRC</acronym> server, which provides an interactive environment for coordination and support of peer-directed projects, including -- and placing particular stress upon -- those relating to free software and open source projects, such as &kde;.</para>
>+<para>The #kde channel is under Freenode, the <acronym>IRC</acronym> server, which provides an interactive environment for coordination and support of peer-directed projects, including -- and placing particular stress upon -- those relating to free software and open source projects, such as &tde;.</para>
> 
> 
> <para>While &kopete; has a <acronym>IRC</acronym> plugin, and handles both channels and nicks well,
>@@ -110,7 +110,7 @@
> you would like to do is to give a reaction on it, but not by
> email. So you switch to your instant messaging client and/or IRC
> client and look if that person is online via MSN, Jabber or IRC. Well
>-&kde; 3.3 has made that a lot easier. A step-by-step manual:</para>
>+&tde; 3.3 has made that a lot easier. A step-by-step manual:</para>
> 
> <para>The requirements are &kmail;, &kaddressbook; and &kopete;
> (<application>Konversation</application> should do as well). Make sure &kmail; is configured and
>@@ -126,7 +126,7 @@
> go to &kopete;.  Go to
> <menuchoice><guimenu>File</guimenu><guimenuitem>Add
> contact</guimenuitem> </menuchoice>. In the wizard, select the
>-checkbox at the bottom called <guilabel>Use the KDE address book for
>+checkbox at the bottom called <guilabel>Use the TDE address book for
> this contact</guilabel> and choose <guibutton>Next</guibutton>. Select
> the right Address Book entry for that contact and press
> <guibutton>Next</guibutton>. Now you can set the display name and the
>diff -urN tdebase/doc/userguide/migrator-applications.docbook tdebase.new/doc/userguide/migrator-applications.docbook
>--- tdebase/doc/userguide/migrator-applications.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/userguide/migrator-applications.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -11,7 +11,7 @@
> 
> 
> 
>-<para>&kde; has many applications, often prefixed with (or containing) the letter k. The names are generally self-explanatory, but it can still be difficult sometimes to find the appropriate packages. Migrates from operating systems such as <trademark class="registered">Microsoft Windows</trademark> or <trademark class="registered">Apple Macintosh</trademark> might have some difficulty in locating an application for a particular job. Below is a table with an expansion on the &kmenu; and the respective Win/Mac equivalent.</para>
>+<para>&tde; has many applications, often prefixed with (or containing) the letter k. The names are generally self-explanatory, but it can still be difficult sometimes to find the appropriate packages. Migrates from operating systems such as <trademark class="registered">Microsoft Windows</trademark> or <trademark class="registered">Apple Macintosh</trademark> might have some difficulty in locating an application for a particular job. Below is a table with an expansion on the &kmenu; and the respective Win/Mac equivalent.</para>
> 
> <table><title>Sample Table</title>
> <tgroup cols='6' align='left' colsep='1' rowsep='1'>
>@@ -23,7 +23,7 @@
> <thead>
> <row>
>   <entry namest="c1" nameend="c2" align="center"><para>&kmenu; Location</para></entry>
>-  <entry><para>&kde; Application</para></entry>
>+  <entry><para>&tde; Application</para></entry>
>   <entry><para><trademark class="registered">Windows</trademark> Equivalent</para></entry>
>   <entry><para><trademark class="registered">Macintosh</trademark> Equivalent</para></entry>
>   <entry><para>Notes</para></entry>
>@@ -146,7 +146,7 @@
> 
> 	<entry><para><application><acronym>MS</acronym> Outlook</application></para></entry>
> 
>-	<entry><para>The Personal Information Manager is &kontact;; all other &kde; <acronym>PIM</acronym> applications integrate into it.</para></entry>
>+	<entry><para>The Personal Information Manager is &kontact;; all other &tde; <acronym>PIM</acronym> applications integrate into it.</para></entry>
> 
> </row>
> 
>@@ -265,7 +265,7 @@
> 
> <itemizedlist>
> <title>Related Information</title>
>-<listitem><para>Many more &kde; applications are available from the &kde; extragear (see <xref linkend="extragear-applications" /> for more information) or from <ulink url="http://kde-apps.org">http://kde-apps.org</ulink>.</para></listitem>
>+<listitem><para>Many more &tde; applications are available from the &tde; extragear (see <xref linkend="extragear-applications" /> for more information) or from <ulink url="http://kde-apps.org">http://kde-apps.org</ulink>.</para></listitem>
> <listitem><para>Reference: <ulink url="http://kudos.berlios.de/kf/kf1.html#pkgtablestock">http://kudos.berlios.de/kf/kf1.html#pkgtablestock</ulink></para></listitem>
> </itemizedlist>
> 
>diff -urN tdebase/doc/userguide/net-connection-setup.docbook tdebase.new/doc/userguide/net-connection-setup.docbook
>--- tdebase/doc/userguide/net-connection-setup.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/userguide/net-connection-setup.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -13,14 +13,14 @@
> 
> 
> 
>-<para>&kde; offers a complete Internet experience, with all the
>+<para>&tde; offers a complete Internet experience, with all the
> programs you'll need to make the most of the Web, email, Usenet and
>-many other Internet technologies. But before you can enjoy &kde;'s
>+many other Internet technologies. But before you can enjoy &tde;'s
> advanced features, you'll need to get online. Here's how:</para>
> 
> <para>If you're using <quote>dialup</quote> (that is, connecting to
> the Internet with a modem connected to a telephone line), you'll want
>-to set up the &kde; dialing program, &kppp;. If that sounds
>+to set up the &tde; dialing program, &kppp;. If that sounds
> complicated, don't worry: &kppp; has an advanced configuration wizard,
> which will usually take the pain out of setting up your dialup
> connection. Take a look at the next two sections for more
>@@ -28,8 +28,8 @@
> 
> <para>If you're using a broadband connection, or connecting via a
> local network, things are easier (from the point of view of
>-&kde;). Once you've set up the connection with the tools provided by
>-your &Linux; or &UNIX; distribution, &kde; will use the connection
>+&tde;). Once you've set up the connection with the tools provided by
>+your &Linux; or &UNIX; distribution, &tde; will use the connection
> automatically.</para>
> 
> <sect1 id="getting-online">
>@@ -198,7 +198,7 @@
> <guibutton>Finish</guibutton> button, and you're all done.</para>
> 
> <para>If you need more details, you can read the full &kppp;
>-manual in the &kde; Help Center, or by typing
>+manual in the &tde; Help Center, or by typing
> <userinput>help:/kppp</userinput> in the <guilabel>Location</guilabel>
> bar in &konqueror;.</para>
> 
>diff -urN tdebase/doc/userguide/networking-with-windows.docbook tdebase.new/doc/userguide/networking-with-windows.docbook
>--- tdebase/doc/userguide/networking-with-windows.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/userguide/networking-with-windows.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -14,7 +14,7 @@
> <para> This section is borrowed and modified from Alexander Neundorf's
> README file on LISa.</para>
> 
>-<para>&kde; features two powerful servers called the Lan Information
>+<para>&tde; features two powerful servers called the Lan Information
> Server (<application>LISa</application>) and Restricted Lan
> Information Server (<application>resLISa</application>) which are used
> to identify CIFS and other servers on your local network providing a
>diff -urN tdebase/doc/userguide/panel-and-desktop.docbook tdebase.new/doc/userguide/panel-and-desktop.docbook
>--- tdebase/doc/userguide/panel-and-desktop.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/userguide/panel-and-desktop.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -1,18 +1,9 @@
> <chapter id="panel-and-desktop">
> 
>-<chapterinfo>
>-<authorgroup>
>-<author>
>-&Philip.Rodrigues;
>-</author>
>-</authorgroup>
>-</chapterinfo>
>-
>-
> <title>The Panel and the Desktop</title>
> 
> <sect1 id="kicker-panel">
>-<title>&kicker;, the &kde; Panel</title>
>+<title>&kicker;, the &tde; Panel</title>
> 
> <indexterm
> significance="preferred"><primary>Panel</primary></indexterm>
>@@ -23,7 +14,7 @@
> Environment.  By default, it appears along the bottom of the screen,
> and takes up the whole of the width of the screen, but this is
> configurable. &kicker; is something of a one-stop shop for (almost!)
>-everything that you might want quick access to. Besides the &kicon;
>+everything that you might want quick access to. Besides the &ticon;
> Menu, where you can start applications, &kicker; is also capable of
> running docked applets like the pager, the taskbar or the clock, and
> extensions, such as child panels. With all these options, you will
>@@ -40,7 +31,7 @@
> <sect2 id="customize-panel-icons">
> <title>Customizing the icons on the panel</title>
> 
>-<para>When you first start &kde;, kicker displays some icons next to
>+<para>When you first start &tde;, kicker displays some icons next to
> the <guimenu>K</guimenu> menu. These can be used to start the
> applications that they represent. To see which application is launched
>  by each icon, hold the mouse cursor over the icon until a tooltip (a
>@@ -54,7 +45,7 @@
> appears. To add a new icon, &RMB;-click on an empty space on the
> panel, and follow the menu entry <guisubmenu>Add Application to Panel
> </guisubmenu>. This leads you to a copy of the
>-<guimenu>K</guimenu> menu, where you can find all of the &kde;
>+<guimenu>K</guimenu> menu, where you can find all of the &tde;
> applications. For example, to add an icon for the &juk; music player,
> follow through the menus to <menuchoice><guisubmenu>Add Application
> to Panel</guisubmenu><guisubmenu>Multimedia</guisubmenu><guimenuitem>&juk; (Music
>@@ -275,14 +266,14 @@
> <title>Related Information</title> 
> 
> <listitem><para>You can find more information about &kicker;, the
>-&kde; Panel, in &khelpcenter; or by entering
>+&tde; Panel, in &khelpcenter; or by entering
> <userinput>help:/kicker</userinput> in &konqueror;'s
> <guilabel>Location</guilabel> bar.</para>
> </listitem>
> 
> <listitem><para>The &klipper;
> Handbook has information about the advanced clipboard management
>-features in &kde;. You can read it in &khelpcenter; or by entering
>+features in &tde;. You can read it in &khelpcenter; or by entering
> <userinput>help:/klipper</userinput> in &konqueror;'s
> <guilabel>Location</guilabel> bar.</para>
> </listitem>
>diff -urN tdebase/doc/userguide/playing-audiocds.docbook tdebase.new/doc/userguide/playing-audiocds.docbook
>--- tdebase/doc/userguide/playing-audiocds.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/userguide/playing-audiocds.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -9,10 +9,10 @@
> </author>
> </sect1info>
> 
>-<title>Audio CD Ripping in &kde;</title>
>+<title>Audio CD Ripping in &tde;</title>
> 
> <para>The conventional way of ripping Audio CDs to MP3 or Ogg files is to
>-use a standalone program such as <trademark class="registered"><application>iTunes</application></trademark>, Winamp or &kde;'s own
>+use a standalone program such as <trademark class="registered"><application>iTunes</application></trademark>, Winamp or &tde;'s own
> <application>KAudioCreator</application>. But if we stick to conventions,
> where's the fun?! So in this article, I am going to show you how to feel
> elite by ripping your CDs in the, umm.. elite way. ;-) </para>
>@@ -20,7 +20,7 @@
> <sect2 id="audio-cd-ingredients">
> <title>Ingredients</title>
> 
>-<para>What do we need to be cool? Vanilla &kde;, without any extra
>+<para>What do we need to be cool? Vanilla &tde;, without any extra
> ingredients, will be able to rip your CDs. But to encode them, you'll need
> to install the relevant codecs. At the moment, Ogg Vorbis, MP3 and FLAC formats
> are supported. To enable encoding to these formats, you'll have to install
>@@ -36,7 +36,7 @@
> Retrieval</guimenuitem></menuchoice> and change anything that's not to your
> liking. <acronym>CDDB</acronym>, in case you didn't know, stands for CD DataBase (or Compact
> Disc DataBase in it's more free flowing form). This functionality enables
>-&kde; to retrieve the Artist/Album/Track information about your CDs from the
>+&tde; to retrieve the Artist/Album/Track information about your CDs from the
> Internet. This metadata is also used to write tags to the MP3 or Ogg files
> that you'll be encoding your CDs to anytime now. </para>
> 
>@@ -96,7 +96,7 @@
> 
> <para>So how do we rip and encode the CD? I think you can guess the answer
> by now. Just decide which format you wish to rip to, open that folder, and
>-copy and paste those files in your target folder. That's it! &kde; will start
>+copy and paste those files in your target folder. That's it! &tde; will start
> ripping and encoding the files on the fly! If you copy any of the files in
> the <guilabel>Full CD</guilabel> folder, you'll be ripping the entire CD as
> one continuous stream. </para>
>diff -urN tdebase/doc/userguide/playing-music.docbook tdebase.new/doc/userguide/playing-music.docbook
>--- tdebase/doc/userguide/playing-music.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/userguide/playing-music.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -21,7 +21,7 @@
> <sect2 id="music-media-players">
> <title>Music Players</title>
> 
>-<para>There are several &kde; music players with somewhat overlapping
>+<para>There are several &tde; music players with somewhat overlapping
> feature sets, however, each is quite different in style. </para>
> 
> <variablelist>
>@@ -35,7 +35,7 @@
> <indexterm><primary>&noatun;</primary></indexterm>
> </term>
> <listitem>
>-<para>Noatun is the default &kde; music player.  It features a highly
>+<para>Noatun is the default &tde; music player.  It features a highly
> configurable interface, including several styles of playlist manager, and
> many plugins to provide different &GUI;s, visualizations, and other
> features.</para>
>@@ -116,7 +116,7 @@
> </varlistentry>
> </variablelist>
> 
>-<para>Most of the &kde; based movie players such as
>+<para>Most of the &tde; based movie players such as
> <application>Kaffeine</application> and <application>kmplayer</application>
> also make useful music players.</para>
> 
>diff -urN tdebase/doc/userguide/printing-from-apps.docbook tdebase.new/doc/userguide/printing-from-apps.docbook
>--- tdebase/doc/userguide/printing-from-apps.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/userguide/printing-from-apps.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -15,7 +15,7 @@
> 
> <title>Printing From Applications</title>
> 
>-<para>Printing from &kde; apps</para>
>+<para>Printing from &tde; apps</para>
> 
> <para>Printing from non-kde apps</para>
> 
>diff -urN tdebase/doc/userguide/programs-and-documents.docbook tdebase.new/doc/userguide/programs-and-documents.docbook
>--- tdebase/doc/userguide/programs-and-documents.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/userguide/programs-and-documents.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -4,16 +4,9 @@
> 
> <sect1 id="programs-launching">
> 
>-<sect1info>
>-<author>
>-<firstname>Robert</firstname>
>-<surname>Stoffers</surname>
>-</author>
>-</sect1info>
>-
> <title>Launching Programs</title>
> 
>-<para>&kde; offers a varying number of ways to launch programs. You may:</para>
>+<para>&tde; offers a varying number of ways to launch programs. You may:</para>
> 	<itemizedlist>
> 	<listitem>
> 		<para>Simply select the relevant item in the &kmenu;.</para>
>@@ -73,7 +66,7 @@
>  program from the list and press <keycap>Enter</keycap> to launch.</para>
> 
> <para>Whichever way you choose, launching a program is a simple affair with
>-&kde;. From the &kmenu;, to &konsole;, all your programs are just a few
>+&tde;. From the &kmenu;, to &konsole;, all your programs are just a few
> clicks or key-presses away.</para>
> 
> 
>@@ -91,24 +84,13 @@
> 
> <sect1 id="programs-save-open">
> 
>-<sect1info>
>-<author>
>-<personname>
>-<firstname>Christian</firstname>
>-<surname>Weickhmann</surname>
>-</personname>
>-<email>christian.weickhmann@gmx.de</email>
>-</author>
>-</sect1info>
>-
>-
> <title>Opening and Saving Files</title>
> 
> 
> 
> 
>-<para>&kde; provides a unified way to open or save files via the file
>-dialog. In almost every &kde; program you will find a
>+<para>&tde; provides a unified way to open or save files via the file
>+dialog. In almost every &tde; program you will find a
> <menuchoice><guimenu>File</guimenu><guimenuitem>Open</guimenuitem>
> </menuchoice> and <menuchoice><guimenu>File</guimenu>
> <guimenuitem>Save</guimenuitem></menuchoice> (and/or <guimenuitem>Save
>@@ -118,19 +100,19 @@
> <title>The File Dialog</title>
> 
> 
> <screenshot>
> <mediaobjectco>
>@@ -149,7 +131,7 @@
> </mediaobjectco>
> </screenshot>
> 
>-
> 
>-<para>One of the main ways that you'll control programs in &kde; is
>+<para>One of the main ways that you'll control programs in &tde; is
> via the program's menus. They provide access to nearly everything
> you'll need to do with that program. So that you can more easily
> remember where things are in the menus, and to help you learn new
> programs more easily, the menus have a standard layout. This means
> that once you know how to open a file in one program, you know how to
>-open a file in any &kde; program. Let's take a look at the standard
>+open a file in any &tde; program. Let's take a look at the standard
> menus:</para> 
> 
> .</para>
> <para>You probably noticed that this menu entry had an ellipsis (...)
> after the name of the entry. This means that clicking on the entry
>@@ -65,7 +65,7 @@
> </menuchoice></term>
> <listitem><para>This menu entry will save any changes you've made to
> the file that you are currently working on. If this is the first time
>-that you've saved the file, the &kde; <quote>Save File</quote> dialog
>+that you've saved the file, the &tde; <quote>Save File</quote> dialog
> will appear, and ask you for a name and location for the file. </para>
> </listitem>
> </varlistentry>
>@@ -116,7 +116,7 @@
> </keycombo>
> </shortcut><guimenuitem>Print...</guimenuitem>
> </menuchoice></term>
>-<listitem><para>This menu entry displays the &kde;
>+<listitem><para>This menu entry displays the &tde;
> <quote>Print</quote> dialog, read to print the current
> document. Youcan find more information about the options available in
> this dialog in <xref linkend="printing-from-apps"/>.</para>
>diff -urN tdebase/doc/userguide/switching-sessions.docbook tdebase.new/doc/userguide/switching-sessions.docbook
>--- tdebase/doc/userguide/switching-sessions.docbook	2012-01-26 15:03:48.000000000 -0600
>+++ tdebase.new/doc/userguide/switching-sessions.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -1,19 +1,8 @@
> <sect1 id="switching-sessions">
> 
>-<sect1info>
>-<author>
>-<personname>
>-<firstname>Christian</firstname>
>-<surname>Weickhmann</surname>
>-</personname>
>-<email>christian.weickhmann@gmx.de</email>
>-</author>
>-</sect1info>
>-
>-
> <title>Switching Sessions</title>
> 
>-<para>From version 3.3 onwards, &kde; provides a session management
>+<para>From version 3.3 onwards, &tde; provides a session management
> system which allows you to switch between different user account on
> one computer. You can stay logged in and &eg; let your sister,
> brother, wife, neigbour or whoever read her or his emails just for a
>diff -urN tdebase/doc/userguide/the-filemanager.docbook tdebase.new/doc/userguide/the-filemanager.docbook
>--- tdebase/doc/userguide/the-filemanager.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/userguide/the-filemanager.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -1,14 +1,5 @@
> <sect1 id="file-manager">
> 
>-<sect1info>
>-<authorgroup>
>-<author>
>-<firstname>Christian</firstname>
>-<surname>Weickhmann</surname>
>-</author>
>-</authorgroup>
>-</sect1info>
>-
> <title>The File Manager</title>
> <indexterm><primary>&konqueror;</primary><secondary>File
> Management</secondary></indexterm>
>@@ -24,7 +15,7 @@
> <sect2 id="filemanager-intro">
> <title>Introduction</title>
> 
>-<para>&kde; includes a versatile and powerful file manager called
>+<para>&tde; includes a versatile and powerful file manager called
> &konqueror; which allows you to do everything you want with the files
> stored on your computer, your network, and even the Internet. There
> are too many features of &konqueror; to describe here, so we will just
>@@ -47,7 +38,7 @@
> popup window will appear, showing the contents of the file and other some
> useful information, like file's size and which user owns the file.</para>
> 
>-<para>You can open any item by clicking (just once &ndash; &kde;
>+<para>You can open any item by clicking (just once &ndash; &tde;
> does not use double-clicking in its default settings) on the icon for the
> file.  Folders will be opened in the same window; files will either be
> opened in the appropriate program, or the file manager will ask you
>@@ -153,7 +144,7 @@
> <listitem>
> <para>Newsticker will display a customisable list of news sources. Right-click 
> either on the <guilabel>Configure button</guilabel> or on one of the 
>-newssource buttons (e.g. KDE News, which is usually predefined) to add a new 
>+newssource buttons (e.g. TDE News, which is usually predefined) to add a new 
> newsticker source.</para>
> </listitem>
> </varlistentry>
>@@ -244,7 +235,7 @@
> <indexterm><primary>Trash</primary></indexterm>
> <indexterm><primary><quote>Recycle Bin</quote></primary></indexterm>
> 
>-<para>Before a file is deleted in the &kde; file manager it will be
>+<para>Before a file is deleted in the &tde; file manager it will be
> moved to the <filename>Trash</filename> folder to give you the
> possibility of getting it back if you deleted it by accident.  The
> trash bin will show all deleted items. You can select the one to be
>diff -urN tdebase/doc/userguide/troubleshooting-network-x.docbook tdebase.new/doc/userguide/troubleshooting-network-x.docbook
>--- tdebase/doc/userguide/troubleshooting-network-x.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/userguide/troubleshooting-network-x.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -6,7 +6,7 @@
> </sect1info>
> <title>Networking and X</title>
> <para>
>-Misconfigured networking can often be the cause of &kde; applications launching slowly, or in the worst case not launching at all. Your &X-Server; has a very powerful client/server interface and is very network aware.
>+Misconfigured networking can often be the cause of &tde; applications launching slowly, or in the worst case not launching at all. Your &X-Server; has a very powerful client/server interface and is very network aware.
> </para>
> <para>
>  X uses the hostname to create both a unique key for authorization, and to figure out where (via $<envar>DISPLAY</envar>) to send
>diff -urN tdebase/doc/userguide/under-the-hood.docbook tdebase.new/doc/userguide/under-the-hood.docbook
>--- tdebase/doc/userguide/under-the-hood.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/userguide/under-the-hood.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -1,37 +1,14 @@
> <chapter id="tinkering-under-the-hood">
>-
>-
> 
>-
>-
>-<title>Tinkering Under the Hood of &kde;</title>
>+<title>Tinkering Under the Hood of &tde;</title>
> 
> <sect1 id="hand-editing-config-files">
> 
>-<sect1info>
>-<author>
>-<personname>
>-<firstname>Nicolas</firstname>
>-<surname>Goutte</surname>
>-</personname>
>-<email>goutte@kde.org</email>
>-</author>
>-</sect1info>
>-
> <title>Hand-Editing Configuration Files</title>
> 
> <sect2 id="hand-editing-intro">
> <title>Introduction</title>
>-<para>In &kde;, the configuration files are easy to edit with a simple
>+<para>In &tde;, the configuration files are easy to edit with a simple
> editor like &kate; as the configuration files are text files.</para>
> 
> <para>An example of a text file:</para>
>@@ -44,14 +21,14 @@
> class="directory">.kde/share/config</filename> (replace 
> <filename>.kde</filename> with your $<envar>TDEHOME</envar> setting) and
> the global ones are in the <filename
>-class="directory">share/config</filename> sub-directory of &kde;'s
>+class="directory">share/config</filename> sub-directory of &tde;'s
> installation path. (You can find this path by running the command
> <command>kde-config --prefix</command>.) Their filenames typically
> end in rc (without an initial period), for example <filename>kopeterc</filename>.</para>
> 
> <warning><para>
> Editing configuration files by hand can risk the stability of your
>-&kde; installation. Applications usually do  not check what they read from the
>+&tde; installation. Applications usually do  not check what they read from the
> configuration files. This means that they can be disturbed by what they
> get as configuration and might even
> crash.</para></warning>
>@@ -65,7 +42,7 @@
> it. The backup is better stored outside any
> <filename class="directory">.kde</filename> subdirectory 
> (or the corresponding $<envar>TDEHOME</envar> directory). Backups are anyway
>-a good idea in case of a major failure of &kde; that would
>+a good idea in case of a major failure of &tde; that would
> destroy important configuration files (for example your &kmail;  settings,
> which are in in the file <filename>kmailrc</filename>).
> (Such a major failure should not happen but it still can happen.)</para>
>@@ -79,14 +56,14 @@
> to add an entry to help him to solve a problem with the application. Perhaps you want to recover from
> a problem without having to remove all the <filename
> class="directory">.kde</filename> directory. Perhaps you want to learn more
>-about the depths of &kde;.</para>
>+about the depths of &tde;.</para>
> 
> <para>Anyway, whatever your reason, you want to modify by hand a
> configuration file.</para>
> 
> <para>When planning to edit such a file, make sure that the application
> using it is not running. If it is one of the basic configuration files,
>-consider editing the file while &kde; is not running at all.</para>
>+consider editing the file while &tde; is not running at all.</para>
> 
> <para>Ready? So make a backup of the file (Did I tell you this already?),
> start you favorite editor (let us assume it is &kate;), load the file
>@@ -112,7 +89,7 @@
> 
> 
> <listitem><para><xref linkend="kde-for-administrators"/> has more
>-information about &kde;'s directory structure, to help you find the
>+information about &tde;'s directory structure, to help you find the
> file you need to edit.</para>
> </listitem>
> 
>@@ -125,15 +102,15 @@
> <sect1 id="scripting-the-desktop">
> <title>Scripting the Desktop</title>
> 
>-<para>&kde; provides a powerful interprocess communication system in
>+<para>&tde; provides a powerful interprocess communication system in
> &DCOP;, the Desktop COmmunication Protocol. Using &DCOP;, you can
>-control a wide range of functions in &kde; from the command line or
>+control a wide range of functions in &tde; from the command line or
> from a script written in your favorite scripting language. You can
>-also get information out of &kde; applications: for example, several
>-&kde; media players provide methods to query the player for
>+also get information out of &tde; applications: for example, several
>+&tde; media players provide methods to query the player for
> information about the currently-playing track.</para>
> 
>-<para>Broadly speaking, each &kde; application provides one or more
>+<para>Broadly speaking, each &tde; application provides one or more
> &DCOP; <firstterm>interfaces</firstterm>, which in turn provide
> methods (or, if you prefer, functions) that another application can
> call. So, the first step in using &DCOP; is to find the appropriate
>@@ -212,7 +189,7 @@
> single quotes to protect the <token>#</token> from the shell.</para>
> 
> <para>To find the hexadecimal RGB value of a color, open any
>-color chooser dialog in a &kde; application (for example, in
>+color chooser dialog in a &tde; application (for example, in
> &kcontrolcenter;, <menuchoice><guimenu>Appearance &amp; Themes</guimenu><guimenuitem>Colors</guimenuitem>
> </menuchoice>), select the color you want, and use the value given in
> the <guilabel>HTML</guilabel> text box.</para>
>@@ -296,7 +273,7 @@
> 
> 
> <sect1 id="adding-extra-keys">
>-<title>Adding Extra Keybindings to &kde;</title>
>+<title>Adding Extra Keybindings to &tde;</title>
> 
> <para>Many modern keyboards contain extra keys that are not by default
> assigned to any action.</para>
>@@ -409,19 +386,8 @@
> </sect1>
> 
> <sect1 id="kdebugdialog">
>-<sect1info>
>-<authorgroup>
>-<author>
>-<personname>
>-<firstname>Adriaan</firstname>
>-<surname>de Groot</surname>
>-</personname>
>-<email>groot@kde.org</email>
>-</author>
>-</authorgroup>
>-</sect1info>
> 
>-<title>&kdebugdialog;  - Controlling &kde;'s Debugging Output</title>
>+<title>&kdebugdialog;  - Controlling &tde;'s Debugging Output</title>
> 
> <sect2 id="kdebugdialog-basic-usage">
> <title>Basic Usage</title>
>@@ -432,7 +398,7 @@
> &kdebugdialog; pops up a window with a long list of debugging areas. Each
> area has a checkbox that you can check or uncheck  in order to enable or disable debugging output for
>-that part of &kde;.</para>
>+that part of &tde;.</para>
> 
> <para>The list of debugging areas is sorted numerically, not alphabetically,
> so kio (127) comes before artskde (400). The numbers go up to 200000 or so,
>@@ -446,7 +412,7 @@
> haha --> will show you just the &kontact; debugging areas. As an even
> quicker way of enabling or disabling debugging output, there are also
> <guibutton>select all</guibutton> and <guibutton>deselect all</guibutton>
>-buttons which will cause &kde; to produce a mountain of debugging output, or
>+buttons which will cause &tde; to produce a mountain of debugging output, or
> very little.</para>
> </sect2>
> 
>diff -urN tdebase/doc/userguide/usenet.docbook tdebase.new/doc/userguide/usenet.docbook
>--- tdebase/doc/userguide/usenet.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/userguide/usenet.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -19,7 +19,7 @@
> various topics: almost any subject you like (and many you don't!) can
> be found there. Although usenet has become less popular than it once
> was, because of the increasing use of web forums, &etc;, it is still a
>-useful tool. &kde; provides a powerful usenet news reader called &knode;.</para>
>+useful tool. &tde; provides a powerful usenet news reader called &knode;.</para>
> 
> <para>You can find &knode; in the <guimenu>K</guimenu> Menu under the
> <guisubmenu>Internet</guisubmenu> entry: the menu entry
>@@ -218,11 +218,11 @@
> <itemizedlist>
> <title>Related Information</title>
> <listitem><para>The comp.windows.x.kde newsgroup is the main user
>-support group for &kde; on usenet. You can find other resources for
>-getting help with &kde; in <xref linkend="getting-help"/>.</para>
>+support group for &tde; on usenet. You can find other resources for
>+getting help with &tde; in <xref linkend="getting-help"/>.</para>
> </listitem>
> <listitem><para><ulink url="http://gmane.org">Gmane</ulink> provides a
>-usenet frontend to many mailing lists, including most of the &kde;
>+usenet frontend to many mailing lists, including most of the &tde;
> lists, so you can read them with &knode;.</para>
> </listitem>
> </itemizedlist>
>diff -urN tdebase/doc/userguide/windows-how-to.docbook tdebase.new/doc/userguide/windows-how-to.docbook
>--- tdebase/doc/userguide/windows-how-to.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/userguide/windows-how-to.docbook	2012-02-17 22:41:05.000000000 -0600
>@@ -1,12 +1,4 @@
> <sect1 id="windows-how-to-work">
>-<sect1info>
>-<authorgroup>
>-<author>
>-&Philip.Rodrigues;
>-</author>
>-</authorgroup>
>-</sect1info>
>-
> 
> <title>Windows, How To Work Them</title>
> 
>@@ -14,10 +6,12 @@
> <title>Basic Window Management</title>
> <indexterm><primary>Window Management</primary></indexterm>
> 
>-<para>Each application running in &kde; has its own window, and some
>-applications may use more than one window. You can manipulate these
>-windows in many ways to make your desktop work for you. Here is a
>-normal window:
>+<para>In computer terminology, a window is a rectangular area containing information
>+that can be moved around the desktop.
>+Each application running in &tde; uses at least one window and some
>+applications use more than one window. These windows are manipulated or controlled
>+in many ways to make the desktop useful. Here is a
>+typical window:
> <screenshot>
> <mediaobject>
> <imageobject>
>@@ -30,39 +24,43 @@
> </para>
> 
> <sect3 id="switching-between-windows">
>-<title>Switching Between Windows</title> 
>+<title>Switching Between Windows</title>
> <indexterm><primary>Focus (windows)</primary></indexterm>
> 
>-<para>If you want to use a window, it must be active. A window
>-automatically becomes active when you open it, so that the application
>-you opened is immediately ready to use. Only one window can be active
>-at a time. The active window is the one into which you can type, and can
>-be distinguished from the others because it has a different colored
>-titlebar. (With the &kde; default theme, the active window has a
>+<para>To use a window the window must be active. A window
>+automatically becomes active when opened and the application
>+is immediately ready to use. Only one window can be active
>+at a time. The active window is the one that responds to user actions and can
>+be distinguished from other windows by the different colored
>+titlebar.</para>
>+
>+<para>The titlebar is the top bar of a window that displays the name and description
>+of the window. The default titlebar also contains the Minimize, Maximize, and Close buttons
>+on the far right side.</para>
>+
>+<para>With the &tde; default theme, the active window has a
> <replaceable>light blue</replaceable> titlebar, and the inactive
>-windows have <replaceable>gray</replaceable> titlebars.)</para>
>+windows have <replaceable>gray</replaceable> titlebars.</para>
> 
> <para>
> <indexterm><primary>Raising Windows</primary></indexterm>
>-When you want to work in a different window, you need to make
>-it active. There are two ways to do this:
>+To work in a different window requires activating that window.
>+There are two ways to do this:
> <itemizedlist>
> 
> <listitem>
>-<para>&LMB;-click on the window that you want to make active. The
>-window will become active and will be raised above other windows if it
>-overlaps them.</para>
>+<para>Use the mouse pointer to select a window. The window becomes
>+active and will be raised to the foreground above other windows.</para>
> </listitem>
> 
> <listitem>
> <para><indexterm><primary><keycombo
> action="simul">&Alt;&Tab;</keycombo></primary></indexterm>
>-Hold down &Alt; and press &Tab; (do not release the &Alt;
>-key). A popup dialog appears with a list of available windows, one of
>-which is highlighted. You can select a different window by pressing
>-&Tab; again to move through the list, all the time holding down
>-&Alt;. When you release the &Alt; key, the window which was highlighted
>-is made active.</para>
>+With the keyboard, press and hold either &Alt; key and press the &Tab; key.
>+A popup dialog appears with a list of available windows, one of
>+which is highlighted. While pressing the &Alt; key, select a different window
>+by again pressing the &Tab; key to move through the list. Release the &Alt; key and the
>+selected window that was highlighted becomes the active window.</para>
> </listitem>
> </itemizedlist>
> </para>
>@@ -73,27 +71,21 @@
> <title>Moving Windows</title>
> <indexterm><primary>Moving Windows</primary></indexterm>
> 
>-<para>The first way to organize the windows on your desktop is to move
>-them around. You can move windows so that they overlap other windows,
>-or so that you can see the whole window. There are three ways to move
>-a window:
>+<para>One way to organize the windows on a desktop is to move
>+them. There are three ways to move a window:
> <itemizedlist>
> <listitem>
>-<para>Click the &LMB; on the window titlebar and hold it down. Move
>-the mouse cursor and the window moves with it. Release the mouse
>-button, and the window remains where you left it.</para>
>+<para>Select the window titlebar using the &LMB; and continue holding the &LMB;. Move
>+the mouse pointer and the window moves too. Release the mouse
>+button and the window remains at that position.</para>
> </listitem>
> 
>- 
>-
>-
>-
> <listitem>
>-<para>Open the window menu using the leftmost button on the window
>-titlebar (as displayed below), and select <guimenuitem>Move</guimenuitem>. The mouse cursor
>-moves to the center of the current window and by moving the mouse
>-around, you can move the window. Once you have moved the window to the
>-position you want, click the &LMB; to release it.</para>
>+<para>Select the window titlebar using the &RMB;, which causes a popup menu to appear
>+as displayed in the following image. From the popup menu select <guimenuitem>Move</guimenuitem>.
>+The mouse pointer moves to the center of the window. Move the mouse pointer
>+to move the window. After moving the window to the desired
>+position, use the &LMB; to release the window.</para>
> <indexterm><primary>Window Menu</primary></indexterm>
> 
> <screenshot>
>@@ -110,12 +102,12 @@
> </listitem>
> 
> <listitem>
>-<para>Hold down &Alt; and the &LMB; when the mouse cursor is
>-above the window you want to move. The mouse cursor changes to a
>-compass, and by moving the mouse, you can move the window. Just
>-release the mouse button to release the window. This method is
>-particularly useful if the window titlebar has been moved off the
>-screen, so you cannot use the other methods.</para>
>+<para>Place the the mouse pointer over the window to move. Press and hold either &Alt; key
>+and the &LMB;. The mouse pointer changes to a
>+compass. Moving the mouse then moves the window. Release the mouse
>+button to release the window. This method is
>+useful when the window titlebar has moved off the
>+screen and the previous methods cannot be used.</para>
> </listitem>
> </itemizedlist>
> </para>
>@@ -131,14 +123,14 @@
> one of two ways. Just use whichever you are most comfortable with:
> <itemizedlist>
> <listitem>
>-<para>Move the mouse cursor over the border of the window (it is light
>+<para>Move the mouse pointer over the border of the window (it is light
> blue in the screenshot above). The pointer will turn into a
> double-headed arrow. Click and drag, and the edge of the window
>-follows the mouse cursor, making the window bigger or smaller. If you
>+follows the mouse pointer, making the window bigger or smaller. If you
> click on the borders on the top or bottom of the window, you can
> adjust the height on its own. If you click on the borders on the left
> or right of the window, you can adjust the width. To change both at
>-the same time, move the mouse cursor over the corner of the
>+the same time, move the mouse pointer over the corner of the
> window. When the pointer becomes a diagonal double-headed arrow, click
> and drag.</para>
> </listitem>
>@@ -146,7 +138,7 @@
> <para>Use the leftmost button on the window titlebar to display the
> window menu. Choose the <guimenuitem>Resize</guimenuitem> entry, and
> the mouse pointer will become a double-headed arrow. Move the mouse
>-cursor around to resize, and click the &LMB; when you are done 
>+pointer around to resize, and click the &LMB; when you are done
> to release the window.</para>
> </listitem>
> <listitem>
>@@ -202,14 +194,14 @@
> <sect3 id="cascade-windows">
> <title>Cascading Windows</title>
> 
>-<para>Sometimes you might have a whole lot of windows open and all over the place. By selecting to cascade windows &kde; will automatically line them up as a succession from the top-left of your screen. To use this option use your &MMB; on the desktop, and then select <guimenuitem>Cascade Windows</guimenuitem>.</para>
>+<para>Sometimes you might have a whole lot of windows open and all over the place. By selecting to cascade windows &tde; will automatically line them up as a succession from the top-left of your screen. To use this option use your &MMB; on the desktop, and then select <guimenuitem>Cascade Windows</guimenuitem>.</para>
> 
> </sect3>
> 
> <sect3 id="unclutter-windows">
> <title>Uncluttering Windows</title>
> 
>-<para>By selecting to unclutter your opened windows &kde; will attempt to use the maximum available space of the desktop in order to display as much of each window as possible. For example, should you have four windows open and you request that they be uncluttered, they will each be placed in a corner of the desktop, regardless of where they were originally. To use this option once again use your &MMB; on the desktop and then select <guimenuitem>Unclutter Windows</guimenuitem>.</para>
>+<para>By selecting to unclutter your opened windows &tde; will attempt to use the maximum available space of the desktop in order to display as much of each window as possible. For example, should you have four windows open and you request that they be uncluttered, they will each be placed in a corner of the desktop, regardless of where they were originally. To use this option once again use your &MMB; on the desktop and then select <guimenuitem>Unclutter Windows</guimenuitem>.</para>
> 
> </sect3>
> 
>@@ -238,7 +230,7 @@
> </listitem>
> 
> <listitem>
>-<para> <mousebutton>Right</mousebutton>-click on the respective window in &kicker;, the &kde; panel, and then select <guimenuitem>Close</guimenuitem>. You will be prompted with an option to save any documents that were being edited.</para>
>+<para> <mousebutton>Right</mousebutton>-click on the respective window in &kicker;, the &tde; panel, and then select <guimenuitem>Close</guimenuitem>. You will be prompted with an option to save any documents that were being edited.</para>
> </listitem>
> 
> <listitem>
>@@ -266,7 +258,7 @@
> </mediaobject>
> </screenshot>
> <note><para>This screenshot shows the titlebar which appears in the
>-default &kde; configuration. The exact appearance on your system may
>+default &tde; configuration. The exact appearance on your system may
> be slightly different, but the functions are similar.</para>
> </note>
> -->
>@@ -281,20 +273,15 @@
> 
> <para>kstart</para>
> <sect3 id="kstart">
>-<sect3info>
>-<author>
>-&Richard.J.Moore;
>-&Richard.J.Moore.mail;
>-</author>
>-</sect3info>
>-<title>&kstart;</title> 
>+
>+<title>&kstart;</title>
> 
> <para>The simplest way to access the advanced window management
>-facilities in &kde; is to use a little known
>-utility called  &kstart;, which is included in &kde; since version 2.1 &kstart; lets you control the way an application interacts with
>+facilities in &tde; is to use a little known
>+utility called  &kstart;, which is included in &tde; since version 2.1 &kstart; lets you control the way an application interacts with
> the window manager. The command is usually
> used to define special behavior for commonly-used applications, but
>-it can also be useful for integrating non-&kde; applications into your
>+it can also be useful for integrating non-&tde; applications into your
> desktop.</para>
> 
> <para>Using &kstart; is easy: you simply put
>@@ -310,7 +297,7 @@
> should be fairly obvious - the kcalc window will stay on top of all
> the others and be visible on every virtual desktop. A feature that is
> less obvious is that this command will work with any NET compliant
>-environment, not just &kde;.</para>
>+environment, not just &tde;.</para>
> 
> <para>We can pass arguments to programs we invoke with &kstart; as normal, for
> example:
>@@ -325,25 +312,19 @@
> World</computeroutput> with <application>xmessage</application> and
> ensures that the window will be shown on the first virtual desktop and
> will be omitted from the taskbar. The fact that this program is
>-written using the Xt toolkit rather than being a native &kde;
>+written using the Xt toolkit rather than being a native &tde;
> application does not cause any problem for
> &kstart;, hopefully this illustrates how
> &kstart; can be used to integrate foreign
>-applications into your &kde; desktop.</para>
>+applications into your &tde; desktop.</para>
> </sect3>
> 
> <sect3 id="special-window-settings">
> <title>Other Special Window Settings</title>
>-<para>While you can use &kstart; to assign particular window settings, &kde; also allows you to alter these -- as well as other similar settings -- from the program window itself. Simply select the leftmost button in the window titlebar (or just hit <keycombo action="simul">&Alt;<keycap>F3</keycap></keycombo> once the window is focued), and then go to <menuchoice><guisubmenu>Advanced</guisubmenu><guimenuitem>Special Window Settings...</guimenuitem></menuchoice>. As you can see, from here you change various things from its geometry upon startup, to whether it should have a border or not.</para>
>+<para>While you can use &kstart; to assign particular window settings, &tde; also allows you to alter these -- as well as other similar settings -- from the program window itself. Simply select the leftmost button in the window titlebar (or just hit <keycombo action="simul">&Alt;<keycap>F3</keycap></keycombo> once the window is focued), and then go to <menuchoice><guisubmenu>Advanced</guisubmenu><guimenuitem>Special Window Settings...</guimenuitem></menuchoice>. As you can see, from here you change various things from its geometry upon startup, to whether it should have a border or not.</para>
> </sect3>
> 
> <sect3 id="system-tray">
>-<sect3info>
>-<author>
>-&Richard.J.Moore;
>-&Richard.J.Moore.mail;
>-</author>
>-</sect3info>
> 
> <title>The System Tray</title>
> 
>@@ -355,7 +336,7 @@
> usually disappears from the task manager when minimised with the tray
> icon providing a replacement. Normally tray icons are specifically
> developed as part of an application, but as with window decorations,
>-&kde; provides a tool for changing this:
>+&tde; provides a tool for changing this:
> <application>ksystraycmd</application>.</para>
> 
> <para>To begin with, we'll take the standard application &kcalc; and turn
>@@ -368,7 +349,7 @@
> <para>The icon shown in the tray is the one specified in the window
> hints and will be updated if the icon changes.  The window title is
> shown as a tooltip if you hold the mouse over the icon.
>-<application>ksystraycmd</application> follows standard &kde;
>+<application>ksystraycmd</application> follows standard &tde;
> behaviour so the target window can be shown and hidden by clicking the
> tray icon, and a standard context menu is available. </para>
> 
>@@ -378,12 +359,6 @@
> </sect3>
> 
> <sect3 id="more-complex-uses-of-ksystraycmd">
>-<sect3info>
>-<author>
>-&Richard.J.Moore;
>-&Richard.J.Moore.mail;
>-</author>
>-</sect3info>
> 
> <title>More Complex Uses of
> <application>ksystraycmd</application></title>
>@@ -394,27 +369,27 @@
> happening on your desktop).  To begin with, we'll simply look at how
> we can view this:
> <screen><prompt>%</prompt> <userinput><command>konsole</command> <option>--icon</option>
>-log <option>--caption</option> 'X Log' \ 
>+log <option>--caption</option> 'X Log' \
> <option>--nomenubar</option> <option>--notabbar</option>
>-<option>--noframe</option> \ 
>+<option>--noframe</option> \
> <option>-e</option> tail -f ~/.xsession-errors</userinput></screen>
> </para>
> 
>  <para>The <option>--caption</option> and <option>--icon</option>
>-arguments are provided as standard by &kde; applications. You can get
>+arguments are provided as standard by &tde; applications. You can get
> a full list of these global options by running an application with the
> <option>--help-kde</option> and <option>--help-qt</option>
> parameters. Here we give our &konsole; window the title 'X Log' and
>-the icon <quote>log</quote>. You can use these options with any &kde; application and
>+the icon <quote>log</quote>. You can use these options with any &tde; application and
> as  mentioned above, <application>ksystraycmd</application> takes account of these when creating
> the tray icon. The <option>-e</option> argument is specific to &konsole; and tells it
> to run the <command>less</command> command. Despite its complexity, we can easily move
>-this window into the tray with <application>ksystraycmd</application>: 
>+this window into the tray with <application>ksystraycmd</application>:
> 
> <screen><prompt>%</prompt> <userinput><command>ksystraycmd</command>
> <option>--hidden</option> <option>--title</option> 'X Log' \
>-konsole --icon log --caption 'XLog' \ 
>---nomenubar --notabbar --noframe \ 
>+konsole --icon log --caption 'XLog' \
>+--nomenubar --notabbar --noframe \
> -e tail -f .xsession-errors</userinput></screen>
> </para>
> 
>@@ -426,7 +401,7 @@
> only run the konsole process when it is visible. The command we use
> is
> <screen><prompt>%</prompt> <userinput><command>ksystraycmd</command> <option>--startonshow</option> \
>- --<option>icon</option> log <option>--tooltip</option> 'X Log' \ 
>+ --<option>icon</option> log <option>--tooltip</option> 'X Log' \
> konsole --icon log --caption 'X Log' \
> --nomenubar --notabbar --noframe \
> -e tail -f ~/.xsession-errors</userinput></screen>
>@@ -447,12 +422,6 @@
> </sect3>
> 
> <sect3 id="improving-reliability">
>-<sect3info>
>-<author>
>-&Richard.J.Moore;
>-&Richard.J.Moore.mail;
>-</author>
>-</sect3info>
> 
> <title>Improving Reliability</title>
> 
>@@ -480,7 +449,7 @@
> supported by both &kstart; and <option>ksystraycmd</option> and can be regular expression
> (&eg; <quote>window[0-9]</quote>) as well as a particular title. (Regular
> expressions are a powerful pattern matching tool you'll find used
>-throughout &kde;.) </para>
>+throughout &tde;.) </para>
> 
> </sect3>
> 
>@@ -495,10 +464,10 @@
> <para>Sometimes, one screen's worth is just not enough space. If you
> use many applications at the same time, and find yourself drowning in
> different windows, virtual desktops offer the solution. By default,
>-&kde; has four virtual desktops, each one of which is like a separate
>+&tde; has four virtual desktops, each one of which is like a separate
> screen: you can open windows, move windows around, and set backgrounds and
> icons on each of the desktops. If you are familiar with the concept of
>-virtual terminals, you will have no trouble with &kde;'s virtual
>+virtual terminals, you will have no trouble with &tde;'s virtual
> desktops.</para>
> 
> <sect3 id="switching-virtual-desktops">
>@@ -507,7 +476,7 @@
> </keycombo> in the same way as you would use <keycombo action="simul">&Alt;&Tab;
> </keycombo> to switch between windows (see <xref linkend="switching-between-windows"/>): Hold down &Ctrl; and then press
> &Tab;. A small popup window appears, showing the virtual desktops,
>-with one highlighted. If you release &Ctrl;, &kde; will switch to the
>+with one highlighted. If you release &Ctrl;, &tde; will switch to the
> highlighted virtual desktop. To select a different desktop, press
> &Tab; repeatedly, while holding down &Ctrl;. The selection moves
> through the available desktops. When the desktop you want to switch to
>@@ -526,7 +495,7 @@
> Desktops</guimenuitem><indexterm><primary>Sticky
> Windows</primary></indexterm> item.</para>
> 
>-
> 
>-<title>About Your &kde; Account</title>
>+<title>About Your &tde; Account</title>
> 
>-<para>&kde; stores information about your personal settings in a few
>+<para>&tde; stores information about your personal settings in a few
> different places:
> 
> <itemizedlist>
> <listitem><para>The hidden directory <filename>.kde</filename> (note the
> period at the beginning), located in your home directory, contains a
>-large number of files that store &kde; settings. Some subdirectories
>+large number of files that store &tde; settings. Some subdirectories
> you may find useful are:<filename>.kde/share/config</filename>, which
> contains configuration files for individual applications;
> <filename>.kde/Autostart</filename>, which contains links to
>-applications which should start each time you start &kde;; and
>+applications which should start each time you start &tde;; and
> <filename>.kde/share/apps/kabc</filename>, where your address book is
> stored.</para>
> </listitem>
> 
> 
> <listitem><para>The environment variables <envar>TDEDIR</envar> and
>-<envar>TDEDIRS</envar> tell &kde; where its files are stored. You will
>+<envar>TDEDIRS</envar> tell &tde; where its files are stored. You will
> usually only need to set <envar>TDEDIR</envar> to the directory in which
>-&kde; is installed, but sometimes you might have other &kde;
>+&tde; is installed, but sometimes you might have other &tde;
> programs installed elsewhere: in this case, you can use the
> <envar>TDEDIRS</envar> environment variable. Set
> <envar>TDEDIRS</envar> to a list of all the directories containing
>-&kde; programs, separated by commas. For example, if you have &kde;
>+&tde; programs, separated by commas. For example, if you have &tde;
> programs in both <filename>/usr/local/kde</filename> and
> <filename>/home/phil/kde</filename>, you can use <userinput>export
> TDEDIR=/usr/local/kde,/home/phil/kde</userinput> if you use
>@@ -53,7 +53,7 @@
> <itemizedlist>
> <title>Related Information</title>
> <listitem><para><xref linkend="kde-for-administrators" /> contains
>-more information about the directories that &kde; uses.</para>
>+more information about the directories that &tde; uses.</para>
> </listitem>
> </itemizedlist>
> 
>diff -urN tdebase/doc/visualdict/index.docbook tdebase.new/doc/visualdict/index.docbook
>--- tdebase/doc/visualdict/index.docbook	2011-12-25 00:52:38.000000000 -0600
>+++ tdebase.new/doc/visualdict/index.docbook	2012-02-17 22:41:04.000000000 -0600
>@@ -1,20 +1,20 @@
> <?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 "Visual Guide to &kde;">
>+  <!ENTITY kappname "Visual Guide to &tde;">
>   <!ENTITY % addindex "IGNORE">
>   <!ENTITY % English "INCLUDE" > 
>-  
>-  
>+
>+
> ]>
> 
> <book lang="&language;">
>-  
>+
> <bookinfo>
>-<title>The &kde; Visual Guide</title>
>+<title>The &tde; Visual Guide</title>
> <authorgroup>
> <corpauthor>
>-The &kde; Team
>+The &tde; Team
> </corpauthor>
> 
> </authorgroup>
>@@ -26,13 +26,17 @@
> <year>2000</year><year>2006</year>
> <holder>The &kde; Team</holder>
> </copyright>
>+<copyright>
>+<year>2012</year>
>+<holder>The &tde; Team</holder>
>+</copyright>
> 
> <legalnotice>&FDLNotice;</legalnotice>
> 
>-<abstract><para>A visual guide to &kde;'s interface.  This is a very early 
>+<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 
>-&kde;.</para></abstract>
>+of the document.  Eventually, this will be a graphical tour of
>+&tde;.</para></abstract>
> 
> <keywordset>
> <keyword>KDE</keyword>
>@@ -49,14 +53,14 @@
> 
> 
> 
>-<title>&kde; Visual Dictionary of terms</title>
>+<title>&tde; Visual Dictionary of terms</title>
> 
>-<para>This project was started to help unify the vocabulary used in &kde;
>+<para>This project was started to help unify the vocabulary used in &tde;
> documentation.</para>
> 
>-<para>We provide this for you here as an aid to learning your way around the 
>-&kde;
>-Graphical User Interface.  These names have been standardized within &kde;
>+<para>We provide this for you here as an aid to learning your way around the
>+&tde;
>+Graphical User Interface.  These names have been standardized within &tde;
> documentation, so that you will always find interface items referred to in the
> same way.</para>
> 
>@@ -67,17 +71,17 @@
> its place within the program.</para></tip>
> 
> 
> <sect1 id="widget-table">
>-<title>Listing of Common &kde; Widgets</title>
>+<title>Listing of Common &tde; Widgets</title>
> <para>Currently, this guide consists of a table of the names of the graphical
>-elements often found in &kde; documentation, and an example of each one. </para>
>+elements often found in &tde; documentation, and an example of each one. </para>
> <para>Our hope, eventually, is to make this a much more complete document,
>-which will take you on a visual tour of &kde;.</para>
>+which will take you on a visual tour of &tde;.</para>
> 
> <informaltable>
> <tgroup cols="2">
>@@ -340,7 +344,7 @@
> <title>Credits and Licenses</title>
> <para>&kappname;</para>
> 
>-<para>Documentation by the &kde; Documentation Team.</para>
>+<para>Documentation by the &tde; Documentation Team.</para>
> 
> &underFDL;
> </chapter>
>diff -urN tdebase/khelpcenter/DESIGN tdebase.new/khelpcenter/DESIGN
>--- tdebase/khelpcenter/DESIGN	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/DESIGN	2012-02-16 17:08:00.000000000 -0600
>@@ -40,7 +40,7 @@
> # predict changes which justify doing so.
> 
> 1.) KHC::ContentsTab provides the following entires:
>-	- Welcome to KDE
>+	- Welcome to TDE
> 	- KDE user's manual
> 	- KDE FAQ
> 	- Contact information
>diff -urN tdebase/khelpcenter/application.h tdebase.new/khelpcenter/application.h
>--- tdebase/khelpcenter/application.h	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/application.h	2012-02-16 17:08:00.000000000 -0600
>@@ -1,5 +1,5 @@
> /*
>- *  This file is part of the KDE Help Center
>+ *  This file is part of the TDE Help Center
>  *
>  *  Copyright (C) 2002 Frerich Raabe <raabe@kde.org>
>  *
>diff -urN tdebase/khelpcenter/fontdialog.cpp tdebase.new/khelpcenter/fontdialog.cpp
>--- tdebase/khelpcenter/fontdialog.cpp	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/fontdialog.cpp	2012-02-16 17:08:00.000000000 -0600
>@@ -1,5 +1,5 @@
> /*
>- *  This file is part of the KDE Help Center
>+ *  This file is part of the TDE Help Center
>  *
>  *  Copyright (C) 2003 Frerich Raabe <raabe@kde.org>
>  *
>diff -urN tdebase/khelpcenter/fontdialog.h tdebase.new/khelpcenter/fontdialog.h
>--- tdebase/khelpcenter/fontdialog.h	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/fontdialog.h	2012-02-16 17:08:00.000000000 -0600
>@@ -1,5 +1,5 @@
> /*
>- *  This file is part of the KDE Help Center
>+ *  This file is part of the TDE Help Center
>  *
>  *  Copyright (C) 2003 Frerich Raabe <raabe@kde.org>
>  *
>diff -urN tdebase/khelpcenter/glossary.cpp tdebase.new/khelpcenter/glossary.cpp
>--- tdebase/khelpcenter/glossary.cpp	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/glossary.cpp	2012-02-16 17:08:00.000000000 -0600
>@@ -1,5 +1,5 @@
> /*
>- *  This file is part of the KDE Help Center
>+ *  This file is part of the TDE Help Center
>  *
>  *  Copyright (C) 2002 Frerich Raabe (raabe@kde.org)
>  *
>diff -urN tdebase/khelpcenter/glossary.h tdebase.new/khelpcenter/glossary.h
>--- tdebase/khelpcenter/glossary.h	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/glossary.h	2012-02-16 17:08:00.000000000 -0600
>@@ -1,5 +1,5 @@
> /*
>- *  glossary.h - part of the KDE Help Center
>+ *  glossary.h - part of the TDE Help Center
>  *
>  *  Copyright (C) 2002 Frerich Raabe (raabe@kde.org)
>  *
>diff -urN tdebase/khelpcenter/history.cpp tdebase.new/khelpcenter/history.cpp
>--- tdebase/khelpcenter/history.cpp	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/history.cpp	2012-02-16 17:08:00.000000000 -0600
>@@ -1,5 +1,5 @@
> /*
>- *  This file is part of the KDE Help Center
>+ *  This file is part of the TDE Help Center
>  *
>  *  Copyright (C) 2002 Frerich Raabe <raabe@kde.org>
>  *
>diff -urN tdebase/khelpcenter/history.h tdebase.new/khelpcenter/history.h
>--- tdebase/khelpcenter/history.h	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/history.h	2012-02-16 17:08:00.000000000 -0600
>@@ -1,5 +1,5 @@
> /*
>- *  This file is part of the KDE Help Center
>+ *  This file is part of the TDE Help Center
>  *
>  *  Copyright (C) 2002 Frerich Raabe <raabe@kde.org>
>  *
>diff -urN tdebase/khelpcenter/infotree.cpp tdebase.new/khelpcenter/infotree.cpp
>--- tdebase/khelpcenter/infotree.cpp	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/infotree.cpp	2012-02-16 17:08:00.000000000 -0600
>@@ -1,5 +1,5 @@
> /*
>- *  This file is part of the KDE Help Center
>+ *  This file is part of the TDE Help Center
>  *
>  *  Copyright (C) 2002 Frerich Raabe (raabe@kde.org)
>  *
>diff -urN tdebase/khelpcenter/infotree.h tdebase.new/khelpcenter/infotree.h
>--- tdebase/khelpcenter/infotree.h	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/infotree.h	2012-02-16 17:08:00.000000000 -0600
>@@ -1,5 +1,5 @@
> /*
>- *  infotree.h - part of the KDE Help Center
>+ *  infotree.h - part of the TDE Help Center
>  *
>  *  Copyright (C) 2002 Frerich Raabe (raabe@kde.org)
>  *
>diff -urN tdebase/khelpcenter/intro.html.in tdebase.new/khelpcenter/intro.html.in
>--- tdebase/khelpcenter/intro.html.in	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/intro.html.in	2012-02-16 17:08:00.000000000 -0600
>@@ -1,7 +1,7 @@
> <HTML>
> 
> <HEAD>
>-	<title>%1</title> 
>+	<title>%1</title>
> 	<link rel="stylesheet" href="file:%1" type="text/css" />
> </HEAD>
> 
>@@ -28,14 +28,14 @@
> 
> 		<TD COLSPAN=2 BGCOLOR=#505050 ALIGN=RIGHT HEIGHT=22>
> 
>-<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 CELLPADDING=0>   
>+<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 CELLPADDING=0>
> 	<TR>
> 		<TD HEIGHT=20 class="menu">&nbsp;</TD>
> 	</TR>
> </TABLE>
> 		</TD>
> 	</TR>
>- 
>+
> 	<TR>
> 		<TD COLSPAN=2 WIDTH=176></TD>
> 		<TD COLSPAN=2 class="shadow1" HEIGHT=9 COLSPAN=4></TD>
>@@ -49,7 +49,7 @@
> 
> 
> 
>-<TABLE WIDTH=100% BORDER=0 CELLPADDING=0 CELLSPACING=0 CELLPADDING=0>   
>+<TABLE WIDTH=100% BORDER=0 CELLPADDING=0 CELLSPACING=0 CELLPADDING=0>
> <TR>
> 	<TD WIDTH=114></TD>
> 	<TD  class="trans" BGCOLOR=#D0DFEC>
>@@ -66,23 +66,23 @@
> 
> 
> 
>-<h1>%1</h1> 
>+<h1>%1</h1> 
> 
>-<p><i>%1</i></p> 
>+<p><i>%1</i></p> 
> 
>-<p>%1</p>
>+<p>%1</p>
> 
> <ul>
>-<li><p><a href="help:/khelpcenter/index.html?anchor=whatiskde">%1</a></p></li> 
>-<li><p><a href="help:/khelpcenter/index.html?anchor=contact">%1</a></p></li> 
>-<li><p><a href="help:/khelpcenter/index.html?anchor=support">%1</a></p></li> 
>+<li><p><a href="help:/khelpcenter/index.html?anchor=whatiskde">%1</a></p></li>
>+<li><p><a href="help:/khelpcenter/index.html?anchor=contact">%1</a></p></li> 
>+<li><p><a href="help:/khelpcenter/index.html?anchor=support">%1</a></p></li> 
> <li><p><a href="help:/khelpcenter/index.html?anchor=links">%1</a></p></li> 
> </ul>
> 
>-<h2>%1</h2> 
>+<h2>%1</h2> 
> 
> <h3>%1</h3> 
> 
>@@ -136,6 +136,6 @@
>                 <TD HEIGHT=50 COLSPAN=2>&nbsp;</TD>
> </TR>
> </TABLE>
>-</div> 
>+</div>
> </BODY>
> </HTML>
>diff -urN tdebase/khelpcenter/khc_indexbuilder.cpp tdebase.new/khelpcenter/khc_indexbuilder.cpp
>--- tdebase/khelpcenter/khc_indexbuilder.cpp	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/khc_indexbuilder.cpp	2012-02-16 17:08:00.000000000 -0600
>@@ -1,5 +1,5 @@
> /*
>-  This file is part of the KDE Help Center
>+  This file is part of the TDE Help Center
>  
>   Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
>  
>@@ -173,7 +173,7 @@
>   KAboutData aboutData( "khc_indexbuilder",
>                         I18N_NOOP("KHelpCenter Index Builder"),
>                         HELPCENTER_VERSION,
>-                        I18N_NOOP("The KDE Help Center"),
>+                        I18N_NOOP("The TDE Help Center"),
>                         KAboutData::License_GPL,
>                         I18N_NOOP("(c) 2003, The KHelpCenter developers") );
> 
>diff -urN tdebase/khelpcenter/khc_indexbuilder.h tdebase.new/khelpcenter/khc_indexbuilder.h
>--- tdebase/khelpcenter/khc_indexbuilder.h	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/khc_indexbuilder.h	2012-02-16 17:08:00.000000000 -0600
>@@ -1,5 +1,5 @@
> /*
>- *  This file is part of the KDE Help Center
>+ *  This file is part of the TDE Help Center
>  *
>  *  Copyright (C) 2003 Cornelius Schumacher <schumacher@kde.org>
>  *
>diff -urN tdebase/khelpcenter/navigator.cpp tdebase.new/khelpcenter/navigator.cpp
>--- tdebase/khelpcenter/navigator.cpp	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/navigator.cpp	2012-02-16 17:08:00.000000000 -0600
>@@ -1,5 +1,5 @@
> /*
>- *  This file is part of the KDE Help Center
>+ *  This file is part of the TDE Help Center
>  *
>  *  Copyright (C) 1999 Matthias Elter (me@kde.org)
>  *
>@@ -469,7 +469,7 @@
>     childCount = item->childCount();
>   } else {
>     title = i18n("Start Page");
>-    name = i18n("KDE Help Center");
>+    name = i18n("TDE Help Center");
> 
>     childCount = mContentsTree->childCount();
>   }
>diff -urN tdebase/khelpcenter/navigator.h tdebase.new/khelpcenter/navigator.h
>--- tdebase/khelpcenter/navigator.h	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/navigator.h	2012-02-16 17:08:00.000000000 -0600
>@@ -1,5 +1,5 @@
> /*
>- *  This file is part of the KDE Help Center
>+ *  This file is part of the TDE Help Center
>  *
>  *  Copyright (C) 1999 Matthias Elter (me@kde.org)
>  *
>diff -urN tdebase/khelpcenter/navigatorappitem.cpp tdebase.new/khelpcenter/navigatorappitem.cpp
>--- tdebase/khelpcenter/navigatorappitem.cpp	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/navigatorappitem.cpp	2012-02-16 17:08:00.000000000 -0600
>@@ -1,5 +1,5 @@
> /*
>- *  This file is part of the KDE Help Center
>+ *  This file is part of the TDE Help Center
>  *
>  *  Copyright (C) 2001 Waldo Bastian <bastian@kde.org>
>  *
>diff -urN tdebase/khelpcenter/navigatorappitem.h tdebase.new/khelpcenter/navigatorappitem.h
>--- tdebase/khelpcenter/navigatorappitem.h	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/navigatorappitem.h	2012-02-16 17:08:00.000000000 -0600
>@@ -1,5 +1,5 @@
> /*
>- *  navigatorappitem.h - part of the KDE Help Center
>+ *  navigatorappitem.h - part of the TDE Help Center
>  *
>  *  Copyright (C) 2001 Waldo Bastian <bastian@kde.org>
>  *
>diff -urN tdebase/khelpcenter/navigatoritem.cpp tdebase.new/khelpcenter/navigatoritem.cpp
>--- tdebase/khelpcenter/navigatoritem.cpp	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/navigatoritem.cpp	2012-02-16 17:08:00.000000000 -0600
>@@ -1,5 +1,5 @@
> /*
>- *  This file is part of the KDE Help Center
>+ *  This file is part of the TDE Help Center
>  *
>  *  Copyright (C) 1999 Matthias Elter (me@kde.org)
>  *
>diff -urN tdebase/khelpcenter/navigatoritem.h tdebase.new/khelpcenter/navigatoritem.h
>--- tdebase/khelpcenter/navigatoritem.h	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/navigatoritem.h	2012-02-16 17:08:00.000000000 -0600
>@@ -1,5 +1,5 @@
> /*
>- *  navigatoritem.h - part of the KDE Help Center
>+ *  navigatoritem.h - part of the TDE Help Center
>  *
>  *  Copyright (C) 1999 Matthias Elter (me@kde.org)
>  *
>diff -urN tdebase/khelpcenter/plugins/userguide.desktop tdebase.new/khelpcenter/plugins/userguide.desktop
>--- tdebase/khelpcenter/plugins/userguide.desktop	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/plugins/userguide.desktop	2012-02-16 17:08:00.000000000 -0600
>@@ -1,7 +1,7 @@
> [Desktop Entry]
> DocPath=help:/khelpcenter/userguide/index.html
> 
>-Name=KDE Users' Manual
>+Name=TDE User Guide
> Name[af]=KDE gebruiker handleiding
> Name[ar]=Ø¯ÙÙÙ KDE ÙÙÙØ³ØªØ®Ø¯ÙÙÙ
> Name[be]=ÐÐ°Ð´ÑÑÑÐ½ÑÐº ÐºÐ°ÑÑÑÑÐ°Ð»ÑÐ½ÑÐºÐ° KDE
>diff -urN tdebase/khelpcenter/plugins/welcome.desktop tdebase.new/khelpcenter/plugins/welcome.desktop
>--- tdebase/khelpcenter/plugins/welcome.desktop	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/plugins/welcome.desktop	2012-02-16 17:08:00.000000000 -0600
>@@ -1,7 +1,7 @@
> [Desktop Entry]
> DocPath=help:/khelpcenter/index.html?anchor=welcome
> 
>-Name=Welcome to KDE
>+Name=Welcome to TDE
> Name[af]=Welkom by KDE
> Name[ar]=ÙØ±ØØ¨Ø§Ù Ø¨Ù Ø¥ÙÙ KDE
> Name[be]=Ð¡Ð°ÑÐ´ÑÑÐ½Ð° Ð·Ð°Ð¿ÑÐ°ÑÐ°ÐµÐ¼ Ñ KDE
>diff -urN tdebase/khelpcenter/plugintraverser.cpp tdebase.new/khelpcenter/plugintraverser.cpp
>--- tdebase/khelpcenter/plugintraverser.cpp	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/plugintraverser.cpp	2012-02-16 17:08:00.000000000 -0600
>@@ -1,5 +1,5 @@
> /*
>- *  This file is part of the KDE Help Center
>+ *  This file is part of the TDE Help Center
>  *
>  *  Copyright (C) 1999 Matthias Elter (me@kde.org)
>  *
>diff -urN tdebase/khelpcenter/plugintraverser.h tdebase.new/khelpcenter/plugintraverser.h
>--- tdebase/khelpcenter/plugintraverser.h	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/plugintraverser.h	2012-02-16 17:08:00.000000000 -0600
>@@ -1,5 +1,5 @@
> /*
>- *  This file is part of the KDE Help Center
>+ *  This file is part of the TDE Help Center
>  *
>  *  Copyright (C) 1999 Matthias Elter (me@kde.org)
>  *
>diff -urN tdebase/khelpcenter/scrollkeepertreebuilder.cpp tdebase.new/khelpcenter/scrollkeepertreebuilder.cpp
>--- tdebase/khelpcenter/scrollkeepertreebuilder.cpp	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/scrollkeepertreebuilder.cpp	2012-02-16 17:08:00.000000000 -0600
>@@ -1,5 +1,5 @@
> /*
>- *  This file is part of the KDE Help Center
>+ *  This file is part of the TDE Help Center
>  *
>  *  Copyright (C) 1999 Matthias Elter (me@kde.org)
>  *
>diff -urN tdebase/khelpcenter/scrollkeepertreebuilder.h tdebase.new/khelpcenter/scrollkeepertreebuilder.h
>--- tdebase/khelpcenter/scrollkeepertreebuilder.h	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/scrollkeepertreebuilder.h	2012-02-16 17:08:00.000000000 -0600
>@@ -1,5 +1,5 @@
> /*
>- *  This file is part of the KDE Help Center
>+ *  This file is part of the TDE Help Center
>  *
>  *  Copyright (C) 1999 Matthias Elter (me@kde.org)
>  *
>diff -urN tdebase/khelpcenter/searchwidget.cpp tdebase.new/khelpcenter/searchwidget.cpp
>--- tdebase/khelpcenter/searchwidget.cpp	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/searchwidget.cpp	2012-02-16 17:08:00.000000000 -0600
>@@ -1,5 +1,5 @@
> /*
>- *  searchwidget.cpp - part of the KDE Help Center
>+ *  searchwidget.cpp - part of the TDE Help Center
>  *
>  *  Copyright (C) 1999 Matthias Elter (me@kde.org)
>  *            (C) 2000 Matthias Hoelzer-Kluepfel (hoelzer@kde.org)
>diff -urN tdebase/khelpcenter/searchwidget.h tdebase.new/khelpcenter/searchwidget.h
>--- tdebase/khelpcenter/searchwidget.h	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/searchwidget.h	2012-02-16 17:08:00.000000000 -0600
>@@ -1,5 +1,5 @@
> /*
>- *  searchwidget.h - part of the KDE Help Center
>+ *  searchwidget.h - part of the TDE Help Center
>  *
>  *  Copyright (C) 1999 Matthias Elter (me@kde.org)
>  *
>diff -urN tdebase/khelpcenter/toc.cpp tdebase.new/khelpcenter/toc.cpp
>--- tdebase/khelpcenter/toc.cpp	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/toc.cpp	2012-02-16 17:08:00.000000000 -0600
>@@ -1,5 +1,5 @@
> /*
>- *  This file is part of the KDE Help Center
>+ *  This file is part of the TDE Help Center
>  *
>  *  Copyright (C) 2002 Frerich Raabe (raabe@kde.org)
>  *
>diff -urN tdebase/khelpcenter/toc.h tdebase.new/khelpcenter/toc.h
>--- tdebase/khelpcenter/toc.h	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/toc.h	2012-02-16 17:08:00.000000000 -0600
>@@ -1,5 +1,5 @@
> /*
>- *  toc.h - part of the KDE Help Center
>+ *  toc.h - part of the TDE Help Center
>  *
>  *  Copyright (C) 2002 Frerich Raabe (raabe@kde.org)
>  *
>diff -urN tdebase/khelpcenter/treebuilder.cpp tdebase.new/khelpcenter/treebuilder.cpp
>--- tdebase/khelpcenter/treebuilder.cpp	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/treebuilder.cpp	2012-02-16 17:08:00.000000000 -0600
>@@ -1,5 +1,5 @@
> /*
>- *  This file is part of the KDE Help Center
>+ *  This file is part of the TDE Help Center
>  *
>  *  Copyright (C) 2002 Frerich Raabe <raabe@kde.org>
>  *
>diff -urN tdebase/khelpcenter/treebuilder.h tdebase.new/khelpcenter/treebuilder.h
>--- tdebase/khelpcenter/treebuilder.h	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/treebuilder.h	2012-02-16 17:08:00.000000000 -0600
>@@ -1,5 +1,5 @@
> /*
>- *  This file is part of the KDE Help Center
>+ *  This file is part of the TDE Help Center
>  *
>  *  Copyright (C) 2002 Frerich Raabe <raabe@kde.org>
>  *
>diff -urN tdebase/khelpcenter/view.cpp tdebase.new/khelpcenter/view.cpp
>--- tdebase/khelpcenter/view.cpp	2011-12-25 00:52:39.000000000 -0600
>+++ tdebase.new/khelpcenter/view.cpp	2012-02-16 17:08:00.000000000 -0600
>@@ -117,24 +117,24 @@
>           .arg( langLookup( "khelpcenter/khelpcenter.png" ) )
>           .arg( i18n("Help Center") )
>           .arg( langLookup( "khelpcenter/lines.png" ) )
>-          .arg( i18n( "Welcome to the K Desktop Environment" ) )
>-          .arg( i18n( "The KDE team welcomes you to user-friendly UNIX computing" ) )
>-          .arg( i18n( "KDE is a powerful graphical desktop environment for UNIX workstations. A\n"
>-                      "KDE desktop combines ease of use, contemporary functionality and outstanding\n"
>-                      "graphical design with the technological superiority of the UNIX operating\n"
>-                      "system." ) )
>-          .arg( i18n( "What is the K Desktop Environment?" ) )
>-          .arg( i18n( "Contacting the KDE Project" ) )
>-          .arg( i18n( "Supporting the KDE Project" ) )
>+          .arg( i18n( "Welcome to the Trinity Desktop Environment" ) )
>+          .arg( i18n( "The TDE team welcomes you to user-friendly UNIX computing" ) )
>+          .arg( i18n( "TDE is a graphical desktop environment for UNIX workstations. The\n"
>+                      "Trinity Desktop Environment combines ease of use, contemporary functionality, and\n"
>+                      "professional graphical design along with the technical advantages of\n"
>+                      "the UNIX operating system." ) )
>+          .arg( i18n( "What is the Trinity Desktop Environment?" ) )
>+          .arg( i18n( "Contacting the TDE Project Members" ) )
>+          .arg( i18n( "Supporting the TDE Project" ) )
>           .arg( i18n( "Useful links" ) )
>-          .arg( i18n( "Getting the most out of KDE" ) )
>+          .arg( i18n( "Getting the most out of TDE" ) )
>           .arg( i18n( "General Documentation" ) )
>           .arg( i18n( "A Quick Start Guide to the Desktop" ) )
>-          .arg( i18n( "KDE Users' guide" ) )
>-          .arg( i18n( "Frequently asked questions" ) )
>+          .arg( i18n( "TDE Users' guide" ) )
>+          .arg( i18n( "Frequently Asked Questions" ) )
>           .arg( i18n( "Basic Applications" ) )
>           .arg( i18n( "The Kicker Desktop Panel" ) )
>-          .arg( i18n( "The KDE Control Center" ) )
>+          .arg( i18n( "The TDE Control Center" ) )
>           .arg( i18n( "The Konqueror File manager and Web Browser" ) )
>           .arg( langLookup( "khelpcenter/kdelogo2.png" ) );
>     begin( KURL( "about:khelpcenter" ) );

Actions: View | Diff

Attachments on bug 694: 304 | 308 | 310 | 311 | 312 | 314 | 345 | 346 | 347 | 352 | 353 | 354 | 355 | 356 | 357 | 358 | 359 | 361 | 362 | 390 | 394 | 396 | 397