12 files changed, 19 insertions, 19 deletions
diff --git a/doc/faq/intro.docbook b/doc/faq/intro.docbook
index 6f9546791..fab2a3064 100644
--- a/doc/faq/intro.docbook
+++ b/doc/faq/intro.docbook
@@ -45,7 +45,7 @@ particular the &gcc; compiler.</para>
 </question>
 <answer>
 <para>No, &kde; is not a window manager.  While &kde; includes a very
-sophisticated window manager (&kwin;), &kde; is much more than that.
+sophisticated window manager (&twin;), &kde; is much more than that.
 It is a full-blown Integrated Desktop Environment.</para>
 <para>&kde; provides a complete desktop environment, including a web
 browser, a file manager, a window manager, a help system, a
diff --git a/doc/faq/misc.docbook b/doc/faq/misc.docbook
index 61d2950f3..ec5ce3209 100644
--- a/doc/faq/misc.docbook
+++ b/doc/faq/misc.docbook
@@ -15,7 +15,7 @@
 <para>Does &kde; support transparency and other visual effects provided by the new composite extension to X.org?</para>
 </question>
 <answer>
-<para> Yes! An exciting new feature for &kde; 3.4 is support for the new X composite extension. This allows for effects such as translucency and drop shadows for all windows, easily configurable through &kwin;'s configuration dialog. This requires you to be using X.org version 6.8.0 or newer and have:
+<para> Yes! An exciting new feature for &kde; 3.4 is support for the new X composite extension. This allows for effects such as translucency and drop shadows for all windows, easily configurable through &twin;'s configuration dialog. This requires you to be using X.org version 6.8.0 or newer and have:
 
 <screen>
 Section "Extensions"
diff --git a/doc/faq/winmng.docbook b/doc/faq/winmng.docbook
index f32384754..d001b8425 100644
--- a/doc/faq/winmng.docbook
+++ b/doc/faq/winmng.docbook
@@ -10,14 +10,14 @@
 <title>The window manager</title>
 
 <para>The default window manager provided by &kde; is the K Window
-Manager (&kwin;).  Please read <quote>The
+Manager (&twin;).  Please read <quote>The
 K Window Manager Handbook</quote> (which should be accessible from the
 <application>&kde; Help Center</application>) for usage information.</para>
 
 <qandaset>
 <qandaentry>
 <question>
-<para>Are there keyboard shortcuts for &kwin; operations?</para>
+<para>Are there keyboard shortcuts for &twin; operations?</para>
 </question>
 <answer>
 <para>Yes.  Please refer to "The K Window Manager Handbook" for the
@@ -58,7 +58,7 @@ Iconified tasks will have their names displayed in gray.</para>
 </listitem>
 <listitem>
 <para>If you click the &MMB; on the root window (&ie;,
-the background of the desktop), &kwin; will give you a list
+the background of the desktop), &twin; will give you a list
 of all available tasks.</para>
 </listitem>
 </itemizedlist>
diff --git a/doc/kcontrol/kwindecoration/CMakeLists.txt b/doc/kcontrol/kwindecoration/CMakeLists.txt
index 55ac98586..a4fb05f50 100644
--- a/doc/kcontrol/kwindecoration/CMakeLists.txt
+++ b/doc/kcontrol/kwindecoration/CMakeLists.txt
@@ -9,4 +9,4 @@
 #
 #################################################
 
-tde_create_handbook( DESTINATION kcontrol/kwindecoration )
+tde_create_handbook( DESTINATION kcontrol/twindecoration )
diff --git a/doc/kcontrol/kwindecoration/Makefile.am b/doc/kcontrol/kwindecoration/Makefile.am
index ad89ecd92..6ee826f55 100644
--- a/doc/kcontrol/kwindecoration/Makefile.am
+++ b/doc/kcontrol/kwindecoration/Makefile.am
@@ -1,2 +1,2 @@
 KDE_LANG = en
-KDE_DOCS = kcontrol/kwindecoration
+KDE_DOCS = kcontrol/twindecoration
diff --git a/doc/kcontrol/kwindecoration/index.docbook b/doc/kcontrol/kwindecoration/index.docbook
index c6bfd5276..c94c12d30 100644
--- a/doc/kcontrol/kwindecoration/index.docbook
+++ b/doc/kcontrol/kwindecoration/index.docbook
@@ -19,7 +19,7 @@
 <keywordset>
 <keyword>KDE</keyword>
 <keyword>KControl</keyword>
-<keyword>kwin</keyword>
+<keyword>twin</keyword>
 <keyword>window</keyword>
 <keyword>border</keyword>
 <keyword>theme</keyword>
diff --git a/doc/kcontrol/windowmanagement/index.docbook b/doc/kcontrol/windowmanagement/index.docbook
index 650b8d2aa..77b21ca45 100644
--- a/doc/kcontrol/windowmanagement/index.docbook
+++ b/doc/kcontrol/windowmanagement/index.docbook
@@ -32,7 +32,7 @@ some windows.</para>
 
 <note>
 <para>Please note that this configuration will not take effect if you
-do not use &kwin; as your window manager. If you do use a different
+do not use &twin; as your window manager. If you do use a different
 window manager, please refer to its documentation for how to customize
 window behavior.</para>
 </note>
