5 files changed, 23 insertions, 23 deletions
diff --git a/doc/kde_app_devel/index.docbook b/doc/kde_app_devel/index.docbook
index 920ba3b0..2d913c0b 100644
--- a/doc/kde_app_devel/index.docbook
+++ b/doc/kde_app_devel/index.docbook
@@ -147,7 +147,7 @@ Unix Systems as well as about the C and C++ programming language.
 </para>
 <para>
 For obtaining help about the TDevelop IDE, you should send requests to our mailinglist at 
-<email>tdevelop@tdevelop.org</email>. Mind that the KDevelop team is dedicated to provide the means to enable you to 
+<email>kdevelop@kdevelop.org</email>. Mind that the KDevelop team is dedicated to provide the means to enable you to 
 program applications and therefore is not intended as a technical support team in cases where the 
 applications you're developing don't work due to implementation errors or misconfigurations of your 
 operating system. By this, we ask all users to take advantage of the mailinglist in any case you're running 
@@ -548,7 +548,7 @@ the tdehtml library, containing KDE's html component
 the kjs library, containing KDE's Javascript support
 </para></listitem>
 <listitem><para>
-the kio library, containing low level access to network files
+the tdeio library, containing low level access to network files
 </para></listitem>
 <listitem><para>
 the tdeparts library, containing support for re-usable embeddable extendable applications
@@ -789,7 +789,7 @@ the compilation phase.
    -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 
    -D_BSD_SOURCE -Wcast-align -Wconversion -O2 -fno-exceptions -fno-check-new -o kscribble -R 
    /usr/local/trinity/lib -R /usr/lib/qt/lib -R /usr/X11R6/lib -L/usr/X11R6/lib -L/usr/lib/qt/lib 
-   -L/usr/local/trinity/lib main.o kscribble.o kscribbleview.o pref.o kscribbleiface_skel.o -lkio 
+   -L/usr/local/trinity/lib main.o kscribble.o kscribbleview.o pref.o kscribbleiface_skel.o -ltdeio 
 54 source='kscribble_client.cpp' object='kscribble_client.o' libtool=no \
 55 depfile='.deps/kscribble_client.Po' tmpdepfile='.deps/kscribble_client.TPo' \
 56 depmode=gcc3 /bin/sh /home/caleb/kscribble/admin/depcomp \
diff --git a/doc/kdearch/index.docbook b/doc/kdearch/index.docbook
index eb7ca4e9..97dee33d 100644
--- a/doc/kdearch/index.docbook
+++ b/doc/kdearch/index.docbook
@@ -16,7 +16,7 @@
 <author>
 <firstname>Bernd</firstname>
 <surname>Gehrmann</surname>
-<affiliation><address><email>bernd@tdevelop.org</email></address></affiliation>
+<affiliation><address><email>bernd@kdevelop.org</email></address></affiliation>
 </author>
 </authorgroup>
 
@@ -71,9 +71,9 @@ respecting user preferences.
 </varlistentry>
 
 <varlistentry>
-<term><ulink url="kdeapi:tdeio/index.html">kio</ulink></term>
+<term><ulink url="kdeapi:tdeio/index.html">tdeio</ulink></term>
 <listitem><para>
-The <literal>kio</literal> library contains facilities for asynchronous,
+The <literal>tdeio</literal> library contains facilities for asynchronous,
 network transparent I/O and access to mimetype handling. It also provides the
 KDE file dialog and its helper classes.
 </para></listitem>
@@ -2074,7 +2074,7 @@ needed. It then goes into a loop and listens for DCOP connections. The program
 may be an interactive one, but it may also run completely or for a part of its
 lifetime as a daemon in the background without the user noticing it. An example 
 for such a daemon is <literal>tdeio_uiserver</literal>, which implements user interaction 
-such as progress dialog for the KIO library. The advantage of such a centralized 
+such as progress dialog for the TDEIO library. The advantage of such a centralized 
 daemon in this context is that e.g. the download progress for several different 
 files can be shown in one window, even if those downloads were initiated from 
 different applications.
