Update tdebase cmake files with STARTKDE->STARTTDE.

Fix tdebase entities, text strings for future maintenance of handbook files. This partially resolves bug report 694. Update konqueror user agent strings. This partially resolves bug report 774. Update TDM help options. This resolves bug report 618. Fix KTips branding issues and obsolete web addresses. This resolves bug report 842.
author: Darrell Anderson <humanreadable@yahoo.com> 2012-02-24 22:53:44 -0600
committer: Darrell Anderson <humanreadable@yahoo.com> 2012-02-24 23:26:11 -0600
commit: fc2650816b4b95f21750c53c0d45daeff31510d6 (patch)
tree: 7227267d1ba5acef3b86db06979667a13bebc7c5 /doc/userguide
parent: ca1a4375014b6f78a06c74169a1285abbcbcd819 (diff)
download: tdebase-fc2650816b4b95f21750c53c0d45daeff31510d6.tar.gz
tdebase-fc2650816b4b95f21750c53c0d45daeff31510d6.zip
38 files changed, 842 insertions, 1019 deletions
diff --git a/doc/userguide/accessibility.docbook b/doc/userguide/accessibility.docbook
index b9ab34719..1d0f50009 100644
--- a/doc/userguide/accessibility.docbook
+++ b/doc/userguide/accessibility.docbook
@@ -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 @@ automatically</secondary></indexterm>
 
 <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 @@ automatically</secondary></indexterm>
 <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>
 
 <!-- Insert Screeny here -->
 
diff --git a/doc/userguide/base-kde-applications.docbook b/doc/userguide/base-kde-applications.docbook
index 917855c69..ca4da8fc3 100644
--- a/doc/userguide/base-kde-applications.docbook
+++ b/doc/userguide/base-kde-applications.docbook
@@ -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>
 
 <!-- What are they?? (Phil) -->
 <!-- Included a few here; may be a good idea to add to this in future -->
@@ -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>
 <!-- Mainly mentioned to raise awareness, for DCOP -->
-	<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 --git a/doc/userguide/browser-fine-tuning.docbook b/doc/userguide/browser-fine-tuning.docbook
index 0a503b6bb..8883a14bf 100644
--- a/doc/userguide/browser-fine-tuning.docbook
+++ b/doc/userguide/browser-fine-tuning.docbook
@@ -36,7 +36,7 @@ stylesheet defined in "Customize" tab</guilabel>, then go to the
 <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 --git a/doc/userguide/control-center.docbook b/doc/userguide/control-center.docbook
index 06e862f3e..96b409fe9 100644
--- a/doc/userguide/control-center.docbook
+++ b/doc/userguide/control-center.docbook
@@ -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 @@ networks. You can select a profile to be loaded on KDE startup.
 </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 @@ Handbook</guimenuitem></menuchoice>.</para>
 </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 @@ applications look.</para>
 <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 @@ with &kde; or you can supply your own.</para>
 <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 @@ appearance.</para>
 <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 @@ fonts to exclude from anti-aliasing settings.</para>
 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 @@ to unlock the screen.</para>
 <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 @@ http://www.kde-look.org</ulink>.</para>
 <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 @@ configuration options than others.</para>
 <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 @@ manually. See <xref linkend="hand-editing-config-files" /> for more
 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 @@ you can find plenty of themes and styles at <ulink url="http://kde-look.org">kde
 <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 @@ like to see icons for.</para>
 <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 @@ button on your mouse.</para>
 <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 @@ mouse buttons.</para>
 <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 @@ their specific role within an application.</para>
 </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 @@ unless you really knew what you were doing.</para>
 <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 @@ forward messages to another location.</para>
 <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 @@ fonts.</para>
 <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 @@ select a profile to be loaded on &kde; startup.</para>
 </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 @@ options. For more information, consult the &konqueror; handbook.</para>
 </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 @@ services.</para>
 
 <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 @@ disable restoring sessions on login entirely.</para>
 
 <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 @@ devices such as keyboards and joysticks.</para>
 
 <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 @@ manually specify the joystick device if it is not autodetected correctly.
 
 <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 @@ current jobs and look at printer properties.</para>
 
 <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 @@ persons.</para>
 
 <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 @@ globally, per application or per window.</para></listitem>
 
 <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 @@ are more used to another windowing environment, like &Windows; or
 <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 @@ new preference the next time that application requests access to the
 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 @@ in the <guilabel>Wallet Manager</guilabel> section.</para></listitem>
 <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 @@ Password...</guibutton> button.</para></listitem>
 
 <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 @@ sections will require the root or Administrator password to effect changes.</par
 <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 @@ settings. You can set the date, time, and also the current time zone. These sett
 
 <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 @@ have installed. By default, it displays personal fonts. To modify system-wide fo
 </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 --git a/doc/userguide/creating-graphics.docbook b/doc/userguide/creating-graphics.docbook
index 30407b0c4..7fd0f1698 100644
--- a/doc/userguide/creating-graphics.docbook
+++ b/doc/userguide/creating-graphics.docbook
@@ -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>
 
 <!-- Add links to "further reading" here - in this case, for the whole -->
 <!-- chapter. -->
diff --git a/doc/userguide/credits-and-license.docbook b/doc/userguide/credits-and-license.docbook
index 19c9b2641..cf1b81690 100644
--- a/doc/userguide/credits-and-license.docbook
+++ b/doc/userguide/credits-and-license.docbook
@@ -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 @@ Team. Individual credits are as follows:
 </varlistentry>
 
 <varlistentry>
-<term>Waldo Bastian <email>bastian@kde.org</email></term>
+<term>Waldo Bastian</term>
 <listitem>
 
 <itemizedlist>
@@ -33,7 +32,7 @@ Team. Individual credits are as follows:
 </varlistentry>
 
 <varlistentry>
-<term>Gardner Bell <email>gbell72@rogers.com</email></term>
+<term>Gardner Bell</term>
 <listitem>
 
 <itemizedlist>
@@ -47,7 +46,7 @@ Team. Individual credits are as follows:
 </varlistentry>
 
 <varlistentry>
-<term>Gary Cramblitt <email>garycramblitt@comcast.net</email></term>
+<term>Gary Cramblitt</term>
 <listitem>
 
 <itemizedlist>
@@ -59,7 +58,7 @@ Team. Individual credits are as follows:
 </varlistentry>
 
 <varlistentry>
-<term>David Faure <email>faure@kde.org</email></term>
+<term>David Faure</term>
 <listitem>
 
 <itemizedlist>
@@ -71,7 +70,7 @@ Team. Individual credits are as follows:
 </varlistentry>
 
 <varlistentry>
-<term>Nicolas Goutte <email>goutte@kde.org</email></term>
+<term>Nicolas Goutte</term>
 <listitem>
 
 <itemizedlist>
@@ -83,7 +82,7 @@ Team. Individual credits are as follows:
 </varlistentry>
 
 <varlistentry>
-<term>&Francis.Giannaros; &Francis.Giannaros.mail;</term>
+<term>&Francis.Giannaros;</term>
 <listitem>
 
 <itemizedlist>
@@ -100,7 +99,7 @@ Team. Individual credits are as follows:
 </varlistentry>
 
 <varlistentry>
-<term>Adriaan de Groot <email>groot@kde.org</email></term>
+<term>Adriaan de Groot</term>
 <listitem>
 
 <itemizedlist>
@@ -114,7 +113,7 @@ Team. Individual credits are as follows:
 </varlistentry>
 
 <varlistentry>
-<term>J Hall <email>jes.hall@kdemail.net</email></term>
+<term>J Hall</term>
 <listitem>
 
 <itemizedlist>
@@ -140,7 +139,7 @@ Team. Individual credits are as follows:
 </varlistentry>
 
 <varlistentry>
-<term>&Anne-Marie.Mahfouf; &Anne-Marie.Mahfouf.mail;</term>
+<term>&Anne-Marie.Mahfouf;</term>
 <listitem>
 
 <itemizedlist>
@@ -151,7 +150,7 @@ Team. Individual credits are as follows:
 </varlistentry>
 
 <varlistentry>
