6 files changed, 38 insertions, 49 deletions
diff --git a/doc/chalk/developers-plugins.docbook b/doc/chalk/developers-plugins.docbook
index 2e592be1..ebd5f664 100644
--- a/doc/chalk/developers-plugins.docbook
+++ b/doc/chalk/developers-plugins.docbook
@@ -33,10 +33,8 @@ the combination of a unique untranslated string (used when saving, for
 instance) and a translated string for GUI purposes.
 </para><para>
 A word on compatibility: &chalk; is still in development. From &chalk; 1.5 to
-1.6 not many API changes are expected, but there may be some. From &chalk; 1.6
-to 2.0 we will move from &Qt;3 to &Qt;4, from &tde;3 to &tde;4, from
-<command>automake</command> to <command>cmake</command>: many changes are to
-be expected. If you develop a plugin for &chalk; and choose to do so in
+1.6 not many API changes are expected, but there may be some.
+If you develop a plugin for &chalk; and choose to do so in
 &chalk;’s subversion repository, chances are excellent that we’ll help you
 porting. These changes may also render parts of this document out of date.
 Always check with the latest API documentation or the header files installed
@@ -143,7 +141,7 @@ import/export filter could be a PDF filter. Filters are loaded by the
 <title>Creating plugins</title>
 
 <para>
-Plugins are written in C++ and can use all of &tde; and &Qt; and the &chalk;
+Plugins are written in C++ and can use all of &tde; and &TQt; and the &chalk;
 developer API. Only viewplugins should use the &koffice; API. Don’t worry:
 &chalk;’s API’s are quite clear and rather extensively documented (for free
 software) and coding your first filter is really easy.
@@ -763,7 +761,7 @@ an option widget:
 </para>
 
 <itemizedlist>
-<listitem><para>Use &Qt; Designer to create a widget base, and subclass it for
+<listitem><para>Use &TQt; Designer to create a widget base, and subclass it for
 your filter</para></listitem>
 <listitem><para>Use one of the simple widgets that show a number of sliders
 for lists of integers, doubles or bools. These are useful if, like the above
@@ -773,7 +771,7 @@ bools. See the API dox for <classname>KisMultiIntegerFilterWidget</classname>,
 <classname>KisMultiBoolFilterWidget</classname>.</para></listitem>
 <listitem><para>Hand-code a widget. This is not recommended, and if you do so
 and want your filter to become part of &chalk;’s official release, then I’ll ask
-you to replate your hand-coded widget with a &Qt; Designer
+you to replate your hand-coded widget with a &TQt; Designer
 widget.</para></listitem>
 </itemizedlist>
 
@@ -871,7 +869,7 @@ non-painting tasks and shape painting tasks.
 A tool has an option widget, just like filters. Currently, the option widgets
 are shown in a tab in a dock window. We may change that to a strip under the
 main menu (which then replaces the toolbar) for &chalk; 2.0, but for now,
-design your option widget to fit in a tab. As always, it’s best to use &Qt;
+design your option widget to fit in a tab. As always, it’s best to use &TQt;
 Designer for the design of the option widget.
 </para><para>
 A good example of a tool is the star tool:
@@ -927,9 +925,9 @@ The following methods (<methodname>buttonPress</methodname>,
 <methodname>move</methodname> and <methodname>buttonRelease</methodname>) are
 called by &chalk; when the input device (mouse, stylus, eraser etc.) is
 pressed down, moved or released. Note that you also get move events if the
-mouse button isn’t pressed. The events are not the regular &Qt; events, but
+mouse button isn’t pressed. The events are not the regular &TQt; events, but
 synthetic &chalk; events because we make use of low-level trickery to get
-enough events to draw a smooth line. By default, toolkits like &Qt; (and GTK)
+enough events to draw a smooth line. By default, toolkits like &TQt; (and GTK)
 drop events if they are too busy to handle them, and we want them all.
 </para>
 
diff --git a/doc/koffice/index.docbook b/doc/koffice/index.docbook
index e39d2815..0aef81ab 100644
--- a/doc/koffice/index.docbook
+++ b/doc/koffice/index.docbook
@@ -413,7 +413,7 @@ letters and use certain templates, there is no need for much more
 functionality than saving, loading, printing, &etc;
 </para>
 
