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

3 files changed, 9 insertions, 9 deletions

diff --git a/doc/userguide/groupware-kontact.docbook b/doc/userguide/groupware-kontact.docbook
index 445a26da5..8a1b81c00 100644
--- a/doc/userguide/groupware-kontact.docbook
+++ b/doc/userguide/groupware-kontact.docbook
@@ -242,7 +242,7 @@ class="username">groupware</systemitem> user (already previously
 done!)</para></step>
 
 <step><para>Create/configure an <acronym>IMAP</acronym> account in &kmail;
-for login as that user</para></step> <step><para>Use kresources to make
+for login as that user</para></step> <step><para>Use tderesources to make
 &kontact; components work with data taken from <acronym>IMAP</acronym>
 source</para></step>
 
@@ -336,7 +336,7 @@ slow data updates.</para>
 <para>Now we have to tell &kontact; to use <acronym>IMAP</acronym> as the
 data source for it's various components. From the &kmenu;, choose
 <guimenuitem>Run command</guimenuitem>, run <userinput><command>kcmshell
-kresources</command></userinput>. In the combo box select
+tderesources</command></userinput>. In the combo box select
 <guilabel>Contacts</guilabel>, then press the <guibutton>Add...</guibutton>
 button, and choose <guilabel>Addressbook on IMAP Server via KMail</guilabel>. Then select that new line and
 press <guibutton>Use as Standard</guibutton> button. Do the same for
diff --git a/doc/userguide/tde-for-admins.docbook b/doc/userguide/tde-for-admins.docbook
index 6a49a129a..872191714 100644
--- a/doc/userguide/tde-for-admins.docbook
+++ b/doc/userguide/tde-for-admins.docbook
@@ -858,7 +858,7 @@ also unique per X-server display. The processes are:</para>
 <varlistentry>
 <term><command>kded</command></term>
 <listitem><para>Generic service daemon.</para>
-<para>Triggers <link linkend="ksycoca">Sycoca</link> database updates when
+<para>Triggers <link linkend="tdesycoca">Sycoca</link> database updates when
 needed</para>
 </listitem>
 </varlistentry>
@@ -1819,14 +1819,14 @@ class="directory">$<envar>HOME</envar>/.trinity/share/applnk</filename>
 (user specific). This is observed unless the <literal role="extension">.desktop</literal> file has a  <varname>Categories</varname>= line. In that case the categories determine the location in the menu.</para>
 </sect2>
 
-<sect2 id="ksycoca">
+<sect2 id="tdesycoca">
 <title><application>KSycoca</application></title>
 <para><application>KSycoca</application> caches menu structure and
 information about all available applications. You can rebuild the
 database with
 <userinput><command>kbuildsycoca</command></userinput>. The database
 which is built lives in <filename
-class="directory">/var/tmp/tdecache-${<envar>USER</envar>}/ksycoca</filename>.
+class="directory">/var/tmp/tdecache-${<envar>USER</envar>}/tdesycoca</filename>.
 It is automatically updated by <application>KDED</application>,
 checked during &tde; login, and <application>KDED</application>
 watches for changes while logged in.</para>
@@ -1839,7 +1839,7 @@ CheckSycoca=false
 </programlisting>
 </para>
 
-<para>To force regeneration, run <userinput><command>touch $<envar>TDEDIR</envar>/share/services/update_ksycoca</command></userinput>.</para>
+<para>To force regeneration, run <userinput><command>touch $<envar>TDEDIR</envar>/share/services/update_tdesycoca</command></userinput>.</para>
 
 </sect2>
 
@@ -2031,7 +2031,7 @@ shell_access=false</screen>
 <para>Since this affects the &tde; menu and the available applications, we
 must force an update of the sycoca database:</para>
 
-<screen><userinput><command>touch</command> <filename>$<envar>TDEDIR</envar>/share/services/update_ksycoca</filename></userinput></screen>
+<screen><userinput><command>touch</command> <filename>$<envar>TDEDIR</envar>/share/services/update_tdesycoca</filename></userinput></screen>
 
 <para>Now re-login to &tde; and check the following points:</para>
 
@@ -2488,7 +2488,7 @@ KDebug
 MainApplication-Interface
 konsole (default)
 konsole-mainwindow#1
-ksycoca
+tdesycoca
 session-1
 session-2
 session-3
diff --git a/doc/userguide/tde-office.docbook b/doc/userguide/tde-office.docbook
index 73e4cc313..28e089b3d 100644
--- a/doc/userguide/tde-office.docbook
+++ b/doc/userguide/tde-office.docbook
@@ -128,7 +128,7 @@ actually use the OASIS OpenDocument file format.
 <!-- comment out for final commit before freeze
 <chapter id="tde-office-embedding">
 <title>Component Embedding</title>
-<sect1 id="tde-office-kparts">
+<sect1 id="tde-office-tdeparts">
 <title>KParts and &koffice;</title>
 <para>To be written</para>
 </sect1>