-<term>&Richard.J.Moore; &Richard.J.Moore.mail;</term>
+<term>&Richard.J.Moore;</term>
 <listitem>
 
 <itemizedlist>
@@ -165,7 +164,7 @@ Team. Individual credits are as follows:
 </varlistentry>
 
 <varlistentry>
-<term>Peter Nuttall <email>p.s.nuttall@dur.ac.uk</email></term>
+<term>Peter Nuttall</term>
 <listitem>
 
 <itemizedlist>
@@ -177,7 +176,7 @@ Team. Individual credits are as follows:
 </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 @@ linkend="file-manager"/> and <xref linkend="accessibility"/>.</para>
 </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 @@ linkend="kde-for-administrators"/>.</para>
 </varlistentry>
 
 <varlistentry>
-<term>Deepak Sarda <email>antrix@gmail.com</email></term>
+<term>Deepak Sarda</term>
 <listitem>
 
 <itemizedlist>
@@ -227,7 +227,7 @@ linkend="kde-for-administrators"/>.</para>
 </varlistentry>
 
 <varlistentry>
-<term>Robert Stoffers <email>robert_angie@ozemail.com.au</email></term>
+<term>Robert Stoffers</term>
 <listitem>
 
 <itemizedlist>
@@ -239,7 +239,7 @@ linkend="kde-for-administrators"/>.</para>
 </varlistentry>
 
 <varlistentry>
-<term>Juan Carlos Torres <email>carlosdgtorres@gmail.com</email></term>
+<term>Juan Carlos Torres</term>
 <listitem>
 
 <itemizedlist>
@@ -251,7 +251,7 @@ linkend="kde-for-administrators"/>.</para>
 </varlistentry>
 
 <varlistentry>
-<term>Simon Vermeersch <email>titeuf@ph34rus.org</email></term>
+<term>Simon Vermeersch</term>
 <listitem>
 
 <itemizedlist>
@@ -262,7 +262,7 @@ linkend="kde-for-administrators"/>.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry><term>&Lauri.Watts; &Lauri.Watts.mail;</term>
+<varlistentry><term>&Lauri.Watts;</term>
 <listitem>
 
 <itemizedlist>
@@ -278,8 +278,7 @@ linkend="kde-for-administrators"/>.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry><term>Christian Weickhmann
-<email>christian.weickhmann@gmx.de</email></term>
+<varlistentry><term>Christian Weickhmann</term>
 <listitem>
 
 <itemizedlist>
diff --git a/doc/userguide/customizing-desktop.docbook b/doc/userguide/customizing-desktop.docbook
index 8089725d1..800496a23 100644
--- a/doc/userguide/customizing-desktop.docbook
+++ b/doc/userguide/customizing-desktop.docbook
@@ -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 @@ to display certain images on your desktop. The settings for the background are
 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 @@ subsection</ulink> of kde-look.org.</para>
 <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 @@ engine to be installed.</para>
 <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 @@ rearrange them.</para>
 
 <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 @@ images and editing a configuration file. The tradeoff is a slight loss of perfor
 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 @@ take effect.</para>
 
 <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 @@ category.</para>
 <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 @@ The <guilabel>Toolbar</guilabel> tab gives some options on the general appearanc
 
 <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 @@ Fonts</para>
 </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 @@ devices, &etc;</para></glossdef>
 
 <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 @@ manager how to display window frames</para></glossdef>
 
 <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 --git a/doc/userguide/email.docbook b/doc/userguide/email.docbook
index 04e95c9b2..9d87aa4e9 100644
--- a/doc/userguide/email.docbook
+++ b/doc/userguide/email.docbook
@@ -20,7 +20,7 @@ started</secondary></indexterm>
 
 <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 --git a/doc/userguide/extragear-applications.docbook b/doc/userguide/extragear-applications.docbook
index fd55985aa..c2fa0bcc6 100644
--- a/doc/userguide/extragear-applications.docbook
+++ b/doc/userguide/extragear-applications.docbook
@@ -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>
 
 <!-- Begin Multimedia  -->
 <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 --git a/doc/userguide/font-installation.docbook b/doc/userguide/font-installation.docbook
index bca1a2308..b321b0295 100644
--- a/doc/userguide/font-installation.docbook
+++ b/doc/userguide/font-installation.docbook
@@ -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 --git a/doc/userguide/getting-help.docbook b/doc/userguide/getting-help.docbook
index c3a872c7c..08456e942 100644
--- a/doc/userguide/getting-help.docbook
+++ b/doc/userguide/getting-help.docbook
@@ -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 @@ reach various ways:</para>
 </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 @@ url="http://docs.kde.org">http://docs.kde.org</ulink></para>
 <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 @@ about <link linkend="file-manager">the &konqueror; file manager</link>.</para>
 
 <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 @@ window.</para>
 </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 @@ url="http://lists.kde.org/?l=kde-linux">http://lists.kde.org/?l=kde-linux</ulink
 <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 --git a/doc/userguide/glossary.docbook b/doc/userguide/glossary.docbook
index 1e4b85d74..8e5dcd597 100644
--- a/doc/userguide/glossary.docbook
+++ b/doc/userguide/glossary.docbook
@@ -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 --git a/doc/userguide/groupware-kontact.docbook b/doc/userguide/groupware-kontact.docbook
index beaf1f338..445a26da5 100644
--- a/doc/userguide/groupware-kontact.docbook
+++ b/doc/userguide/groupware-kontact.docbook
@@ -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 @@ without the need of installing the <application>Kolab</application> server
 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 @@ than on a local computer. Through IMAP the user can create, delete, or
 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 @@ once working. So no, thanks, I'll go to simple
 
 <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 @@ structure.</para></note>
 
 <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 @@ near future I hope to replace both with 2 mini-itx thin clients using the
 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 @@ already)</para></step>
 <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 @@ enter the following data:</para>
 <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 @@ computer as the <acronym>IMAP</acronym> server</para>
 </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 @@ things run fast, because at every connection &kontact; has to fetch all data
 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 @@ are not updated when someone adds events (you must manually switch to
 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 @@ kresources</command></userinput>. In the combo box select
 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 @@ so we can see that happens. You can return here and check it once everything
 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 @@ are paths to local home files. Instead, the <guilabel>Contacts</guilabel>
 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 @@ users.</para>
 <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 @@ every real user has the same read/write permissions of the others, since
 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
 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 @@ channels for their competence, patience and helpfulness.</para>
 <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 @@ in #cyrus channel:</para>
 
 <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 --git a/doc/userguide/index.docbook b/doc/userguide/index.docbook
index 44a0f5d90..03a886cd6 100644
--- a/doc/userguide/index.docbook
+++ b/doc/userguide/index.docbook
@@ -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>
 
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
@@ -70,23 +70,28 @@ The &kde; Documentation Team
 <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 @@ The &kde; Documentation Team
 <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 @@ we're referring to:
 <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 @@ we're referring to:
 </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 @@ class="directory">~/.kde</filename> is used.</para>
 <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 @@ for example, just a web browser, hence the name.</para>
 <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 @@ same):</para>
 </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>
 
 <!-- Put this somewhere else
 At the far left is the &kmenu;
-button. Clicking on this button will open the main &kde; menu, which
-has links to all the installed &kde; applications, and some useful
+button. Selecting this button will open the main &tde; menu, which
+has links to all the installed &tde; applications, and some useful
 commands, like <guilabel>Find Files</guilabel> and <guilabel>Log
-Out</guilabel>. You can start an application by finding it in the
-&kmenu; and clicking on its name. Like the other things on the
-desktop, the &kmenu; can be changed to fit your needs.</para>
+Out</guilabel>. Start an application from the
+&kmenu;. Like the other things on the desktop,
+the &kmenu; can be changed.</para>
 </listitem>
 -->
 
 <!-- Put this in the Panel section
 <listitem><para>Next to the &kmenu; button are icons which will
-start some commonly-used &kde; applications. icons are similar
-to the ones on the desktop background, but you can only put links to
-programs here (and not links to removable media, like CDs).</para>
+start some commonly-used &tde; applications. These icons are similar
+to the ones on the desktop, but only links to programs
+(and not links to removable media, like CDs).</para>
 </listitem>
 
 -->
 
 <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>