diff --git a/doc/kompmgr/index.docbook b/doc/kompmgr/index.docbook
index 2d70bc9d6..192c7dd8e 100644
--- a/doc/kompmgr/index.docbook
+++ b/doc/kompmgr/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 kappname "kompmgr">
- <!ENTITY package "kwin">
+ <!ENTITY package "twin">
  <!ENTITY % English "INCLUDE">
  <!ENTITY % addindex "IGNORE">
 ]>
@@ -30,7 +30,7 @@
 <releaseinfo>2.0.1</releaseinfo>
 
 <abstract>
-<para>&kappname; is a composite rendering engine to be used by &kwin;.</para>
+<para>&kappname; is a composite rendering engine to be used by &twin;.</para>
 <para>This document is rather a general explanation of what it does, 
 how it works and what the restrictions are than a documentation how to use
 it (as it works in the background automatically).</para> 
@@ -38,7 +38,7 @@ it (as it works in the background automatically).</para>
 
 <keywordset>
 <keyword>KDE</keyword>
-<keyword>kwin</keyword>
+<keyword>twin</keyword>
 <keyword>render engine</keyword>
 </keywordset>
 </bookinfo>
diff --git a/doc/userguide/control-center.docbook b/doc/userguide/control-center.docbook
index 240046c73..774be64ac 100644
--- a/doc/userguide/control-center.docbook
+++ b/doc/userguide/control-center.docbook
@@ -252,7 +252,7 @@ mouse buttons.</para>
 <term><guilabel>Window Behavior</guilabel></term>
 <listitem>
 <para>This is where you would configure options related to the behavior of
-&kde;'s window manager, &kwin;. &kwin; is extremely configurable and has
+&kde;'s window manager, &twin;. &twin; is extremely configurable and has
 advanced features such as focus stealing prevention and different focus
 policies such as focus follows mouse. You can also configure what actions
 you would like to bind to certain keys and mouse events.</para>
diff --git a/doc/userguide/customizing-desktop.docbook b/doc/userguide/customizing-desktop.docbook
index eb427d599..4d095cbdc 100644
--- a/doc/userguide/customizing-desktop.docbook
+++ b/doc/userguide/customizing-desktop.docbook
@@ -118,7 +118,7 @@ to apply effects such as translucency. Window decorations must be able to do all
 these without sacrificing speed and performance. This is the reason why window
 decorations come in source code that must be compiled, or as binary packages
 that must be installed. Basically, Window decorations are plugins or small
-programs that instruct &kwin;, &kde;'s Window Manager,
+programs that instruct &twin;, &kde;'s Window Manager,
 how to display window frames.</para>
 
 <para>In order to add a new window decoration, you need to compile it from
@@ -153,7 +153,7 @@ while this may be unnoticeable on very fast systems.</para>
 <para>To add an IceWM theme, select IceWM as the window decoration and click on
 the <guilabel>Open &kde;'s IceWM theme folder</guilabel> link in the window
 decoration description area. This will open a &konqueror; window
-to <filename>$<envar>KDEHOME</envar>/share/apps/kwin/icewm-themes</filename>.
+to <filename>$<envar>KDEHOME</envar>/share/apps/twin/icewm-themes</filename>.
 Extract your IceWM theme to this folder. The theme will then be added to
 the list of IceWM themes. Select the theme you want to use and click on
 <guibutton>Apply</guibutton>.</para>
diff --git a/doc/userguide/kde-for-admins.docbook b/doc/userguide/kde-for-admins.docbook
index 6424ea965..da0d91496 100644
--- a/doc/userguide/kde-for-admins.docbook
+++ b/doc/userguide/kde-for-admins.docbook
@@ -1135,7 +1135,7 @@ at the time the session was saved.  Sessions are stored in the
 references to application-specific state information. The
 application-specific state information is saved in <filename
 class="directory">$<envar>KDEHOME</envar>/share/config/session</filename>.
-The state information of &kwin; contains the location of the application
+The state information of &twin; contains the location of the application
 windows of all the other applications in the session.
 </para>
 
@@ -1184,7 +1184,7 @@ class="username">root</systemitem>.</para>
 <varlistentry><term>$<envar>KDEWM</envar></term><listitem><para>If the
 <envar>KDEWM</envar> environment variable has been set, then it will
 be used as &kde;'s window manager within the
-<command>startkde</command> script instead of &kwin;.</para>
+<command>startkde</command> script instead of &twin;.</para>
 </listitem>
 </varlistentry>
 
diff --git a/doc/userguide/under-the-hood.docbook b/doc/userguide/under-the-hood.docbook
index 094a01d63..be6cacdfc 100644
--- a/doc/userguide/under-the-hood.docbook
+++ b/doc/userguide/under-the-hood.docbook
@@ -381,13 +381,13 @@ the one with the <guiicon>Next Page</guiicon> picture on it.
 </step>
 <step>
 <para>In the <guilabel>Command/URL Settings</guilabel> tab, enter the
-command to run in the field: <userinput><command>dcop kwin default
+command to run in the field: <userinput><command>dcop twin default
 nextDesktop</command></userinput></para>
 </step>
 </procedure>
 
 <para>Repeat the above with the <keysym>Prev_Virtual_Screen</keysym> key and
-<userinput><command>dcop kwin default
+<userinput><command>dcop twin default
 previousDesktop</command></userinput>.</para>
 
 <para>Now pressing the <keysym>Prev_Virtual_Screen</keysym> or