Additional kde to tde renaming

29 files changed, 267 insertions, 267 deletions

diff --git a/doc/faq/install.docbook b/doc/faq/install.docbook
index d428f0ae5..a0edad92d 100644
--- a/doc/faq/install.docbook
+++ b/doc/faq/install.docbook
@@ -167,7 +167,7 @@ server.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term>kdegames</term>
+<term>tdegames</term>
 <listitem>
 <para>Optional</para>
 <para>Various games like &kmahjongg;, &ksnake;, &kasteroids;, and
@@ -206,7 +206,7 @@ download manager &kget;, and several other network-related programs.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term>kdepim</term>
+<term>tdepim</term>
 <listitem>
 <para>Optional</para>
 <para>Personal information management tools. Contains the email client &kmail;, the newsreader &knode; and other related programs.</para>
diff --git a/doc/faq/webbrowse.docbook b/doc/faq/webbrowse.docbook
index b80c7ae1a..94315dcf9 100644
--- a/doc/faq/webbrowse.docbook
+++ b/doc/faq/webbrowse.docbook
@@ -19,7 +19,7 @@ url="http://www.konqueror.org">http://www.konqueror.org</ulink> where a
 
 <qandaentry>
 <question><para>Can I run &konqueror; without running &kde;?</para></question>
-<answer><para>Yes. Just install &Qt;, kdelibs and kdebase, and from your favorite window manager just launch &konqueror;. It should work just fine, but if it doesn't (&kde; developers don't test that case often), report it to http://bugs.kde.org and try running "kdeinit" before running &konqueror;, it usually helps. 
+<answer><para>Yes. Just install &Qt;, kdelibs and kdebase, and from your favorite window manager just launch &konqueror;. It should work just fine, but if it doesn't (&kde; developers don't test that case often), report it to http://bugs.kde.org and try running "tdeinit" before running &konqueror;, it usually helps. 
 This is of course the same for any other &kde; application. </para>
 </answer>
 </qandaentry>
diff --git a/doc/glossary/CMakeLists.txt b/doc/glossary/CMakeLists.txt
index decd03348..73a84f204 100644
--- a/doc/glossary/CMakeLists.txt
+++ b/doc/glossary/CMakeLists.txt
@@ -10,5 +10,5 @@
 #################################################
 
 tde_create_handbook(
-  FILES checkxrefs index.docbook kdeprintingglossary.docbook
+  FILES checkxrefs index.docbook tdeprintingglossary.docbook
   DESTINATION khelpcenter/glossary )
diff --git a/doc/glossary/index.docbook b/doc/glossary/index.docbook
index 4aba44c53..f089c0bad 100644
--- a/doc/glossary/index.docbook
+++ b/doc/glossary/index.docbook
@@ -2,7 +2,7 @@
 <!DOCTYPE glossary PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
 <!ENTITY % English "INCLUDE">
-<!ENTITY glossary-kdeprinting SYSTEM "kdeprintingglossary.docbook">
+<!ENTITY glossary-tdeprinting SYSTEM "tdeprintingglossary.docbook">
 
 
 ]>
@@ -10,7 +10,7 @@
 
 <glossary id="glossary">
 
-&glossary-kdeprinting;
+&glossary-tdeprinting;
 
 	<glossdiv id="glossdiv-technologies">
 		<title>Technologies</title>
diff --git a/doc/glossary/kdeprintingglossary.docbook b/doc/glossary/kdeprintingglossary.docbook
index 7a9311c73..6a0f35a34 100644
--- a/doc/glossary/kdeprintingglossary.docbook
+++ b/doc/glossary/kdeprintingglossary.docbook
@@ -5,7 +5,7 @@
 "customization/dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
 <!ENTITY % English "INCLUDE">
-<!ENTITY glossary-kdeprinting SYSTEM "kdeprintingglossary.docbook">
+<!ENTITY glossary-tdeprinting SYSTEM "tdeprintingglossary.docbook">
 
 ]>
 <glossary id="glossary">
@@ -170,7 +170,7 @@
                                 <glossseealso otherterm="gloss-authentication">Authentication</glossseealso>
                                 <glossseealso otherterm="gloss-bsdstyleprinting">BSD-style printing</glossseealso>
                                 <glossseealso otherterm="gloss-ipp">IPP</glossseealso>
-                                <glossseealso otherterm="gloss-kdeprint">KDEPrint</glossseealso>
+                                <glossseealso otherterm="gloss-tdeprint">KDEPrint</glossseealso>
                                 <glossseealso otherterm="gloss-lprlpd">LPR/LPD</glossseealso>
                                 <glossseealso otherterm="gloss-ppd">PPD</glossseealso>
                         </glossdef>
@@ -184,7 +184,7 @@
 				is a valuable resource to answer many questions that anyone new to 
 				&CUPS; printing might have at first.
 				</para>
-                                <glossseealso otherterm="gloss-kdeprinthandbook">KDEPrint Handbook</glossseealso>
+                                <glossseealso otherterm="gloss-tdeprinthandbook">KDEPrint Handbook</glossseealso>
                         </glossdef>
                 </glossentry>
 
@@ -715,7 +715,7 @@ now.
                         </glossdef>
                 </glossentry>
 
-                <glossentry id="gloss-kdeprint">
+                <glossentry id="gloss-tdeprint">
                         <glossterm><acronym>KDEPrint</acronym></glossterm>
                         <glossdef><para>The new printing functionality of &kde; since version 2.2
 				consists of several modules that translate the features and settings
@@ -736,16 +736,16 @@ now.
                                 <glossseealso otherterm="gloss-bsdstyleprinting">BSD-style printing</glossseealso>
                                 <glossseealso otherterm="gloss-cups">&CUPS;</glossseealso>
                                 <glossseealso otherterm="gloss-kprinter">kprinter</glossseealso>
-                                <glossseealso otherterm="gloss-kdeprinthandbook">KDEPrint Handbook</glossseealso>
+                                <glossseealso otherterm="gloss-tdeprinthandbook">KDEPrint Handbook</glossseealso>
                         </glossdef>
                 </glossentry>
 
 
-                <glossentry id="gloss-kdeprinthandbook">
+                <glossentry id="gloss-tdeprinthandbook">
                         <glossterm><acronym>KDEPrint Handbook...</acronym></glossterm>
                         <glossdef><para>...is the name of the reference document that describes KDEPrint
 				functions to users and administrators. You can load it into Konqueror by
-				typing "help:/kdeprint" into the address field. The <ulink
+				typing "help:/tdeprint" into the address field. The <ulink
 				url="http://printing.kde.org/">KDEPrint website</ulink>
 				is the resource for updates to this documentation, as well as PDF
 				versions suitable for printing it. It is authored and maintained by Kurt 
@@ -1260,7 +1260,7 @@ now.
 				has an "Add Printer Wizard" to make RLPR usage even easier.
 				The kprinter command allows switching to RLPR "on
 				the fly" at any time.</para>
-                                <glossseealso otherterm="gloss-kdeprint">KDEPrint</glossseealso>
+                                <glossseealso otherterm="gloss-tdeprint">KDEPrint</glossseealso>
                                 <glossseealso otherterm="gloss-kprinter">kprinter</glossseealso>
                                 <glossseealso otherterm="gloss-printcap">printcap</glossseealso>
                         </glossdef>
diff --git a/doc/kcontrol/passwords/index.docbook b/doc/kcontrol/passwords/index.docbook
index 3aa2ed0bc..b2be11f36 100644
--- a/doc/kcontrol/passwords/index.docbook
+++ b/doc/kcontrol/passwords/index.docbook
@@ -31,7 +31,7 @@
 <title>Introduction</title>
 
 <para>This module of the &kcontrol; gives you options for configuring the way in
-which the &kdesu; program treats passwords. &kdesu; will ask you for a password
+which the &tdesu; program treats passwords. &tdesu; will ask you for a password
 when you try to carry out some privileged actions, such as changing the
 date/time stored in your system clock, or adding new users on your
 computer.</para>
@@ -69,7 +69,7 @@ choose a time period in minutes using the spinner labeled
 and 1200 minutes, or use the arrows on the spinner.)</para>
 
 <para>If the <guilabel>Remember passwords</guilabel> option has been selected,
-<application>kdesu</application> will not ask you for a password for the length
+<application>tdesu</application> will not ask you for a password for the length
 of time specified, after you have given the password once. Keep in mind,
 however, that this makes your workstation less secure.</para>
 
diff --git a/doc/kdeprint/CMakeLists.txt b/doc/kdeprint/CMakeLists.txt
index 30f7f022c..3a1f95d9e 100644
--- a/doc/kdeprint/CMakeLists.txt
+++ b/doc/kdeprint/CMakeLists.txt
@@ -9,4 +9,4 @@
 #
 #################################################
 
-tde_create_handbook( DESTINATION kdeprint )
+tde_create_handbook( DESTINATION tdeprint )
diff --git a/doc/kdeprint/add-printer-wiz.docbook b/doc/kdeprint/add-printer-wiz.docbook
index 6b6ada4ea..28d5791d2 100644
--- a/doc/kdeprint/add-printer-wiz.docbook
+++ b/doc/kdeprint/add-printer-wiz.docbook
@@ -20,7 +20,7 @@ your box.</para>
 change a setting. </para>
 
 <screenshot>
-<screeninfo>The &kdeprint; wizard introduction screen</screeninfo>
+<screeninfo>The &tdeprint; wizard introduction screen</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsaddprinterwizard1.png"
@@ -93,13 +93,13 @@ configure your network settings directly.</para>
 decide which setting could be useful. </para>
 
 <screenshot>
-<screeninfo>&kdeprint; wizard network scan</screeninfo>
+<screeninfo>&tdeprint; wizard network scan</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsaddprinterwizard3_networkscan.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase>In the &kdeprint; wizard, you can enter network details
+<phrase>In the &tdeprint; wizard, you can enter network details
 directly, or you can scan the network
 automatically.</phrase></textobject>
 </mediaobject>
@@ -115,14 +115,14 @@ printer with &IPP;), you have an option for scanning the network. Be careful
 when applying this; in some environments network scanning is considered
 to be hostile and harmful!</para>
 
-<para>In the case of <acronym>SMB</acronym>, &kdeprint; will use the
+<para>In the case of <acronym>SMB</acronym>, &tdeprint; will use the
 Samba utilities <command>nmblookup</command> and
 <command>smbclient</command> (which need to be installed for this to
 work) to retrieve the information it presents in a tree
 structure.</para>
 
 <para>In the case of &IPP; (Port 631) and <acronym>TCP</acronym>
-Network/AppSocket (Port 9100) &kdeprint; will try to open the port and,
+Network/AppSocket (Port 9100) &tdeprint; will try to open the port and,
 if successful, send an <command>ipp-get-printer-attribute</command>
 request to the printer. For newer &HP; printers the latter usually
 works, because they support both AppSocket and &IPP;.</para>
@@ -137,13 +137,13 @@ timeout to use.</para>
 your network, if you use the scanning technique.</para>
 
 <screenshot>