-<!-- Not sure what exactly to say about starttde and where to say it -->
-<!-- (Phil) -->
-<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 @@ by entering <userinput>help:/tdm</userinput> in &konqueror;'s
 </part>
 
 <part id="components">
-<title>&kde; Components</title>
+<title>&tde; Components</title>
 
 &control-center;
 
@@ -444,7 +449,7 @@ by entering <userinput>help:/tdm</userinput> in &konqueror;'s
 &extragear-applications;
 
 <chapter id="multimedia">
-<title>Multimedia With &kde;</title>
+<title>Multimedia With &tde;</title>
 
 &removable-disks;
 
@@ -457,7 +462,7 @@ by entering <userinput>help:/tdm</userinput> in &konqueror;'s
 </chapter>
 
 <chapter id="multiuser-kde">
-<title>&kde; the Multiuser Desktop</title>
+<title>&tde; the Multiuser Desktop</title>
 
 &your-kde-account;
 
@@ -467,7 +472,7 @@ by entering <userinput>help:/tdm</userinput> in &konqueror;'s
 </chapter>
 
 <chapter id="networking">
-<title>Networking with &kde;</title>
+<title>Networking with &tde;</title>
 
 &file-sharing;
 
@@ -502,7 +507,7 @@ by entering <userinput>help:/tdm</userinput> in &konqueror;'s
 </part>
 
 <part id="kde-online">
-<title>&kde; and the Internet</title>
+<title>&tde; and the Internet</title>
 
 &net-connection-setup;
 
@@ -561,10 +566,10 @@ by entering <userinput>help:/tdm</userinput> in &konqueror;'s
 </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 --git a/doc/userguide/internet-shortcuts.docbook b/doc/userguide/internet-shortcuts.docbook
index f6705c292..0e75494a8 100644
--- a/doc/userguide/internet-shortcuts.docbook
+++ b/doc/userguide/internet-shortcuts.docbook
@@ -24,7 +24,7 @@ once you get used to them, you'll wonder how you ever lived without them.</para>
 <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 @@ disable web shortcuts if you don't like them. If you set the <guilabel>Default
 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 @@ space (<userinput>gg kde</userinput>).</para>
 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>
 
 <!-- Add links to "further reading" here -->
 <!-- <itemizedlist>
diff --git a/doc/userguide/kde-as-root.docbook b/doc/userguide/kde-as-root.docbook
index c97f2e5f5..510828c4e 100644
--- a/doc/userguide/kde-as-root.docbook
+++ b/doc/userguide/kde-as-root.docbook
@@ -9,13 +9,13 @@
 </sect1info>
 
 
-<title>Using &kde; as Root</title>
+<title>Using &tde; as Root</title>
 
 <para>For &UNIX; operating systems there are often different users, which in turn might have different privileges. The conventional method is to have an ordinary user account, whose files are generally stored in <filename>/home/username</filename>, and then to also have a <systemitem class="username">root</systemitem> account. The <systemitem class="username">root</systemitem>, or Super User, account has system-wide privileges, being able to modify any file on the system. </para>
 
 <para>Although this means that it is easy to perform administrative tasks without hassle, it also means that there are no security restrictions imposed upon it. Thus, a small typographical error or other mistake can result in irrevocable damage.</para>
 
-<para>Some of the operating systems that run &kde; come with a graphical <systemitem class="username">root</systemitem> login enabled. Despite this, you should never log in to &kde; as <systemitem class="username">root</systemitem>, and you should never need to. Your system is far more open to attack, particularly if you are browsing the Internet as <systemitem class="username">root</systemitem>, and you dramatically increase your chances of damaging your system.</para>
+<para>Some of the operating systems that run &tde; come with a graphical <systemitem class="username">root</systemitem> login enabled. Despite this, you should never log in to &tde; as <systemitem class="username">root</systemitem>, and you should never need to. Your system is far more open to attack, particularly if you are browsing the Internet as <systemitem class="username">root</systemitem>, and you dramatically increase your chances of damaging your system.</para>
 
 <para>Some &Linux; distributions have tried to stress this point so much that they have disabled the <systemitem class="username">root</systemitem> account altogether, and instead use the <command>sudo</command> model. Nevertheless, the basic security model in <command>sudo</command> is the same as <command>su</command>, and thus they share the same security strengths and weaknesses, essentially.</para>
 
diff --git a/doc/userguide/kde-edutainment.docbook b/doc/userguide/kde-edutainment.docbook
index 11c6faae7..e5e7f7a4c 100644
--- a/doc/userguide/kde-edutainment.docbook
+++ b/doc/userguide/kde-edutainment.docbook
@@ -10,17 +10,17 @@ Your name here
 </chapterinfo>
 -->
 
-<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 @@ website</ulink>. What follows is an overview of a few of them.
 <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 @@ website</ulink>. What follows is an overview of a few of them.
 <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 @@ website</ulink>. What follows is an overview of a few of them.
 <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 @@ website</ulink>. What follows is an overview of a few of them.
 <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 @@ website</ulink>. What follows is an overview of a few of them.
 <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>
 
 <!-- Screeny! -->
@@ -226,12 +226,12 @@ website</ulink>. What follows is an overview of a few of them.
 <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>
 
 <!-- Screeny! -->
@@ -244,12 +244,12 @@ website</ulink>. What follows is an overview of a few of them.
 <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>
 
 <!-- Screeny! -->
@@ -258,12 +258,12 @@ website</ulink>. What follows is an overview of a few of them.
 <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 @@ website</ulink>. What follows is an overview of a few of them.
 <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 @@ website</ulink>. What follows is an overview of a few of them.
 <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 --git a/doc/userguide/kde-for-admins.docbook b/doc/userguide/kde-for-admins.docbook
index 466aba62b..6bf03c0db 100644
--- a/doc/userguide/kde-for-admins.docbook
+++ b/doc/userguide/kde-for-admins.docbook
@@ -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 @@ check which directory trees are used with the following command:
 <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 @@ root writing to $TDEHOME of the user after running
 <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 @@ compiled-in default.</seg>
 <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 @@ userProfileMapFile=/etc/kde-user-profile
 </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 @@ bastian=staff
 <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 @@ directory tree.</para>
 <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 @@ archs.</para>
 <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 @@ files.</para></listitem>
 <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 @@ class="directory">share/config/session</filename></term>
 <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 @@ these numbers when saving a session in
 
 <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 @@ categorized by theme, dimension and usage category.</para></listitem>
 <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 @@ file.</para>
 <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 @@ background picture</para></listitem>
 </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 @@ an alternative name and link to that instead.</para>
 </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 @@ second group contains the keys <varname>Show hidden files</varname>
 and <varname>Sort by</varname>:</para>
 
 <programlisting>
-[KDE]
+[TDE]
 LargeCursor=false
 SingleClick=true
 </programlisting>
@@ -527,13 +512,13 @@ Description=This is\na very long\ndescription.
 
 <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 @@ result in a value equal to <literal>joe@joes_host</literal>. The setting is
 not locked down.</para>
 
 <programlisting>
-[Mail Settings] 
+[Mail Settings]
 Host[$ie]=$(hostname)
 Email[$e]=${USER}@${HOST}
 </programlisting>
@@ -739,11 +724,11 @@ Caption[fr]=Ma L&eacute;gende
 </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 @@ Auto Save Interval=25
 </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 @@ Startup - <filename>/etc/X11/xdm/Xstartup</filename> - prepare as root
 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 @@ Reset - <filename>/etc/X11/xdm/Xreset</filename> - after session finished
 </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 @@ ksmserver $TDEWM
 
 <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 @@ user is logged out.</para>
 <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 @@ needed</para>
 
 <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 @@ command line in the <command>starttde</command> script, normally
 <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 @@ startup problems.</para>
 <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 @@ methods.</para>
 <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 @@ are:</para>
 
 <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 @@ will automatically open any files stored in this directory including
 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 @@ windows of all the other applications in the session.
 <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 @@ windows of all the other applications in the session.
 <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 @@ class="username">root</systemitem>.</para>
 
 <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 @@ environment as the application. This can be the case with
 </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 @@ debugging).</para>
 </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 @@ class="directory">$<envar>XDG_DATA_HOME</envar></filename> base
 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 @@ $XDG_DATA_DIRS/desktop-directories
 </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 @@ $<envar>TDEDIRS</envar> and profiles as well. Used by <literal role="extension">
 
 <!-- FIXME: Add more words. Fix markup -->
 
