Additional k => tde renaming and fixes

25 files changed, 81 insertions, 81 deletions

diff --git a/tde-i18n-en_GB/docs/tdebase/faq/filemng.docbook b/tde-i18n-en_GB/docs/tdebase/faq/filemng.docbook
index fcc7e1d9e10..b4c08665d1b 100644
--- a/tde-i18n-en_GB/docs/tdebase/faq/filemng.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/faq/filemng.docbook
@@ -314,7 +314,7 @@
 > is set to <guilabel
 >Show file in embedded viewer</guilabel
 >, and that <guilabel
->KHTML (khtml)</guilabel
+>TDEHTML (tdehtml)</guilabel
 > is at the top of <guilabel
 >Services Preference Order.</guilabel
 ></para
diff --git a/tde-i18n-en_GB/docs/tdebase/glossary/index.docbook b/tde-i18n-en_GB/docs/tdebase/glossary/index.docbook
index 719ae126ef3..2d690b502df 100644
--- a/tde-i18n-en_GB/docs/tdebase/glossary/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/glossary/index.docbook
@@ -34,10 +34,10 @@
 >&kde;</glossseealso
 > </glossdef>
 		</glossentry>
-		<glossentry id="gloss-kio">
+		<glossentry id="gloss-tdeio">
 			<glossterm
 ><acronym
->KIO</acronym
+>TDEIO</acronym
 ></glossterm>
 			<glossdef
 ><para
@@ -54,7 +54,7 @@
 >&kde;</glossseealso
 > </glossdef>
 		</glossentry>
-		<glossentry id="gloss-kparts">
+		<glossentry id="gloss-tdeparts">
 			<glossterm
 >KParts</glossterm>
 			<glossdef
@@ -64,7 +64,7 @@
 >&konqueror;</glossseealso>
 			</glossdef>
 		</glossentry>
-		<glossentry id="gloss-ksycoca">
+		<glossentry id="gloss-tdesycoca">
 			<glossterm
 ><acronym
 >KSycoca</acronym
@@ -81,7 +81,7 @@
 >Ca</emphasis
 >che) is a configuration cache which, for example, guarantees fast access to the menu entries.</para>
 				<glossseealso 
-otherterm="gloss-kbuildsycoca"
+otherterm="gloss-tdebuildsycoca"
 ><application
 >KBuildSycoca</application
 ></glossseealso>
@@ -121,7 +121,7 @@ otherterm="gloss-kbuildsycoca"
 	<glossdiv id="glossdiv-applications">
 		<title
 >Applications</title>
-		<glossentry id="gloss-kbuildsycoca">
+		<glossentry id="gloss-tdebuildsycoca">
 			<glossterm
 ><application
 >KBuildSycoca</application
@@ -133,7 +133,7 @@ otherterm="gloss-kbuildsycoca"
 > is a command line program and regenerates the so-called <acronym
 >KSycoca</acronym
 >. This is useful, for example, if some or all modules in &kcontrol; are missing.</para>
-<glossseealso otherterm="gloss-ksycoca"
+<glossseealso otherterm="gloss-tdesycoca"
 ><acronym
 >KSycoca</acronym
 ></glossseealso
diff --git a/tde-i18n-en_GB/docs/tdebase/glossary/tdeprintingglossary.docbook b/tde-i18n-en_GB/docs/tdebase/glossary/tdeprintingglossary.docbook
index 1637c8915b9..17b6ddb88ac 100644
--- a/tde-i18n-en_GB/docs/tdebase/glossary/tdeprintingglossary.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/glossary/tdeprintingglossary.docbook
@@ -966,13 +966,13 @@
 
                 <glossentry id="gloss-printtdeioslave">
                         <glossterm
->print:/ KIO Slave</glossterm>
+>print:/ TDEIO Slave</glossterm>
                         <glossdef
 ><para
 >You can use a syntax of "print:/..." to get quick access to TDEPrint resources. Typing "print:/manager" as a Konqueror URL address gives administrative access to TDEPrint. Konqueror uses &kde;'s famous "KParts" technology to achieve that. </para>
 <glossseealso otherterm="gloss-ioslave"
 >IO Slave</glossseealso