-<para> Thanks to the <quote>action</quote> concept of &Qt; and &tde;,
+<para> Thanks to the <quote>action</quote> concept of &TQt; and &tde;,
 you can freely customize &koffice; menubars and tool
 bars. Unfortunately, at the moment, there are no easy-to-use dialogs
 to do this. &koffice; stores its &GUI; configuration in &XML; files
@@ -510,7 +510,7 @@ absolutely free desktop environment for unix-like operating systems.
 </para></listitem>
 <listitem>
 <para><ulink url="http://www.trolltech.com">Trolltech</ulink>. The creators
-of the C++-toolkit &Qt;. &tde; and &koffice; make use of &Qt;.
+of the C++-toolkit &TQt;. &tde; and &koffice; make use of &TQt;.
 </para></listitem>
 </itemizedlist>
 
@@ -531,7 +531,7 @@ be of interest:
 <itemizedlist>
 <listitem><para> At <ulink
 url="http://developer.kde.org">http://developer.kde.org</ulink> you'll
-find many documents about programming with &Qt; and &tde;. Here you can find
+find many documents about programming with &TQt; and &tde;. Here you can find
 the online version of the complete &tde; library documentation.
 </para></listitem> 
 <listitem><para>
@@ -642,13 +642,10 @@ A functioning &UNIX; system (for example, &Linux; or BSD)
 with a configured &X-Window; (for example, XFree86 or X.Org).
 </para></listitem>
 <listitem><para>
-The &Qt; 3.3 libraries from Trolltech. See
-<ulink url="http://www.trolltech.com/">www.trolltech.com</ulink>
-for more information.
+The &TQt; libraries.
 </para></listitem>
 <listitem><para>
-The Trinity Desktop Environment (&tde;) or newer. &koffice; cannot be compiled
-with earlier versions of &kde;. Information on obtaining and installing
+The Trinity Desktop Environment (&tde;). Information on obtaining and installing
 &tde; can be found at: &tde-http;
 </para></listitem>
 <listitem><para>
@@ -659,7 +656,7 @@ using a networked computer, check with your administrator first.
 </itemizedlist>
 
 <para>
-Please note that, while you need the &tde; 3.3 (or newer) libraries 
+Please note that, while you need the &tde; libraries
 on your system, you can still use &koffice; in a different desktop
 environment (for example, XFCE or GNOME).
 </para>
@@ -684,12 +681,12 @@ A C++ compiler which supports exceptions, preferably a recent version of GCC.
 for info about getting and installing it.) 
 </para></listitem>
 <listitem><para>
-Troll Tech's &Qt; 3.3 development packages. If these packages are not installed on
+&TQt; development packages. If these packages are not installed on
 your system and they are not included in the distribution of your operating 
-system, you should probably have to compile &Qt; from source. 
+system, you should probably have to compile &TQt; from source. 
 These sources can be obtained from 
-<ulink url="http://www.trolltech.com/download/index.html">
-http://www.trolltech.com/download/index.html</ulink>.
+<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3">
+https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3</ulink>.
 </para></listitem>
 </itemizedlist>
 
diff --git a/doc/kugar/index.docbook b/doc/kugar/index.docbook
index ebb84d16..b05d2aac 100644
--- a/doc/kugar/index.docbook
+++ b/doc/kugar/index.docbook
@@ -79,7 +79,7 @@
 <chapter id="introduction">
 <title>Introduction</title>
 
-<para> &kugar; is a report creation tool for &Qt; and &tde;. It includes
+<para> &kugar; is a report creation tool for &TQt; and &tde;. It includes
 a &GUI; report template designer, a report engine, a &konqueror; part
 for easy report preview and a set of examples.</para>
 
diff --git a/doc/kugar/progguide.docbook b/doc/kugar/progguide.docbook
index 97f4e471..a61faf07 100644
--- a/doc/kugar/progguide.docbook
+++ b/doc/kugar/progguide.docbook
@@ -61,15 +61,15 @@ for a detailed description.
 </listitem>
 <listitem>
 <para>