-<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 @@ difficult to kill a process that is causing trouble:</para>
 
 <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 @@ destruction!</para>
 <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 @@ package.</para>
 </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 @@ URL=http://www.kde.org/
 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>
 
 <!-- Perhaps legacy and translated should be the other way around, but -->
@@ -1496,7 +1481,7 @@ disable if it doesn't work.</para>
 <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 @@ open several local files at once.</para>
 <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 @@ have file in current working directory.</para>
 </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 @@ will use icon from <varname>Icon</varname>= line in taskbar.</para>
 </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 @@ class="directory">/opt/trinity/share/config/SuSE/default/</filename></para></lis
 </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 @@ represents a single application</para></listitem>
 </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 @@ Icon=kcmsystem
 
 <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 @@ role="extension">.directory</literal> file</para>
 <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 @@ NoDisplay=true
 <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 @@ database with
 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 @@ profile- or system-wide locations.
 
 <!-- This section might be redundant. If it isn't, it needs some screenies -->
 <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 @@ consists of the following components:
 </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 @@ and the following special buttons:
 
 <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 @@ role="extension">.gif</literal> files.
 &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 @@ default for multiple users.</para>
 </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 @@ certain configuration modules</link></para></listitem>
 
 <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 @@ presented with an user interface option to make such change.</para></note>
 <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 @@ functionality that would offer the user access to a &UNIX; shell.</para>
 <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 @@ accessed.</para>
 <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 @@ rule_2=open,,,,http,*.ourcompany.com,,true</screen></screenco>
 <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 @@ $<envar>HOME</envar> directory:</para>
 <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 @@ directory.</para></callout>
 </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 @@ that are outside his $<envar>HOME</envar> directory:</para>
 <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 @@ opening of any local file</para></callout>
 <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 @@ refer to locally stored documents.</para>
 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 @@ example.</para></listitem>
 <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 @@ configuration dialog is an integral part of the application
 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 @@ menu.</para>
 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 @@ corresponds to the hidden .hidden menu, included as a result of
 <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 @@ Konqueror</guilabel> dialog if the proxy configuration is still
 there.</para>
 
 </sect1>
-<!-- 
+<!--
 <sect1 id="making-it-work">
 <title>Making it Work</title>
 
 Making It Work
-KDE 3.2: Set $TDEDIRS from starttde script
+TDE 3.2: Set $TDEDIRS from starttde script
 Distribute profiles to all clients
 
 </para>
@@ -2380,13 +2365,13 @@ Distribute profiles to all clients
 The Lazy Admin
 Overview
 Deployment
-	How to get &kde; available on many clients
+	How to get &tde; available on many clients
 Remote Desktop Sharing
 Take a look at someone else desktop
 DCOP
-	The DCOP command line tool makes it possible to control &kde; applications from the command line
+	The DCOP command line tool makes it possible to control &tde; applications from the command line
 KDialog
-	A versatile tool to use standard &kde; dialogs in your own scripts
+	A versatile tool to use standard &tde; dialogs in your own scripts
 
 
 
@@ -2418,8 +2403,8 @@ invitation. This is ideal for tech support teams or administrators to gain
 access to users desktops in order to troubleshoot or remedy a problem or
 guide a user through a procedure.</para>
 