@@ -2393,7 +2393,7 @@ else
 </programlisting>
 
 <para>
-This starts a KIO job to download a part of the file and check this.
+This starts a TDEIO job to download a part of the file and check this.
 Note that this function is perhaps quite slow and blocks the program. Normally
 you will only want to use this if <function>KMimeType::findByURL()</function>
 has returned <literal>"application/octet-stream"</literal>.
@@ -2401,7 +2401,7 @@ has returned <literal>"application/octet-stream"</literal>.
 
 <para>
 On the other hand, if you do not want to block your application, you can also 
-explicitly start the KIO job and connect to some of its signals:
+explicitly start the TDEIO job and connect to some of its signals:
 </para>
 
 <programlisting>
@@ -2558,7 +2558,7 @@ completely available, but should updated regularly as data comes in.
 </para>
 
 <para>
-In the KDE libraries, network transparency is implemented in the KIO API. The
+In the KDE libraries, network transparency is implemented in the TDEIO API. The
 central concept of this architecture is an IO <emphasis>job</emphasis>. A job
 may copy, or delete files or similar things. Once a job is started, it works
 in the background and does not block the application. Any communication from
@@ -2589,10 +2589,10 @@ http://www-com.physik.hu-berlin.de/~bernd/article.tgz#tar:/paper.tex
 
 
 <simplesect id="nettransparency-usingkio">
-<title>Using KIO</title>
+<title>Using TDEIO</title>
 
 <para>
-In most cases, jobs are created by calling functions in the KIO namespace.
+In most cases, jobs are created by calling functions in the TDEIO namespace.
 These functions take one or two URLs as arguments, and possible other
 necessary parameters. When the job is finished, it emits the signal
 <literal>result(TDEIO::Job*)</literal>. After this signal has been emitted, the job
@@ -2855,7 +2855,7 @@ easier to use: the class <classname>KFileItem</classname>.
 <title>Synchronous usage</title>
 
 <para>
-Often, the asynchronous API of KIO is too complex to use and therefore 
+Often, the asynchronous API of TDEIO is too complex to use and therefore 
 implementing full asynchronicity is not a priority. For example, in a program 
 that can only handle one document file at a time, there is little that can be
 done while the program is downloading a file anyway. For these simple cases, 
@@ -2965,7 +2965,7 @@ void FooClass::transferResult(TDEIO::Job *job)
 <title>Scheduling</title>
 
 <para>
-When using the KIO API, you usually do not have to cope with the details of
+When using the TDEIO API, you usually do not have to cope with the details of
 starting IO slaves and communicating with them. The normal use case is to
 start a job and with some parameters and handle the signals the jobs emits.
 </para>
@@ -2973,7 +2973,7 @@ start a job and with some parameters and handle the signals the jobs emits.
 <para>
 Behind the curtains, the scenario is a lot more complicated. When you create a
 job, it is put in a queue. When the application goes back to the event loop,
-KIO allocates slave processes for the jobs in the queue.  For the first jobs
+TDEIO allocates slave processes for the jobs in the queue.  For the first jobs
 started, this is trivial: an IO slave for the appropriate protocol is started.
 However, after the job (like a download from an http server) has finished, it
 is not immediately killed. Instead, it is put in a pool of idle slaves and
@@ -2988,7 +2988,7 @@ Of course, reusing is only possible when the existing slave has already finished
 its previous job. when a new request arrives while an existing slave process is 
 still running, a new process must be started and used. In the API usage in the
 examples above, there are no limitation for creating new slave processes: if you
-start a consecutive series of downloads for 20 different files, then KIO will 
+start a consecutive series of downloads for 20 different files, then TDEIO will 
 start 20 slave processes. This scheme of assigning slaves to jobs is called 
 <emphasis>direct</emphasis>. It  not always the most appropriate scheme, as it
 may need much memory and put a high load on both the client and server machines.
