Additional kde to tde renaming

12 files changed, 134 insertions, 134 deletions

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>[email protected]</email>
+<para>Please contact Michael Goffioul at <email>[email protected]</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>[email protected]</email></address>
+<address><email>[email protected]</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>[email protected]</email></para>
+<para>&tdeprint; copyright 2001, Michael Goffioul
+<email>[email protected]</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>