-<para>Remote desktop sharing involves two applications: &krfb; (&kde; remote
-frame buffer, a VNC server) and &krdc; (&kde; remote desktop connection; a
+<para>Remote desktop sharing involves two applications: &krfb; (&tde; remote
+frame buffer, a VNC server) and &krdc; (&tde; remote desktop connection; a
 VNC client.)</para>
 
 <para>&krfb; can be used by any user to create and manage invitations.
@@ -2438,16 +2423,16 @@ appear to ask for confirmation by the current user.</para>
 </sect1>
 
 <sect1 id="kde-diy">
-<title>&kde; DIY - Building Your Own Tools</title>
+<title>&tde; DIY - Building Your Own Tools</title>
 
 <sect2 id="dcop">
 <title>DCOP</title>
 
 <para>
-Desktop COmmunication Protocol, <acronym>DCOP</acronym>, is a lightweight mechanism for inter-process communication.  
+Desktop COmmunication Protocol, <acronym>DCOP</acronym>, is a lightweight mechanism for inter-process communication.
 <acronym>DCOP</acronym> allows the user to interact with programs that are currently running.
-&kde; supplies two programs to utilitize <acronym>DCOP</acronym>: 
-<application>dcop</application>, a command-line program, and 
+&tde; supplies two programs to utilitize <acronym>DCOP</acronym>:
+<application>dcop</application>, a command-line program, and
 <application>kdcop</application>, a <acronym>GUI</acronym> program.
 </para>
 <para>
@@ -2463,7 +2448,7 @@ A few notes about using <command>dcop</command>:
 </listitem>
 <listitem>
 <para>
-Applications that can open more than one window at a time will be listed as 
+Applications that can open more than one window at a time will be listed as
 &lt;application&gt;-<acronym>PID</acronym>
 </para>
 </listitem>
@@ -2589,10 +2574,10 @@ dcop $konsole $session sendSession 'cd /my/work/directory'
 
 <sect2 id="kdialog">
 <title>KDialog</title>
-<subtitle>&kde; DIY - Building Your Own Tools</subtitle>
+<subtitle>&tde; DIY - Building Your Own Tools</subtitle>
 
-<para>You can use &kde; dialogs from your own scripts, to combine the power
-of &UNIX; shell scripting with the ease of use of &kde;.</para>
+<para>You can use &tde; dialogs from your own scripts, to combine the power
+of &UNIX; shell scripting with the ease of use of &tde;.</para>
 
 <screen><userinput><command>kdialog</command> <option>--msgbox 'You have new mail!'</option></userinput></screen>
 
diff --git a/doc/userguide/kde-office.docbook b/doc/userguide/kde-office.docbook
index 176180294..a13144ca3 100644
--- a/doc/userguide/kde-office.docbook
+++ b/doc/userguide/kde-office.docbook
@@ -16,7 +16,7 @@
 </partinfo>
 
 <!-- keep a copy of the desired structure here:
-* KDE Office
+* TDE Office
         * Introduction to KOffice
                 * Overview
                 * Features
@@ -40,14 +40,14 @@
 <sect1 id="kde-office-overview">
 <title>Overview</title>
 <para>
-The &kde; project has also created a fully featured office suite
+The &tde; project has also created a fully featured office suite
 called &koffice; which adheres to standards and fits very well into
-the &kde; desktop. This section was written with version 1.4 of
+the &tde; desktop. This section was written with version 1.4 of
 &koffice; in mind.
 </para>
 <para>
 &koffice; is a highly integrated office suite that builds directly on the
-KDE technology. This has many advantages in terms of integration, features,
+TDE technology. This has many advantages in terms of integration, features,
 performance, familiar look and feel and so on. All technologies like &DCOP;,
 KIO, KParts are directly available.
 </para>
@@ -56,7 +56,7 @@ In particular the KParts technology is extended for the &koffice;
 components to allow very flexible embedding of documents inside documents.
 </para>
 <para>
-Because much technology is already present inside &kde; itself, &koffice; is
+Because much technology is already present inside &tde; itself, &koffice; is
 a very lightweight office suite, which results in fast application startup
 and low memory consumption. This makes &koffice; a very suitable office suite
 for older hardware as well, which can save lots of costs in some cases.
@@ -71,7 +71,7 @@ as the formula editor are available as stand alone tools.
 </para>
 <para>
 As you can see &koffice; brings a lot of features that can enrich your
-office experience. Its straight forward and &kde; like approach in look
+office experience. Its straight forward and &tde; like approach in look
 and feel as well as familiar usability makes &koffice; quite useful for
 daily office work.
 </para>
@@ -92,9 +92,9 @@ The &koffice; office suite is too large to list every detail.
 </para>
 <itemizedlist>
 <title>&koffice; features:</title>
-<listitem><para>Fully builds on &kde; which makes these technologies available at low costs.</para></listitem>
-<listitem><para>Fully integrates into &kde; which is vital for business environments.</para></listitem>
-<listitem><para>&kde; technologies include document location abstraction, DCOP scripting, parts and plugins,...</para></listitem>
+<listitem><para>Fully builds on &tde; which makes these technologies available at low costs.</para></listitem>
+<listitem><para>Fully integrates into &tde; which is vital for business environments.</para></listitem>
+<listitem><para>&tde; technologies include document location abstraction, DCOP scripting, parts and plugins,...</para></listitem>
 <listitem><para>Full Component embedding.</para></listitem>
 <listitem><para>Low memory footprint, fast startup, lightweight.</para></listitem>
 <listitem><para>Feature complete: many components are offered.</para></listitem>
@@ -312,7 +312,7 @@ capabilities are probably very interesting in business environments to
 make &koffice; meet individual requirements. You can either take a look
 at existing plugins or read a general introduction at
 <ulink url="http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html">
-the developer's site</ulink>. The general KDE developers website is available
+the developer's site</ulink>. The general TDE developers website is available
 at <ulink url="http://developer.kde.org/">http://developer.kde.org</ulink>.
 </para>
 </sect1>
diff --git a/doc/userguide/konsole-intro.docbook b/doc/userguide/konsole-intro.docbook
index ec168ac22..3b534bf02 100644
--- a/doc/userguide/konsole-intro.docbook
+++ b/doc/userguide/konsole-intro.docbook
@@ -35,7 +35,7 @@ work.</para>
 <para>On &Linux; and &UNIX;-based systems every process runs independently in its own memory
 space so it can't accidentally overwrite any other processes memory, unless
 of course it has <systemitem class="username">root</systemitem> privileges. 
-If a process in &kde; crashes due to a bug one should not need to worry
+If a process in &tde; crashes due to a bug one should not need to worry
 about it accessing any other active process.</para>
 
 <para>To keep track of all system processes use the <command>top</command>
@@ -63,14 +63,14 @@ name for your new session.  This will now become your default session when
 you start &konsole;.</para>
 
 <para>When &konsole; is invoked <application>bash</application> specific
-commands and &kde; specific variables are read and executed from
+commands and &tde; specific variables are read and executed from
 <filename>~/.bashrc</filename> or <filename>~/.bash_profile</filename>. 
 The preferred configuration file for user environments is
 <filename>~/.bash_profile</filename>, the commands
 <command>printenv</command> or <command>env</command> can be used to
 display all currently set variables.  To set a variable in the shell use 
 <command>VARNAME=<replaceable>value</replaceable></command>.  For a full
-list of variables that can be set in &kde; see the <ulink
+list of variables that can be set in &tde; see the <ulink
 url="http://wiki.kde.org/tiki-index.php?page=Environment+Variables">wiki
 </ulink>.</para>
 
@@ -80,11 +80,11 @@ url="http://wiki.kde.org/tiki-index.php?page=Environment+Variables">wiki
 action="simul">&Ctrl;&Alt;<keycap>S</keycap></keycombo> and enter the new
 name.</para>
 
-<para>If you find the need to run any &kde; program with <systemitem
+<para>If you find the need to run any &tde; program with <systemitem
 class="username">root</systemitem> privileges,  you can use the &tdesu; command with the <option>-c</option> switch
 from the command line like this: <userinput><command>tdesu</command>
 <option>-c -n <replaceable>PROGRAM</replaceable></option></userinput>, using
-the <option>-n</option> switch will prevent &kde; from remembering your
+the <option>-n</option> switch will prevent &tde; from remembering your
 passwords.</para>
 
 <!-- Add links to "further reading" here -->
diff --git a/doc/userguide/messaging-intro.docbook b/doc/userguide/messaging-intro.docbook
index 8d042a451..a4d7b30b2 100644
--- a/doc/userguide/messaging-intro.docbook
+++ b/doc/userguide/messaging-intro.docbook
@@ -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 @@ useful features including support for &kaddressbook;, meta-contacts,
 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 @@ linkend="integrated-messaging"/></para>
 <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 @@ power-<acronym>IRC</acronym> client before, you should have no trouble using
 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 @@ Book</guibutton>.</para>
 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 --git a/doc/userguide/migrator-applications.docbook b/doc/userguide/migrator-applications.docbook
index fee1caacd..a10c1fb3c 100644
--- a/doc/userguide/migrator-applications.docbook
+++ b/doc/userguide/migrator-applications.docbook
@@ -11,7 +11,7 @@
 
 <!-- Section needs a +lot+ of work. I couldn't do any of the Mac equivalents, as I haven't used it before. More entries could be put in, too. -->
 
-<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 @@ viewer/player and web browser</para></entry>
 
 	<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 @@ viewer/player and web browser</para></entry>
 
 <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 --git a/doc/userguide/net-connection-setup.docbook b/doc/userguide/net-connection-setup.docbook
index cd44fda34..fe77366eb 100644
--- a/doc/userguide/net-connection-setup.docbook
+++ b/doc/userguide/net-connection-setup.docbook
@@ -13,14 +13,14 @@
 <!-- Contents shamelessly stolen from the KPPP manual, written by -->
 <!-- Lauri -->
 
-<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 @@ details.</para>
 
 <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 @@ back and forth through the dialogs.  When you're done with your settings, click
 <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 --git a/doc/userguide/networking-with-windows.docbook b/doc/userguide/networking-with-windows.docbook
index ba8ef0596..546313b7c 100644
--- a/doc/userguide/networking-with-windows.docbook
+++ b/doc/userguide/networking-with-windows.docbook
@@ -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 --git a/doc/userguide/panel-and-desktop.docbook b/doc/userguide/panel-and-desktop.docbook
index 1e92d3a82..ad36985f6 100644
--- a/doc/userguide/panel-and-desktop.docbook
+++ b/doc/userguide/panel-and-desktop.docbook
@@ -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 @@ significance="preferred"><primary>&kicker;</primary></indexterm>
 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 @@ next section describes some common ways to customize the panel.</para>
 <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 @@ name</replaceable> Button</guilabel> in the popup menu that
 appears. To add a new icon, &RMB;-click on an empty space on the
 panel, and follow the menu entry <guisubmenu>Add Application to Panel
 </guisubmenu>. This leads you to a copy of the
-<guimenu>K</guimenu> menu, where you can find all of the &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 @@ more information.</para>
 <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 --git a/doc/userguide/playing-audiocds.docbook b/doc/userguide/playing-audiocds.docbook
index 3f96a6056..38e8c9f77 100644
--- a/doc/userguide/playing-audiocds.docbook
+++ b/doc/userguide/playing-audiocds.docbook
@@ -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 @@ elite by ripping your CDs in the, umm.. elite way. ;-) </para>
 <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 @@ look so you at least know what's on offer. Again, take a look at
 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 @@ various formats. </para>
 
 <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 --git a/doc/userguide/playing-music.docbook b/doc/userguide/playing-music.docbook
index f93bf99cf..75a1e21eb 100644
--- a/doc/userguide/playing-music.docbook
+++ b/doc/userguide/playing-music.docbook
@@ -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 @@ feature sets, however, each is quite different in style. </para>
 <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 @@ find packages from your normal distribution source.</para>
 </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 --git a/doc/userguide/printing-from-apps.docbook b/doc/userguide/printing-from-apps.docbook
index 975149cdb..eafbcb516 100644
--- a/doc/userguide/printing-from-apps.docbook
+++ b/doc/userguide/printing-from-apps.docbook
@@ -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 --git a/doc/userguide/programs-and-documents.docbook b/doc/userguide/programs-and-documents.docbook
index c5eef682d..60ced60d3 100644
--- a/doc/userguide/programs-and-documents.docbook
+++ b/doc/userguide/programs-and-documents.docbook
@@ -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 @@ launch. If it finds more then one matching program, a list of
  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>
 
 <!-- Add links to "further reading" here -->