-<screeninfo>&kdeprint; wizard network configuration dialog</screeninfo>
+<screeninfo>&tdeprint; wizard network configuration dialog</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsaddprinterwizard4_networkscan_config.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase>In the &kdeprint; wizard, you can enter parameters to have the
+<phrase>In the &tdeprint; wizard, you can enter parameters to have the
 wizard scan parts of your network.</phrase></textobject>
 </mediaobject>
 </screenshot>
@@ -163,7 +163,7 @@ first, then the device model in the right part. This split window shows
 all &PPD;s found by &CUPS; in its standard repository of installable
 &PPD;s.  This repository normally is <filename
 class="directory">/usr/share/cups/model/</filename>. If you want your
-driver to be found automatically by &CUPS; and &kdeprint;, place it in
+driver to be found automatically by &CUPS; and &tdeprint;, place it in
 there.</para>
 
 <!-- Insert Screenshot here:  -->
@@ -215,7 +215,7 @@ url="http://www.linuxprinting.org">http://www.linuxprinting.org</ulink>
 <para>And ask for help. At a later stage, a document detailing the
 differences between the different driver and &PPD; models will appear at
 <ulink
-url="http://kdeprint.sourceforge.net">http://kdeprint.sourceforge.net/</ulink>
+url="http://tdeprint.sourceforge.net">http://tdeprint.sourceforge.net/</ulink>
 Watch out for this!</para>
 
 <para>Via the <guibutton>Other...</guibutton> button you are able to
diff --git a/doc/kdeprint/cups-config.docbook b/doc/kdeprint/cups-config.docbook
index 3196c9af3..304fe9514 100644
--- a/doc/kdeprint/cups-config.docbook
+++ b/doc/kdeprint/cups-config.docbook
@@ -15,7 +15,7 @@ configuration file for that daemon is normally located in
 <acronym>ASCII</acronym> file with a syntax similar to the configuration
 file of the <application>Apache</application> web server. It is a good
 idea to create a backup copy, just in case something goes wrong with the
-configuration through &kdeprint;/&CUPS; Server Configuration
+configuration through &tdeprint;/&CUPS; Server Configuration
 dialogs:</para>
 
 <screen><userinput><command>cp</command> <filename>/etc/cups/cupsd.conf</filename> <filename>/etc/cups/cupsd.conf.bak</filename></userinput></screen>
@@ -52,7 +52,7 @@ class="directory">/usr/share/doc/cups/</filename> or
 always refer to the original &CUPS; documentation.  &CUPS; is, much like
 &kde; in a rapid development process.  There are constantly new features
 being added. New features might for times be only configurable by
-directly editing the configuration files. The &kdeprint; &GUI; might not
+directly editing the configuration files. The &tdeprint; &GUI; might not
 have caught up with &CUPS; development.</para>
 
 <para>Just in case you want to look at the original configuration files
@@ -198,12 +198,12 @@ http://www.linuxprinting.org/newsportal/</ulink></term>
 </varlistentry>
 </variablelist>
 
-<para>And finally, there will be a WebSite for &kdeprint; and related
-documentation, at <ulink url="http://kdeprint.sourceforge.net/">
-http://kdeprint.sourceforge.net/</ulink></para>
+<para>And finally, there will be a WebSite for &tdeprint; and related
+documentation, at <ulink url="http://tdeprint.sourceforge.net/">
+http://tdeprint.sourceforge.net/</ulink></para>
 
 <para>In the next section I will step you through most of the
-configuration options of &kdeprint; with &CUPS;.</para>
+configuration options of &tdeprint; with &CUPS;.</para>
 
 </sect1>
 <sect1 id="explaining-different-gui-elements">
@@ -442,7 +442,7 @@ to.  By default &CUPS; will use <quote>root@hostname</quote>.</para>
 <note>
 <para>Contrary to what the quickhelp suggests, it is also legal to
 send an email full of praise and enthusiasm about &CUPS; and
-&kdeprint; to the server administrator.</para>
+&tdeprint; to the server administrator.</para>
 </note>
 </listitem>
 </varlistentry>
diff --git a/doc/kdeprint/cupsoptions.docbook b/doc/kdeprint/cupsoptions.docbook
index dc886d21c..bd0ba95a3 100644
--- a/doc/kdeprint/cupsoptions.docbook
+++ b/doc/kdeprint/cupsoptions.docbook
@@ -2,14 +2,14 @@
 <title>&CUPS; options presently not available through &kcontrol;</title>
 
 <para>This chapter gives you some hints about further configuration
-possibilities which may not be available through the &kdeprint; &GUI;
+possibilities which may not be available through the &tdeprint; &GUI;
 interface to &CUPS;.</para>
 
 <sect1>
 <title>Overview of provided features</title>
 
 <para>All of the most often used features and functions &CUPS; provides
-are supported in &kdeprint;.</para>
+are supported in &tdeprint;.</para>
 
 <itemizedlist>
 <listitem>
@@ -38,13 +38,13 @@ a start. There you find a link to locally available &CUPS; documentation
 in <acronym>HTML</acronym> and <acronym>PDF</acronym> if you are new to
 &CUPS;.</para>
 
-<para>&CUPS; is accessible through other means than &kdeprint;:
+<para>&CUPS; is accessible through other means than &tdeprint;:
 commandline and browser are two native &CUPS; interfaces. The many
 commandline utilities add up to the most complete control you have on
 &CUPS;. The web interface is only a subset of all available
 configuration or control options. </para>
 
-<para>This is also true for &kdeprint;. Generally, as &CUPS; develops,
+<para>This is also true for &tdeprint;. Generally, as &CUPS; develops,
 most new features will first be implemented through the commandline. Be
 sure to check the latest versions of the man pages for &CUPS; to stay
 up-to-date with new features after you install a new version.</para>
@@ -103,7 +103,7 @@ filter (1)        - cups file conversion filter interfaces
 </sect1>
 
 <sect1 id="tips-and-tricks-for-cups">
-<title>Outside &kdeprint;: Hints &amp; Tips Tricks with &CUPS; on the
+<title>Outside &tdeprint;: Hints &amp; Tips Tricks with &CUPS; on the
 Commandline</title>
 
 <para>Here are a few examples of options that are presently only
@@ -288,9 +288,9 @@ handy.</para>
 
 </sect1>
 <sect1 id="troubleshooting-cups">
-<title>Troubleshooting &CUPS; in &kdeprint;</title>
+<title>Troubleshooting &CUPS; in &tdeprint;</title>
 
-<para>This section of the &kdeprint; Handbook will live from the
+<para>This section of the &tdeprint; Handbook will live from the
 readers' feedback. Here is just a small beginning.</para>
 
 <sect2>
@@ -587,7 +587,7 @@ with the name <systemitem class="resource">lp</systemitem>.  Maybe
 printers it sees on the network into a <quote>Class</quote> name lp. All
 jobs destined to lp are sent to this class and the first available
 member prints it. So if you had this nice fellow (who listened closely
-when you raved about &CUPS; and &kdeprint;) install &CUPS; and poke
+when you raved about &CUPS; and &tdeprint;) install &CUPS; and poke
 around the system...get the idea?</para>
 
 <para>Take my advice: choose a unique name for any network printer!
diff --git a/doc/kdeprint/extensions.docbook b/doc/kdeprint/extensions.docbook
index 3995272c2..c14691d51 100644
--- a/doc/kdeprint/extensions.docbook
+++ b/doc/kdeprint/extensions.docbook
@@ -1,5 +1,5 @@
 <chapter id="extensions-to-all-printsubsystems">
-<title>&kdeprint; Extensions To All Print Subsystems</title>
+<title>&tdeprint; Extensions To All Print Subsystems</title>
 
 <sect1>
 <title><quote>Virtual</quote> Printers</title>
diff --git a/doc/kdeprint/final-word.docbook b/doc/kdeprint/final-word.docbook
index ed2ae029a..175afb2f1 100644
--- a/doc/kdeprint/final-word.docbook
+++ b/doc/kdeprint/final-word.docbook
@@ -72,7 +72,7 @@ community. Not least within the &kde; project... ;-)
 <listitem>
 <para>Jean-Eric Cuendet for starting <application>kups</application>
 and <application>qtcups</application>, the predecessors of
-&kdeprint;</para>
+&tdeprint;</para>
 </listitem>
 <listitem>
 <para>Michael Goffioul for doing all the hard work recently</para>
@@ -101,14 +101,14 @@ writing</quote></para>
 <sect1 id="caveats">
 <title>Caveats</title>
 
-<para>&kdeprint; has been developed on a system using &CUPS; 1.1.6.
-&kdeprint; has been tested on other versions of &CUPS; and so
+<para>&tdeprint; has been developed on a system using &CUPS; 1.1.6.
+&tdeprint; has been tested on other versions of &CUPS; and so
 far no incompatibilities are known. By the time of writing
 this Handbook, &CUPS; 1.1.9 is out with a few new features
-not yet supported by &kdeprint;. Of course you are able to
-access these features, but you will need to bypass &kdeprint;
+not yet supported by &tdeprint;. Of course you are able to
+access these features, but you will need to bypass &tdeprint;
 and use the &CUPS; command-line tools or edit configuration
-files manually. &kdeprint;'s development will go on and this
+files manually. &tdeprint;'s development will go on and this
 Handbook strives to always be the best available user documentation
 resource for it.</para>
 
diff --git a/doc/kdeprint/getting-started.docbook b/doc/kdeprint/getting-started.docbook
index cb360379f..9ef1500b7 100644
--- a/doc/kdeprint/getting-started.docbook
+++ b/doc/kdeprint/getting-started.docbook
@@ -1,11 +1,11 @@
 <chapter id="getting-started">
 <title>Getting Started</title>
 
-<para>This chapter of the &kdeprint; Handbook will walk you through most
-of the configuration or selection options of &kdeprint;.  It will mainly
+<para>This chapter of the &tdeprint; Handbook will walk you through most
+of the configuration or selection options of &tdeprint;.  It will mainly
 deal with &CUPS; in this version, as the author is most familiar with
-it, and also because &kdeprint; started off with supporting &CUPS;
-best.  Later versions of the &kdeprint; software and editions of this
+it, and also because &tdeprint; started off with supporting &CUPS;
+best.  Later versions of the &tdeprint; software and editions of this
 handbook will support and explore other printing
 systems more closely.</para>
 
@@ -13,7 +13,7 @@ systems more closely.</para>
 <title>Selecting Your Print Subsystem</title>
 
 <para>You need to define your print subsystem, before you are able to
-install any printer with the &kdeprint; framework.  There are two areas
+install any printer with the &tdeprint; framework.  There are two areas
 where you can define this: either in &kcontrol; (The <guilabel>Printing
 Manager</guilabel> section), or directly and <quote>on the fly</quote>
 from the print dialog.</para>
@@ -51,7 +51,7 @@ your box prior to your selection, or before it takes effect.  <!-- The -->
 <!-- authors personal recommendation is &CUPS; -->
 </para>
 
-<para>On it's first startup, &kdeprint; will try an autodetection.  This
+<para>On it's first startup, &tdeprint; will try an autodetection.  This
 only works for:</para>
 
 <itemizedlist>
@@ -78,13 +78,13 @@ your selection.  The author's personal recommendation is
 subsystem will take effect for all &kde; applications.  Different
 users may have different print subsystems in use, if those do exist on
 the computer and are compliant with each other.  Their settings are