-> <glossseealso otherterm="gloss-kparts"
+> <glossseealso otherterm="gloss-tdeparts"
 >KParts</glossseealso
 > </glossdef>
                 </glossentry>
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/filemanager/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/filemanager/index.docbook
index 7acd2c6d6b2..91d669d56e7 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/filemanager/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/filemanager/index.docbook
@@ -52,7 +52,7 @@
 
 <note
 ><para
->&konqueror;'s web browser functionality has its <ulink url="help:/kcontrol/khtml/index.html"
+>&konqueror;'s web browser functionality has its <ulink url="help:/kcontrol/tdehtml/index.html"
 >own configuration modules</ulink
 >.</para
 ></note>
@@ -217,7 +217,7 @@
 >Download Dialogue Box</screeninfo>
   <mediaobject>
   <imageobject
-><imagedata fileref="kfileman2.png"
+><imagedata fileref="tdefileman2.png"
  format="PNG"/></imageobject>
   <textobject
 > <phrase
@@ -240,7 +240,7 @@
 >Download Dialogue Box</screeninfo>
   <mediaobject>
   <imageobject
-><imagedata fileref="kfileman1.png"
+><imagedata fileref="tdefileman1.png"
  format="PNG"/></imageobject>
   <textobject
 ><phrase
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmcss/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmcss/index.docbook
index 5c7c78b8029..34b33d4c1d7 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmcss/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/kcmcss/index.docbook
@@ -73,7 +73,7 @@
 >&kde; can use its own stylesheet, based on simple defaults and the colour scheme you are using for your desktop. &kde; can also use a stylesheet that you have written yourself. Finally, you can specify a stylesheet in this module. The options presented in this module are tuned for accessibility purposes, especially for people with reduced vision.</para>
 
 <para
->Your choices here affect every &kde; application that renders HTML with &kde;'s own renderer, which is called khtml. These include &kmail;, &khelpcenter; and of course &konqueror;. Choices here do not affect other browsers such as &Netscape;.</para>
+>Your choices here affect every &kde; application that renders HTML with &kde;'s own renderer, which is called tdehtml. These include &kmail;, &khelpcenter; and of course &konqueror;. Choices here do not affect other browsers such as &Netscape;.</para>
 
 <para
 >The module has two pages, <guilabel
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/tdehtml/Makefile.am b/tde-i18n-en_GB/docs/tdebase/kcontrol/tdehtml/Makefile.am
index 18dbdeb9f43..dc8a8c9c033 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/tdehtml/Makefile.am
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/tdehtml/Makefile.am
@@ -1,4 +1,4 @@
 KDE_LANG = en_GB
 SUBDIRS = $(AUTODIRS)
-KDE_DOCS = kcontrol/khtml
+KDE_DOCS = kcontrol/tdehtml
 KDE_MANS = AUTO
diff --git a/tde-i18n-en_GB/docs/tdebase/kcontrol/tdehtml/index.docbook b/tde-i18n-en_GB/docs/tdebase/kcontrol/tdehtml/index.docbook
index 315599da5f1..4c7deb25248 100644
--- a/tde-i18n-en_GB/docs/tdebase/kcontrol/tdehtml/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kcontrol/tdehtml/index.docbook
@@ -237,11 +237,11 @@ use iso8859-1</para>
 
 <para
 ><guilabel
->Use KIO</guilabel
+>Use TDEIO</guilabel
 > will cause the <acronym
 >JVM</acronym
 >to use &kde;'s own <acronym
->KIO</acronym
+>TDEIO</acronym
 > transports for network connections.</para>
 
 <para
diff --git a/tde-i18n-en_GB/docs/tdebase/kicker/index.docbook b/tde-i18n-en_GB/docs/tdebase/kicker/index.docbook
index 7b0bfe2175f..7f9cb31571d 100644
--- a/tde-i18n-en_GB/docs/tdebase/kicker/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kicker/index.docbook
@@ -2404,7 +2404,7 @@ format="PNG"/></imageobject
 <answer>
 <para
 >Your menu entries may be mixed up for some reason. Simply run <command
->kbuildsycoca</command
+>tdebuildsycoca</command
 > on a commandline. </para>
 </answer>
 </qandaentry>