@@ -91,24 +84,13 @@ clicks or key-presses away.</para>
 
 <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>
 <!-- TODO: Convert this whole thing to an image with callouts. It -->
 <!-- should be much nicer that way. -->
 
 
-<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 @@ As...</guimenuitem>) entry.</para>
 <title>The File Dialog</title>
 
 <!--
-<screenshot> 
-<screeninfo>The &kde; <quote>Open File</quote> dialog</screeninfo> 
-<mediaobject> 
-<imageobject> 
-<imagedata fileref="open-file-dialog.png" format="PNG"/> </imageobject> 
-<textobject> 
-<phrase>The &kde; <quote>Open File</quote> dialog</phrase> 
-</textobject> 
-<caption> 
-<para>The &kde; <quote>Open File</quote> dialog</para> 
-</caption> 
-</mediaobject> 
-</screenshot> 
+<screenshot>
+<screeninfo>The &tde; <quote>Open File</quote> dialog</screeninfo>
+<mediaobject>
+<imageobject>
+<imagedata fileref="open-file-dialog.png" format="PNG"/> </imageobject>
+<textobject>
+<phrase>The &tde; <quote>Open File</quote> dialog</phrase>
+</textobject>
+<caption>
+<para>The &tde; <quote>Open File</quote> dialog</para>
+</caption>
+</mediaobject>
+</screenshot>
 -->
 <screenshot>
 <mediaobjectco>
@@ -149,7 +131,7 @@ As...</guimenuitem>) entry.</para>
 </mediaobjectco>
 </screenshot>
 
-<!-- ====================================================================== 
+<!-- ======================================================================
 
 <calloutlist>
 
@@ -244,7 +226,7 @@ previewed.</para>
 (&eg; scaled down if they are large images). You can disable automatic
 previews by unselecting <guilabel>Automatic Preview</guilabel> below the
 preview. You can still preview individual files: just click <guibutton>Preview</guibutton>. You can also disable previews for files above a certain
-size. Go to &kcontrolcenter;,  choose <menuchoice><guilabel>KDE
+size. Go to &kcontrolcenter;,  choose <menuchoice><guilabel>TDE
 components</guilabel><guilabel>File manager</guilabel></menuchoice>, go to
 the <guilabel>Preview and Metafiles</guilabel> tab and change the
 <guilabel>Maximum Filesize</guilabel> value.</para></note>
@@ -266,13 +248,6 @@ the <guilabel>Preview and Metafiles</guilabel> tab and change the
 </sect1>
 
 <sect1 id="configuring-programs">
-<sect1info>
-<authorgroup>
-<author>
-&Philip.Rodrigues;
-</author>
-</authorgroup>
-</sect1info>
 
 <title>Configuring Programs</title>
 
@@ -282,15 +257,15 @@ the <guilabel>Preview and Metafiles</guilabel> tab and change the
 <indexterm><primary>Configuration</primary></indexterm>
 <indexterm><primary>Customization</primary></indexterm>
 
-<para>&kde; applications are intended to be as useful and usable as
+<para>&tde; applications are intended to be as useful and usable as
 possible <quote>out of the box</quote>, but they also offer a wide
-range of options which you can change to make &kde; work for you. As
-well as the settings which affect the whole of &kde; (see <xref
+range of options which you can change to make &tde; work for you. As
+well as the settings which affect the whole of &tde; (see <xref
 linkend="control-center"/>), each application has a set of
 configuration options, which you can access using the menu option
 <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure
 <replaceable>Application</replaceable></guimenuitem>
-</menuchoice>. This is the same for all &kde; applications, which
+</menuchoice>. This is the same for all &tde; applications, which
 makes it easy to find the configuration dialog for an
 application.</para>
 
@@ -321,10 +296,10 @@ without saving your changes.</para>
 <indexterm><primary>Shortcuts</primary></indexterm>
 <indexterm><primary>Keybindings</primary></indexterm>
 
-<para>Most &kde; applications offer keyboard shortcuts for the main
+<para>Most &tde; applications offer keyboard shortcuts for the main
 actions in the application. If you find that you don't like the
 default keyboard shortcuts, or that they conflict with the shortcuts
-of another application (maybe one that's not part of &kde;), you can
+of another application (maybe one that's not part of &tde;), you can
 change them with the
 <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure
 Shortcuts...</guimenuitem>
@@ -385,7 +360,7 @@ key combination for the shortcut you want.</para>
 </sect2info>
 <title>Configuring Toolbars</title>
 
-<para>Nearly every &kde; application has one or more toolbars at the top of
+<para>Nearly every &tde; application has one or more toolbars at the top of
 the application window, underneath the menu. The toolbar contains icons
 (toolbar buttons) that represent commonly used actions and configuration
 settings. The &kmail; window, for instance, has a toolbar that contains
diff --git a/doc/userguide/removable-disks.docbook b/doc/userguide/removable-disks.docbook
index 7b07941e4..34f16e4b7 100644
--- a/doc/userguide/removable-disks.docbook
+++ b/doc/userguide/removable-disks.docbook
@@ -12,14 +12,14 @@
 
 <title>Removable Disks</title>
 
-<para>For &kde; to use any device, removable or not, the device must
-first be mounted. When a device is mounted, &kde; gets all the needed
+<para>For &tde; to use any device, removable or not, the device must
+first be mounted. When a device is mounted, &tde; gets all the needed
 information about the device: how to read it, how to write information to
 it, and much more.</para>
 
 <para>The use of a device is controlled by the operating
 system and it is important your operating system has tools for managing
-these devices. &kde; can also auto mount devices, working with
+these devices. &tde; can also auto mount devices, working with
 <acronym>HAL</acronym> (Hardware Abstraction Layer). Your distribution
 should have set up <acronym>HAL</acronym> automatically; if not,
 consult the documentation provided by your distribution.</para>
@@ -54,13 +54,13 @@ Media</guilabel>.</para>
 
 <para>The <guilabel>Storage Media</guilabel> location (also known as
 the media:/ protocol) will show all devices which are recognized by
-&kde;, including the hard drive and &CD; and <acronym>DVD</acronym>
+&tde;, including the hard drive and &CD; and <acronym>DVD</acronym>
 drives, as well as <acronym>USB</acronym> and Firewire devices,
-provided that your distribution is set up correctly to tell &kde;
+provided that your distribution is set up correctly to tell &tde;
 about them.</para>
 
 
- <para>You can also setup &kde; to display a device icon
+ <para>You can also setup &tde; to display a device icon
 on the desktop. To start or configure this feature in the &kcontrolcenter; go
 to
 <menuchoice><guilabel>Desktop</guilabel><guilabel>Behavior</guilabel></menuchoice>
@@ -72,8 +72,8 @@ configured), by not checking the unmounted boxes.</para>
 <sect2 id="automounting">
 <title>Automount</title>
 
-<para>With &kde; 3.5 and newer, devices can be automounted, meaning one only
-has to insert the removable disk. &kde; will then open an automount prompt
+<para>With &tde; 3.5 and newer, devices can be automounted, meaning one only
+has to insert the removable disk. &tde; will then open an automount prompt
 asking the user <quote>What do you want to do?</quote> with the media. To
 configure the list of options prompted for devices open the &kcontrolcenter; and
 navigate to <menuchoice><guilabel>Peripherals</guilabel><guilabel>Storage
@@ -86,13 +86,13 @@ list of devices.</para>
 configured. To find out if they are running on your system check the
 <guilabel>Process Table</guilabel> in &ksysguard; for:
 <command>hald</command>, <command>dbus-deamon</command>, and
-<command>udevd</command>. &kde; does not provide any of these
+<command>udevd</command>. &tde; does not provide any of these
 components. You must check with you distribution.</para>
 
 <itemizedlist>
 <title>Related Information</title>
-<listitem><para><ulink url="http://wiki.kde.org/tiki-index.php?page=DBUS">HOWTO: setting up D-BUS and HAL with KDE's media ioslave
-edit</ulink> (A community maintained HOWTO on the &kde; wiki)</para></listitem>
+<listitem><para><ulink url="http://wiki.kde.org/tiki-index.php?page=DBUS">HOWTO: setting up D-BUS and HAL with TDE's media ioslave
+edit</ulink> (A community maintained HOWTO on the &tde; wiki)</para></listitem>
 <listitem><para><ulink url="http://www.freedesktop.org/wiki/Software/dbus">The DBus page</ulink></para></listitem>
 <listitem><para><ulink url="http://www.freedesktop.org/wiki/Software/hal"></ulink>HAL - Hardware Abstraction Layer</para></listitem>
 </itemizedlist>
@@ -102,17 +102,17 @@ edit</ulink> (A community maintained HOWTO on the &kde; wiki)</para></listitem>
 <sect2 id="mounting-removable-disks">
 <title>Mounting</title>
 
-<para>If your system does not automount, &kde; is configured to mount and
+<para>If your system does not automount, &tde; is configured to mount and
 unmount devices which the current user has permission to mount. If a device
 is mounted as the root partition (&ie; <literal>/</literal>), and you log in
-to &kde; as a user, &kde; can not mount or unmount it without being given a
+to &tde; as a user, &tde; can not mount or unmount it without being given a
 higher permission. To check a devices mount permission see the
 <filename>/etc/fstab</filename> file.</para>
 
-<para>To mount and unmount devices manually in &kde; one only has to &RMB;
+<para>To mount and unmount devices manually in &tde; one only has to &RMB;
 click the device icon in media:/ or on the desktop and select
 <guimenuitem>Mount</guimenuitem> or <guimenuitem>Unmount</guimenuitem>, for
-removable devices one can also unmount with <guimenuitem>Safely Remove</guimenuitem>. &kde; still requires the device to be setup in
+removable devices one can also unmount with <guimenuitem>Safely Remove</guimenuitem>. &tde; still requires the device to be setup in
 /etc/fstab.</para>
 </sect2>
 
diff --git a/doc/userguide/standard-menu-entries.docbook b/doc/userguide/standard-menu-entries.docbook
index cfa37b453..c6c8f09ca 100644
--- a/doc/userguide/standard-menu-entries.docbook
+++ b/doc/userguide/standard-menu-entries.docbook
@@ -12,13 +12,13 @@
 
 <!-- FIXME: The text is immensely repetitive. Fix that. -->
 
-<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> <!-- TODO: Note that programs have other menu entries as well-->
 
 <!-- Probably a good place for a screenie, but we'd need one showing
@@ -33,7 +33,7 @@ menus:</para> <!-- TODO: Note that programs have other menu entries as well-->
 </menuchoice></term>
 <listitem><para>This entry will start a new, blank document that's
 appropriate to the program you're using. For example, in &kate; (the
-&kde; Advanced Text Editor) this entry creates a new text file.</para>
+&tde; Advanced Text Editor) this entry creates a new text file.</para>
 </listitem>
 </varlistentry>
 