-Create a &Qt; designer plugin, use it to build the application &GUI; in the designer and
+Create a &TQt; designer plugin, use it to build the application &GUI; in the designer and
 link it to the program dynamically.
-See <link linkend="prog-designer-plugin">Creating a &Qt; designer plugin</link>
+See <link linkend="prog-designer-plugin">Creating a &TQt; designer plugin</link>
 for a detailed description.
 </para>
 </listitem>
 </itemizedlist>
 
-<para> The last two ways are acceptable for &Qt; and &tde; developers;
+<para> The last two ways are acceptable for &TQt; and &tde; developers;
 but &kugar; is designed to be a report generator, independent from a
 programming language and/or <acronym>IDE</acronym>. It uses &XML;
 format for describing report templates and data files. So any program
@@ -125,7 +125,7 @@ developers. It supports a &tde; printing system and &UNIX; localization
 via <function>i18n()</function> calls.
 </para>
 <para>
-The <classname>MReportViewer</classname> class is designed for &Qt;
+The <classname>MReportViewer</classname> class is designed for &TQt;
 developers and provides real crossplatforming. It can be used not
 only on &UNIX; platforms, but also on &Windows; and &MacOS;.
 </para>
@@ -136,7 +136,7 @@ with <filename>libkugar.so</filename> shared library, which is provided with the
 </para>
 <para>
 Include files are <filename>kugarqt.h</filename> and <filename>kugar.h</filename>
-for &Qt; and &tde; programs respectively.
+for &TQt; and &tde; programs respectively.
 </para>
 <para>For a detailed example of how &kugar; classes can be used, look in the <filename class="directory">/shell</filename>
 folder in the &kugar; sources.
@@ -214,7 +214,7 @@ create a TQIODevice successor and redefine all necessary functionality.
 </sect1>
 
 <sect1 id="prog-designer-plugin">
-<title>Creating &Qt; designer plugin</title>
+<title>Creating &TQt; designer plugin</title>
 
 <para>
 This is the example code of how a designer plugin is created. The code below creates a plugin for
@@ -222,7 +222,7 @@ a &tde; <classname>KReportViewer</classname> widget.
 </para>
 
 <para>
-If a &Qt;
+If a &TQt;
 widget is desired, replace <classname>KReportViewer</classname> with
 <classname>MReportViewer</classname> and <filename>kugar.h</filename> with
 <filename>kugarqt.h</filename> in the plugin code.
@@ -231,7 +231,7 @@ widget is desired, replace <classname>KReportViewer</classname> with
 <sect2 id="plugin-usage">
 <title>Plugin usage</title>
 <para>
-The designer plugin will allow the usage of &Qt; Designer to place a <classname>KReportViewer</classname>
+The designer plugin will allow the usage of &TQt; Designer to place a <classname>KReportViewer</classname>
 widget onto a window and preview it correctly.
 </para>
 
@@ -240,7 +240,7 @@ Programs that make use of this plugin must be linked dynamically with it.
 The corresponding library is called <filename>libkugar_plugin.so</filename>.
 Widgets or dialogs that include <classname>KReportViewer</classname>
 widget must include &lt;kugar.h&gt; in implementation and have a forward declaration
-of <classname>class KReportViewer</classname>. Includes can be done with &Qt;
+of <classname>class KReportViewer</classname>. Includes can be done with &TQt;
 Designer's Object Explorer (Source tab).
 </para>
 
diff --git a/doc/kword/index.docbook b/doc/kword/index.docbook
index a9a1fd99..849a3765 100644
--- a/doc/kword/index.docbook
+++ b/doc/kword/index.docbook
@@ -661,7 +661,7 @@ Any software updates, bug fixes or announcements of new releases of &koffice; wi
 <para>How do themes affect &kword;?</para>
 </question>
 <answer>
-<para>&kword; (like all of &koffice;) is completely themeable.  You can use any QT or &tde; theme to customize the look of &kword;.</para>
+<para>&kword; (like all of &koffice;) is completely themeable.  You can use any TQt or &tde; theme to customize the look of &kword;.</para>
 </answer>
 </qandaentry>
 