diff --git a/tde-i18n-en_GB/docs/tdebase/kinfocenter/samba/index.docbook b/tde-i18n-en_GB/docs/tdebase/kinfocenter/samba/index.docbook
index e7a4350478f..c636e2c010c 100644
--- a/tde-i18n-en_GB/docs/tdebase/kinfocenter/samba/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kinfocenter/samba/index.docbook
@@ -286,7 +286,7 @@
 ></listitem>
 <listitem
 ><para
->Conversion to kcmodule, added tab pages 2,3,4, bug fixed:</para>
+>Conversion to tdecmodule, added tab pages 2,3,4, bug fixed:</para>
 <para
 >&Alexander.Neundorf; &Alexander.Neundorf.mail;</para
 ></listitem>
diff --git a/tde-i18n-en_GB/docs/tdebase/konqueror/browser.docbook b/tde-i18n-en_GB/docs/tdebase/konqueror/browser.docbook
index 922d4b7e141..1590932907e 100644
--- a/tde-i18n-en_GB/docs/tdebase/konqueror/browser.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/konqueror/browser.docbook
@@ -559,9 +559,9 @@ OverridePorts=CommaSeparatedListOfAllowedPorts
 </userinput
 ></screen
 > to <filename
->$TDEDIR/share/config/kio_httprc </filename
+>$TDEDIR/share/config/tdeio_httprc </filename
 > or <filename
->~/.trinity/share/config/kio_httprc</filename
+>~/.trinity/share/config/tdeio_httprc</filename
 >.</para>
 <para
 >For example <screen
@@ -572,7 +572,7 @@ OverridePorts=CommaSeparatedListOfAllowedPorts
 > (it should not include any embedded spaces).</para>
 <para
 >&konqueror; will reject the following ports (the list is hardcoded in <filename
->tdelibs/kio/kio/job.cpp</filename
+>tdelibs/tdeio/tdeio/job.cpp</filename
 >):</para>
 <para
 >1, 7, 9, 11, 13, 15, 17, 19, 20, 21, 22, 23, 25, 37, 42, 43, 53, 77, 79, 87, 95, 101, 102, 103, 104, 109, 110, 111, 113, 115, 117, 119, 123, 135, 139, 143, 179, 389, 512, 513, 514, 515, 526, 530, 531, 532, 540, 556, 587, 601, 989, 990, 992, 993, 995, 1080, 2049, 4045, 6000, 6667 </para>
diff --git a/tde-i18n-en_GB/docs/tdebase/konqueror/config.docbook b/tde-i18n-en_GB/docs/tdebase/konqueror/config.docbook
index d964a7037e1..473ab9af051 100644
--- a/tde-i18n-en_GB/docs/tdebase/konqueror/config.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/konqueror/config.docbook
@@ -77,7 +77,7 @@
 ></menuchoice
 > option, which brings up the <guilabel
 >Configure Toolbars</guilabel
-> dialogue box. The Main and Extra Toolbars are divided into sections, such as Main Toolbar &lt;&konqueror;&gt;, Main Toolbar &lt;khtmlpart&gt; and Extra Toolbar &lt;khtmlsettingsplugin&gt;. The number and type of these sections will depend on whether &konqueror; is in Web Browser or File Manager mode and whether you have &konqueror; plugins installed.</para>
+> dialogue box. The Main and Extra Toolbars are divided into sections, such as Main Toolbar &lt;&konqueror;&gt;, Main Toolbar &lt;tdehtmlpart&gt; and Extra Toolbar &lt;tdehtmlsettingsplugin&gt;. The number and type of these sections will depend on whether &konqueror; is in Web Browser or File Manager mode and whether you have &konqueror; plugins installed.</para>
 
 </sect1>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/ksplashml/index.docbook b/tde-i18n-en_GB/docs/tdebase/ksplashml/index.docbook
index feecfb86a24..7308d911061 100644
--- a/tde-i18n-en_GB/docs/tdebase/ksplashml/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/ksplashml/index.docbook
@@ -1273,13 +1273,13 @@ theme_DATA = Theme.rc Preview.png
 >#include &lt;qlabel.h&gt;
 #include &lt;qwidget.h&gt;
 