-stored in the <filename>kdeprintrc</filename>.  This file is unique to
+stored in the <filename>tdeprintrc</filename>.  This file is unique to
 every user, and is normally installed in
-<filename>$<envar>HOME</envar>/.kde/share/config/kdeprintrc</filename>.</para>
+<filename>$<envar>HOME</envar>/.kde/share/config/tdeprintrc</filename>.</para>
 
 <warning>
 <para>This file is not intended to be directly editable, and all
-available options can be set from the &kdeprint; &GUI;.</para>
+available options can be set from the &tdeprint; &GUI;.</para>
 </warning>
 
 <para>You may even select a different printer subsystem, on the fly, from
@@ -97,7 +97,7 @@ the &kprinter; dialog box.</para>
 
 <para>Once you have chosen your preferred and installed print subsystem,
 you are ready to investigate, configure administer and work with this
-system through the &kdeprint; framework.</para>
+system through the &tdeprint; framework.</para>
 
 <para>Navigate to <menuchoice><guimenu>K Menu</guimenu>
 <guisubmenu>Preferences</guisubmenu> <guisubmenu>System</guisubmenu>
@@ -131,10 +131,10 @@ choices at your fingertips than with any other printing
 system. &CUPS; is new to most Linux users (even the senior
 hackers amongst us), and it is quite easy to use. But it
 is at the same time very different from other printing systems.
-Therfor the &CUPS; part in the &kdeprint; Handbook is naturally
+Therfor the &CUPS; part in the &tdeprint; Handbook is naturally
 the most detailed.
 
-Future editions of the &kdeprint; handbook will describe in
+Future editions of the &tdeprint; handbook will describe in
 more detail the other systems.
 -->       
 
diff --git a/doc/kdeprint/highlights.docbook b/doc/kdeprint/highlights.docbook
index 85e0e348f..72982c10c 100644
--- a/doc/kdeprint/highlights.docbook
+++ b/doc/kdeprint/highlights.docbook
@@ -1,19 +1,19 @@
-<chapter id="kdeprint-highlights">
-<title>&kdeprint;'s Highlights</title>
+<chapter id="tdeprint-highlights">
+<title>&tdeprint;'s Highlights</title>
 
-<para>The new &kdeprint; system includes more than one highlight.
+<para>The new &tdeprint; system includes more than one highlight.
 Having worked in an environment in the past that is not exactly
 sophisticated, as far as printing is concerned, take a look at some of
-the benefits that come with &kdeprint;</para>
+the benefits that come with &tdeprint;</para>
 
 <sect1 id="add-printer-wizard">
 <title>The <quote>Add Printer</quote> Wizard</title>
 
-<para>&kdeprint; has an <quote>Add Printer Wizard</quote>.  The Add
+<para>&tdeprint; has an <quote>Add Printer Wizard</quote>.  The Add
 Printer Wizard helps you with adding and configuring a new printer.  Of
 course, you may do this manually as well.</para>
 
