Rename a number of libraries and executables to avoid conflicts with KDE4

8 files changed, 8 insertions, 8 deletions

diff --git a/doc/kcontrol/filemanager/index.docbook b/doc/kcontrol/filemanager/index.docbook
index a9aa9ab5a..26cc11ac5 100644
--- a/doc/kcontrol/filemanager/index.docbook
+++ b/doc/kcontrol/filemanager/index.docbook
@@ -29,7 +29,7 @@
 &konqueror;'s file manager functionality.</para>
 
 <note><para>&konqueror;'s web browser functionality has its <ulink
-url="help:/kcontrol/khtml/index.html">own configuration
+url="help:/kcontrol/tdehtml/index.html">own configuration
 modules</ulink>.</para></note>
 
 <sect2 id="fileman-use">
diff --git a/doc/kcontrol/kcmcss/index.docbook b/doc/kcontrol/kcmcss/index.docbook
index 113c2fe19..8560fa8a7 100644
--- a/doc/kcontrol/kcmcss/index.docbook
+++ b/doc/kcontrol/kcmcss/index.docbook
@@ -45,7 +45,7 @@ tuned for accessibility purposes, especially for people with reduced
 vision.</para>
 
 <para>Your choices here affect every &tde; application that renders HTML
-with &tde;'s own renderer, which is called khtml.  These include
+with &tde;'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>
 
diff --git a/doc/kcontrol/khtml/Makefile.am b/doc/kcontrol/khtml/Makefile.am
deleted file mode 100644
index c54c99e96..000000000
--- a/doc/kcontrol/khtml/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_LANG = en
-KDE_DOCS = kcontrol/khtml
diff --git a/doc/kcontrol/spellchecking/index.docbook b/doc/kcontrol/spellchecking/index.docbook
index 813aba96a..2893d750b 100644
--- a/doc/kcontrol/spellchecking/index.docbook
+++ b/doc/kcontrol/spellchecking/index.docbook
@@ -30,7 +30,7 @@
 <title>Spell Checker</title>
 
 <para>The configuration options available here are used by all &tde;
-applications that use &kspell;, which is a front end to
+applications that use &tdespell;, which is a front end to
 <command>ispell</command> or <command>aspell</command>.</para>
 
 <variablelist>
@@ -57,7 +57,7 @@ error.</para></listitem>
 <term><guilabel>Dictionary:</guilabel></term>
 <listitem>
 <para>Choose from the available dictionaries, which one to use for
-&kspell;.</para>
+&tdespell;.</para>
 </listitem>
 </varlistentry>
 
diff --git a/doc/kcontrol/khtml/CMakeLists.txt b/doc/kcontrol/tdehtml/CMakeLists.txt
index dda61f78d..b7e6bb6b7 100644
--- a/doc/kcontrol/khtml/CMakeLists.txt
+++ b/doc/kcontrol/tdehtml/CMakeLists.txt
@@ -9,4 +9,4 @@
 #
 #################################################
 
-tde_create_handbook( DESTINATION kcontrol/khtml )
+tde_create_handbook( DESTINATION kcontrol/tdehtml )
diff --git a/doc/kcontrol/tdehtml/Makefile.am b/doc/kcontrol/tdehtml/Makefile.am
new file mode 100644
index 000000000..07d632f49
--- /dev/null
+++ b/doc/kcontrol/tdehtml/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = kcontrol/tdehtml
diff --git a/doc/kcontrol/khtml/index.docbook b/doc/kcontrol/tdehtml/index.docbook
index 386df55fd..b8df24598 100644
--- a/doc/kcontrol/khtml/index.docbook
+++ b/doc/kcontrol/tdehtml/index.docbook
@@ -305,7 +305,7 @@ creates one.</para>
 
 </sect2>
 
-<sect2 id="khtml-adblock">
+<sect2 id="tdehtml-adblock">
 <title>AdBlocK</title>
 
 <para>&konqueror; AdBlocK can be configured to replace or remove
diff --git a/doc/kcontrol/khtml/nsplugin.docbook b/doc/kcontrol/tdehtml/nsplugin.docbook
index 958a8f1a1..958a8f1a1 100644
--- a/doc/kcontrol/khtml/nsplugin.docbook
+++ b/doc/kcontrol/tdehtml/nsplugin.docbook