-#include &lt;kapplication.h&gt;
-#include &lt;kconfig.h&gt;
+#include &lt;tdeapplication.h&gt;
+#include &lt;tdeconfig.h&gt;
 #include &lt;kdebug.h&gt;
 #include &lt;kdialogbase.h&gt;
 #include &lt;kgenericfactory.h&gt;
-#include &lt;kglobalsettings.h&gt;
-#include &lt;klocale.h&gt;
+#include &lt;tdeglobalsettings.h&gt;
+#include &lt;tdelocale.h&gt;
 #include &lt;ksplash/objkstheme.h&gt;
 #include &lt;kstandarddirs.h&gt;
 
diff --git a/tde-i18n-en_GB/docs/tdebase/kxkb/index.docbook b/tde-i18n-en_GB/docs/tdebase/kxkb/index.docbook
index 85a87c51593..227f8914731 100644
--- a/tde-i18n-en_GB/docs/tdebase/kxkb/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kxkb/index.docbook
@@ -102,7 +102,7 @@
 > or by opening <application
 >Control Centre</application
 > and selecting Localisation/Keyboard Layout. Alternatively, you can start it by typing <command
->kcmshell keyboard_layout</command
+>tdecmshell keyboard_layout</command
 > in a terminal.</para>
 
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/audiocd.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/audiocd.docbook
index 6e0519b2109..10008a8b8c7 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/audiocd.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/audiocd.docbook
@@ -284,7 +284,7 @@
 >/dev/sg1</filename
 >, &etc;. If it still doesn't work, try typing <userinput
 >audiocd:/?device=/dev/sg0</userinput
-> (or similar) to tell kio_audiocd which device your &CD-ROM; is.</para
+> (or similar) to tell tdeio_audiocd which device your &CD-ROM; is.</para
 > 
 </answer>
 </qandaentry>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/index.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/index.docbook
