From de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:02:02 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 doc/kcontrol/filemanager/index.docbook   |   4 ++--
 doc/kcontrol/filemanager/kfileman1.png   | Bin 7883 -> 0 bytes
 doc/kcontrol/filemanager/kfileman2.png   | Bin 9224 -> 0 bytes
 doc/kcontrol/filemanager/tdefileman1.png | Bin 0 -> 7883 bytes
 doc/kcontrol/filemanager/tdefileman2.png | Bin 0 -> 9224 bytes
 doc/kcontrol/index.docbook               |   2 +-
 doc/kcontrol/proxy/index.docbook         |   2 +-
 7 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 doc/kcontrol/filemanager/kfileman1.png
 delete mode 100644 doc/kcontrol/filemanager/kfileman2.png
 create mode 100644 doc/kcontrol/filemanager/tdefileman1.png
 create mode 100644 doc/kcontrol/filemanager/tdefileman2.png

(limited to 'doc/kcontrol')

diff --git a/doc/kcontrol/filemanager/index.docbook b/doc/kcontrol/filemanager/index.docbook
index 26cc11ac5..110f3177f 100644
--- a/doc/kcontrol/filemanager/index.docbook
+++ b/doc/kcontrol/filemanager/index.docbook
@@ -155,7 +155,7 @@ download.</para>
 <screenshot>
   <screeninfo>Download Dialog Box</screeninfo>
   <mediaobject>
-  <imageobject><imagedata fileref="kfileman2.png"
+  <imageobject><imagedata fileref="tdefileman2.png"
  format="PNG"/></imageobject>
   <textobject> <phrase>Download Dialog Box</phrase> </textobject>
   <caption>
@@ -173,7 +173,7 @@ together under a single dialog box.</para>
 <screenshot>
   <screeninfo>Download Dialog Box</screeninfo>
   <mediaobject>
-  <imageobject><imagedata fileref="kfileman1.png"
+  <imageobject><imagedata fileref="tdefileman1.png"
  format="PNG"/></imageobject>
   <textobject><phrase>Download Dialog Box</phrase></textobject>
   <caption>
diff --git a/doc/kcontrol/filemanager/kfileman1.png b/doc/kcontrol/filemanager/kfileman1.png
deleted file mode 100644
index 0505d604d..000000000
Binary files a/doc/kcontrol/filemanager/kfileman1.png and /dev/null differ
diff --git a/doc/kcontrol/filemanager/kfileman2.png b/doc/kcontrol/filemanager/kfileman2.png
deleted file mode 100644
index 6c8d17d75..000000000
Binary files a/doc/kcontrol/filemanager/kfileman2.png and /dev/null differ
diff --git a/doc/kcontrol/filemanager/tdefileman1.png b/doc/kcontrol/filemanager/tdefileman1.png
new file mode 100644
index 000000000..0505d604d
Binary files /dev/null and b/doc/kcontrol/filemanager/tdefileman1.png differ
diff --git a/doc/kcontrol/filemanager/tdefileman2.png b/doc/kcontrol/filemanager/tdefileman2.png
new file mode 100644
index 000000000..6c8d17d75
Binary files /dev/null and b/doc/kcontrol/filemanager/tdefileman2.png differ
diff --git a/doc/kcontrol/index.docbook b/doc/kcontrol/index.docbook
index 0c8926797..f55b3e8e4 100644
--- a/doc/kcontrol/index.docbook
+++ b/doc/kcontrol/index.docbook
@@ -308,7 +308,7 @@ the control center.
 <title>Running Individual Modules</title>
 
 <para>
-You can run individual modules without running kcontrol using the command <command>kcmshell</command> from &konsole;. Type <userinput> <command>kcmshell</command><option> --list</option></userinput> to see a list of the available &kcontrolcenter; modules. You can also access individual &kcontrolcenter; modules through adding the <guilabel>Preferences</guilabel> button to either &kicker; or the &kmenu; through their respective configuration dialogs.
+You can run individual modules without running kcontrol using the command <command>tdecmshell</command> from &konsole;. Type <userinput> <command>tdecmshell</command><option> --list</option></userinput> to see a list of the available &kcontrolcenter; modules. You can also access individual &kcontrolcenter; modules through adding the <guilabel>Preferences</guilabel> button to either &kicker; or the &kmenu; through their respective configuration dialogs.
 </para>
 
 </sect1>
diff --git a/doc/kcontrol/proxy/index.docbook b/doc/kcontrol/proxy/index.docbook
index c69d27bc3..63a154eaa 100644
--- a/doc/kcontrol/proxy/index.docbook
+++ b/doc/kcontrol/proxy/index.docbook
@@ -172,7 +172,7 @@ ask for a username or password if it needs to.</para>
 <para>The other option is <guilabel>Use automatic login</guilabel>.
 Select this option if you have already set up a login entry for your
 proxy server in the
-<filename>$<envar>TDEDIR</envar>/share/config/kionetrc</filename>
+<filename>$<envar>TDEDIR</envar>/share/config/tdeionetrc</filename>
 file.</para>
 
 </sect2>
-- 
cgit v1.2.1