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

14 files changed, 21 insertions, 21 deletions

diff --git a/doc/knetworkconf/Makefile.am b/doc/knetworkconf/Makefile.am
deleted file mode 100644
index 01c1911..0000000
--- a/doc/knetworkconf/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-KDE_LANG = en
-KDE_DOCS = knetworkconf
-
-
diff --git a/doc/knetworkconf/01.png b/doc/knetwortdeconf/01.png
index 0e6bd6f..0e6bd6f 100644
--- a/doc/knetworkconf/01.png
+++ b/doc/knetwortdeconf/01.png
diff --git a/doc/knetworkconf/02.png b/doc/knetwortdeconf/02.png
index 2d41e65..2d41e65 100644
--- a/doc/knetworkconf/02.png
+++ b/doc/knetwortdeconf/02.png
diff --git a/doc/knetworkconf/03.png b/doc/knetwortdeconf/03.png
index 89dbf86..89dbf86 100644
--- a/doc/knetworkconf/03.png
+++ b/doc/knetwortdeconf/03.png
diff --git a/doc/knetworkconf/04.png b/doc/knetwortdeconf/04.png
index 9a80161..9a80161 100644
--- a/doc/knetworkconf/04.png
+++ b/doc/knetwortdeconf/04.png
diff --git a/doc/knetworkconf/05.png b/doc/knetwortdeconf/05.png
index c10457c..c10457c 100644
--- a/doc/knetworkconf/05.png
+++ b/doc/knetwortdeconf/05.png
diff --git a/doc/knetworkconf/06.png b/doc/knetwortdeconf/06.png
index 1dc2096..1dc2096 100644
--- a/doc/knetworkconf/06.png
+++ b/doc/knetwortdeconf/06.png
diff --git a/doc/knetworkconf/07.png b/doc/knetwortdeconf/07.png
index fee712e..fee712e 100644
--- a/doc/knetworkconf/07.png
+++ b/doc/knetwortdeconf/07.png
diff --git a/doc/knetworkconf/08.png b/doc/knetwortdeconf/08.png
index fc56293..fc56293 100644
--- a/doc/knetworkconf/08.png
+++ b/doc/knetwortdeconf/08.png
diff --git a/doc/knetworkconf/09.png b/doc/knetwortdeconf/09.png
index 3c834a8..3c834a8 100644
--- a/doc/knetworkconf/09.png
+++ b/doc/knetwortdeconf/09.png
diff --git a/doc/knetworkconf/11.png b/doc/knetwortdeconf/11.png
index 3ebffaf..3ebffaf 100644
--- a/doc/knetworkconf/11.png
+++ b/doc/knetwortdeconf/11.png
diff --git a/doc/knetwortdeconf/Makefile.am b/doc/knetwortdeconf/Makefile.am
new file mode 100644
index 0000000..19c4bed
--- /dev/null
+++ b/doc/knetwortdeconf/Makefile.am
@@ -0,0 +1,4 @@
+KDE_LANG = en
+KDE_DOCS = knetwortdeconf
+
+
diff --git a/doc/knetworkconf/about1.png b/doc/knetwortdeconf/about1.png
index f602d20..f602d20 100644
--- a/doc/knetworkconf/about1.png
+++ b/doc/knetwortdeconf/about1.png
diff --git a/doc/knetworkconf/index.docbook b/doc/knetwortdeconf/index.docbook
index 2483880..0858115 100644
--- a/doc/knetworkconf/index.docbook
+++ b/doc/knetwortdeconf/index.docbook
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY knetworkconf "<application>KNetworkConf</application>">
-  <!ENTITY kappname "&knetworkconf;">
+  <!ENTITY knetwortdeconf "<application>KNetworkConf</application>">
+  <!ENTITY kappname "&knetwortdeconf;">
   <!ENTITY package "tdeadmin">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
@@ -65,7 +65,7 @@ document.</revremark>
 <releaseinfo>1.0</releaseinfo>
 
 <abstract>
-<para>This manual explains how to install and use &knetworkconf;, a module for
+<para>This manual explains how to install and use &knetwortdeconf;, a module for
 &kcontrolcenter; that enables management of Network Interfaces, Routing and DNS
 properties.</para>
 </abstract>
@@ -86,9 +86,9 @@ integrated interface from which to manage a wide variety of system and
 desktop settings and preferences. &kcontrolcenter; can be started by selecting
 <menuchoice><guimenu>TDE Menu</guimenu><guimenuitem>&kcontrolcenter;</guimenuitem></menuchoice>.</para>
 