index 8984fcd7701..391ecd32b1e 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/index.docbook
@@ -1,46 +1,46 @@
 <?xml version="1.0" ?>
 <!DOCTYPE part PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" 
 "dtd/kdex.dtd" [
-<!ENTITY kio-bzip SYSTEM "bzip.docbook">
-<!ENTITY kio-bzip2 SYSTEM "bzip2.docbook">
-<!ENTITY kio-cgi SYSTEM "cgi.docbook">
-<!ENTITY kio-data SYSTEM "data.docbook">
-<!ENTITY kio-file SYSTEM "file.docbook">
-<!ENTITY kio-finger SYSTEM "finger.docbook">
-<!ENTITY kio-fish SYSTEM "fish.docbook">
-<!ENTITY kio-floppy SYSTEM "floppy.docbook">
-<!ENTITY kio-ftp SYSTEM "ftp.docbook">
-<!ENTITY kio-gopher SYSTEM "gopher.docbook">
-<!ENTITY kio-gzip SYSTEM "gzip.docbook">
-<!ENTITY kio-help SYSTEM "help.docbook">
-<!ENTITY kio-http SYSTEM "http.docbook">
-<!ENTITY kio-https SYSTEM "https.docbook">
-<!ENTITY kio-imap SYSTEM "imap.docbook">
-<!ENTITY kio-imaps SYSTEM "imaps.docbook">
-<!ENTITY kio-info SYSTEM "info.docbook">
-<!ENTITY kio-lan SYSTEM "lan.docbook">
-<!ENTITY kio-ldap SYSTEM "ldap.docbook">
-<!ENTITY kio-mailto SYSTEM "mailto.docbook">
-<!ENTITY kio-mac SYSTEM "mac.docbook">
-<!ENTITY kio-man SYSTEM "man.docbook">
-<!ENTITY kio-mrml SYSTEM "mrml.docbook"
+<!ENTITY tdeio-bzip SYSTEM "bzip.docbook">
+<!ENTITY tdeio-bzip2 SYSTEM "bzip2.docbook">
+<!ENTITY tdeio-cgi SYSTEM "cgi.docbook">
+<!ENTITY tdeio-data SYSTEM "data.docbook">
+<!ENTITY tdeio-file SYSTEM "file.docbook">
+<!ENTITY tdeio-finger SYSTEM "finger.docbook">
+<!ENTITY tdeio-fish SYSTEM "fish.docbook">
+<!ENTITY tdeio-floppy SYSTEM "floppy.docbook">
+<!ENTITY tdeio-ftp SYSTEM "ftp.docbook">
+<!ENTITY tdeio-gopher SYSTEM "gopher.docbook">
+<!ENTITY tdeio-gzip SYSTEM "gzip.docbook">
+<!ENTITY tdeio-help SYSTEM "help.docbook">
+<!ENTITY tdeio-http SYSTEM "http.docbook">
+<!ENTITY tdeio-https SYSTEM "https.docbook">
+<!ENTITY tdeio-imap SYSTEM "imap.docbook">
+<!ENTITY tdeio-imaps SYSTEM "imaps.docbook">
+<!ENTITY tdeio-info SYSTEM "info.docbook">
+<!ENTITY tdeio-lan SYSTEM "lan.docbook">
+<!ENTITY tdeio-ldap SYSTEM "ldap.docbook">
+<!ENTITY tdeio-mailto SYSTEM "mailto.docbook">
+<!ENTITY tdeio-mac SYSTEM "mac.docbook">
+<!ENTITY tdeio-man SYSTEM "man.docbook">
+<!ENTITY tdeio-mrml SYSTEM "mrml.docbook"
 > <!-- post release, put this in the right module -->
-<!ENTITY kio-news SYSTEM "news.docbook">
-<!ENTITY kio-nfs SYSTEM "nfs.docbook">
-<!ENTITY kio-nntp SYSTEM "nntp.docbook">
-<!ENTITY kio-pop3 SYSTEM "pop3.docbook">
-<!ENTITY kio-pop3s SYSTEM "pop3s.docbook">
-<!ENTITY kio-print SYSTEM "print.docbook">
-<!ENTITY kio-rlan SYSTEM "rlan.docbook">
-<!ENTITY kio-rlogin SYSTEM "rlogin.docbook">
-<!ENTITY kio-sftp SYSTEM "sftp.docbook">
-<!ENTITY kio-smb SYSTEM "smb.docbook">
-<!ENTITY kio-smtp SYSTEM "smtp.docbook">
-<!ENTITY kio-tar SYSTEM "tar.docbook">
-<!ENTITY kio-telnet SYSTEM "telnet.docbook">
-<!ENTITY kio-thumbnail SYSTEM "thumbnail.docbook">
-<!ENTITY kio-webdav SYSTEM "webdav.docbook">
-<!ENTITY kio-webdavs SYSTEM "webdavs.docbook">
+<!ENTITY tdeio-news SYSTEM "news.docbook">
+<!ENTITY tdeio-nfs SYSTEM "nfs.docbook">
+<!ENTITY tdeio-nntp SYSTEM "nntp.docbook">
+<!ENTITY tdeio-pop3 SYSTEM "pop3.docbook">
+<!ENTITY tdeio-pop3s SYSTEM "pop3s.docbook">
+<!ENTITY tdeio-print SYSTEM "print.docbook">
+<!ENTITY tdeio-rlan SYSTEM "rlan.docbook">
+<!ENTITY tdeio-rlogin SYSTEM "rlogin.docbook">
+<!ENTITY tdeio-sftp SYSTEM "sftp.docbook">
+<!ENTITY tdeio-smb SYSTEM "smb.docbook">
+<!ENTITY tdeio-smtp SYSTEM "smtp.docbook">
+<!ENTITY tdeio-tar SYSTEM "tar.docbook">
+<!ENTITY tdeio-telnet SYSTEM "telnet.docbook">
+<!ENTITY tdeio-thumbnail SYSTEM "thumbnail.docbook">
+<!ENTITY tdeio-webdav SYSTEM "webdav.docbook">
+<!ENTITY tdeio-webdavs SYSTEM "webdavs.docbook">
 <!ENTITY tdeprint "<application
 >TDEPrint</application
 >">
@@ -62,5 +62,5 @@
 <part lang="&language;">
 <title
 >IO-Slaves</title>
-&kio-bzip; &kio-bzip2; &kio-cgi; &kio-data; &kio-file; &kio-finger; &kio-fish; &kio-floppy; &kio-ftp; &kio-gopher; &kio-gzip; &kio-help; &kio-http; &kio-https; &kio-imap; &kio-imaps; &kio-info; &kio-lan; &kio-ldap; &kio-mailto; &kio-mac; &kio-man; &kio-mrml; &kio-news; &kio-nfs; &kio-nntp; &kio-pop3; &kio-pop3s; &kio-print; &kio-rlan; &kio-rlogin; &kio-sftp; &kio-smb; &kio-smtp; &kio-tar; &kio-telnet; &kio-thumbnail; &kio-webdav; &kio-webdavs; </part>
+&tdeio-bzip; &tdeio-bzip2; &tdeio-cgi; &tdeio-data; &tdeio-file; &tdeio-finger; &tdeio-fish; &tdeio-floppy; &tdeio-ftp; &tdeio-gopher; &tdeio-gzip; &tdeio-help; &tdeio-http; &tdeio-https; &tdeio-imap; &tdeio-imaps; &tdeio-info; &tdeio-lan; &tdeio-ldap; &tdeio-mailto; &tdeio-mac; &tdeio-man; &tdeio-mrml; &tdeio-news; &tdeio-nfs; &tdeio-nntp; &tdeio-pop3; &tdeio-pop3s; &tdeio-print; &tdeio-rlan; &tdeio-rlogin; &tdeio-sftp; &tdeio-smb; &tdeio-smtp; &tdeio-tar; &tdeio-telnet; &tdeio-thumbnail; &tdeio-webdav; &tdeio-webdavs; </part>
 
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/mac.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/mac.docbook
index 593c0331a43..5eba03e0941 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/mac.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/mac.docbook
@@ -39,7 +39,7 @@
 <para
 >Enter <userinput
 >mac:/</userinput
-> into &konqueror; and you should see the contents of your &MacOS; partition. If you have not used kio-mac before, you will probably get an error message saying you have not specified the right partition. Enter something like <userinput
+> into &konqueror; and you should see the contents of your &MacOS; partition. If you have not used tdeio-mac before, you will probably get an error message saying you have not specified the right partition. Enter something like <userinput
 >mac:/<option
 >?dev=/dev/hda2</option
 ></userinput
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/mrml.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/mrml.docbook
index 00d8753bd0a..d0cb42f3611 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/mrml.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/mrml.docbook
@@ -38,7 +38,7 @@
 > for more information. </para>
 
 <para
->kio_mrml is used for the Image Finding feature in &kde;</para>
+>tdeio_mrml is used for the Image Finding feature in &kde;</para>
 
 <para
 >&eg; type <userinput
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeioslave/thumbnail.docbook b/tde-i18n-en_GB/docs/tdebase/tdeioslave/thumbnail.docbook
index 6f78056ac7c..bc9d6f408d5 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeioslave/thumbnail.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeioslave/thumbnail.docbook
@@ -41,7 +41,7 @@
 >See the documentation in the sources for more information. You will find these at <filename
 >$<envar
 >TDEDIR</envar
->/include/kio/thumbcreator.h</filename
+>/include/tdeio/thumbcreator.h</filename
 > or in the source folder <filename class="directory"
 >tdebase/tdeioslave/thumbnail</filename
 ></para>
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeprint/highlights.docbook b/tde-i18n-en_GB/docs/tdebase/tdeprint/highlights.docbook
index 38e6cc497e8..9f2c2e1fae9 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeprint/highlights.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeprint/highlights.docbook
@@ -489,7 +489,7 @@
 > command. And in place of <command
 >kups</command
 > you will probably use <command
->kcmshell printmgr</command
+>tdecmshell printmgr</command
 > from now on. </para>
 
 <para
diff --git a/tde-i18n-en_GB/docs/tdebase/tdeprint/tech-overview.docbook b/tde-i18n-en_GB/docs/tdebase/tdeprint/tech-overview.docbook
index 026acc700ec..05bfbc915c4 100644
--- a/tde-i18n-en_GB/docs/tdebase/tdeprint/tech-overview.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/tdeprint/tech-overview.docbook
@@ -270,7 +270,7 @@ format="PNG"/></imageobject>
 >CLI</acronym
 >) type <userinput
 > <command