@@ -805,20 +805,14 @@ main ftp site of the &tde; project. </para>
 
 <itemizedlist>
 <listitem>
-<para>&Qt; Toolkit 3.2 or later.  This can be obtained from <ulink
-url="http://www.trolltech.com">Trolltech</ulink>.</para>
-<tip><para>While &koffice; will compile and run with any version of &Qt; 3.2 or later, it is recommended that you compile and install
-&Qt; 3.3.4 to take advantage of all the bug fixes (including some security fixes) that have occurred.</para></tip>
+<para>&TQt; Toolkit. This can be obtained from <ulink
+url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3">https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3</ulink>.</para>
 </listitem>
 
 <listitem>
-<para>&tde; 3.3.0 libraries (tdelibs) and the &tde; 3.3.0 base package
-(tdebase).  These can be obtained from the <ulink
-url="http://www.kde.org">&tde; web page.</ulink></para>
-<tip><para>While &koffice; will compile and run with any version of &tde; 3.3.0 or later, it is recommended that you compile and install
-&tde; 3.4 to take advantage of all the bug fixes that have occurred.</para>
-<para>It is also recommended that you install the arts package 1.3.2 from the
-<ulink url="ftp://ftp.kde.org">&tde; &FTP; site</ulink>.</para></tip>
+<para>&tde; libraries (tdelibs) and the &tde; base package
+(tdebase). These can be obtained from the <ulink
+url="https://mirror.git.trinitydesktop.org/gitea/explore/repos">&tde; web page.</ulink></para>
 </listitem>
 
 <listitem>
@@ -832,7 +826,7 @@ your distribution's web site.</para>
 </itemizedlist>
 
 <note><para>In order to use external databases for mail merging documents, you must have
-the QT toolkit compiled with SQL support.  To add SQL support (as a plugin), simply include
+the TQt toolkit compiled with SQL support.  To add SQL support (as a plugin), simply include
 <option>-plugin-sql-<replaceable>driver</replaceable></option> in your configure line.</para>
 <para><replaceable>driver</replaceable> should be replaced with <replaceable>mysql</replaceable>, <replaceable>odbc</replaceable>,
 <replaceable>CVS</replaceable>, or <replaceable>psql</replaceable> as is appropriate for your database needs.</para></note>
@@ -874,7 +868,7 @@ the file to edit.</para>
 
 <para><emphasis>Show &kword; version</emphasis></para>
 
-<para>To see the version numbers for the QT toolkit, &tde;, and &kword; type:</para>
+<para>To see the version numbers for the TQt toolkit, &tde;, and &kword; type:</para>
 
 <screen width="40">
 <prompt>$</prompt> <userinput><command>kword -v</command></userinput>
diff --git a/doc/kword/mailmerge.docbook b/doc/kword/mailmerge.docbook
index 2a1355d3..04036fba 100644
--- a/doc/kword/mailmerge.docbook
+++ b/doc/kword/mailmerge.docbook
@@ -38,7 +38,7 @@ SQL database for your data source.</para></listitem>
 
 <para>&kword; has the ability to use several of the most popular open source databases as a source of data for personalized documents.</para>
 <note><para>In order to access an outside database using SQL, your machine needs to have the appropriate database module compiled 
-into your copy of QT.</para>
+into your copy of TQt.</para>
 <para>For more information see the <link linkend="installation">installation section of this documentation</link>.</para></note>
 <para>The database can be located on the same machine as &kword;, or on any computer which is accessable through your computer 
 network or the Internet.</para>
@@ -82,7 +82,7 @@ the menubar. A dialog box will appear.</para>
 </mediaobject>
 </screenshot>
 
-<para>Select <guilabel>QT-SQL Source</guilabel> and click on
+<para>Select <guilabel>TQt-SQL Source</guilabel> and click on
 <guibutton>OK</guibutton>.  A new dialog box will appear.<anchor id="mail-merge-login"/></para>
 
 <screenshot>