-<para>&kdeprint; helps you <quote>discover</quote> printers. It is able
+<para>&tdeprint; helps you <quote>discover</quote> printers. It is able
 to scan the environment for available devices and queues. This works for
 network connections using <acronym>TCP</acronym> (AppSocket,
 <acronym>aka</acronym> &HP; <trademark
@@ -67,22 +67,22 @@ subsystem.</para>
 </listitem>
 </itemizedlist>
 
-<para>A screenshot of the &kdeprint; PrintJob Viewer shows the information
+<para>A screenshot of the &tdeprint; PrintJob Viewer shows the information
 you get: Job-ID, target printer, job name, job owner, job status and job
-size. In the next &kdeprint; release you will also see information about the
+size. In the next &tdeprint; release you will also see information about the
 number of pages (as &CUPS; calculates it; see chapter on page accounting
 for more information about its merits and limitations).</para>
 
 <screenshot>
-<screeninfo>A screenshot of the &kdeprint; PrintJob Viewer</screeninfo>
+<screeninfo>A screenshot of the &tdeprint; PrintJob Viewer</screeninfo>
 <mediaobject>
 <imageobject>
-<imagedata fileref="kdeprint-jobviewer.png" format="PNG"/>
+<imagedata fileref="tdeprint-jobviewer.png" format="PNG"/>
 </imageobject>
 <textobject>
-<phrase>Here's a screenshot of the &kdeprint; PrintJob Viewer.</phrase>
+<phrase>Here's a screenshot of the &tdeprint; PrintJob Viewer.</phrase>
 </textobject>
-<caption><para>A screenshot of the &kdeprint; PrintJob
+<caption><para>A screenshot of the &tdeprint; PrintJob
 Viewer.</para></caption>
 </mediaobject>
 </screenshot>
@@ -106,7 +106,7 @@ to see this:</para>
 <imagedata fileref="kcontrolcenter-printmanager-jobcontrol-2.png" format="PNG"/>
 </imageobject>
 <textobject>
-<phrase>Here's a screenshot of the &kdeprint; PrintJob Viewer.</phrase>
+<phrase>Here's a screenshot of the &tdeprint; PrintJob Viewer.</phrase>
 </textobject>
 </mediaobject>
 </screenshot>
@@ -116,7 +116,7 @@ to see this:</para>
 <sect1 id="modules-for-different-subsystems">
 <title>Modules for different print subsystems</title>
 
-<para>&kdeprint; uses different modules to realize the interface to the
+<para>&tdeprint; uses different modules to realize the interface to the
 possible print subsystems.  Not all the modules are yet developed fully,
 but you will have basic printing functionality with:</para>
 
@@ -142,7 +142,7 @@ Modules for other print subsystems, such as <acronym>PLP</acronym>,
 <acronym>PPR</acronym> and <acronym>PDQ</acronym> may be available
 later.</para>
 
-<para>&kdeprint; makes &kde; much more flexible.  It gives freedom of
+<para>&tdeprint; makes &kde; much more flexible.  It gives freedom of
 choice to &kde; 2.2 users.  To use different available print subsystems,
 these must, of course, be installed independently from &kde;.  In
 former versions, users were stuck with the old <acronym>LPD</acronym>
@@ -152,19 +152,19 @@ appear on the scene.</para>
 
 </sect1>
 
-<sect1 id="kdeprint-goodies">
-<title>More &kdeprint; <quote>Goodies</quote></title>
+<sect1 id="tdeprint-goodies">
+<title>More &tdeprint; <quote>Goodies</quote></title>
 <subtitle>Benefitting all Print SubSystems.</subtitle>
 
-<para>Some specific features of &kdeprint; depend on the chosen print
+<para>Some specific features of &tdeprint; depend on the chosen print
 subsystem.  This dependency might exist because those features are only
-implemented there; remember, &kdeprint; is an intermediate layer between
+implemented there; remember, &tdeprint; is an intermediate layer between
 &kde; applications, and the print subsystem, but it's no replacement for
 any print subsystem by itself.  Such dependency may exist for another
-reason: that &kdeprint; has not yet implemented an interface to all the
+reason: that &tdeprint; has not yet implemented an interface to all the
 features of all the subsystems.</para>
 
-<para>Other features include benefits from &kdeprint; that are
+<para>Other features include benefits from &tdeprint; that are
 independent of the chosen print subsystem, and are available with all of
 them.  At present there are <quote>special</quote> or
 <quote>virtual</quote> printers, and some generic
@@ -183,7 +183,7 @@ displaying on screen using &kghostview;.</para>
 <varlistentry>
 <term><guilabel>Special Printers</guilabel></term>
 <listitem>
-<para>Amongst these additional &kdeprint; features are a few
+<para>Amongst these additional &tdeprint; features are a few
 <quote>special</quote> or <quote>virtual</quote> printers:</para>
 
 <para>These special printers may:</para>
@@ -232,7 +232,7 @@ configurable on a per-user basis.</para>
 <varlistentry>
 <term><guilabel>Generic Pre-Filtering</guilabel></term>
 <listitem>
-<para>&kdeprint; provides you with a framework to define and configure
+<para>&tdeprint; provides you with a framework to define and configure
 your own <quote>pre-filters</quote>.  These pre-filters may take effect
 <emphasis>before</emphasis> they are passed to your print subsystem for
 further processing, but <emphasis>after</emphasis> the (&PostScript;,
@@ -264,13 +264,13 @@ any one of those formats.</para>
 This makes an extension of the concept very easy for experienced developers,
 but end-user configuration is also done through an intuitive graphical
 user interface.  So, fear not, you don't need to learn
-<acronym>XML</acronym> because of &kdeprint;!</para>
+<acronym>XML</acronym> because of &tdeprint;!</para>
 
 <variablelist>
 <varlistentry>
 <term><guilabel>Multiple Pages Per Sheet Filter</guilabel></term>
 <listitem>
-<para>This is a predefined filter that installs with &kdeprint;.  It
+<para>This is a predefined filter that installs with &tdeprint;.  It
 allows you to create a modified &PostScript; output, from &PostScript;
 input, that prints 1, 2, or 4 logical pages on a single sheet of
 paper.</para>
@@ -280,7 +280,7 @@ paper.</para>
 <varlistentry>
 <term><guilabel>Enscript Text Filter</guilabel></term>
 <listitem>
-<para>This is a predefined filter that installs with &kdeprint;.  It
+<para>This is a predefined filter that installs with &tdeprint;.  It
 allows you to create &PostScript; output from any text file input, that
 includes syntax highlighting for program listings, pretty-printing, and
 nice configurable page frames and headers.</para>
@@ -315,9 +315,9 @@ side.  These can then be folded to make a pamphlet.</para>
 </variablelist>
 </sect1>
 <sect1 id="cups-plugin">
-<title>&CUPS; Support: the Most Important Module in &kdeprint;</title>
+<title>&CUPS; Support: the Most Important Module in &tdeprint;</title>
 
-<para>&kdeprint; contains a module for &CUPS;.  &CUPS;, the
+<para>&tdeprint; contains a module for &CUPS;.  &CUPS;, the
 <quote>Common &UNIX; Printing System</quote> (<ulink
 url="http://www.cups.org">http://www.cups.org/</ulink>), is the most
 advanced, powerful and flexible of all print subsystems on &UNIX; and
@@ -325,7 +325,7 @@ other &UNIX;-like operating systems.  It is still quite new on the
 horizon, but is based on <acronym>IPP</acronym>, the Internet Printing
 Protocol, the newly emerging standard for the future of network
 printing. &CUPS; is clearly the print system of choice for Michael
-Goffioul, the principal &kdeprint; developer.</para>
+Goffioul, the principal &tdeprint; developer.</para>
 
 <para>Experienced &kde; users may already be familiar with Michael's
 utilities <application>qtcups</application> and
@@ -360,9 +360,9 @@ restart it.</para>
 </sect2>
 
 <sect2>
-<title>&kdeprint; &mdash; The Heir</title>
+<title>&tdeprint; &mdash; The Heir</title>
 
-<para>The &CUPS; Module in &kdeprint; now contains all (and more)
+<para>The &CUPS; Module in &tdeprint; now contains all (and more)
 functions that were provided by <application>qtcups</application> and
 <application>kups</application> in former &kde; versions.</para>
 
@@ -372,7 +372,7 @@ functions that were provided by <application>qtcups</application> and
 <command>kcmshell printers</command> from now on.
 </para>
 
-<para>The &kdeprint; module for &CUPS; also lets you fully administer
+<para>The &tdeprint; module for &CUPS; also lets you fully administer
 the print subsystem, just like <application>kups</application> did
 before. It can start, stop and configure your &CUPS; daemon. It can also
 start, stop, add and delete <quote>printers</quote> (&ie; printer
@@ -385,7 +385,7 @@ different default setting of print options.</para>
 <sect2>
 <title>&kprinter; &mdash; Graphical Print Command</title>
 
-<para>&kdeprint;'s &CUPS; module gives you access to a <quote>graphical
+<para>&tdeprint;'s &CUPS; module gives you access to a <quote>graphical
 print command</quote>, like <application>qtcups</application> did
 before.</para>
 
@@ -469,16 +469,16 @@ for you.  Read more about this in <xref linkend="ppd-files"/>.</para>
 <title>Plans for Future Development</title>
 
 <para>What you have now is the first, already very feature-rich
-version of &kdeprint;. This version is, of course, fully usable for
+version of &tdeprint;. This version is, of course, fully usable for
 printing. You might even think that <quote>it was never so
 easy</quote> (not even back in the days when you had to use
 &Microsoft; &Windows;).</para>
 
-<para> In the future, &kdeprint; will become even better. It will do a
+<para> In the future, &tdeprint; will become even better. It will do a
 better job of <quote>detecting</quote> your installed print subsystem
-itself. Already &kdeprint; is doing quite well in automatically
+itself. Already &tdeprint; is doing quite well in automatically
 sensing if you have &CUPS; on your system. But in many cases you will
-have to tell &kdeprint; what you are using, if you want to keep a
+have to tell &tdeprint; what you are using, if you want to keep a
 legacy print system.</para>
 
 <para>The most important improvement in the near future will be a
@@ -511,7 +511,7 @@ a virtual folder to the services section of the &konqueror; navigation
 panel, giving a nice integrated way to browse and manage your print
 system via the &URL; <userinput>print:/manager</userinput>.</para>
 
-<para>Please contact Michael Goffioul at <email>kdeprint@swing.be</email>
+<para>Please contact Michael Goffioul at <email>tdeprint@swing.be</email>
 with any further user or developer suggestions.</para>
 
 </sect1>
diff --git a/doc/kdeprint/index.docbook b/doc/kdeprint/index.docbook
index 79ef27770..977d9a6f4 100644
--- a/doc/kdeprint/index.docbook
+++ b/doc/kdeprint/index.docbook
@@ -20,7 +20,7 @@
   <!ENTITY external-command-doc SYSTEM "external-command.docbook">
   <!ENTITY extensions-doc SYSTEM "extensions.docbook">
   <!ENTITY final-word-doc SYSTEM "final-word.docbook">
-  <!ENTITY kappname "&kdeprint;"><!-- replace kapp here -->
+  <!ENTITY kappname "&tdeprint;"><!-- replace kapp here -->
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE"><!-- change language only here -->
 ]>
@@ -28,7 +28,7 @@
 <book lang="&language;">
   
 <bookinfo>
-<title>The &kdeprint; Handbook</title>
+<title>The &tdeprint; Handbook</title>
 
 <authorgroup>
 <author>
@@ -43,7 +43,7 @@
 <firstname>Michael</firstname>
 <surname>Goffioul</surname>
 <affiliation>
-<address><email>kdeprint@swing.be</email></address>
+<address><email>tdeprint@swing.be</email></address>
 </affiliation>
 <contrib>Developer</contrib>
 </othercredit>
@@ -72,8 +72,8 @@
 <releaseinfo>1.00.04</releaseinfo>
 
 <abstract>
-<para>This handbook describes &kdeprint;. &kdeprint; is not a standalone
-program. It is the new printing framework for &kde; 2.2. &kdeprint;
+<para>This handbook describes &tdeprint;. &tdeprint; is not a standalone
+program. It is the new printing framework for &kde; 2.2. &tdeprint;
 is an intermediate layer between &kde; (or other) applications and the selected
 (and installed) print subsystem of your OS (&OS;).</para>
 </abstract>
@@ -81,7 +81,7 @@ is an intermediate layer between &kde; (or other) applications and the selected
 <keywordset>
 <keyword>KDE</keyword>
 <keyword>kdebase</keyword>
-<keyword>kdeprint</keyword>
+<keyword>tdeprint</keyword>
 <keyword>print</keyword>
 <keyword>printing</keyword>
 <keyword>CUPS</keyword>
@@ -93,8 +93,8 @@ is an intermediate layer between &kde; (or other) applications and the selected
 <chapter id="introduction">
 <title>Introduction</title>
 
-<para>This handbook describes &kdeprint;. &kdeprint; is not a standalone
-program. It is the new printing framework for &kde; 2.2. &kdeprint;
+<para>This handbook describes &tdeprint;. &tdeprint; is not a standalone
+program. It is the new printing framework for &kde; 2.2. &tdeprint;
 is an intermediate layer between &kde; (or other) applications and the selected
 (and installed) print subsystem of your OS (&OS;).</para>
 
@@ -104,7 +104,7 @@ printing system.  At the time of writing, &CUPS; is the best supported
 printing subsystem, and it is the best documented.</para>
 
 <para>This handbook is a work in progress, and later versions of the
-&kdeprint; software and editions of this handbook will support and
+&tdeprint; software and editions of this handbook will support and
 explore more closely other printing systems.</para>
 
 <para>In the meantime, even if your printing subsystem is not yet well
@@ -123,7 +123,7 @@ subsystem you use.</para>
 <para>To configure your printing subsystem from &kcontrol;, go to
 <menuchoice><guilabel>System</guilabel><guilabel>Printing
 Manager</guilabel></menuchoice> and select your subsystem. Or you can
-let &kdeprint; try to determine it... </para>
+let &tdeprint; try to determine it... </para>
 
 <screenshot>
 <screeninfo>&CUPS; Printing Manager dialog: overview via &kcontrol;</screeninfo>
@@ -173,8 +173,8 @@ settings</phrase></textobject>
 <chapter id="credits-and-license">
 <title>Credits And Licenses</title>
 
-<para>&kdeprint; copyright 2001, Michael Goffioul
-<email>kdeprint@swing.be</email></para>
+<para>&tdeprint; copyright 2001, Michael Goffioul
+<email>tdeprint@swing.be</email></para>
 &underGPL;
 
 <para>Documentation copyright 2001, Kurt Pfeifle,
diff --git a/doc/kdeprint/lprng.docbook b/doc/kdeprint/lprng.docbook
index 5117664e0..78db2615b 100644
--- a/doc/kdeprint/lprng.docbook
+++ b/doc/kdeprint/lprng.docbook
@@ -1,7 +1,7 @@
 <chapter id="lprng-module">
 <title><application>LPRng</application></title>
 
-<para>An <application>LPRng</application> module for &kdeprint; is in
+<para>An <application>LPRng</application> module for &tdeprint; is in
 development, and hopefully available for the &kde; 2.3 release.</para>
 
 </chapter>
diff --git a/doc/kdeprint/tech-overview.docbook b/doc/kdeprint/tech-overview.docbook
index 96b3888e9..7a81a48a2 100644
--- a/doc/kdeprint/tech-overview.docbook
+++ b/doc/kdeprint/tech-overview.docbook
@@ -1,25 +1,25 @@
 <chapter id="technical-overview">
 <title>Technical Overview</title>
 
-<para>This chapter aims to give a technical overview of &kdeprint; which
+<para>This chapter aims to give a technical overview of &tdeprint; which
 non-programmers can comprehend.</para>
 
-<para>&kdeprint; is a new and revolutionary tool to give easy access to
+<para>&tdeprint; is a new and revolutionary tool to give easy access to
 printing services for both &kde; users and &kde; developers.</para>
 
 <sect1 id="brief-description">
-<title>A Brief Description of &kdeprint;</title>
+<title>A Brief Description of &tdeprint;</title>
 
-<para>You can access the functions of &kdeprint; in different ways:
+<para>You can access the functions of &tdeprint; in different ways:
 through the Printing Manger in the &kcontrol;, through the
 <command>kprinter</command> command or through the dialog that pops up
 if you want to print.</para>
 
-<sect2 id="what-kdeprint-is-not">
+<sect2 id="what-tdeprint-is-not">
 <title>What it is <emphasis>not</emphasis></title>
 
-<para>&kdeprint; is <emphasis>not</emphasis> a replacement for the
-printing subsystem itself.  &kdeprint; does <emphasis>not</emphasis>
+<para>&tdeprint; is <emphasis>not</emphasis> a replacement for the
+printing subsystem itself.  &tdeprint; does <emphasis>not</emphasis>
 therefore give provision for spooling, and it does
 <emphasis>not</emphasis> do the basic processing of &PostScript; or
 other print data.</para>
@@ -28,15 +28,15 @@ other print data.</para>
 
 <sect2 id="what-kde-print-is">
 <title>What it <emphasis>is</emphasis></title>
-<para>&kdeprint; is an intermediate layer between the spooling and the
+<para>&tdeprint; is an intermediate layer between the spooling and the
 data processing print subsystem (as installed), and the application that
-seeks to print.  &kdeprint; provides a common interface for &kde;
+seeks to print.  &tdeprint; provides a common interface for &kde;
 developers and &kde; users, to various supported print subsystems.  At
 the same time, it is customizable, and highly configurable.</para>
 
-<para>&kdeprint; is easy to use for both &kde; developers and end-users.
+<para>&tdeprint; is easy to use for both &kde; developers and end-users.
 Developers can port their applications, with minimal changes, to use
-&kdeprint; instead of the old &Qt; print <quote>system</quote>. Users
+&tdeprint; instead of the old &Qt; print <quote>system</quote>. Users
 can easily choose and configure their print subsystem.</para>
 
 <para>For a reference to new &kde; users: &Qt; is the basic library and
@@ -48,24 +48,24 @@ developed by TrollTech, a Norwegian software company.</para>
 </sect1>
 
 <sect1 id="different-users">
-<title>&kdeprint; -- Different Usage for Different People</title>
+<title>&tdeprint; -- Different Usage for Different People</title>
 
-<para>&kdeprint; has different faces for different people.</para>
+<para>&tdeprint; has different faces for different people.</para>
 
 <sect2 id="what-users-can-do">
-<title>What users and administrators can do with &kdeprint;</title>
+<title>What users and administrators can do with &tdeprint;</title>
 
-<para>&kdeprint; allows users and/or administrators, depending on their
+<para>&tdeprint; allows users and/or administrators, depending on their
 rights, access to printing subsystems (&CUPS;, <acronym>LPD</acronym>,
 <acronym>RLPR</acronym>, <application>LPRng</application>,
 <application>PDQ</application> &etc;) through a &kde; graphical user
-interface (&GUI;).  Using &kdeprint;, they can print, administer jobs,
+interface (&GUI;).  Using &tdeprint;, they can print, administer jobs,
 printers and the printing daemon, all in a comfortable manner.</para>
 
 <para>Experienced users will like the capability to plug any working
 filter for the print data between the output of their application and
 the input, into the chosen print subsystem. Some examples for this
-already ship with <quote>plain vanilla</quote> &kdeprint;. Read
+already ship with <quote>plain vanilla</quote> &tdeprint;. Read
 on.</para>
 
 </sect2>
@@ -80,34 +80,34 @@ service was provided by the <classname>QPrinter</classname> class, a
 library function of the &Qt; Toolkit. The
 <classname>QPrinter</classname> class relied on the out-moded
 <quote>Line Printer Daemon</quote> (<acronym>LPD</acronym>). The
-&kdeprint; library bases itself firmly on the more modern Common &UNIX;
+&tdeprint; library bases itself firmly on the more modern Common &UNIX;
 Printing System (&CUPS;), while at the same time keeping backward
 compatibility with <acronym>LPD</acronym> and other legacy, or less
 elaborate, print systems. It also <quote>leaves the door open</quote>
 for any new development that might occur.</para>
 
-<para>For &kde; developers to use the new &kdeprint; class in their
+<para>For &kde; developers to use the new &tdeprint; class in their
 applications, they require only minimal changes to their code: for every
 call of <classname>QPrinter</classname>, they just need to change this to
 <classname>KPrinter</classname>.  Replacing one (!) letter in a few
 spots, and automatically they are done; their application can then use
-all of the features of the new &kdeprint; library.</para>
+all of the features of the new &tdeprint; library.</para>
 
 <para>More ambitious developers, or ones with special requirements, can
-do more: despite &kdeprint;'s feature-rich framework, they are still able
+do more: despite &tdeprint;'s feature-rich framework, they are still able
 to customize the print dialog of their application
 by creating an additional <quote>Tab</quote>, where their
-extensions to the standard &kdeprint; will feel right at home.</para>
+extensions to the standard &tdeprint; will feel right at home.</para>
 
 
 <para>This last mentioned feature has not been used widely inside
-&kde; so far, as developers are not yet fully aware of &kdeprint;'s
+&kde; so far, as developers are not yet fully aware of &tdeprint;'s
 power. Expect more of this in the near future. One example I
 discovered is the &kcron; application. It lets you edit the crontab
 through a &GUI;. The developers have implemented a printing feature
 that lets you (or <systemitem class="username">root</systemitem>)
 choose if you want to print the whole of crontab (for all users) or
-just the part that is marked. You can see the effects on &kdeprint;
+just the part that is marked. You can see the effects on &tdeprint;
 in the following screenshots.</para>
 
 <para>This shot shows a sample from the &kcron; utility.
@@ -127,22 +127,22 @@ cron table or just the marked part of it.</phrase></textobject>
 
 <para>The dialog to configure &kcron;'s printing options: the
 additional tab titled <guilabel>Cron Options</guilabel> is from inside
-&kcron;, not &kdeprint;; it is a special extension added by the
+&kcron;, not &tdeprint;; it is a special extension added by the
 &kcron; developers for printing purposes, not originating from, but
-executed by &kdeprint;. Developers of other applications are free
+executed by &tdeprint;. Developers of other applications are free
 to implement their own goodies, if they feel need for it.</para>
 
 
 <screenshot>
-<screeninfo>&kcron;'s addition to the &kdeprint; dialog.</screeninfo>
+<screeninfo>&kcron;'s addition to the &tdeprint; dialog.</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="kprinter_with_kcron_developer_special.png"
 format="PNG"/></imageobject>
 <textobject>
-<phrase>&kcron;'s addition to the &kdeprint; dialog.</phrase></textobject>
+<phrase>&kcron;'s addition to the &tdeprint; dialog.</phrase></textobject>
 <caption>
-<para>&kcron;'s addition to the &kdeprint; dialog.</para>
+<para>&kcron;'s addition to the &tdeprint; dialog.</para>
 </caption>
 </mediaobject>
 </screenshot>
@@ -150,9 +150,9 @@ format="PNG"/></imageobject>
 </sect2>
 
 <sect2>
-<title>What &kdeprint; offers to everybody...</title>
+<title>What &tdeprint; offers to everybody...</title>
 
-<para>&kdeprint;'s easy-to-use interface for all supported print subsystems
+<para>&tdeprint;'s easy-to-use interface for all supported print subsystems
 of course does not eliminate basic traditional weaknesses of some of
 those systems. But it smooths some rough edges.  Different users may use
 different printing systems on the same box. A user is free to even
@@ -169,7 +169,7 @@ working remotely over any distance (like every TCP/IP based protocol),
 <acronym>LPD</acronym> lacks bi-directional communication,
 authentication, access control and encryption support.</para>
 
-<para>&kdeprint; can use &CUPS; to support:</para>
+<para>&tdeprint; can use &CUPS; to support:</para>
 
 <itemizedlist>
 <listitem>
@@ -188,14 +188,14 @@ eavesdropping, or at least make it much more difficult.</para>
 </listitem>
 </itemizedlist>
 
-<para>This makes &kdeprint; a much more robust and reliable solution
+<para>This makes &tdeprint; a much more robust and reliable solution
 than using the venerable <acronym>LPD</acronym>.</para>
 
 </sect2>
 <sect2>
-<title>How to access &kdeprint; </title>
+<title>How to access &tdeprint; </title>
 
-<para>You get access to &kdeprint;, or parts of it, in four different
+<para>You get access to &tdeprint;, or parts of it, in four different
 ways:</para>
 
 <itemizedlist>
@@ -214,14 +214,14 @@ window: this also opens the printing dialog.</para></listitem>
 fileref="kcontrol-icon.png" format="PNG"/></imageobject>
 </inlinemediaobject> button, starting &kcontrol;, and then go to
 <menuchoice><guilabel>System</guilabel><guilabel>Printing
-Manager</guilabel></menuchoice>. This opens the &kdeprint;
+Manager</guilabel></menuchoice>. This opens the &tdeprint;
 administration which is part of the &kcontrolcenter; and also lets
 you switch to other parts of the &kcontrol;</para></listitem>
 
 <listitem><para>from a command line (&konsole; or
 mini-<acronym>CLI</acronym>) type <userinput>
 <command>kcmshell</command> <option>printers</option></userinput>.
-This opens just the &kdeprint; part of &kcontrol; to change your settings
+This opens just the &tdeprint; part of &kcontrol; to change your settings
 </para></listitem>
 </itemizedlist>
 <screenshot>
diff --git a/doc/kdeprint/theory.docbook b/doc/kdeprint/theory.docbook
index a90aa2755..7b137f1c3 100644
--- a/doc/kdeprint/theory.docbook
+++ b/doc/kdeprint/theory.docbook
@@ -348,7 +348,7 @@ anything other than the originally supported &OS;s: &Microsoft; &Windows; and
 &MacOS;.  Through its brilliant move to fully support and utilize
 the existing &PPD; specification, &CUPS; now gives the power to use
 all features of modern printers to users of &Linux; and &Linux;-like
-systems.  &kdeprint; makes its usage even more comfortable than the
+systems.  &tdeprint; makes its usage even more comfortable than the
 &CUPS; developers ever dreamed of.</para>
 
 <para>&CUPS; can use original &Windows; &PPD;s, distributed by the
@@ -568,7 +568,7 @@ internet and printed.</para>
 
 <para>&CUPS; is the most advanced implementation of &IPP; on all &OS;
 platforms.  That makes &CUPS; a crucial ally to help "conquer the
-desktop" for projects like &kde;. &kdeprint; is the best utility to
+desktop" for projects like &kde;. &tdeprint; is the best utility to
 make &CUPS; core functionality available to &kde; Desktop
 users.</para>
 
diff --git a/doc/kdesu/CMakeLists.txt b/doc/kdesu/CMakeLists.txt
index e0a216477..9c562330f 100644
--- a/doc/kdesu/CMakeLists.txt
+++ b/doc/kdesu/CMakeLists.txt
@@ -9,4 +9,4 @@
 #
 #################################################
 
-tde_create_handbook( DESTINATION kdesu )
+tde_create_handbook( DESTINATION tdesu )
diff --git a/doc/kdesu/index.docbook b/doc/kdesu/index.docbook
index 800d20b10..81c71cf17 100644
--- a/doc/kdesu/index.docbook
+++ b/doc/kdesu/index.docbook
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
-  <!ENTITY kappname "&kdesu;">
+  <!ENTITY kappname "&tdesu;">
   <!ENTITY package "kdebase">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
@@ -10,7 +10,7 @@
 <book lang="&language;">
 <bookinfo>
 
-<title>The &kdesu; handbook</title>
+<title>The &tdesu; handbook</title>
 
 <authorgroup>
 <author>&Geert.Jansen; &Geert.Jansen.mail;</author>
@@ -28,7 +28,7 @@
 <releaseinfo>1.00.00</releaseinfo>
 
 
-<abstract><para>&kdesu; is a graphical front end for the &UNIX;
+<abstract><para>&tdesu; is a graphical front end for the &UNIX;
 <command>su</command> command.</para></abstract>
 
 <keywordset>
@@ -43,13 +43,13 @@
 <chapter id="introduction">
 <title>Introduction</title>
 
-<para>Welcome to &kdesu;! &kdesu; is a graphical front end for the
+<para>Welcome to &tdesu;! &tdesu; is a graphical front end for the
 &UNIX; <command>su</command> command for the K Desktop Environment.
 It allows you to run a program as different user by supplying the
-password for that user. &kdesu; is an unprivileged program; it uses
+password for that user. &tdesu; is an unprivileged program; it uses
 the system's <command>su</command>.</para>
 
-<para>&kdesu; has one additional feature: it can remember passwords
+<para>&tdesu; has one additional feature: it can remember passwords
 for you. If you are using this feature, you only need to enter the
 password once for each command. See <xref
 linkend="sec-password-keeping"/> for more information on this and a
@@ -63,13 +63,13 @@ glue instead of a pure &GUI; program.</para>
 
 </chapter>
 
-<chapter id="using-kdesu">
-<title>Using &kdesu;</title>
+<chapter id="using-tdesu">
+<title>Using &tdesu;</title>
 
-<para>Usage of &kdesu; is easy. The syntax is like this:</para>
+<para>Usage of &tdesu; is easy. The syntax is like this:</para>
 
 <cmdsynopsis>
-<command>kdesu</command>
+<command>tdesu</command>
 
 <group choice="opt"><option>-c</option></group>
 <group choice="opt"><option>-d</option></group>
@@ -89,7 +89,7 @@ user</replaceable></group>
           <arg rep="repeat"><replaceable></replaceable></arg></arg></group>
 </cmdsynopsis>
 <cmdsynopsis>
-<command>kdesu</command>
+<command>tdesu</command>
 <arg choice="opt">&kde; Generic Options</arg>
 <arg choice="opt">Qt Generic Options</arg>
 </cmdsynopsis>
@@ -101,7 +101,7 @@ user</replaceable></group>
 <term><option>-c <replaceable>program</replaceable></option></term>
 <listitem><para>This specifies the program to run as root. It has to be passed
 in one argument. So if, for example, you want to start a new file manager, you
-would enter at the prompt: <userinput><command>kdesu <option>-c <replaceable>kfm
+would enter at the prompt: <userinput><command>tdesu <option>-c <replaceable>kfm
 -sw</replaceable></option></command></userinput></para></listitem>
 </varlistentry>
 <varlistentry>
@@ -110,10 +110,10 @@ would enter at the prompt: <userinput><command>kdesu <option>-c <replaceable>kfm
 </varlistentry>
 <varlistentry>
 <term><option>-f <replaceable>file</replaceable></option></term>
-<listitem><para>This option allow efficient use of &kdesu; in
-<filename>.desktop</filename> files. It tells &kdesu; to examine the
+<listitem><para>This option allow efficient use of &tdesu; in
+<filename>.desktop</filename> files. It tells &tdesu; to examine the
 file specified by <parameter>file</parameter>. If this file is
-writable by the current user, &kdesu; will execute the command as the
+writable by the current user, &tdesu; will execute the command as the
 current user. If it is not writable, the command is executed as user
 <parameter>user</parameter> (defaults to root).</para>
 <para><parameter>file</parameter> is evaluated like this: if
@@ -121,7 +121,7 @@ current user. If it is not writable, the command is executed as user
 taken as an absolute filename. Otherwise, it is taken as the name of a
 global &kde; configuration file. For example: to configure the K display
 manager, <application>kdm</application>, you could issue
-<command>kdesu <option>-c kdmconfig -f
+<command>tdesu <option>-c kdmconfig -f
 kdmrc</option></command></para></listitem>
 </varlistentry>
 <varlistentry>
@@ -130,7 +130,7 @@ kdmrc</option></command></para></listitem>
 just the name, without any extension.</para>
 <para>For instance to run <command>kfmclient</command> and show the
 &konqueror; icon in the password dialog:</para>
-<screen><userinput><command>kdesu</command>  <option>-i konqueror</option> <command>kfmclient</command></userinput></screen>
+<screen><userinput><command>tdesu</command>  <option>-i konqueror</option> <command>kfmclient</command></userinput></screen>
 </listitem>
 </varlistentry>
 
@@ -155,7 +155,7 @@ password</guilabel> checkbox in the password dialog.</para></listitem>
 
 <varlistentry>
 <term><option>-s</option></term>
-<listitem><para>Stop the kdesu daemon. See <xref
+<listitem><para>Stop the tdesu daemon. See <xref
 linkend="sec-password-keeping"/>.</para></listitem>
 </varlistentry>
 <varlistentry>
@@ -166,7 +166,7 @@ standard <command>su</command> instead.</para> </listitem>
 </varlistentry>
 <varlistentry>
 <term><option>-u</option> <replaceable> user</replaceable></term>
-<listitem><para>While the most common use for &kdesu; is to run a command as
+<listitem><para>While the most common use for &tdesu; is to run a command as
 the superuser, you can supply any user name and the appropriate
 password.</para>
 </listitem>
@@ -183,12 +183,12 @@ password.</para>
 <title>X authentication</title>
 
 <para>The program you execute will run under the root user id and will
-generally have no authority to access your X display. &kdesu; gets
+generally have no authority to access your X display. &tdesu; gets
 around this by adding an authentication cookie for your display to a
 temporary <filename>.Xauthority</filename> file. After the command
 exits, this file is removed. </para>
 
-<para>If you don't use X cookies, you are on your own. &kdesu; will
+<para>If you don't use X cookies, you are on your own. &tdesu; will
 detect this and will not add a cookie but you will have to make sure
 that root is allowed to access to your display.</para>
 
@@ -197,18 +197,18 @@ that root is allowed to access to your display.</para>
 <sect1 id="interface-to-su">
 <title>Interface to <command>su</command></title>
 
-<para>&kdesu; uses the sytem's <command>su</command> for acquiring
-priviliges. In this section, I explain the details of how &kdesu; does
+<para>&tdesu; uses the sytem's <command>su</command> for acquiring
+priviliges. In this section, I explain the details of how &tdesu; does
 this. </para>
 
 <para>Because some <command>su</command> implementations (&ie; the one
 from &RedHat;) don't want to read the password from
-<literal>stdin</literal>, &kdesu; creates a pty/tty pair and executes
+<literal>stdin</literal>, &tdesu; creates a pty/tty pair and executes
 <command>su</command> with it's standard filedescriptors connected to
 the tty.</para>
 
 <para>To execute the command the user selected, rather than an
-interactive shell, &kdesu; uses the <option>-c</option> argument with
+interactive shell, &tdesu; uses the <option>-c</option> argument with
 <command>su</command>. This argument is understood by every shell that
 I know of so it should work portably. <command>su</command> passes
 this <option>-c</option> argument to the target user's shell, and the
@@ -216,9 +216,9 @@ shell executes the program. Example command: <command>su <option>root
 -c <replaceable>the_program</replaceable></option></command>.</para>
 
 <para>Instead of executing the user command directly with
-<command>su</command>, &kdesu; executes a little stub program called
-<application>kdesu_stub</application>. This stub (running as the
-target user), requests some information from &kdesu; over the pty/tty
+<command>su</command>, &tdesu; executes a little stub program called
+<application>tdesu_stub</application>. This stub (running as the
+target user), requests some information from &tdesu; over the pty/tty
 channel (the stub's stdin and stdout) and then executes the user's
 program. The information passed over is: the X display, an X
 authentication cookie (if available), the <envar>PATH</envar> and the
@@ -231,7 +231,7 @@ command line.</para>
 <sect1 id="password-checking">
 <title>Password Checking</title>
 
-<para>&kdesu; will check the password you entered and gives an error
+<para>&tdesu; will check the password you entered and gives an error
 message if it is not correct. The checking is done by executing a test
 program: <filename>/bin/true</filename>. If this succeeds, the
 password is assumed to be correct.</para>
@@ -241,25 +241,25 @@ password is assumed to be correct.</para>
 <sect1 id="sec-password-keeping">
 <title>Password Keeping</title>
 
-<para>For your comfort, &kdesu; implements a <quote>keep
+<para>For your comfort, &tdesu; implements a <quote>keep
 password</quote> feature. If you are interested in security, you
 should read this paragraph.</para>
 
-<para>Allowing &kdesu; to remember passwords opens up a (small)
-security hole in your system. Obviously, &kdesu; does not allow
+<para>Allowing &tdesu; to remember passwords opens up a (small)
+security hole in your system. Obviously, &tdesu; does not allow
 anybody but your user id to use the passwords, but, if done without
 caution, this would lowers <systemitem
 class="username">root</systemitem>'s security level to that of a
 normal user (you). A hacker who breaks into your account, would get
-<systemitem class="username">root</systemitem> access. &kdesu; tries
+<systemitem class="username">root</systemitem> access. &tdesu; tries
 to prevent this. The security scheme it uses is, in my opinion at
 least, reasonably safe and is explained here.</para>
 
-<para>&kdesu; uses a daemon, called
-<application>kdesud</application>. The daemon listens to a &UNIX;
+<para>&tdesu; uses a daemon, called
+<application>tdesud</application>. The daemon listens to a &UNIX;
 socket in <filename>/tmp</filename> for commands. The mode of the
 socket is 0600 so that only your user id can connect to it. If
-password keeping is enabled, &kdesu; executes commands through this
+password keeping is enabled, &tdesu; executes commands through this
 daemon. It writes the command and <systemitem
 class="username">root</systemitem>'s password to the socket and the
 daemon executes the command using <command>su</command>, as describe
@@ -271,7 +271,7 @@ not have to supply the password. To keep hackers who broke into your
 account from stealing passwords from the daemon (for example, by
 attaching a debugger), the daemon is installed set-group-id
 nogroup. This should prevent all normal users (including you) from
-getting passwords from the <application>kdesud</application>
+getting passwords from the <application>tdesud</application>
 process. Also, the daemon sets the <envar>DISPLAY</envar> environment
 variable to the value it had when it was started. The only thing a
 hacker can do is execute an application on your display.</para>
@@ -292,12 +292,12 @@ yourself if you want to use it or not.</para>
 <chapter id="Author">
 <title>Author</title>
 
-<para>&kdesu;</para>
+<para>&tdesu;</para>
 
 <para>Copyright 2000 &Geert.Jansen;</para>
 
-<para>&kdesu; is written by &Geert.Jansen;. It is somewhat based on
-Pietro Iglio's &kdesu;, version 0.3. Pietro and I agreed that I will
+<para>&tdesu; is written by &Geert.Jansen;. It is somewhat based on
+Pietro Iglio's &tdesu;, version 0.3. Pietro and I agreed that I will
 maintain this program in the future.</para>
 
 <para>The author can be reached through email at &Geert.Jansen.mail;.
diff --git a/doc/kdesu/man-kdesu.1.docbook b/doc/kdesu/man-kdesu.1.docbook
index b9c5ac4ca..fd99812fd 100644
--- a/doc/kdesu/man-kdesu.1.docbook
+++ b/doc/kdesu/man-kdesu.1.docbook
@@ -12,18 +12,18 @@
 </refentryinfo>
 
 <refmeta>
-<refentrytitle><command>kdesu</command></refentrytitle>
+<refentrytitle><command>tdesu</command></refentrytitle>
 <manvolnum>1</manvolnum>
 </refmeta>
 
 <refnamediv>
-<refname><command>kdesu</command></refname>
+<refname><command>tdesu</command></refname>
 <refpurpose>Runs a program with elevated privileges</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 <cmdsynopsis>
-<command>kdesu</command>
+<command>tdesu</command>
 
 <group choice="opt"><option>-c</option></group>
 <group choice="opt"><option>-d</option></group>
@@ -43,7 +43,7 @@ user</replaceable></group>
           <arg rep="repeat"><replaceable></replaceable></arg></arg></group>
 </cmdsynopsis>
 <cmdsynopsis>
-<command>kdesu</command>
+<command>tdesu</command>
 <arg choice="opt">KDE Generic Options</arg>
 <arg choice="opt">Qt Generic Options</arg>
 </cmdsynopsis>
@@ -51,13 +51,13 @@ user</replaceable></group>
 
 <refsect1>
 <title>Description</title>
-<para>&kdesu; is a graphical front end for the
+<para>&tdesu; is a graphical front end for the
 &UNIX; <command>su</command> command for the K Desktop Environment.
 It allows you to run a program as different user by supplying the
-password for that user. &kdesu; is an unprivileged program; it uses
+password for that user. &tdesu; is an unprivileged program; it uses
 the system's <command>su</command>.</para>
 
-<para>&kdesu; has one additional feature: it can optionally remember passwords
+<para>&tdesu; has one additional feature: it can optionally remember passwords
 for you. If you are using this feature, you only need to enter the
 password once for each command.</para>
 
@@ -73,7 +73,7 @@ from <filename>.desktop</filename> files.</para>
 <term><option>-c <replaceable>program</replaceable></option></term>
 <listitem><para>This specifies the program to run as root. It has to be passed
 in one argument. So if, for example, you want to start a new file manager, you
-would enter at the prompt: <userinput><command>kdesu <option>-c <replaceable>kfm
+would enter at the prompt: <userinput><command>tdesu <option>-c <replaceable>kfm
 -sw</replaceable></option></command></userinput></para></listitem>
 </varlistentry>
 <varlistentry>
@@ -82,10 +82,10 @@ would enter at the prompt: <userinput><command>kdesu <option>-c <replaceable>kfm
 </varlistentry>
 <varlistentry>
 <term><option>-f <replaceable>file</replaceable></option></term>
-<listitem><para>This option allow efficient use of &kdesu; in
-<filename>.desktop</filename> files. It tells &kdesu; to examine the
+<listitem><para>This option allow efficient use of &tdesu; in
+<filename>.desktop</filename> files. It tells &tdesu; to examine the
 file specified by <parameter>file</parameter>. If this file is
-writable by the current user, &kdesu; will execute the command as the
+writable by the current user, &tdesu; will execute the command as the
 current user. If it is not writable, the command is executed as user
 <parameter>user</parameter> (defaults to root).</para>
 <para><parameter>file</parameter> is evaluated like this: if
@@ -93,7 +93,7 @@ current user. If it is not writable, the command is executed as user
 taken as an absolute filename. Otherwise, it is taken as the name of a
 global &kde; configuration file. For example: to configure the K display
 manager, <application>kdm</application>, you could issue
-<command>kdesu <option>-c kdmconfig -f
+<command>tdesu <option>-c kdmconfig -f
 kdmrc</option></command></para></listitem>
 </varlistentry>
 <varlistentry>
@@ -124,9 +124,9 @@ password</guilabel> checkbox in the password dialog.</para></listitem>
 
 <varlistentry>
 <term><option>-s</option></term>
-<listitem><para>Stop the kdesu daemon. This is the daemon that caches
+<listitem><para>Stop the tdesu daemon. This is the daemon that caches
 successful passwords in the background.  This feature may also be disabled with
-<option>-n</option> when &kdesu; is initially run.</para></listitem>
+<option>-n</option> when &tdesu; is initially run.</para></listitem>
 </varlistentry>
 <varlistentry>
 <term><option>-t</option></term>
@@ -136,7 +136,7 @@ standard <command>su</command> instead.</para> </listitem>
 </varlistentry>
 <varlistentry>
 <term><option>-u</option> <replaceable> user</replaceable></term>
-<listitem><para>While the most common use for &kdesu; is to run a command as
+<listitem><para>While the most common use for &tdesu; is to run a command as
 the superuser, you can supply any user name and the appropriate
 password.</para>
 </listitem>
@@ -151,10 +151,10 @@ password.</para>
 <para>su(1)</para>
 
 <para>More detailed user documentation is available from <ulink
-url="help:/kdesu">help:/kdesu</ulink>
+url="help:/tdesu">help:/tdesu</ulink>
 (either enter this <acronym>URL</acronym> into &konqueror;, or run
 <userinput><command>khelpcenter</command>
-<parameter>help:/kdesu</parameter></userinput>).</para>
+<parameter>help:/tdesu</parameter></userinput>).</para>
 
 </refsect1>
 
@@ -163,13 +163,13 @@ url="help:/kdesu">help:/kdesu</ulink>
 <para>Run <command>kfmclient</command> as user <systemitem
 class="username">jim</systemitem>, and show the &konqueror; icon in the
 password dialog:</para>
-<screen><userinput><command>kdesu</command> <option>-u jim</option> <option>-i konqueror</option> <command>kfmclient</command></userinput></screen>
+<screen><userinput><command>tdesu</command> <option>-u jim</option> <option>-i konqueror</option> <command>kfmclient</command></userinput></screen>
 
 </refsect1>
 
 <refsect1>
 <title>Authors</title>
-<para>&kdesu; was written by
+<para>&tdesu; was written by
 <personname><firstname>Geert</firstname><surname>Jansen</surname></personname> <email>jansen@kde.org</email>
 and <personname><firstname>Pietro</firstname><surname>Iglio</surname></personname>
 <email>iglio@fub.it</email>. 
diff --git a/doc/kioslave/index.docbook b/doc/kioslave/index.docbook
index 6f70d6e23..d76ba7d0a 100644
--- a/doc/kioslave/index.docbook
+++ b/doc/kioslave/index.docbook
@@ -40,7 +40,7 @@
 <!ENTITY kio-thumbnail SYSTEM "thumbnail.docbook">
 <!ENTITY kio-webdav SYSTEM "webdav.docbook">
 <!ENTITY kio-webdavs SYSTEM "webdavs.docbook">
-<!ENTITY kdeprint "<application>KDEPrint</application>">
+<!ENTITY tdeprint "<application>KDEPrint</application>">
 <!ENTITY Ferdinand.Gassauer '<personname><firstname>Ferdinand</firstname><surname>Gassauer</surname></personname>'>
 <!ENTITY Ferdinand.Gassauer.mail '<email>f.gassauer@aon.at</email>'>
 <!ENTITY % addindex "IGNORE">
diff --git a/doc/kioslave/print.docbook b/doc/kioslave/print.docbook
index 034eddab1..557636aab 100644
--- a/doc/kioslave/print.docbook
+++ b/doc/kioslave/print.docbook
@@ -13,7 +13,7 @@
 </articleinfo>
 
 <para>The <acronym>print</acronym> KIOSlave gives quick access to browse
-different &kdeprint; sections via <quote>virtual folders</quote>.
+different &tdeprint; sections via <quote>virtual folders</quote>.
 These folders provide some information about and quick access to your print 
 subsystem.</para>
 
@@ -116,7 +116,7 @@ or <userinput>print:printers/printer_name </userinput> </term>
 <term><userinput>print:/manager </userinput> or
 <userinput>print:manager </userinput>
 </term> <listitem>
-<para>opens a page very similar to the &kdeprint;
+<para>opens a page very similar to the &tdeprint;
       Manager module inside the  &kde; Control Center.
       Switch to a different printing system here or do every
       other administrative task. </para>
@@ -157,9 +157,9 @@ or <userinput>print:printers/printer_name </userinput> </term>
  the <quote>Quick Command</quote> utility (started via
 <keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo>)</para></tip>
 
-<para>You can learn more about printing and &kdeprint;'s powerful abilities
-by reading the <ulink url="help:/kdeprint/index.html">&kdeprint; Handbook
-locally</ulink> or at the <ulink url="http://printing.kde.org/">&kdeprint;
+<para>You can learn more about printing and &tdeprint;'s powerful abilities
+by reading the <ulink url="help:/tdeprint/index.html">&tdeprint; Handbook
+locally</ulink> or at the <ulink url="http://printing.kde.org/">&tdeprint;
 Website</ulink> where there are documents online (<acronym>HTML</acronym> and 
 <acronym>PDF</acronym>),containing
 <ulink 
diff --git a/doc/konqueror/faq.docbook b/doc/konqueror/faq.docbook
index 268655dbe..ebc11ca9e 100644
--- a/doc/konqueror/faq.docbook
+++ b/doc/konqueror/faq.docbook
@@ -30,7 +30,7 @@ manager?</para></question>
 window manager, launch &konqueror;. It should work just fine, but if it
 doesn't (&kde; developers don't test that case often), report it to <ulink
 url="http://bugs.kde.org">http://bugs.kde.org</ulink> and try running
-<application>kdeinit</application> before running &konqueror;; it usually
+<application>tdeinit</application> before running &konqueror;; it usually
 helps.</para></answer>
 </qandaentry>
 
diff --git a/doc/konqueror/filemanager.docbook b/doc/konqueror/filemanager.docbook
index c6fb880ba..b63fbfbb7 100644
--- a/doc/konqueror/filemanager.docbook
+++ b/doc/konqueror/filemanager.docbook
@@ -862,7 +862,7 @@ easier.</para>
 <para><menuchoice><guimenu>Tools</guimenu><guimenuitem>Execute Shell Command...
 </guimenuitem></menuchoice> (<keycombo action="simul">&Ctrl;
 <keycap>E</keycap></keycombo>) opens a small command line dialog window where 
-you can enter a shell command such as <userinput>ps -ax | grep kdeinit
+you can enter a shell command such as <userinput>ps -ax | grep tdeinit
 </userinput>. Note that it does not support full featured terminal control 
 characters, so applications such as <userinput>top</userinput> and <userinput>
 less</userinput> will not work properly, but it is available immediately 
diff --git a/doc/userguide/base-kde-applications.docbook b/doc/userguide/base-kde-applications.docbook
index 863271b37..917855c69 100644
--- a/doc/userguide/base-kde-applications.docbook
+++ b/doc/userguide/base-kde-applications.docbook
@@ -128,7 +128,7 @@
 
 </sect1>
 
-<sect1 id="base-applications-kdepim">
+<sect1 id="base-applications-tdepim">
 <sect1info>
 <authorgroup>
 <author>
@@ -229,7 +229,7 @@
 
 <itemizedlist>
 <title>Related Information</title>
-	<listitem><para>See <ulink url="http://kontact.kde.org">http://kontact.kde.org</ulink> and <ulink url="http://kdepim.kde.org">http://kdepim.kde.org</ulink> for more information.</para></listitem>
+	<listitem><para>See <ulink url="http://kontact.kde.org">http://kontact.kde.org</ulink> and <ulink url="http://tdepim.kde.org">http://tdepim.kde.org</ulink> for more information.</para></listitem>
 	<listitem><para><ulink url="help:kontact">&kontact; Handbook</ulink></para></listitem>
 </itemizedlist>
 
diff --git a/doc/userguide/kde-as-root.docbook b/doc/userguide/kde-as-root.docbook
index 7e6bb6fe9..c97f2e5f5 100644
--- a/doc/userguide/kde-as-root.docbook
+++ b/doc/userguide/kde-as-root.docbook
@@ -19,14 +19,14 @@
 
 <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>
 
-<para>If you should ever need to run a program with Super User privileges, then it is always recommend that you use &kdesu;. From &konsole; or from hitting <keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo>, enter <userinput>kdesu <replaceable>application</replaceable></userinput>, and the application will be run with the appropriate Super User privileges. </para>
+<para>If you should ever need to run a program with Super User privileges, then it is always recommend that you use &tdesu;. From &konsole; or from hitting <keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo>, enter <userinput>tdesu <replaceable>application</replaceable></userinput>, and the application will be run with the appropriate Super User privileges. </para>
 
-<para>Even if you have set up your system to use <command>sudo</command>, or you are on a distribution that uses <command>sudo</command>, such as &kubuntu;, you should still use &kdesu;. The program will be appropriately modified by the developers to use the correct settings. You should not, however, ever use <command>sudo <replaceable>application</replaceable></command> to run an application with <systemitem class="username">root</systemitem> permissions; it can derange permissions of certain configuration files for a program. Running a graphical applications as <systemitem class="username">root</systemitem> in general is not a good idea, but using &kdesu; will always be your safest bet with it.</para>
+<para>Even if you have set up your system to use <command>sudo</command>, or you are on a distribution that uses <command>sudo</command>, such as &kubuntu;, you should still use &tdesu;. The program will be appropriately modified by the developers to use the correct settings. You should not, however, ever use <command>sudo <replaceable>application</replaceable></command> to run an application with <systemitem class="username">root</systemitem> permissions; it can derange permissions of certain configuration files for a program. Running a graphical applications as <systemitem class="username">root</systemitem> in general is not a good idea, but using &tdesu; will always be your safest bet with it.</para>
 
 <!-- Add links to "further reading" here -->
 <itemizedlist>
 <title>Related Information</title>
-<listitem><para><ulink url="help:kdesu">&kdesu; Handbook</ulink></para>
+<listitem><para><ulink url="help:tdesu">&tdesu; Handbook</ulink></para>
 </listitem>
 </itemizedlist>
 
diff --git a/doc/userguide/kde-for-admins.docbook b/doc/userguide/kde-for-admins.docbook
index f5d98e019..6424ea965 100644
--- a/doc/userguide/kde-for-admins.docbook
+++ b/doc/userguide/kde-for-admins.docbook
@@ -833,22 +833,22 @@ are two very important lines in the <filename>startkde</filename>
 script:</para>
 
 <programlisting>
-LD_BIND_NOW=true kdeinit +kcminit +knotify and kwrapper
+LD_BIND_NOW=true tdeinit +kcminit +knotify and kwrapper
 ksmserver $KDEWM
 </programlisting>
 
-<para>The first line starts the <command>kdeinit</command> master process.
-The <command>kdeinit</command> master process is used to start all other
+<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
-<option>aux</option></command> as <computeroutput>kdeinit:
-Running...</computeroutput>. The arguments after <command>kdeinit</command>
+<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>
-indicates that <command>kdeinit</command> needs to wait till the process has
-finished.  <command>kdeinit</command> also starts
+indicates that <command>tdeinit</command> needs to wait till the process has
+finished.  <command>tdeinit</command> also starts
 <command>dcopserver</command>, <command>klauncher</command> and
 <command>kded</command>.</para>
 
-<para>The second of the two lines asks <command>kdeinit</command> to start
+<para>The second of the two lines asks <command>tdeinit</command> to start
 the <command>ksmserver</command> session manager process.  The session
 manager determines the lifetime of the session. When this process exits, the
 user is logged out.</para>
@@ -910,18 +910,18 @@ needed</para>
 
 </variablelist>
 
-<sect2 id="kdeinit">
-<title><command>kdeinit</command></title>
-<para><command>kdeinit</command> is used to start all other &kde;
-programs. <command>kdeinit</command> can start normal binary program files
-as well as <command>kdeinit</command> loadable modules
+<sect2 id="tdeinit">
+<title><command>tdeinit</command></title>
+<para><command>tdeinit</command> is used to start all other &kde;
+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
 program files but can be started more efficiently.  <acronym>KLM</acronym>s
 live in <filename
 class="directory">$<envar>KDEDIR</envar>/lib/trinity</filename></para>
 
 <para>The drawback is that programs started this way appear as
-<computeroutput><command>kdeinit</command></computeroutput> in the output of
+<computeroutput><command>tdeinit</command></computeroutput> in the output of
 <command>top</command> and <command>ps</command>. Use <command>top
 <option>-c</option></command> or <command>ps <option>aux</option></command>
 to see the actual program name:</para>
@@ -929,20 +929,20 @@ to see the actual program name:</para>
 <screen>
 <prompt>%</prompt><userinput><command>ps <option>aux</option></command></userinput>
 <computeroutput>
-waba     23184  0.2  2.1 23428 11124 ?	S    21:41   0:00 kdeinit: Running...
-waba     23187  0.1  2.1 23200 11124 ?	S    21:41   0:00 kdeinit: dcopserver --nosid
-waba     23189  0.2  2.4 25136 12496 ?	S    21:41   0:00 kdeinit: klauncher
-waba     23192  0.7  2.8 25596 14772 ?	S    21:41   0:00 kdeinit: kded
-waba     23203  0.8  3.4 31516 17892 ?	S    21:41   0:00 kdeinit:
+waba     23184  0.2  2.1 23428 11124 ?	S    21:41   0:00 tdeinit: Running...
+waba     23187  0.1  2.1 23200 11124 ?	S    21:41   0:00 tdeinit: dcopserver --nosid
+waba     23189  0.2  2.4 25136 12496 ?	S    21:41   0:00 tdeinit: klauncher
+waba     23192  0.7  2.8 25596 14772 ?	S    21:41   0:00 tdeinit: kded
+waba     23203  0.8  3.4 31516 17892 ?	S    21:41   0:00 tdeinit:
 knotify
 </computeroutput>
 </screen>
 
-<para><computeroutput>kdeinit: Running...</computeroutput> indicates the
-master <command>kdeinit</command> process. The other processes listed are
+<para><computeroutput>tdeinit: Running...</computeroutput> indicates the
+master <command>tdeinit</command> process. The other processes listed are
 programs started as <acronym>KLM</acronym>s.</para>
 
-<para>When <command>kdeinit</command> starts for the first time it will
+<para>When <command>tdeinit</command> starts for the first time it will
 launch <command>dcopserver</command>, <command>klauncher</command>, and
 <command>kded</command>, as well as any additional programs specified on its
 command line in the <command>startkde</command> script, normally
@@ -1019,7 +1019,7 @@ startup problems.</para>
 
 <para><command>klauncher</command> is a daemon which is responsible for
 service activation within &kde;. It operates in close connection with the
-<command>kdeinit</command> master process to start new processes. &kde;
+<command>tdeinit</command> master process to start new processes. &kde;
 applications communicate with <command>klauncher</command> over &DCOP; in
 order to start new applications or services.</para>
 
@@ -1029,7 +1029,7 @@ either indicates a serious problem with the <command>dcopserver</command> or
 that <command>klauncher</command> crashed.</para>
 
 <para><command>klauncher</command> can be restarted by restarting
-<command>kdeinit</command> from a console window. Make sure that
+<command>tdeinit</command> from a console window. Make sure that
 $<envar>HOME</envar>, $<envar>DISPLAY</envar> and the various
 $<envar>KDEDIR(S)</envar> are set correctly when doing so!</para>
 
@@ -1205,7 +1205,7 @@ on a multi-head system.</para>
 <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
-<command>klauncher</command>/<command>kdeinit</command>. This option is
+<command>klauncher</command>/<command>tdeinit</command>. This option is
 useful if the <acronym>KIO</acronym>-slave should run in the same
 environment as the application. This can be the case with
 <application>Clearcase</application>.</para>
@@ -1228,7 +1228,7 @@ lookups.</para>
 <varlistentry><term>$<envar>KDE_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
-<command>kdeinit</command>.</para>
+<command>tdeinit</command>.</para>
 </listitem>
 </varlistentry>
 
@@ -1243,7 +1243,7 @@ locale.</para>
 (Since &kde; 3.2)  Automatically set to true by &kde; 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; &kdesu; does that, it's also useful for
+after being closed (&eg; &tdesu; does that, it's also useful for
 debugging).</para>
 </listitem>
 </varlistentry>
@@ -1314,21 +1314,21 @@ $<envar>KDEDIRS</envar> and profiles as well. Used by <literal role="extension">
 
 </sect1>
 
-<sect1 id="the-kdeinit-mystery">
-<title>The kdeinit Mystery</title>
+<sect1 id="the-tdeinit-mystery">
+<title>The tdeinit Mystery</title>
 
 <!-- FIXME: Add more words. Fix markup -->
 
-<para><command>kdeinit</command> is used to start all other &kde;
-programs. <command>kdeinit</command> can start normal binary program f iles
-as well as <command>kdeinit</command> loadable modules
+<para><command>tdeinit</command> is used to start all other &kde;
+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
 program files but can be started more efficiently.  <acronym>KLM</acronym>s
 live in <filename
 class="directory">$<envar>KDEDIR</envar>/lib/trinity</filename></para>
 
 <para>The drawback is that programs started this way appear as
-<computeroutput><command>kdeinit</command></computeroutput> in the
+<computeroutput><command>tdeinit</command></computeroutput> in the
 output of <command>top</command> and <command>ps</command>. Use
 <command>top <option>-c</option></command> or <command>ps
 <option>aux</option></command> to see the actual program name:</para>
@@ -1336,14 +1336,14 @@ output of <command>top</command> and <command>ps</command>. Use
 <screen>
 <prompt>%</prompt> <userinput><command>ps aux | grep bastian</command></userinput>
 <computeroutput>
-bastian  26061  0.0  2.2 24284 11492 ?       S    21:27   0:00 kdeinit: Running...
-bastian  26064  0.0  2.2 24036 11524 ?       S    21:27   0:00 kdeinit: dcopserver
-bastian  26066  0.1  2.5 26056 12988 ?       S    21:27   0:00 kdeinit: klauncher
-bastian  26069  0.4  3.2 27356 16744 ?       S    21:27   0:00 kdeinit: kded
-bastian  26161  0.2  2.7 25344 14096 ?       S    21:27   0:00 kdeinit: ksmserver
-bastian  26179  1.1  3.4 29716 17812 ?       S    21:27   0:00 kdeinit: kicker
-bastian  26192  0.4  3.0 26776 15452 ?       S    21:27   0:00 kdeinit: klipper
-bastian  26195  1.0  3.5 29200 18368 ?       S    21:27   0:00 kdeinit: kdesktop
+bastian  26061  0.0  2.2 24284 11492 ?       S    21:27   0:00 tdeinit: Running...
+bastian  26064  0.0  2.2 24036 11524 ?       S    21:27   0:00 tdeinit: dcopserver
+bastian  26066  0.1  2.5 26056 12988 ?       S    21:27   0:00 tdeinit: klauncher
+bastian  26069  0.4  3.2 27356 16744 ?       S    21:27   0:00 tdeinit: kded
+bastian  26161  0.2  2.7 25344 14096 ?       S    21:27   0:00 tdeinit: ksmserver
+bastian  26179  1.1  3.4 29716 17812 ?       S    21:27   0:00 tdeinit: kicker
+bastian  26192  0.4  3.0 26776 15452 ?       S    21:27   0:00 tdeinit: klipper
+bastian  26195  1.0  3.5 29200 18368 ?       S    21:27   0:00 tdeinit: kdesktop
 </computeroutput>
 </screen>
 <para>As you might have noticed, this has another side effect, making it
@@ -1353,7 +1353,7 @@ difficult to kill a process that is causing trouble:</para>
 <computeroutput>kdesktop: no process killed</computeroutput></screen>
 
 <para>You might be tempted to try <userinput><command>killall
-kdeinit</command></userinput>, but killing all kdeinit processes will have
+tdeinit</command></userinput>, but killing all tdeinit processes will have
 the effect of shutting down all of &kde;. In effect, total
 destruction!</para>
 
diff --git a/doc/userguide/konsole-intro.docbook b/doc/userguide/konsole-intro.docbook
index d42b4f59a..ec168ac22 100644
--- a/doc/userguide/konsole-intro.docbook
+++ b/doc/userguide/konsole-intro.docbook
@@ -81,8 +81,8 @@ 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
-class="username">root</systemitem> privileges,  you can use the &kdesu; command with the <option>-c</option> switch
-from the command line like this: <userinput><command>kdesu</command>
+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
 passwords.</para>