->kcmshell</command
+>tdecmshell</command
 > <option
 >printmgr</option
 ></userinput
diff --git a/tde-i18n-en_GB/docs/tdelibs/tdespell/index.docbook b/tde-i18n-en_GB/docs/tdelibs/tdespell/index.docbook
index 282b6740ae5..f02bbc27985 100644
--- a/tde-i18n-en_GB/docs/tdelibs/tdespell/index.docbook
+++ b/tde-i18n-en_GB/docs/tdelibs/tdespell/index.docbook
@@ -54,7 +54,7 @@
 <keyword
 >spelling</keyword>
 <keyword
->kspell</keyword>
+>tdespell</keyword>
 <keyword
 >ispell</keyword>
 <keyword
diff --git a/tde-i18n-en_GB/docs/tdepim/kmail/menus.docbook b/tde-i18n-en_GB/docs/tdepim/kmail/menus.docbook
index 4f73619de8d..1157641c3f5 100644
--- a/tde-i18n-en_GB/docs/tdepim/kmail/menus.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/kmail/menus.docbook
@@ -2847,7 +2847,7 @@ you to set up scanning messages for virusses.</para>
 </term>
 <listitem>
 <para
->Uses <ulink url="/kspell/"
+>Uses <ulink url="/tdespell/"
 >&tdespell;</ulink
 > to check the spelling in the body of your message. Note that you have to configure &tdespell; with <menuchoice
 ><guimenu