@@ -43,10 +43,10 @@ appropriate to the program you're using. For example, in &kate; (the
 </shortcut><guimenuitem>Open...</guimenuitem>
 </menuchoice></term>
 <listitem><para>The <guimenuitem>Open...</guimenuitem> menu entry
-displays the &kde; <quote>Open File</quote> dialog box, where you can
+displays the &tde; <quote>Open File</quote> dialog box, where you can
 choose a file to open in the program you're using. The <quote>Open
 File</quote> dialog is also standardized, so it's the same for all
-&kde; programs. You can find out more about using this dialog
+&tde; programs. You can find out more about using this dialog
 somewhere else in this guide <!-- FIXME: real link -->.</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 @@ any changes you made, and close the dialog, by clicking on the
 </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. <!-- TODO: Point to another section for more info --></para>
 </listitem>
 </varlistentry>
@@ -116,7 +116,7 @@ World!</quote>.
 </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 --git a/doc/userguide/switching-sessions.docbook b/doc/userguide/switching-sessions.docbook
index 2f27871d9..e23e22876 100644
--- a/doc/userguide/switching-sessions.docbook
+++ b/doc/userguide/switching-sessions.docbook
@@ -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 --git a/doc/userguide/the-filemanager.docbook b/doc/userguide/the-filemanager.docbook
index a56628cf8..f3a67c311 100644
--- a/doc/userguide/the-filemanager.docbook
+++ b/doc/userguide/the-filemanager.docbook
@@ -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 @@ Management</secondary></indexterm>
 <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 @@ hold the mouse cursor over the name of the file for about a second: a
 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 @@ on the sidebar. The file will immediately be played.</para>
 <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 @@ regularly, you can easily group them in a folder and create links in it.
 <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 --git a/doc/userguide/troubleshooting-network-x.docbook b/doc/userguide/troubleshooting-network-x.docbook
index 45c55196c..fd4610f2a 100644
--- a/doc/userguide/troubleshooting-network-x.docbook
+++ b/doc/userguide/troubleshooting-network-x.docbook
@@ -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 --git a/doc/userguide/under-the-hood.docbook b/doc/userguide/under-the-hood.docbook
index 9b08bf449..97a9f839c 100644
--- a/doc/userguide/under-the-hood.docbook
+++ b/doc/userguide/under-the-hood.docbook
@@ -1,37 +1,14 @@
 <chapter id="tinkering-under-the-hood">
-<!-- Uncomment the <*info> below and add your name to be -->
-<!-- credited for writing this section. -->
-
-<!--
-<chapterinfo>
-<authorgroup>
-<author>
-<firstname>Your First Name here</firstname>
-<surname>Your Surname here </surname>
-</author>
-</authorgroup>
-</chapterinfo>
--->
 
-<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 @@ LastFile=/var/tmp/test.txt</programlisting>
 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 @@ crash.</para></warning>
 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 @@ when you want to enforce the KIOSK mode. Perhaps a developer has asked you
 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 @@ configuration file.</para>
 
 
 <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 @@ file you need to edit.</para>
 <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 @@ hexadecimal RGB value, as used in &HTML;. Note that it is enclosed in
 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 @@ wallpaper.</para>
 
 
 <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 @@ window.</para></listitem>
 </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 @@ the command <userinput><command>kdebugdialog</command></userinput>.
 &kdebugdialog; pops up a window with a long list of debugging areas. Each
 area has a checkbox that you can check or uncheck <!-- perhaps
 select/deselect --> 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 @@ all, but entering <userinput>kont</userinput> <!-- that's "butt" in dutch,
 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 --git a/doc/userguide/usenet.docbook b/doc/userguide/usenet.docbook
index 2aba10a2b..bc7ced686 100644
--- a/doc/userguide/usenet.docbook
+++ b/doc/userguide/usenet.docbook
@@ -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 @@ class="systemname">mail.server.com</systemitem></userinput></para>
 <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 --git a/doc/userguide/windows-how-to.docbook b/doc/userguide/windows-how-to.docbook
index 914e228da..1c72983e0 100644
--- a/doc/userguide/windows-how-to.docbook
+++ b/doc/userguide/windows-how-to.docbook
@@ -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 @@ normal window:
 </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>A window must be active or receive the focus to be used. When first starting
+an application the main window immediately receives the focus and is 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. When selected the window receives the focus
+and 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. The currently active window that
+has the focus will be selected automatically in the list. While pressing the &Alt; key,
+select a different window by again pressing the &Tab; key to scroll through the list.
+Release the &Alt; key and the window that is selected in the list receives the focus
+and becomes the active window.</para>
 </listitem>
 </itemizedlist>
 </para>
@@ -73,27 +71,21 @@ is made active.</para>
 <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;. When
+selected in this manner, moving the mouse pointer moves the window. Release the mouse
+button and the window remains at that position.</para>
 </listitem>
 
-<!-- FIXME:  OK, so the screenie sucks, but it shows the idea --> 
-<!-- In fact, maybe it's not even necessary: just mention the previous -->
-<!-- screenshot (having callouts on it would be nice) -->
-
 <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 @@ position you want, click the &LMB; to release it.</para>
 </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 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>