@@ -3093,14 +3093,14 @@ The "input" and "output" lines are not used currently.
 <para>
 The remaining lines in the <literal>.protocol</literal> file define which
 abilities the slave has. In general, the features a slave must implement are
-much simpler than the features the KIO API provides for the application. The
+much simpler than the features the TDEIO API provides for the application. The
 reason for this is that complex jobs are scheduled to a couple of subjobs. For
 example, in order to list a directory recursively, one job will be started for
 the toplevel directory. Then for each subdirectory reported back, new subjobs
-are started. A scheduler in KIO makes sure that not too many jobs are active
+are started. A scheduler in TDEIO makes sure that not too many jobs are active
 at the same time. Similarly, in order to copy a file within a protocol that
 does not support copying directly (like the <literal>ftp:</literal> protocol),
-KIO can read the source file and then write the data to the destination
+TDEIO can read the source file and then write the data to the destination
 file. For this to work, the <literal>.protocol</literal> must advertise the
 actions its slave supports.
 </para>
@@ -3174,7 +3174,7 @@ functions:
 
 <para>
 Additionally, there are reimplementable functions not listed in the <literal>.protocol</literal>
-file. For these operations, KIO automatically determines whether they are supported
+file. For these operations, TDEIO automatically determines whether they are supported
 or not (i.e. the default implementation returns an error).
 </para>
 
diff --git a/doc/tdevelop/credits.docbook b/doc/tdevelop/credits.docbook
index d47af015..77712cc4 100644
--- a/doc/tdevelop/credits.docbook
+++ b/doc/tdevelop/credits.docbook
@@ -7,7 +7,7 @@
 <para>
 <itemizedlist>
   <listitem><para>
-  The initial contents of this manual were witten by Bernd Gehrmann <email>bernd@tdevelop.org</email> and Caleb Tennis <email>caleb@aei-tech.com</email>.
+  The initial contents of this manual were witten by Bernd Gehrmann <email>bernd@kdevelop.org</email> and Caleb Tennis <email>caleb@aei-tech.com</email>.
   </para></listitem>
   <listitem><para>
   The <link linkend="automake-manager-summary">Summary of &automanag;</link> and <link linkend="automake-manager-operation">Automake Manager Operation</link> chapters were written by Ian Wadham, <email>ianw@netspace.net.au</email>).
diff --git a/doc/tdevelop/index.docbook b/doc/tdevelop/index.docbook
index 30ac2531..d412dc35 100644
--- a/doc/tdevelop/index.docbook
+++ b/doc/tdevelop/index.docbook
@@ -86,7 +86,7 @@ Entries which require special treatment are marked with comments starting with '
       <firstname>Bernd</firstname>
       <surname>Gehrmann</surname>
       <affiliation>
-        <address><email>bernd@tdevelop.org</email></address>
+        <address><email>bernd@kdevelop.org</email></address>
       </affiliation>
     </author>
 
diff --git a/doc/tdevelop/plugin-tools.docbook b/doc/tdevelop/plugin-tools.docbook
index 36a7a925..ad10fb16 100644
--- a/doc/tdevelop/plugin-tools.docbook
+++ b/doc/tdevelop/plugin-tools.docbook
@@ -158,7 +158,7 @@ it is because the plugin authors made them this way.</para>
 <para>This plugin displays a graphical view of all the classes in the project, complete with methods and attributes, and provides a way of direct source navigation.</para></formalpara></listitem>
 <listitem><formalpara id="KDevcopyto">
 <title>CopyTo</title>
-<para>Simple file uploader plugin. It does a file copy over any KIO supported protocol.</para></formalpara></listitem>
+<para>Simple file uploader plugin. It does a file copy over any TDEIO supported protocol.</para></formalpara></listitem>
 <listitem><formalpara id="KDevCTags2">
 <title>CTags Frontend</title>
 <para>CTags is a source navigation tool with support for many languages. When loaded it provides a context menu for finding type declarations/definitions and also a query dialog. http://ctags.sourceforge.net/</para></formalpara></listitem>