@@ -2929,7 +2929,7 @@ you to set up scanning messages for virusses.</para>
 </term>
 <listitem>
 <para
->Allows you to configure <ulink url="/kspell/"
+>Allows you to configure <ulink url="/tdespell/"
 >&tdespell;</ulink
 >, &kde;'s spellchecker.</para>
 </listitem>
diff --git a/tde-i18n-en_GB/docs/tdepim/kmail/using-kmail.docbook b/tde-i18n-en_GB/docs/tdepim/kmail/using-kmail.docbook
index 78a0b270823..9bbf43f48a7 100644
--- a/tde-i18n-en_GB/docs/tdepim/kmail/using-kmail.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/kmail/using-kmail.docbook
@@ -541,7 +541,7 @@
 > <guimenuitem
 >Spelling...</guimenuitem
 ></menuchoice
->. &kmail; uses <ulink url="/kspell/"
+>. &kmail; uses <ulink url="/tdespell/"
 >&tdespell;</ulink
 > to check spelling, which is the &kde; frontend to the <application
 >ispell</application
diff --git a/tde-i18n-en_GB/docs/tdesdk/kbabel/preferences.docbook b/tde-i18n-en_GB/docs/tdesdk/kbabel/preferences.docbook
index 4801aeae713..1e92e0dc2b1 100644
--- a/tde-i18n-en_GB/docs/tdesdk/kbabel/preferences.docbook
+++ b/tde-i18n-en_GB/docs/tdesdk/kbabel/preferences.docbook
@@ -791,8 +791,8 @@
 ></term>
     <listitem
 ><para
->Here you choose the encoding for your text. This option is passed to the spellchecker, and is used as the encoding for your words dictionary. See the <ulink url="help:/kspell"
->kspell</ulink
+>Here you choose the encoding for your text. This option is passed to the spellchecker, and is used as the encoding for your words dictionary. See the <ulink url="help:/tdespell"
+>tdespell</ulink
 > documentation for more details. </para
 ></listitem>
   </varlistentry>
diff --git a/tde-i18n-en_GB/docs/tdesdk/kbabel/using.docbook b/tde-i18n-en_GB/docs/tdesdk/kbabel/using.docbook
index ac3894831f7..9741d7ba9a6 100644
--- a/tde-i18n-en_GB/docs/tdesdk/kbabel/using.docbook
+++ b/tde-i18n-en_GB/docs/tdesdk/kbabel/using.docbook
@@ -969,7 +969,7 @@
 >. The number is set by selecting the name of a language, which uses the same number and <emphasis
 >rules</emphasis
 > for finding the right plural form. The up-to-date list of possible values can be found in the tdelibs source code, in the file <filename
->tdecore/klocale.cpp</filename
+>tdecore/tdelocale.cpp</filename
 >. </para>
 <para
 >&kde; plural forms are denoted by comment <userinput