-<para>The &knetworkconf; package was developed to enable users to manage TCP/IP
+<para>The &knetwortdeconf; package was developed to enable users to manage TCP/IP
 networking settings in the same way they manage other system settings from
-&kcontrolcenter;. Tasks enabled by &knetworkconf; provide users with a simple
+&kcontrolcenter;. Tasks enabled by &knetwortdeconf; provide users with a simple
 interface from which to perform the following tasks:</para>
 
 <itemizedlist>
@@ -117,7 +117,7 @@ interface from which to perform the following tasks:</para>
 
 <para>Once installed a new module called <guimenuitem>Network
 Settings</guimenuitem> is displayed in the &kcontrolcenter;.
-To start the <application>Network Settings</application> (&knetworkconf;) module select <menuchoice>
+To start the <application>Network Settings</application> (&knetwortdeconf;) module select <menuchoice>
 <guimenuitem>&kcontrolcenter;</guimenuitem> <guimenuitem>Internet &amp; Network</guimenuitem>
 <guimenuitem>Network Settings</guimenuitem> </menuchoice> in the &kmenu;.</para>
 
@@ -126,13 +126,13 @@ To start the <application>Network Settings</application> (&knetworkconf;) module
 <imagedata fileref="11.png" format="PNG"/>
 </imageobject>
 <textobject>
-<phrase>&knetworkconf; in user mode</phrase>
+<phrase>&knetwortdeconf; in user mode</phrase>
 </textobject>
 </mediaobject>
 
-<para>It is important to understand that &knetworkconf; cannot install
+<para>It is important to understand that &knetwortdeconf; cannot install
 networking hardware. As such physical devices and their drivers must be
-properly installed and configured in order for &knetworkconf; to display the
+properly installed and configured in order for &knetwortdeconf; to display the
 device and enable management of networking properties.</para>
 
 <para>In most cases drivers for networking hardware and other devices are
@@ -211,14 +211,14 @@ click the <guibutton>Administrator Mode</guibutton> button located bottom
 left of the module. Enter your password when prompted.</para>
 
 <screenshot>
-<screeninfo>&knetworkconf; in administrator mode</screeninfo>
+<screeninfo>&knetwortdeconf; in administrator mode</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="01.png"
 format="PNG"/>
 </imageobject>
 <textobject>
-<phrase>&knetworkconf; in administrator mode</phrase>
+<phrase>&knetwortdeconf; in administrator mode</phrase>
 </textobject>
 </mediaobject>
 </screenshot>
@@ -277,7 +277,7 @@ fileref="03.png"
 format="PNG"/>
 </imageobject>
 <textobject>
-<phrase>The &knetworkconf; interface</phrase>
+<phrase>The &knetwortdeconf; interface</phrase>
 </textobject>
 </mediaobject>
 
@@ -748,8 +748,8 @@ following command.</para>
 <title>How to obtain knetwork-conf</title>
 
 <para>knetwork-conf's home page is at <ulink
-url="http://knetworkconf.sourceforge.net"
->http://knetworkconf.sourceforge.net</ulink> where you at least can download
+url="http://knetwortdeconf.sourceforge.net"
+>http://knetwortdeconf.sourceforge.net</ulink> where you at least can download
 source packages. </para>
 </sect1>
 
@@ -778,7 +778,7 @@ packages. Install them from &konsole; using
 installed; you also need the development packages which include libraries
 and other stuff. </para>
 
-<para>Recommended for advanced users only. Otherwise, compiling &knetworkconf;
+<para>Recommended for advanced users only. Otherwise, compiling &knetwortdeconf;
 is not difficult.  The following commands should do it.</para>
 
 <screen>
@@ -801,7 +801,7 @@ let us know.</para>
 
 <para>In the first section of this chapter, you'll find some valuable
 information about networking basics. In the second, all configuration files
-on your disk which can be changed by &knetworkconf; will be discussed. </para>
+on your disk which can be changed by &knetwortdeconf; will be discussed. </para>
 
 <sect1 id="networking-overview">
 <title>IPv4 Networking</title>
@@ -894,7 +894,7 @@ gateway-computer. </para>
 <title>Configuration files</title>
 
 <para>In this section you'll find the configuration files which are touched
-by &knetworkconf; and where they reside in the file system of the different
+by &knetwortdeconf; and where they reside in the file system of the different
 distributions. </para>
 
 <sect2 id="resolv.conf">