@@ -127,49 +119,43 @@ screen, so you cannot use the other methods.</para>
 
 <indexterm><primary>Resizing Windows</primary></indexterm>
 
-<para>You can make windows bigger or smaller, wider, or taller in
-one of two ways. Just use whichever you are most comfortable with:
+<para>The window size can be changed: bigger, smaller, wider, or taller. There
+are two ways to resize a window.
+Use either method:
 <itemizedlist>
 <listitem>
-<para>Move the mouse cursor 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
-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
-window. When the pointer becomes a diagonal double-headed arrow, click
+<para>Move the mouse pointer over one of the side borders of the window. The mouse pointer changes
+into a horizontal double-headed arrow. Press and hold the &LMB; and drag the window border,
+making the window bigger or smaller. Similarly, selecting the top or bottom
+borders of the window will change the height of the window.
+To concurrently change both width and height of a window,
+move the mouse pointer over the corner of the
+window. When the pointer becomes a diagonal double-headed arrow, select the border corner
 and drag.</para>
 </listitem>
 <listitem>
-<para>Use the leftmost button on the window titlebar to display the
+<para>Use the left-most 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 
-to release the window.</para>
+pointer around to resize, and use the &LMB; to release the window.</para>
 </listitem>
 <listitem>
-<para>If you cannot see the window border or the button for the window
-menu, you can use &Alt; and the &RMB;: Hold down &Alt; and drag with
-the &RMB;. The window will resize. You just release the &RMB; when
-you are done. </para>
+<para>When the window border or the button for the window menu are not visible,
+usethe  &Alt; key and &RMB;: Press and hold the &Alt; key and drag with
+the &RMB;. The window will resize. Release the &RMB; when finsihed resizing.</para>
 </listitem>
 </itemizedlist>
 </para>
 
-<para>If you just want to make a window as big as possible, so it
-takes up the whole screen, use the
+<para>Windows may be maximized in size to use the entire screen. Use the
 <guibutton>Maximize<indexterm><primary>Maximizing
-Windows</primary></indexterm></guibutton> button, which is the second
-button from the right on the window titlebar. Clicking with the &LMB;
-on this button will make the window as big as possible in both
-directions; while clicking with the &MMB;<indexterm><primary>Maximizing
+Windows</primary></indexterm></guibutton> button, which is located on the window titlebar,
+the second button from the right. Selecting that button with the mouse
+will force the window to resize as large as the screen allows in both
+directions. Alternately, selecting that button with the &MMB;<indexterm><primary>Maximizing
 Windows</primary><secondary>Vertically</secondary></indexterm> or the
 &RMB;<indexterm><primary>Maximizing Windows</primary><secondary>Horizontally</secondary></indexterm>
-will increase the window's size in only the vertical or horizontal
-direction, respectively.</para>
-
+will increase the window's size in only the vertical or horizontal direction, respectively.</para>
 
 </sect3>
 
@@ -180,36 +166,35 @@ direction, respectively.</para>
 <!-- TODO: Screenshot of the minimize button -->
 <para>
 <indexterm><primary>Minimize</primary></indexterm>
-When you need to keep a program open, but you do not want it to
-take up space on your desktop, you can minimize it or shade it. To
-minimize a window, click the <guibutton>Minimize</guibutton> button,
-which is third from the right on the window titlebar. The window will
-not be displayed, but the program is still running, and an entry for
-it appears in the taskbar on the panel. To display the window again,
-click on its entry in the taskbar. You can also use <keycombo
+A window can be made to shrink out of view without closing the application.
+There are two ways to shrink a window: minimizing and shading. To
+minimize a window, select the <guibutton>Minimize</guibutton> button,
+which is located on the window titlebar, third button from the right. The window will
+not be displayed, but the application remains running as can be seen
+in the taskbar on the panel. To display the window again,
+use the mouse to select the respective rectangular button in the taskbar or use the <keycombo
 action="simul">&Alt;&Tab;</keycombo><indexterm><primary><keycombo
-action="simul">&Alt;&Tab;</keycombo></primary></indexterm>: see <xref
+action="simul">&Alt;&Tab;</keycombo></primary></indexterm> as described in <xref
 linkend="switching-between-windows" />.</para>
 
 <para>
 <indexterm><primary>Shade</primary></indexterm>
-Shading windows is very similar to minimizing them, but this
-time, only the titlebar of the window is shown. To shade a window,
-double-click on the titlebar. To restore the window, just double-click
-on the titlebar again.</para>
+Shading windows is similar to minimizing, but the titlebar of the window
+remains on the screen. To shade a window, use the mouse to "double-click"
+on the titlebar. To restore the window, again "double-click" on the titlebar.</para>
 </sect3>
 
 <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>
 
@@ -223,7 +208,7 @@ the application and close its window.  Once again, you have the choice
 of a few options:
 <itemizedlist>
 <listitem>
-<para>Click on the rightmost button on the window titlebar.<!-- TODO: -->
+<para>Click on the right-most button on the window titlebar.<!-- TODO: -->
 <!-- Screenie --> If you are editing a document with that application,
 you will be asked whether you want to <guibutton>Save</guibutton> your
 changes, <guibutton>Discard</guibutton> them, or
@@ -238,7 +223,7 @@ same choice of <guibutton>Save</guibutton>,
 </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 +251,7 @@ closer look:
 </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 +266,15 @@ vertical/horizontal maximization. Or is this advanced? -->
 
 <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 +290,7 @@ before a command. To begin, let's look at how we might use
 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 +305,19 @@ example:
 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 left-most 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 +329,7 @@ quick access to commands. A window that has an item in the system tray
 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 +342,7 @@ command:
 <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 +352,6 @@ fileref="kcalc-systray.png"></imagedata></imageobject>
 </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 +362,27 @@ fileref="kcalc-systray.png"></imagedata></imageobject>
 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 +394,7 @@ to the log file, but we can do things a little more efficiently if we
 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 +415,6 @@ too.</para>
 </sect3>
 
 <sect3 id="improving-reliability">
-<sect3info>
-<author>
-&Richard.J.Moore;
-&Richard.J.Moore.mail;
-</author>
-</sect3info>
 
 <title>Improving Reliability</title>
 
@@ -480,7 +442,7 @@ the best way to use &kstart; and <application>ksystraycmd</application>. The <op
 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 +457,10 @@ throughout &kde;.) </para>
 <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 +469,7 @@ desktops.</para>
 </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 +488,7 @@ window appear on all desktops with the <guimenuitem>All
 Desktops</guimenuitem><indexterm><primary>Sticky
 Windows</primary></indexterm> item.</para>
 
-<!-- Add links to "further reading" here 
+<!-- Add links to "further reading" here
 <itemizedlist>
 <title>Related Information</title>
 <listitem><para></para>
diff --git a/doc/userguide/your-kde-account.docbook b/doc/userguide/your-kde-account.docbook
index 2864eb4ba..536e01966 100644
--- a/doc/userguide/your-kde-account.docbook
+++ b/doc/userguide/your-kde-account.docbook
@@ -13,32 +13,32 @@
 </sect1info>
 -->
 
-<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>
 <!-- FIXME: Apparently TDEDIR and TDEDIRS are deprecated. I need to -->
 <!-- get the truth on this -->
 <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 @@ TDEDIR=/usr/local/kde,/home/phil/kde</userinput> if you use sh.
 <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>
author	Darrell Anderson <humanreadable@yahoo.com>	2012-02-24 22:53:44 -0600
committer	Darrell Anderson <humanreadable@yahoo.com>	2012-02-24 23:26:11 -0600
commit	fc2650816b4b95f21750c53c0d45daeff31510d6 (patch)
tree	7227267d1ba5acef3b86db06979667a13bebc7c5 /doc/userguide
parent	ca1a4375014b6f78a06c74169a1285abbcbcd819 (diff)
download	tdebase-fc2650816b4b95f21750c53c0d45daeff31510d6.tar.gz tdebase-fc2650816b4b95f21750c53c0d45daeff31510d6.zip