Help handbook updates.

18 files changed, 447 insertions, 522 deletions

diff --git a/doc/faq/configtde.docbook b/doc/faq/configtde.docbook
index 7ef125401..dd5c45686 100644
--- a/doc/faq/configtde.docbook
+++ b/doc/faq/configtde.docbook
@@ -10,26 +10,25 @@
 <question>
 <para>How do I set the language used by &tde;?</para>
 </question>
-
 <answer>
-<para>There are two ways to set the language &tde; uses in the
+<para>First ensure the appropriate tde-i18n language package is installed.</para>
+<para>Thereafter there are two ways to set the language &tde; uses in the
 messages it will display:</para>
-
 <variablelist>
 <varlistentry><term>Using the <application>&tde; Control Center</application></term>
-<listitem><para>Fire up the <application>&tde; Control Center</application> and select
-<guimenu>Regional &amp; Accessibility</guimenu> followed by
-<guimenuitem>Country/Region &amp; Language</guimenuitem>.  You can select your language and location
-here.  If &tde; cannot find a translation in the first language
-chosen, it will fall back on the default language.  This is usually
+<listitem><para>Open the <application>&tde; Control Center</application> and select
+<guimenu>Regional &amp; Accessibility</guimenu> then
+<guimenuitem>Country/Region &amp; Language</guimenuitem>. You can select your language and location
+here. If &tde; cannot find a translation in the first language
+chosen, it will fall back on the default language. This is usually
 (American) English by default.</para>
 <note><para>Using the <application>&tde; Control Center</application> is the preferred way of choosing
 languages in &tde;.</para></note></listitem>
 </varlistentry>
 <varlistentry><term>Using the <envar>LANG</envar> environment variable</term>
 <listitem><para>The second method uses the standard locale setting on
-your system.  To change the language, simply set the environment
-variable <envar>LANG</envar> accordingly.  For example, if your shell 
+your system. To change the language, simply set the environment
+variable <envar>LANG</envar> accordingly. For example, if your shell
 is <application>bash</application>, execute
 <userinput><command>export</command> <envar>LANG</envar>=de</userinput>
 to set German as the language used.</para></listitem>
@@ -45,10 +44,9 @@ to set German as the language used.</para></listitem>
 </question>
 <answer>
 <para>
-Yes, you can configure it using the <application>&tde; Control Center</application>
-<guimenu>Regional &amp; Accessibility</guimenu>
-<guimenuitem>Keyboard Layout</guimenuitem>
- configuration page.
+Yes, configure the switcher using the <application>&tde; Control Center</application>
+<menuchoice><guimenu>Regional &amp; Accessibility</guimenu><guimenuitem>
+Keyboard Layout</guimenuitem></menuchoice> configuration page.
 </para>
 </answer>
 </qandaentry>
@@ -59,27 +57,27 @@ Yes, you can configure it using the <application>&tde; Control Center</applicati
 &tde; login screen?</para>
 </question>
 <answer>
-<note><para>Your distribution/&UNIX; flavor may have its own setup tools to
+<note><para>Your &UNIX; distribution might have its own setup tools to
 change this (&eg; <application>YaST</application> on &SuSE; &Linux;). This will
 be the safest way to enable the &tde; login screen. However, if for some reason
-you do not wish to use these tools, the following instructions may be useful.</para></note>
-<para>First, you need to change to the <quote>xdm runlevel</quote> (runlevel 5 on
+you do not wish to use these tools, the following instructions might be useful.</para></note>
+<para>First, ychange to the <quote>xdm runlevel</quote> (runlevel 5 on
 &RedHat; and &SuSE; systems) by editing your
-<filename>/etc/inittab</filename> file.  In the file, you should have
-a line saying <userinput>id:3:initdefault:</userinput>.  Change it to
-<userinput>id:5:initdefault:</userinput>.  Now, at the end of the file,
+<filename>/etc/inittab</filename> file. In the file, there should be
+a line saying <userinput>id:3:initdefault:</userinput>. Change it to
+<userinput>id:5:initdefault:</userinput>. At the end of the file,
 comment out the following line:
 <literal>x:5:respawn:/usr/bin/X11/xdm -nodaemon</literal> and
 replace it with
-<userinput>x:5:respawn:<replaceable>/opt/kde/</replaceable>bin/tdm
+<userinput>x:5:respawn:<replaceable>/opt/trinity/</replaceable>bin/tdm
 -nodaemon</userinput>.
-<note><para>The location of &tdm; may differ on your
+<note><para>The location of &tdm; might differ on your
 system.</para></note></para>
 <para>For changes to take effect immediately, type <command>init
-5</command> (for &RedHat; systems) at the shell prompt. 
+5</command> (for &RedHat; systems) at the shell prompt.
 <caution><para>It is risky to initiate a graphical login without
-checking beforehand whether it works.  If it fails to work, you would
-be in for a hard time getting back....</para></caution></para>
+checking beforehand whether it works. If it fails to work, you would
+be in for a hard time getting back.</para></caution></para>
 </answer>
 <answer>
 <para>
@@ -93,15 +91,13 @@ off secure</userinput>.</para>
 
 <qandaentry>
 <question>
-
 <para>I would like to click the &LMB; anywhere on the
 desktop and have the <guimenu>TDE</guimenu> menu displayed.</para>
 </question>
 <answer>
-<para>Open the <application>&tde; Control Center</application> and
-choose <menuchoice><guisubmenu>Desktop</guisubmenu>
-<guisubmenu>Behavior</guisubmenu></menuchoice>.  You
-can now choose the behavior of mouse clicks on the desktop.  To have
+<para>Use the &RMB; to select the desktop. From the popup menu, select
+<guisubmenu>Configure Desktop</guisubmenu>. From the icon list
+select the Behavior icon. Choose the behavior of mouse clicks on the desktop. To have
 the <guimenu>TDE</guimenu> menu open from a single &LMB; click, change
 the entry labeled <guilabel>Left button</guilabel> to say
 <guilabel>Application Menu</guilabel>.</para>
@@ -110,12 +106,10 @@ the entry labeled <guilabel>Left button</guilabel> to say
 
 <qandaentry>
 <question>
-<para>Where do I find information regarding &tde; themes?</para>
+<para>Where do I find additional &tde; themes?</para>
 </question>
 <answer>
-<para>Go to <ulink
-url="http://kde.themes.org/">http://kde.themes.org/</ulink> or <ulink
-url="http://www.kde-look.org">http://www.kde-look.org</ulink>.</para>
+<para>Go to <ulink url="http://www.kde-look.org">http://www.kde-look.org</ulink>.</para>
 </answer>
 </qandaentry>
 
@@ -124,30 +118,31 @@ url="http://www.kde-look.org">http://www.kde-look.org</ulink>.</para>
 <para>How do I change &MIME; Types?</para>
 </question>
 <answer>
-<para>If you are using &konqueror;, do this instead: first, open a
-&konqueror; window and choose
+<para>When using &konqueror;, open a &konqueror; window and choose
 <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure
-Konqueror</guimenuitem></menuchoice>, then <guilabel>File Associations</guilabel>.  Find the type you want to change
+Konqueror</guimenuitem></menuchoice>. From the icon list select
+<guilabel>File Associations</guilabel>. Find the mime type you want to change
 (&eg; <literal>text/english</literal> or
 <literal>image/gif</literal>), and set the application preference order
 to whatever you want.</para>
+<para>The same thing can be accomplished by using the <application>&tde; Control Center
+</application>. Select <menuchoice><guimenu>TDE Components</guimenu><guimenuitem>File Associations</guimenuitem></menuchoice>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para>&tde; (&tdm;) does not read my
-<filename>.bash_profile</filename>!</para>
+<para>&tde; (&tdm;) does not read my <filename>.bash_profile</filename>.</para>
 </question>
 <answer>
 <para>The login managers<application>xdm</application> and &tdm; do
 not run a login shell, so <filename>.profile</filename>,
 <filename>.bash_profile</filename>, &etc; are not
-sourced.  When the user logs in, <application>xdm</application> runs
+sourced. When the user logs in, <application>xdm</application> runs
 <command>Xstartup</command> as root and then
-<command>Xsession</command> as user.  So the normal practice is to add
+<command>Xsession</command> as user. The normal practice is to add
 statements in <filename>Xsession</filename> to source the user
-profile.  Please edit your <filename>Xsession</filename> and
+profile. Please edit your <filename>Xsession</filename> and
 <filename>.xsession</filename> files.</para>
 </answer>
 </qandaentry>
@@ -157,49 +152,48 @@ profile.  Please edit your <filename>Xsession</filename> and
 <para>How do I use &TrueType; fonts in &tde;?</para>
 </question>
 <answer>
-
-<para>You need to install &TrueType; font support into your &X-Window; configuration.
-Please take a look at <ulink
+<para>Install &TrueType; font support into your &X-Window; configuration.
+<!--Please take a look at <ulink
 url="http://x.themes.org/">x.themes.org</ulink> for the fonts, and
 <ulink url="http://www.dcs.ed.ac.uk/home/jec/programs/xfsft/">xfsft:
 &TrueType; Font Support For X11</ulink> or <ulink
 url="http://X-TT.dsl.gr.jp/">X-&TrueType; Server Project Home
-Page</ulink> for the font servers.</para>
-
+Page</ulink> for the font servers.-->
+</para>
 <para>If you have a bunch of &TrueType; fonts from &Microsoft;
-&Windows;, edit the <filename>XF86Config</filename> file to get the
-fonts from the font folder.  Then just tell &tde; to use these new
-fonts with the font administrator utility.</para>
-
+&Windows;, edit the <filename>xorg.conf</filename> file to get the
+fonts from the font folder. Then configure &tde; to use these new
+fonts with the <filename>Font Administrator</filename> utility.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para>Is it possible to enter, show and work with the Euro Symbol in
+<para>Is it possible to enter, show, and work with the Euro Symbol in
 &tde;?</para>
 </question>
 <answer>
-<para>Yes and no.  For details, look here: <ulink
-url="http://www.koffice.org/kword/euro.php">http://www.koffice.org/kword/euro.php</ulink>.</para>
+<para>Yes. Open the <application>&tde; Control Center</application> and select
+<guimenu>Regional &amp; Accessibility</guimenu>, then
+<guimenuitem>Keyboard Layout</guimenuitem>. Select the <guimenuitem>Xkb Options</guimenuitem>
+tab and enable the <guilabel>Enable xkb options</guilabel> check box. Choose a compose key.
+Enable <guilabel>Adding Eurosign to certain keys</guilabel> and select the desired key.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question><para>How do I run a program at &tde; startup?</para></question>
-
-<answer><para>There are many ways to do that. If what you want to do
-is to run some scripts that would set some environment variables (for
-example, to start <command>gpg-agent</command>, <command>ssh-agent</command> and others), you can put
-these scripts into <filename class="directory">$<envar>TDEHOME</envar>/env/</filename> and make sure their names end in
+<answer><para>There are several ways to do that. If you want to
+run some scripts that set environment variables (for
+example, to start <command>gpg-agent</command>, <command>ssh-agent</command> and others), place the
+scripts into <filename class="directory">$<envar>TDEHOME</envar>/env/</filename>. Make sure their names end in
 <literal role="extension">.sh</literal>. $<envar>TDEHOME</envar> is
-usually a folder named <filename class="directory">.kde</filename>
-(note the period at the beginning) in your home
+usually a folder named <filename class="directory">.trinity</filename>
+(notice the period at the beginning) in your home
 folder. If you want scripts to be executed for all &tde; users, you can
-put them under <filename class="directory">$<envar>TDEDIR</envar>/env/</filename>, where $<envar>TDEDIR</envar> is the prefix &tde; was
-installed to (you can find this out using the command
-<userinput><command>tde-config</command> --prefix</userinput>).</para>
-<para>If you wish to start a program after &tde; has started, you may want to use the 
+put them under <filename class="directory">$<envar>TDEDIR</envar>/env/</filename>, where $<envar>TDEDIR</envar> is the prefix &tde; is installed (you can find this out using the command
+<userinput><command>tde-config --prefix</command></userinput>).</para>
+<para>If you wish to start a program after &tde; has started, you may want to use the
 <filename class="directory">Autostart</filename> folder. To add
 entries to the <filename class="directory">Autostart</filename> folder:
 <orderedlist>
@@ -218,31 +212,30 @@ the <guilabel>Command</guilabel> text box.</para>
 </listitem>
 </orderedlist>
 </para>
-
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para>How can I allow more than one user to be logged in a at a time?  Can &tde; do <quote>fast user switching</quote>?</para>
+<para>How can I allow more than one user to be logged in a at a time? Can &tde; do <quote>fast user switching</quote>?</para>
 </question>
 <answer>
-
+<para>Yes, when starting &tde; through the graphical login mode. When starting &tde;
+from the command line using <filename>startx</filename>, then toggle to a different console
+to login in.</para>
 <para>To enable more than one user to log in at one time on the same
-computer (sometimes referred to as <quote>fast user switching</quote>) you
-need to tell the program that logs you in that it can use more than one
+computer (sometimes referred to as <quote>fast user switching</quote>)
+configure the program that logs you in to allow more than one
 session (or, in &X-Window; terms, <quote>display</quote>) at a time.</para>
-
 <para>In &tde;, this program is called &tdm; which stands for <quote>&tde;
 Display Manager</quote>. If you are not using &tdm; as your login screen
 then you will need to consult the documentation for the software you are using on how to
 accomplish multiple sessions.</para>
-
 <para>By default, this will be configured at installation time automatically
 if &tdm; supports virtual terminals on your system (currently Linux only).
 If it was not configured automatically, consult the &tdm; manual, section
-<ulink url="help:/tdm/tdmrc-xservers">Specifying permanent &X-Server;s</ulink>.
-After modifying tdmrc, you will have to let &tdm; know about it; just
+<ulink url="help:/tdm/tdmrc-xservers.html">Specifying permanent &X-Server;s</ulink>.
+After modifying tdmrc, you will have to restart &tdm;; just
 invoke <command>killall -HUP tdm</command>.</para>
 </answer>
 </qandaentry>
diff --git a/doc/faq/contrib.docbook b/doc/faq/contrib.docbook
index 702bd7710..9d6fc7858 100644
--- a/doc/faq/contrib.docbook
+++ b/doc/faq/contrib.docbook
@@ -14,30 +14,23 @@
 <para>How can I contribute to &tde;?</para>
 </question>
 <answer>
-<para>&tde; is a free software project that lives from voluntary
+<para>&tde; is a free/libre software project that lives from voluntary
 contributions. Everybody is encouraged to contribute to &tde;. Not
 only programmers are welcome. There are many ways in which you can
 help to improve &tde;:</para>
 <itemizedlist>
 <listitem><para>Test the software.</para></listitem>
-<listitem><para>Send in bug reports. For more information on this,
-see <link linkend="bug-report">How do I submit a bug
+<listitem><para>Send in bug reports. For more information,
+refer to <link linkend="bug-report">How do I submit a bug
 report?</link>.</para></listitem>
-<listitem><para>Write documentation or help files. You can get some
-information by visiting the <ulink
-url="http://i18n.kde.org/doc/">&tde; Editorial Team
-Home Page</ulink>.</para></listitem>
+<listitem><para>Write or edit documentation and help files.</para></listitem>
 <listitem><para>Translate programs, documentation, and help files.
-For more information on this, you should visit <ulink
-url="http://i18n.kde.org">The &tde; Translators' and Documenters' Web
-Site</ulink>.</para></listitem>
-<listitem><para>Draw nice icons or compose sound effects. You can
-visit the <ulink url="http://artist.kde.org/">&tde;
-artists page</ulink> to find out more.</para></listitem>
+</para></listitem>
+<listitem><para>Draw icons, wallpaper, or compose sound effects.</para></listitem>
 <listitem><para>Write articles and books about &tde;. If you want to
-help spread the word about &tde;, simply send an email to
-<email>[email protected]</email>. This will get you in touch
-with the &tde; public relations volunteers.</para></listitem>
+help spread the word about &tde;, send an email to
+<email>[email protected]</email>. This will get you in touch
+with the &tde; developers and packagers.</para></listitem>
 <listitem><para>Program new &tde; applications. Please refer to <xref
 linkend="programming"/> for more information.</para></listitem>
 <listitem><para> Of course, sponsors are also
@@ -45,7 +38,7 @@ welcome. :-)</para></listitem>
 </itemizedlist>
 <para>There are several places to look for more information if you
 want to get involved in the development. The first step is to
-subscribe to some of the <ulink  url="http://www.kde.org/mailinglists/">mailing
+subscribe to some of the <ulink  url="http://www.trinitydesktop.org/mailinglist.php">mailing
 lists</ulink>. You will soon see something
 that can be improved or added.</para>
 </answer>
@@ -62,9 +55,9 @@ and thanks for helping! The system features several query types and a
 list of all known bugs.</para>
 <para>The easiest way to submit a bug is to select
 <menuchoice><guimenu>Help</guimenu><guimenuitem>Report
-Bug...</guimenuitem></menuchoice> from the menu bar of the application
-with the bug. This will open a small dialog box with a link
-to the bug tracking system. Please make sure to follow the
+Bug/Request Enhancement...</guimenuitem></menuchoice> from the menu bar of the application
+with the bug. This will open a dialog box with a link
+to the bug tracking system. Please follow the
 instructions of the bug reporting wizard.</para>
 </answer>
 </qandaentry>
@@ -93,72 +86,66 @@ on.</para>
 <para>To get into &tde; programming, you will need some basic tools:
 <application>automake</application>,
 <application>autoconf</application>, and
-<application>egcs</application>. You should look to <ulink
-url="http://developer.kde.org/">http://developer.kde.org/</ulink>
-for more tips.</para>
-<para>Another excellent resource for learning &tde;
-programming is the &Qt;
-online tutorials. These are installed along with &Qt;. To view them,
+<application>cmake</application>.</para>
+<para>An excellent resource for learning &tde;
+programming is the &Qt; tutorials. These are installed along with &Qt;. To view them,
 open <filename>$<envar>QTDIR</envar>/doc/html/index.html</filename> in
-&konqueror; and bookmark it. The tutorials
-can be found under "Using
-Qt". The source code for each lesson can be found in the <filename
+&konqueror; and bookmark the locatio. The tutorials
+can be found under "Using Qt". The source code for each lesson can be found in the <filename
 class="directory">$<envar>QTDIR</envar>/tutorial</filename>
 directory.</para>
-<para>There is, however, one thing that everybody interested in
-programming for &tde; should do: <emphasis>subscribe to the developers
+<para>There is one thing everybody interested in
+programming for &tde; should do: please <emphasis>subscribe to the developers
 mailing list</emphasis>. To subscribe, you have to send an email to
 <ulink
-url="mailto:[email protected]">[email protected]</ulink>
-with the subject <userinput>subscribe
-<replaceable>your_email_address</replaceable></userinput>.
-<important><para>Please read <link linkend="subscribe">How to
-subscribe/unsubscribe to these lists</link> carefully. Everything
-said there applies to the development list as
-well.</para></important></para>
+url="mailto:[email protected]">[email protected]</ulink>
+with an empty email.
+<important><para>Please read<ulink url="http://www.trinitydesktop.org/mailinglist.php">
+http://www.trinitydesktop.org/mailinglist.php</ulink>. Everything
+written there applies to the development list as well.</para></important></para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para>How do I get access to &tde; <acronym>SVN</acronym>?</para>
+<para>How do I get access to &tde; <acronym>GIT</acronym>?</para>
 </question>
 <answer>
-<para>The &tde; project uses <acronym>SVN</acronym> to develop the
+<para>The &tde; project uses <acronym>GIT</acronym> to develop the
 core parts of the software. Usually, when you have changed one of the
 parts (&eg; fixed a bug), and you want to commit this change, the best
 way is to create a patch against a current snapshot and send this
 patch to the developer/maintainer of the respective program.</para>
-<para>If you are doing this more or less regularly, there are instructions here on how to get write access to the <acronym>SVN</acronym> repository: <ulink url="http://developer.kde.org/documentation/other/developer-faq.html#q1.8">
-http://developer.kde.org/documentation/other/developer-faq.html#q1.8</ulink>. But be aware that more users will slow
-down <acronym>SVN</acronym> access for all developers, so we want to
-keep the number of people with direct <acronym>SVN</acronym> access
-reasonably small. But feel free to ask!</para>
+<para>If you are doing this more or less regularly, then contact the developers
+to obtain write access to the <acronym>GIT</acronym> repository:
+<ulink url="[email protected]">
[email protected]</ulink>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para>Can I have read-only access to the <acronym>SVN</acronym> repository?</para>
+<para>Can I have read-only access to the <acronym>GIT</acronym> repository?</para>
 </question>
 <answer>
-<para>Yes. Instructions on how to get anonymous, read-only <acronym>SVN</acronym> access are here: <ulink url="http://developer.kde.org/source/anonsvn.html">
-http://developer.kde.org/source/anonsvn.html</ulink>
+<para>Yes. Instructions on how to get anonymous, read-only <acronym>GIT</acronym>
+access are here: <ulink url="http://www.trinitydesktop.org/wiki/bin/view/Developers/GIT">
+http://www.trinitydesktop.org/wiki/bin/view/Developers/GIT</ulink>
 </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para>Are there any <acronym>SVN</acronym> mirror sites for &tde;?</para>
+<para>Are there any <acronym>GIT</acronym> mirror sites for &tde;?</para>
 </question>
 <answer>
-<para>No, there are currently no anonymous <acronym>SVN</acronym> mirror sites for &tde;. If you're interested in setting one up, please contact <email>[email protected]</email>
+<para>No, currently there are no anonymous <acronym>GIT</acronym> mirror sites for &tde;.
 </para>
 </answer>
 </qandaentry>
 
-<qandaentry>
+<!--<qandaentry>
 <question>
 <para>How do I go about translating &tde; programs into my native
 language?</para>
@@ -169,7 +156,7 @@ Translators' and Documenters' Web Site</ulink> to see whether your
 program is already translated (most are). Otherwise you will find
 information there on how to do it yourself.</para>
 </answer>
-</qandaentry>
+</qandaentry>-->
 </qandaset>
 </chapter>
 
diff --git a/doc/faq/desktop.docbook b/doc/faq/desktop.docbook
index 4c984b4ab..cd5e8c1c5 100644
--- a/doc/faq/desktop.docbook
+++ b/doc/faq/desktop.docbook
@@ -15,8 +15,8 @@
 <answer>
 
 <para>Just choose the desired application from the <guimenu>TDE</guimenu> menu and drag and drop it to the Desktop.
-</para> 
-<para>For applications not listed in the <guimenu>TDE</guimenu> menu, 
+</para>
+<para>For applications not listed in the <guimenu>TDE</guimenu> menu,
 use the &RMB; on the desktop and choose <menuchoice><guimenuitem>Create New</guimenuitem><guisubmenu>File</guisubmenu>
 <guimenuitem>Link to Application...</guimenuitem></menuchoice> and fill in the configuration for the application you want to link to.
 </para>
@@ -30,9 +30,9 @@ use the &RMB; on the desktop and choose <menuchoice><guimenuitem>Create New</gui
 </question>
 <answer>
 
-<para>First, make sure you are allowed to <command>mount</command>/<command>umount</command> the relevant device as a user. 
+<para>First, make sure you are allowed to <command>mount</command>/<command>umount</command> the relevant device as a user.
 </para>
-<para>Then you can add any device via &RMB; on the desktop and then choosing <menuchoice><guimenu>Create New</guimenu><guimenuitem>Link to Device</guimenuitem></menuchoice> and then selecting the device of the type you wish to control from the desktop. Fill in the settings for the device in the dialog that appears and click <guilabel>OK</guilabel>. You can use the resulting desktop icon to mount/unmount the device from the desktop.  
+<para>Then you can add any device via &RMB; on the desktop and then choosing <menuchoice><guimenu>Create New</guimenu><guimenuitem>Link to Device</guimenuitem></menuchoice> and then selecting the device of the type you wish to control from the desktop. Fill in the settings for the device in the dialog that appears and click <guilabel>OK</guilabel>. You can use the resulting desktop icon to mount/unmount the device from the desktop.
 </para>
 
 </answer>
@@ -46,14 +46,13 @@ use the &RMB; on the desktop and choose <menuchoice><guimenuitem>Create New</gui
 <answer>
 <para>The icons can be found only in <filename
 class="directory">$<envar>TDEDIRS</envar>/share/icons</filename> or <filename
-class="directory">$<envar>HOME</envar>/.kde/share/icons</filename> or
-<filename class="directory">$<envar>HOME</envar>/.kde2/share/icons</filename>.  To use icons
+class="directory">$<envar>HOME</envar>/.trinity/share/icons</filename>. To use icons
 stored in other locations, you must either copy them into one of the
 above-mentioned fixed &tde; locations or make symlinks.</para>
 </answer>
 </qandaentry>
 
-<qandaentry>
+<!--<qandaentry>
 <question>
 <para>How do I use the mouse scroll wheel in &tde;?</para>
 </question>
@@ -61,7 +60,7 @@ above-mentioned fixed &tde; locations or make symlinks.</para>
 <para>Mouse wheel support comes with &Qt; 2.0 and above, so &tde; based on
 that will automatically support the use of the mouse scroll wheel if your system is configured correctly. Check your &X-Server; settings support the use of a scrollwheel if it is not working.</para>
 </answer>
-</qandaentry>
+</qandaentry>-->
 
 <qandaentry>
 <question>
@@ -71,7 +70,7 @@ that will automatically support the use of the mouse scroll wheel if your system
 <para>&tde; comes with a program called &kstart;.
 To start an <application>xterm</application> on the second desktop and then activate it use:
 
-<userinput><command>kstart</command> <option>--desktop 
+<userinput><command>kstart</command> <option>--desktop
 2 --activate --window "xterm" </option>xterm</userinput>.</para>
 <para>Note that the <option>--window</option> option is important. It takes an
 argument which is a regular expression matching the title of the window to
@@ -89,7 +88,7 @@ the desktop?</para>
 </question>
 <answer>
 <para><filename
-class="directory">$<envar>HOME</envar>/Desktop</filename>.  You might
+class="directory">$<envar>HOME</envar>/Desktop</filename>. You might
 need to refresh your desktop after you have saved your files.</para>
 </answer>
 </qandaentry>
diff --git a/doc/faq/filemng.docbook b/doc/faq/filemng.docbook
index 64f2e0622..276bab1e8 100644
--- a/doc/faq/filemng.docbook
+++ b/doc/faq/filemng.docbook
@@ -1,14 +1,13 @@
 <!-- <?xml version="1.0" ?>
 <!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
  "dtd/kdex.dtd"> -->
-	
+
 <chapter id="filemanager">
 <title>The File Manager</title>
 
-<para>&tde;'s file manager is &konqueror;.  The
-&konqueror; home page is located at <ulink
-url="http://www.konqueror.org">http://www.konqueror.org</ulink> where a
-&konqueror; specific <acronym>FAQ</acronym> can be found.</para>
+<para>The default file manager in &tde; is &konqueror;. Please refer to
+the <ulink url="help:/konqueror/index.html">
+Konqueror Handbook</ulink> for detailed information.</para>
 
 <qandaset>
 
@@ -36,28 +35,26 @@ Editor</guimenuitem></menuchoice>.
 <answer>
 <para>Normally, if you enter a &URL; like
 <userinput>ftp://<replaceable>ftp.somehost.com</replaceable></userinput>,
-&konqueror; will attempt an anonymous login to the &FTP; server.  If you
+&konqueror; will attempt an anonymous login to the &FTP; server. If you
 want to login as a particular user, enter a &URL; like
 <userinput>ftp://<replaceable>[email protected]</replaceable></userinput>
-instead.  &konqueror; will ask for your password and connect to the
+instead. &konqueror; will ask for your password and connect to the
 server.</para>
 </answer>
 </qandaentry>
 
-
 <qandaentry>
 <question>
 <para>How do I specify the startup folder for &konqueror;?</para>
 </question>
 <answer>
-
-<para>Using the &RMB;, click on the Home icon and choose
-<guimenuitem>Properties</guimenuitem>.  Under the
-<guilabel>Application</guilabel> tab you will probably find something like
-<command>kfmclient openProfile filemanagement</command>; just append
-<filename class="directory">file:/whereever/you/want</filename> with the
-folder you would like &konqueror; to start in.</para>
-
+<para>With the desktop Home icon, using the &RMB;, select the icon and choose
+<guimenuitem>Properties</guimenuitem>. Select the
+<guilabel>URL</guilabel> tab. Type <filename class="directory">/whereever/you/want</filename>
+with the folder you would like &konqueror; to start in.</para>
+<para>From within &konqueror; the process is similar. Ensure the Navigation Panel is active
+(press <keycap>F9</keycap>). From the Navigation Panel tabs, select the Home icon.
+In the Navigation Panel directory, use the &RMB; to select the top level <filename class="directory">Home Folder</filename> and select <guimenuitem>Properties</guimenuitem>.</para>
 </answer>
 </qandaentry>
 
@@ -76,11 +73,11 @@ folder you would like &konqueror; to start in.</para>
 <para>Where did the delete entry from my right-click context menu go?</para>
 </question>
 <answer>
-<para>In &tde; 3.4 the delete context menu entries that bypass the
-trashcan are no longer displayed by default. To enable them, go to 
+<para>The Delete context menu entry that bypasses the
+Trash can is not displayed by default. To enable that menu option, go to
 <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure
 &konqueror;</guimenuitem></menuchoice > and select
-<guilabel>Behaviour</guilabel> in the iconbar to the left. Tick the checkbox
+<guilabel>Behaviour</guilabel> in the iconbar to the left. Enable the checkbox
 <guilabel>Show 'Delete' context menu entries which bypass the
 trashcan</guilabel>.
 </para>
@@ -93,7 +90,7 @@ open different types of files?</para></question>
 <answer>
 <para>In order to configure file associations, you should go to the
 &kcontrolcenter; and choose the item <guimenuitem>File
-Associations</guimenuitem> under the category <guimenu>TDEDE
+Associations</guimenuitem> under the category <guimenu>TDE
 Components</guimenu>.</para>
 <para>
 Suppose the default <acronym>PDF</acronym> viewer is now &kghostview; and
@@ -116,7 +113,7 @@ associated Konqueror with inode/directory, but it cannot handle this file
 type.</quote></para>
 </question>
 <answer>
-<para>You need to make sure that the embedding settings for inode/directory
+<para>Make sure the embedding settings for inode/directory
 are correct:
 <orderedlist>
 <listitem><para>In &konqueror;, go to
@@ -136,34 +133,35 @@ of <guilabel>Services Preference Order.</guilabel></para></listitem>
 </qandaentry>
 
 <qandaentry> <question> <para>What are <option>%i</option> and
-<option>%m</option> in the Execute line?</para> </question> <answer>
+<option>%m</option> parameters in a file's Properties Command line?</para>
+</question>
+<answer>
 <para>They are used by all &tde; applications (since they are implemented in
 <classname>KApplication</classname> and all good &tde; programs create a
 <classname>KApplication</classname> object before they even look at the
 command line arguments).</para> <para>A standard line for a &tde;
 application looks like this: <userinput><command>foo</command>
-<option>... %i %m -caption \"%c\"</option></userinput>.  Pretty confusing,
+<option>... %i %m -caption \"%c\"</option></userinput>. Pretty confusing,
 -but it has been designed in that way so that it can integrate legacy,
-non-&tde; applications as smoothly as possible.  &konqueror;, when executing
+non-&tde; applications as smoothly as possible. &konqueror;, when executing
 the line above, will extend the command to
 <userinput><command><replaceable>foo</replaceable></command> <option>-icon
 something.png -miniicon something_mini.png -caption \"The
-Foo\"</option></userinput>.  Both the icon and the mini-icon as well as "The
-Foo" are properties defined in the <filename>.desktop</filename> file.  If
+Foo\"</option></userinput>. Both the icon and the mini-icon as well as "The
+Foo" are properties defined in the <filename>.desktop</filename> file. If
 the icons are not defined, they simply default to the executable name
 <replaceable>foo</replaceable>.</para>
- 
+
 <para>This way a user can change these things in &kmenuedit; for his or her
-applications.  The <option>-caption</option> option is important, because no
+applications. The <option>-caption</option> option is important, because no
 user will accept that the menu item <guimenuitem>Editor</guimenuitem> starts
-something called <guilabel>kedit-0.9pl4-build47</guilabel>.  Instead, he
-expects a window called <guilabel>Editor</guilabel>.  Furthermore these
-names are localized, <abbrev>i.e.</abbrev> an American user launches
+something called <guilabel>kedit-0.9pl4-build47</guilabel>. Instead, users
+expect a window called <guilabel>Editor</guilabel>. Furthermore these
+names are localized, &ie; an American English user launches
 <guimenuitem>CD-Player</guimenuitem> and gets a window called
 <guilabel>CD-Player</guilabel> while a German user launches
 <guimenuitem>CD-Spieler</guimenuitem> and gets a window called
 <guilabel>CD-Spieler</guilabel>.</para>
-
 </answer>
 </qandaentry>
 
@@ -174,15 +172,13 @@ I can't save a view profile when the menu bar is invisible!</para>
 
 <answer><para>The easiest way to do this is to edit &konqueror;'s
 configuration file manually. Add the following lines to
-<filename>~/.kde/share/config/konquerorrc</filename>:
+<filename>~/.trinity/share/config/konquerorrc</filename>:
 <programlisting>
 [KonqMainWindow]
 MenuBar=Disabled
 </programlisting>
 </para>
-
 <para>On restarting &konqueror;, the menubar should be hidden.</para>
-
 </answer>
 </qandaentry>
 
diff --git a/doc/faq/index.docbook b/doc/faq/index.docbook
index 8a87318e8..86f1a8716 100644
--- a/doc/faq/index.docbook
+++ b/doc/faq/index.docbook
@@ -102,12 +102,12 @@ maintain this &FAQ;.</para> </abstract>
 </itemizedlist>-->
 
 <para>Many of the answers in this &FAQ; are taken
-from the various &tde; mailing lists and newsgroups. Here is a
+from various mailing lists and newsgroups. Here is a
 <emphasis>big</emphasis> thank you to all of you who have contributed
 answers that eventually appear in this &FAQ;.</para>
 
 <para>Special thanks go to the former &FAQ;
-maintainers, Rainer Endres, Mr. Lee Wee Tiong, and J. Hall. </para>
+maintainers, Rainer Endres, Mr. Lee Wee Tiong, and J. Hall.</para>
 
 
 <!-- TRANS:CREDIT_FOR_TRANSLATORS -->
diff --git a/doc/faq/install.docbook b/doc/faq/install.docbook
index c21f6f70a..91ebbbb5c 100644
--- a/doc/faq/install.docbook
+++ b/doc/faq/install.docbook
@@ -42,8 +42,7 @@ to run on many &UNIX; platforms.</para>
 <para>To obtain &tde;, please refer to <xref linkend="where-to-get-tde"/>. If
 you encounter problems while installing &tde;, please do not
 hesitate to make use of the &tde; <link
-linkend="mailing-lists">mailing lists</link> and <link
-linkend="newsgroups">newsgroups</link>. No question is too silly to ask, but
+linkend="mailing-lists">mailing lists</link>. No question is too silly to ask, but
 remember to first look for answers in this <acronym>FAQ</acronym>.</para>
 <para>Good luck and have fun!</para>
 
diff --git a/doc/faq/intro.docbook b/doc/faq/intro.docbook
index e09812eca..f2b00a2d5 100644
--- a/doc/faq/intro.docbook
+++ b/doc/faq/intro.docbook
@@ -185,7 +185,7 @@ desktop environments have functioned traditionally. There is a sense of
 familiarity with that environment many people like. Similarly other users prefer
 the work flow features offered by KDE4 because those features match their
 expectations of how they want their computer to behave. The difference between the
-two environments does not mean one is better, buggier, or slower -- only that
+two environments does not mean one is better, buggier, or slower  -- mdash; only that
 they are different and appeal to different types of people. Although sharing a
 common heritage, both desktops appeal to different groups of people. As always
 with free/libre software, there is a choice.</para>
diff --git a/doc/faq/misc.docbook b/doc/faq/misc.docbook
index 0b2e4febd..0dd2c4556 100644
--- a/doc/faq/misc.docbook
+++ b/doc/faq/misc.docbook
@@ -15,7 +15,7 @@
 <para>Does &tde; 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 &tde; 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:
+<para>Yes. &tde; supports for the X composite extension and provides its own compositor. This allows for effects such as translucency and drop shadows for all windows, easily configurable through &twin;'s configuration dialog. For those using an xorg.conf file, be sure the following is included:
 
 <screen>
 Section "Extensions"
@@ -23,15 +23,16 @@ Option  "Composite" "Enable"
 EndSection
 </screen>
 
-In your <filename>xorg.conf</filename>. If you have an nvidia graphics card and use the nvidia driver you can improve the performance of these effects by also adding the RenderAccel option to the Device section for your graphics card:
+<!-- This option is enabled by default -->
+<!--Those users with an Nvidia graphics card and driver can improve the performance of these effects by adding the RenderAccel option to the Device section for the graphics card:
 
 <screen>
 Section "Device"
     Identifier  "nvidia-fx5200"
     Driver      "nvidia"
     Option      "RenderAccel" "true"
-</screen>
-Once you have configured X.org correctly, transparency and other effects can be enabled through the <menuchoice><guimenu>Desktop</guimenu><guimenuitem>Window Behavior</guimenuitem></menuchoice> &kcontrolcenter; module, under the <guilabel>Translucency</guilabel> tab.
+</screen>-->
+After correctly configuring xorg.conf, transparency and other effects can be enabled through the <menuchoice><guimenu>Desktop</guimenu><guimenuitem>Window Behavior</guimenuitem></menuchoice> &kcontrolcenter; module, under the <guilabel>Translucency</guilabel> tab.
 </para>
 </answer>
 </qandaentry>
@@ -43,7 +44,7 @@ them into the menu?</para>
 </question>
 <answer>
 <para>Use &kmenuedit;. To access it use the &RMB; on the
-<guibutton>K</guibutton> button and select <guimenu>Menu Editor</guimenu>.</para>
+<guibutton>T</guibutton> button and select <guimenu>Menu Editor</guimenu>.</para>
 </answer>
 </qandaentry>
 
@@ -63,15 +64,17 @@ folders.</para>
 <para>How do I exit &tde;?</para>
 </question>
 <answer>
-<para>Simply click on the <guibutton>K</guibutton> button and select
-<guimenu>Logout</guimenu>. In addition, if you
-<mousebutton>right</mousebutton> click on an
-empty area of the desktop, you will be presented with a menu
-containing logout as one of the options.
+<para>On the panel (kicker) use the &LMB; to select the <guibutton>T</guibutton>
+button and select <guimenu>Log Out...</guimenu>. Another method is to use the &RMB;
+to select an empty area of the desktop, which opens a popup menu,
+containing <guimenu>Log Out...</guimenu> as one of the options.
+Another option is to use a keyboard shortcut, which on many systems is
+<keycombo action="simul">&Ctrl;&Alt;<keycap>Delete</keycap></keycombo>.
+A fourth option is to add the <application>Lock/Logout</application> button applet.
 <note><para>Depending on your configuration of the &X-Window;, <keycombo
 action="simul">&Ctrl;&Alt;&Backspace;</keycombo>
-might also do the trick by killing the X server, but its use prevents
-session management and cannot be recommended.</para></note></para>
+might also exit &tde; by killing the X server, but using that shortcut prevents
+session management and is recommended only for emergencies.</para></note></para>
 </answer>
 </qandaentry>
 
@@ -88,14 +91,13 @@ connected, it will just sit there (idling).</para>
 
 <qandaentry>
 <question>
-<para>Is it really necessary to upgrade to the latest version?</para>
+<para>Is it really necessary to update to the latest version?</para>
 </question>
 <answer>
-<para>We recommend to always use the latest stable release. If you
-don't, it will probably be difficult to get answers to your
-questions. If you have a problem with an old version, the answer will
-probably be <quote>Please upgrade and try again</quote>. Note that
-new versions also sometimes fix security problems.</para>
+<para>We recommend updating to the latest stable release, or at least to stay within
+a release version. Otherwise, getting answers to questions might be challenging.
+Each release always contains bug fixes and enhancements. Often a problem with an old version
+has been fixed in a more recent release. Newer versions also fix security problems. Only seldom are bug and security fixes backported to older releases.</para>
 </answer>
 </qandaentry>
 
@@ -115,10 +117,9 @@ focus.</para></step>
 button mouse and are emulating a three button mouse, push both buttons
 simultaneously.</para></step>
 </procedure>
-
-<para>For more information about using the clipboard in &tde; please see the &klipper; hand book, accessed by typing <userinput><command>help:/klipper</command></userinput>
-into the &konqueror; address bar. </para>
-
+<para>The standard keyboard shortcuts for copying is <keycombo action="simul">&Ctrl;<keycap>C</keycap></keycombo>, to cut is <keycombo action="simul">&Ctrl;<keycap>X</keycap></keycombo>, and to paste is <keycombo action="simul">&Ctrl;<keycap>V</keycap></keycombo>.</para>
+<para>&tde; provides a multiple layer clipboard called &klipper;. Refer to the <ulink
+url="help:/klipper">&klipper; handbook</ulink> for further information.</para>
 </answer>
 </qandaentry>
 
@@ -128,27 +129,19 @@ into the &konqueror; address bar. </para>
 <guimenu>TDE</guimenu> menu?</para>
 </question>
 <answer>
-<para>Click on the <guibutton>K</guibutton> button and select
+<para>Click on the <guibutton>T</guibutton> button and select
 <menuchoice><guimenu>System</guimenu><guimenuitem>Appfinder</guimenuitem></menuchoice>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question id="CVS">
-<para>What is <acronym>CVS</acronym>?</para>
+<question id="GIT">
+<para>What is <acronym>GIT</acronym>?</para>
 </question>
 <answer>
-<para>It stands for Concurrent Versions System. It is a version
-control system and is based on <acronym>RCS</acronym> (Revision
-Control System), but
-offers more functionality. It is used to maintain source code under
-development. It will keep multiple versions of things (handy if you
-broke something and have to back up and get a clean old version), and
-allows people remote access over the Net to pick up the latest source
-code and even to check in new files if they have permission. It is
-also open source (you pay for support if you want it), and since it is
-free it is the system of choice for people writing more free products,
-such as &tde;.</para>
+<para>GIT is a distributed version control and source code management system.
+GIT is used to maintain source code under development. The &tde; developers use GIT.
+</para>
 </answer>
 </qandaentry>
 
@@ -157,20 +150,19 @@ such as &tde;.</para>
 <para>Does &tde; support dual screen (Xinerama)?</para>
 </question>
 <answer>
-<para>Yes, you need to have a multi-headed X server
-(&eg; MetroX or XFree86 4.0 and above) and a &tde; >= 2.2.1
+<para>Yes, you need to have a multi-headed X server.
 </para>
 </answer>
 </qandaentry>
 
-<qandaentry>
+<!--<qandaentry>
 <question>
 <para>Why does Drag and Drop not work with Xinerama?</para>
 </question>
 <answer>
-<para>You should upgrade to XFree86 4.2.0 for this to work properly.</para>
+<para>You should update to XFree86 4.2.0 for this to work properly.</para>
 </answer>
-</qandaentry>
+</qandaentry>-->
 
 <qandaentry>
 <question>
@@ -183,9 +175,9 @@ related information in the <guimenuitem>About</guimenuitem> dialog.
 </answer>
 </qandaentry>
 
-<qandaentry>
+<!--<qandaentry>
 <question>
-<para>How do I go about creating themes and icons?</para>
+<para>How do I create themes and icons?</para>
 </question>
 <answer>
 <para>Go see <ulink
@@ -194,15 +186,17 @@ There is also a more informal community of &tde; related artists and
 artwork at <ulink url="http://kde-look.org">http://kde-look.org</ulink>.
 </para>
 </answer>
-</qandaentry>
+</qandaentry>-->
 
 <qandaentry>
 <question>
 <para>How do I learn about development updates?</para>
 </question>
 <answer>
-<para>You might want to subscribe to the &tde; developer's mail list.
-Check <ulink url="http://trinity-devel.pearsoncomputing.net/">http://trinity-devel.pearsoncomputing.net/</ulink>
+<para>You might want to subscribe to the
+<ulink url="http://www.trinitydesktop.org/mailinglist.php">
+&tde; developer's mail list</ulink>.
+Refer to <ulink url="http://trinity-devel.pearsoncomputing.net/">http://trinity-devel.pearsoncomputing.net/</ulink>
 if you want to read without subscribing.</para>
 </answer>
 </qandaentry>
@@ -245,7 +239,5 @@ in the development sources.</para>
 </answer>
 </qandaentry>
 
-
 </qandaset>
 </chapter>
-
diff --git a/doc/faq/moreinfo.docbook b/doc/faq/moreinfo.docbook
index 2e520388e..f9d619456 100644
--- a/doc/faq/moreinfo.docbook
+++ b/doc/faq/moreinfo.docbook
@@ -14,10 +14,7 @@
 </question>
 <answer>
 <para>The &tde; homepage is located at <ulink
-url="http://www.kde.org">http://www.kde.org</ulink>.  If you prefer a
-local mirror, there are several to choose from.  For a current list of
-web site mirrors sorted by location, please visit <ulink
-url="http://www.kde.org/mirrors/web.php">http://www.kde.org/mirrors/web.php</ulink>.</para>
+url="http://www.trinitydesktop.org/">http://www.trinitydesktop.org/</ulink>.</para>
 </answer>
 </qandaentry>
 
@@ -26,28 +23,32 @@ url="http://www.kde.org/mirrors/web.php">http://www.kde.org/mirrors/web.php</uli
 <para>Is there a &tde; mailing list?</para>
 </question>
 <answer>
-<para>There are several &tde; mailing lists.  Each focuses on a different
-aspect of &tde;.  Some are for developers, so they are not
-discussed in detail.  Some of the more important lists that users
+<para>There are several &tde; mailing lists. Each focuses on a different
+aspect of &tde;. Some are for developers, so they are not
+discussed in detail. Some of the more important lists that users
 might be interested in are:</para>
+
 <variablelist>
-<varlistentry><term>kde</term>
-<listitem><para>This is the main &tde; mailing list for general
-discussions.</para></listitem>
+<varlistentry>
+<term><ulink url="http://www.trinitydesktop.org/mailinglist.php">tde-users</ulink></term>
+<listitem><para>For general discussion, users helping each other.</para></listitem>
 </varlistentry>
-<varlistentry><term>kde-announce</term>
-<listitem><para>This list is used to announce new versions of &tde; as
-well as new tools and applications.</para></listitem>
+
+<varlistentry>
+<term><ulink url="http://www.trinitydesktop.org/mailinglist.php">tde-announce</ulink></term>
+<listitem><para>Announcements of &tde; news</para></listitem>
 </varlistentry>
-<varlistentry><term>kde-look</term>
-<listitem><para>This is the list that deals with questions about look and
-feel, and general user interface considerations.</para></listitem>
+
+<varlistentry>
+<term><ulink url="http://www.trinitydesktop.org/mailinglist.php">tde-devel</ulink></term>
+<listitem><para>For developers, artists, documentation writers.</para></listitem>
 </varlistentry>
 </variablelist>
+
 <para>For the complete list of mailing lists available, please refer
 to <ulink
-url="http://www.kde.org/mailinglists/">http://www.kde.org/mailinglists/</ulink>.</para>
-<para>Please note that it is not a good idea to ask questions which are
+url="http://www.trinitydesktop.org/mailinglist.php">http://www.trinitydesktop.org/mailinglist.php</ulink>.</para>
+<para>Please note that it is not a good idea to ask questions that are
 already answered in this &FAQ;.</para>
 </answer>
 </qandaentry>
@@ -57,31 +58,9 @@ already answered in this &FAQ;.</para>
 <para>How do I subscribe/unsubscribe to these lists?</para>
 </question>
 <answer>
-<para>To subscribe, send an email to list-request, that is:</para>
-<itemizedlist>
-<listitem><para><ulink
-url="mailto:[email protected]">[email protected]</ulink></para></listitem>
-<listitem><para><ulink url="mailto:[email protected]">[email protected]</ulink></para></listitem>
-<listitem><para><ulink url="mailto:[email protected]">[email protected]</ulink></para></listitem>
-</itemizedlist>
-<para>The email must contain <userinput>subscribe
-<replaceable>your_email_address</replaceable></userinput> in the
-subject.</para>
-<para>To unsubscribe, send an email to list-request, that is:</para>
-<itemizedlist>
-<listitem><para><ulink url="mailto:[email protected]">[email protected]</ulink></para></listitem>
-<listitem><para><ulink url="mailto:[email protected]">[email protected]</ulink></para></listitem>
-<listitem><para><ulink url="mailto:[email protected]">[email protected]</ulink></para></listitem>
-</itemizedlist>
-<para>The email must contain <userinput>unsubscribe
-<replaceable>your_email_address</replaceable></userinput> in the
-subject.
-<important><para>Never send subscribe/unsubscribe request to the
-mailing lists directly! Use the list-request
-instead.</para></important></para>
-<para>There is also a complete list of all &tde;-related mailing
-lists, and a web interface for subscribing and unsubscribing located
-at <ulink url="http://master.kde.org/mailman/listinfo">http://master.kde.org/mailman/listinfo</ulink>.</para>
+<para>To subscribe, follow the directions here:
+<ulink url="http://www.trinitydesktop.org/mailinglist.php">Official Mailing Lists</ulink>
+</para>
 </answer>
 </qandaentry>
 
@@ -90,44 +69,48 @@ at <ulink url="http://master.kde.org/mailman/listinfo">http://master.kde.org/mai
 <para>Is there a mailing list archive?</para>
 </question>
 <answer>
+<para>Yes, each list has a searchable archive:
 
-<para>Yes, there is a searchable mailing list archive hosted by <ulink
-url="http://www.progressive-comp.com">Progressive Computer
-Concepts</ulink>.  The &URL; is <ulink
-url="http://lists.kde.org">http://lists.kde.org</ulink>.  There you
-will see a folder listing of the mailing lists.  Note that you can
-only do a subject/author search at this level.  You probably will not
-find what you want doing this kind of search.</para>
+<variablelist>
+<varlistentry>
+<term><ulink url="http://trinity-users.pearsoncomputing.net/">tde-users</ulink></term>
+<listitem><para>General discussion archives.</para></listitem>
+</varlistentry>
 
-<para>To do a body search, you have to enter one of the mailing lists.
-Just click on the folder you want to search (&eg; <quote>kde</quote>
-or <quote>kde-devel</quote>) and then the pull-down menu by the search
-box will default to <quote>Body</quote> searches.  To be thorough, you
-should probably search the <quote>kde</quote>, <quote>kde-linux</quote>, and <quote>kde-devel</quote> folders. </para>
+<varlistentry>
+<term><ulink url="http://trinity-announce.pearsoncomputing.net/">tde-announce</ulink></term>
+<listitem><para>Announcement archives.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><ulink url="http://trinity-devel.pearsoncomputing.net/">tde-devel</ulink></term>
+<listitem><para>Developers, artists, documentation writer archives.</para></listitem>
+</varlistentry>
+</variablelist>
 
+</para>
 </answer>
 </qandaentry>
 
-<qandaentry>
+<!--<qandaentry>
 <question id="newsgroups">
 <para>Is there a newsgroup about &tde;?</para>
 </question>
 <answer>
 <para>Yes, there is!  It is at <literal>comp.windows.x.kde</literal>.
 In addition, there is also a German newsgroup at
-<literal>de.alt.comp.kde</literal>.  Please note that it is not a good
+<literal>de.alt.comp.kde</literal>. Please note that it is not a good
 idea to ask questions which are already answered in this
 &FAQ;.</para>
 </answer>
-</qandaentry>
+</qandaentry>-->
 
-<qandaentry>
+<!--<qandaentry>
 <question>
-<para>Are there any other &tde;-related
-&FAQ;s?</para>
+<para>Are there any other &tde;-related &FAQ;s?</para>
 </question>
 <answer>
-<para>Yes.  Here is a list of them:</para>
+<para>Yes. Here is a list of them:</para>
 <itemizedlist>
 <listitem><para><ulink
 url="http://www.kde.org/info/faq.php">&tde; &FAQ;</ulink></para></listitem>
@@ -136,18 +119,18 @@ url="http://konqueror.org/faq/">&konqueror;
 &FAQ;</ulink></para></listitem>
 <listitem><para><ulink
 url="http://www.arts-project.org/doc/manual/index.html">aRts
-sound server documentation</ulink></para></listitem>
+sound server documentation</ulink></para></listitem>-->
 
 <!-- Removed because the kmail FAQ is part of the KMail manual and not a -->
-<!-- separate document 
+<!-- separate document
 <listitem><para><ulink
 url="http://kmail.kde.org/manual/faq.html">&kmail;
 &FAQ;</ulink></para></listitem>
 -->
 
-</itemizedlist>
+<!--</itemizedlist>
 </answer>
-</qandaentry>
+</qandaentry>-->
 
 </qandaset>
 </chapter>
diff --git a/doc/faq/nontdeapps.docbook b/doc/faq/nontdeapps.docbook
index b433d671d..ec04e11b6 100644
--- a/doc/faq/nontdeapps.docbook
+++ b/doc/faq/nontdeapps.docbook
@@ -31,9 +31,8 @@ non-TDE applications</guilabel> checkbox and click
 <question><para>How can I set my default web browser to be something other
 than &konqueror;?</para></question>
 <answer>
-<para>If you are using &tde; 3.3 or later, open up the &kcontrolcenter; and
-navigate to the <menuchoice><guimenu>TDEDE
-Components</guimenu><guimenuitem>Component
+<para>Open the &kcontrolcenter; and
+navigate to the <menuchoice><guimenu>TDE Components</guimenu><guimenuitem>Component
 Chooser</guimenuitem></menuchoice> panel. Select <guilabel>Web
 Browser</guilabel> from the list on the left, then select <guilabel>Open
 http and https URLs in the following browser:</guilabel> and type in the
@@ -51,11 +50,8 @@ applications within &tde; ?
 </question>
 <answer>
 <para>
-The simplest way to achieve this is to download and compile the
-<acronym>gtk-qt</acronym> theme engine from <ulink
-url="http://www.freedesktop.org/Software/gtk-qt">
-http://www.freedesktop.org/Software/gtk-qt</ulink>. This theme engine makes
-your <acronym>GTK</acronym> applications look like your &tde; widget style
+Install the <application>qt-gtk-engine</application> package, which is available as part of &tde;. This
+theme engine makes <acronym>GTK</acronym> applications look like your &tde; widget style
 by calling functions from &Qt; instead of drawing the styles itself. Once
 the theme engine has been installed, there will be a &kcontrolcenter; module
 under <menuchoice><guimenu>Appearance &amp; Themes</guimenu><guimenuitem>GTK
@@ -64,7 +60,7 @@ Styles and Fonts</guimenuitem></menuchoice>.
 </answer>
 </qandaentry>
 
-<qandaentry>
+<!--<qandaentry>
 <question>
 <para>I have been hearing about this gecko kpart or &Qt; Mozilla, how do I
 get these?</para>
@@ -77,12 +73,12 @@ according to these instructions:
 <ulink url="http://www.mozilla.org/cvs.html">
 http://www.mozilla.org/cvs.html</ulink>. Then, configure either the Mozilla
 suite or the Firefox browser with the option
-<command>--enable-default-toolkit=qt</command> in addition to any other
+<command>- -enable-default-toolkit=qt</command> in addition to any other
 options you would like to enable. More instructions on building Mozilla can
 be found <ulink url="http://www.mozilla.org/build">here</ulink>.
 </para>
 </answer>
-</qandaentry>
+</qandaentry>-->
 
 </qandaset>
 </chapter>
diff --git a/doc/faq/notrelated.docbook b/doc/faq/notrelated.docbook
index 972bd9f32..5440341c1 100644
--- a/doc/faq/notrelated.docbook
+++ b/doc/faq/notrelated.docbook
@@ -65,7 +65,7 @@ depth.</para>
 <para>Go buy a 3-button one, or use third button emulation.  The third
 button is emulated by pressing both the &LMB; and the &RMB;
 together.  You would need to enable <option>Emulate3Buttons</option>
-in your <filename>XF86Config</filename> file. </para>
+in your <filename>XF86Config</filename> file.</para>
 </answer>
 </qandaentry>
 
@@ -79,7 +79,7 @@ in your <filename>XF86Config</filename> file. </para>
 desktops, as if sticking to the glass of the screen.
 <application>Xclock</application> is a typical candidate for sticking,
 as you need to run only one instance of it, and it always stays with
-you. </para>
+you.</para>
 </answer>
 </qandaentry>
 
diff --git a/doc/faq/qt.docbook b/doc/faq/qt.docbook
index 2e1b3289c..91806f333 100644
--- a/doc/faq/qt.docbook
+++ b/doc/faq/qt.docbook
@@ -12,9 +12,9 @@
 also includes many utility classes like string classes and classes
 to handle input and output. It
 provides most of the widgets you will see in a &tde; application:
-menus, buttons, sliders, &etc;.  &Qt; is a cross-platform library that
-allows you to write code that will compile on &UNIX; systems as well as
-&Windows; and embedded devices.  You can learn more about &Qt; at <ulink
+menus, buttons, sliders, &etc; &Qt; is a cross-platform library that
+allows developers to write code that will compile on &UNIX; systems as well as
+&Windows; and embedded devices. Learn more about &Qt; at <ulink
 url="http://www.trolltech.com">http://www.trolltech.com</ulink>.</para>
 </answer>
 </qandaentry>
@@ -25,9 +25,9 @@ url="http://www.trolltech.com">http://www.trolltech.com</ulink>.</para>
 </question>
 <answer>
 <para>&Qt; is a sophisticated toolkit that provides everything that
-is needed to build a modern user interface.  &Qt; is written in C++, thus
+needed to build a modern user interface. &Qt; is written in C++, thus
 allowing object-oriented development which ensures efficiency and
-code reuse in a project the size and scope of &tde;.  In our opinion
+code reuse in a project the size and scope of &tde;. In our opinion
 there is no better toolkit available for &UNIX; systems and that it
 would have been a grave mistake to try to build &tde; on anything but
 the best.</para>
@@ -39,9 +39,9 @@ the best.</para>
 <para>Why does &tde; not use gtk, xforms, xlib, whatever?</para>
 </question>
 <answer>
-<para>There are a number of toolkits available.  To provide a
+<para>There are a number of toolkits available. To provide a
 consistent user interface and to keep used resources such as memory to
-a minimum, &tde; can use only one of them.  &Qt; was selected for the
+a minimum, &tde; can use only one of them. &Qt; was selected for the
 reasons mentioned above.</para>
 </answer>
 </qandaentry>
@@ -51,9 +51,9 @@ reasons mentioned above.</para>
 <para>But &Qt; isn't free, is it?</para>
 </question>
 <answer>
-<para>It is!  As of September 4, 2000, version 2.2 of the &Qt;
-libraries were licensed under the <acronym>GPL</acronym>, thereby
-fulfiling all aspects of <quote>free software</quote>.</para>
+<para>&Qt; is free/libre. Since September 4, 2000, version 2.2 of the &Qt;
+libraries are licensed under the <acronym>GPL</acronym>, thereby
+fulfiling all aspects of <quote>free/libre software</quote>.</para>
 </answer>
 </qandaentry>
 
@@ -64,12 +64,11 @@ fulfiling all aspects of <quote>free software</quote>.</para>
 <answer>
 <para>You can use the &tde; libraries to write <quote>commercial and
 closed source</quote> as well as <quote>commercial and open
-source</quote> software.  If you write open source software you can
-use the &Qt; free edition.  But if you write closed source software
+source</quote> software. If you write open source software you can
+use the &Qt; free edition. If you write closed source software
 you may not use the &Qt; free edition; you need to obtain the &Qt;
-professional edition from Troll Tech. </para> <para>If you want more
-information, please contact <ulink
-url="http://www.trolltech.com">Troll Tech</ulink> directly.</para>
+professional edition from Troll Tech. For more information, please
+contact <ulink url="http://www.trolltech.com">Troll Tech</ulink> directly.</para>
 </answer>
 </qandaentry>
 
@@ -88,7 +87,7 @@ used as an emotional wedge more than a factual observation.</para>
 
 <qandaentry>
 <question>
-<para>Are there plans to migrate Trinity to Qt4?</para>
+<para>Are there plans to migrate &tde; to Qt4?</para>
 </question>
 <answer>
 <para>Not at this time.</para>
diff --git a/doc/faq/questions.docbook b/doc/faq/questions.docbook
index dc311f421..f622a0a69 100644
--- a/doc/faq/questions.docbook
+++ b/doc/faq/questions.docbook
@@ -3,13 +3,10 @@
 
 <title>Asking Questions</title>
 
-<para>Chances are, you have been linked to this document from IRC or a
-mailing list. You've asked a question, and someone has told you that you
-need how to ask more effectively. In order to get an appropriate, clear
-answer you need to ask an appropriate, clear question in a manner that's
-going to provide an incentive for people to take their time to help you. If
-you appear to be rude, lazy or use bad or unclear language then chances are
-your question will be ignored</para>
+<para>To get an appropriate answer to questions requires asking a clear
+question in a manner that motivates people to help. Writing questions that
+appear to be rude, lazy, or uses bad or unclear language likely will result
+in your question being ignored.</para>
 
 <qandaset>
 <qandaentry>
@@ -19,25 +16,24 @@ your question will be ignored</para>
 <answer><para>Read the documentation and &FAQ; for the application. There is
 a wealth of &tde; documentation availible both in the help center and
 online. A lot of time and effort has gone into this documentation, and
-quite often the answer to your question is here. The general &tde; userguide
-can be found by typing
-<userinput><command>help:/userguide</command></userinput> into your
-&konqueror; addressbar.</para>
+often the answer to your question is there. The general &tde; userguide
+can be found by typing <userinput><command>help:/khelpcenter/userguide</command></userinput>
+into the &konqueror; address bar or <userinput><command>
+khelpcenter help:/khelpcenter/userguide with the minicli</command></userinput>.</para>
 
-<para>Search the web: Usually googling for a specific error message or
-searching mailing list archives can come up with a solution for you.</para>
+<para>Search the web: Usually searching for a specific error message or
+searching mailing list archives will find a solution.</para>
 
 <para>Try it and see! Look through all the application options, read the
 What's this? and tooltips for the ones you're not sure about. If you're
-really unsure about an option save your data and then try it. As long as you
-use some common sense, you are very unlikely to break anything by clicking
-buttons.</para>
+really unsure about an option save your data and then try. As long as you
+use common sense you are unlikely to break anything by experimenting.</para>
 
-<para>Above all, don't be lazy. If you show the people who you are asking
+<para>Don't be lazy. If you show the people who you are asking
 that you are able to troubleshoot and research in a logical manner, you're
 showing them you're a reasonable person who is worth their time to
 help. It's your problem and not theirs so the legwork is yours to do. Save
-your helpers as much time as you can, they're busy people.</para> </answer>
+your helpers as much time as you can.</para> </answer>
 </qandaentry>
 
 <qandaentry>
@@ -47,8 +43,12 @@ your helpers as much time as you can, they're busy people.</para> </answer>
 <acronym>IRC</acronym> channels and mailing lists devoted to user
 questions. Don't post simple questions about using &tde; to the devel
 channels and mailing lists, these are for technical discussions. Some good
-places are #kde on irc.freenode.net, and the &tde; mailing
-lists.</para></answer> </qandaentry>
+places are chat.freenode.net, channel: #trinity-desktop, and the &tde; <ulink
+url="http://www.trinitydesktop.org/mailinglist.php">mailing
+lists</ulink>.
+</para>
+</answer>
+</qandaentry>
 
 <qandaentry>
 <question><para>How do I ask?</para></question>
@@ -57,87 +57,82 @@ lists.</para></answer> </qandaentry>
 information possible and is polite and courteous. Don't ask to ask, just
 ask!</para>
 
-<para>Q: &tde; sucks, it's being slow</para>
+<para>Q: &tde; sucks, it's slow</para>
 
 <para>Is not a question that is likely to get you a useful answer. It does
 not give any useful information about troubleshooting the problem, and it
 starts out attacking the software in a way that isn't productive.</para>
 
-<para>Q: Since upgrading &tde; on Slackware &Linux; from version 3.2.3 to
-3.3.2 using sources, I have noticed it's being really slow &mdash; sometimes
+<para>Q: Since updating &tde; on Slackware &Linux; using sources, I have
+noticed it's being really slow &mdash; sometimes
 applications take up to 20 seconts to launch. I am using the same user
-configuration as I had with the previous version, and I have tried as a new
-user. I can't find anything about this on the mailing lists or by a google
+configuration as I had with the previous version. I have tried as a new
+user. I can't find anything about this on the mailing lists or by a web
 search. Could anyone point me to some information that could help?</para>
 
 <para>This question is polite, contains information to help people
 troubleshoot the problem and shows your helpers what avenues you have
 already tried.</para>
 
-<para>Don't assume automatically that the problem is the fault of
-&tde;. Proceed as though this is your error, otherwise you will quickly
-annoy people if it does indeed turn out to be your problem and not
-&tde;.</para>
+<para>Don't presume automatically that the problem is the fault of
+&tde;. Otherwise you likely will annoy people.</para>
 
 <para>Use clear language with correct spelling. Watch out for any
 ambiguities and make sure you think about what you say before you write
 it. If you are asked for clarification, give it as best you can. &tde; is a
 project where many of the users and developers are not native english
-speakers and if you don't use correct english, misunderstandings may
-ensue. Use the language appropriate to the channel or mailing list you are
-in &mdash; if you don't, people who might have been able to help you may
+speakers and if you don't use correct english, misunderstandings might
+ensue. Be patient. Use the language appropriate to the channel or mailing list you are
+in &mdash; if you don't, people who might have been able to help you might
 ignore your message because it is not in a language they understand.</para>
 
-<para>Include all information that could be relevant, even if you're not
-sure. Have you upgraded other software or hardware on your system,
+<para>Include all information that could be relevant, even when you're not
+sure. Have you updated other software or hardware on your system,
 particularly system libraries or a new kernel? These things could affect how
-&tde; performs. Even if you cannot see a link, someone else might.</para>
+&tde; performs. Even when you cannot see a connecting cause, someone else might.</para>
 
 <para>Don't paraphrase error messages. Paste in the exact error, and if it's
 more than a line or two don't paste them directly into an
-<acronym>IRC</acronym> channel. Use a paste service like <ulink
-url="http://www.rafb.net/paste/"> http://www.rafb.net/paste</ulink>. If you
-must type them in by hand, be sure you are 100% accurate. When you provide
-faulty information, your helpers cannot help you as easily. </para>
-
-<para>Follow up on your solution! Tell us if it worked, or if you have
-solved it yourself in the meantime. This helps us know for sure if our
-solution worked, and helps other users who may be searching mailing list
-archives for a solution to the problem themselves.</para> </answer>
+<acronym>IRC</acronym> channel. Use an online paste service. If you
+must type the messages by hand, be sure you are accurate. When you provide
+faulty information, your helpers cannot help you as easily.</para>
+
+<para>Follow through on your solution! Tell people when the solution worked, or when you have
+solved the problem yourself. This helps everybody involved know when
+solutions work and helps other users who might be searching for a similar
+solution to the problem.</para>
+</answer>
 </qandaentry>
 
 <qandaentry>
 <question><para>What do I do when told to look elsewhere?</para></question>
 
-<answer><para>When you're told <quote>google knows</quote> or <quote>google
-is your friend</quote> then chances are, you have not followed the above
-advice. You've not done your research, and the solution is probably one the
-helper knows very well to be easy to find. When you're linked to a
-<acronym>FAQ</acronym> or a usermanual don't ever say, <quote>No, I don't
-want to have to read this I want you to just tell me</quote>. This is very
-bad manners. If you cannot put in the effort to read the document, what is
-the incentive for your helper to put in the time and effort to help you?  If
-you're told to go use google, take it graciously and do so.</para> </answer>
-</qandaentry> </qandaset>
-
-<para>Above all, use common courtesy. &tde; users and developers are usually
-volunteering their time out of an already very busy schedule, and like to
-know that you are appreciating that they are helping you for free. Be
-polite, say please and thank you and try to be pleasant and
-friendly. </para>
+<answer><para>Possibly you have not followed the above
+advice. You've not done your research, and the solution probably is one the
+helper knows very well to be easy to find. When provided a web link to an
+<acronym>FAQ</acronym> or documentation don't say, <quote>No, I don't
+want to have to read this I want you to just tell me</quote>. That response
+is considered bad manners. People who don't provide effort to learn often
+find others have little incentive to help.</para>
+</answer>
+</qandaentry>
+</qandaset>
+
+<para>Use common courtesy. &tde; users and developers volunteer their time
+out of an already very busy schedule, and like to
+know that you are appreciating they are helping you for free. Be
+polite, say please and thank you, be constructive, and try to be pleasant and
+friendly.</para>
 
 <para> Does this seem like a lot of trouble to ask a question? If you want
 to be able to feel that people owe you an answer or support, then you're
 quite welcome to pay for commercial support from companies that support
 &tde; on &UNIX; platforms. If you don't want to pay money, then pay the
-people who do this for free with your politeness and appreciation :)</para>
-
+people who do this for free with your politeness and appreciation. :-)</para>
 
 <para>If you think the answer to your question should be included in the
 &tde; &FAQ; please feel free to submit any patches or suggestions to the
-&tde; &FAQ; Maintainer, at <email>[email protected]</email></para>
-
-
+&tde; &FAQ; Maintainer, at <email>[email protected]</email></para>
 
 </chapter>
 
diff --git a/doc/faq/sound.docbook b/doc/faq/sound.docbook
index ce5397653..feaaf6651 100644
--- a/doc/faq/sound.docbook
+++ b/doc/faq/sound.docbook
@@ -22,7 +22,7 @@ problem.</para>
 <para>Try playing sound with
 <userinput><command>artsplay</command><option><replaceable>
 /path/to/some/soundfile</replaceable></option></userinput>. Try various
-formats, ogg, mp3 and wav.  Any error messages there might be useful in
+formats, ogg, mp3 and wav. Any error messages there might be useful in
 pointing you in the right direction.</para>
 
 <para>Try setting the &arts; output method to <acronym>OSS</acronym>. In the
@@ -42,14 +42,12 @@ conjunction with using <command>artsplay</command> in a second terminal can give
 </qandaentry>
 <qandaentry>
 <question><para>
-I've upgraded to the latest version of &tde; keeping my old configuration, and my system sounds don't work anymore!</para></question>
+I've updated to the latest version of &tde; keeping my previous configuration and my system sounds don't work anymore!</para></question>
 <answer><para>
-Assuming you've installed &arts; correctly and you still have the codecs installed your previous &tde; installation needed, chances are this is a small problem with your <filename>knotifyrc</filename>. To confirm this, try creating an entirely new user and seeing if system notifications work under the new account. If they do, try moving your <filename>$<envar>TDEHOME</envar>/share/config/knotifyrc</filename> out of the way for your original user to see if this solves the problem.
+Assuming you've installed &arts; correctly and you still have the codecs installed your previous &tde; installation needed, possibly there is a problem with your <filename>knotifyrc</filename>. To confirm this, try temporarily
+renaming the file. A new one will be created when starting &tde;.
 </para></answer>
 </qandaentry>
 
-
 </qandaset>
-
 </chapter>
-
diff --git a/doc/faq/tdeapps.docbook b/doc/faq/tdeapps.docbook
index e10a452e7..6f20acc69 100644
--- a/doc/faq/tdeapps.docbook
+++ b/doc/faq/tdeapps.docbook
@@ -14,45 +14,41 @@
 </question>
 <answer>
 
-<para>Many &tde; users report problems using &kppp;.  But before you
-complain about &kppp;, make sure you have already checked the
+<para>Many &tde; users report problems using &kppp;. Make sure you have already checked the
 following:</para>
 
 <itemizedlist>
 <listitem><para>Can you dialup to your <acronym>ISP</acronym> without using &kppp;?  If you cannot, then perhaps &kppp; is not the culprit after
 all.</para></listitem>
-<listitem><para>Have you gone through the &kppp; documentation at
-least three times and followed its instructions and trouble-shooting
+<listitem><para>Have you gone through the &kppp; documentation
+and followed the instructions and troubleshooting
 suggestions?</para></listitem>
 </itemizedlist>
-<para>The &kppp; documentation can be accessed through the 
-<application>&tde; Help Center</application>.
- Last, but not least, the &kppp; homepage is at <ulink
- url="http://ktown.kde.org/~kppp/">http://ktown.kde.org/~kppp/</ulink>.</para>
-<para>Now, if you still encounter problems, here's what might help you
-solve them:</para>
+<para>The <ulink url="help:/kppp">&kppp; handbook</ulink> is available through the
+<application>&tde; Help Center</application>.</para>
+<para>If you still encounter problems, then the following might help:</para>
 <variablelist>
 <varlistentry><term>How do I change the &MTU; setting in &kppp;?</term>
 <listitem><para>Open up the &kppp; dialog box and select
-<guibutton>Setup</guibutton>.  Choose an existing account and click
+<guibutton>Setup</guibutton>. Choose an existing account and click
 <guibutton>Edit</guibutton>, or <guibutton>New</guibutton> to create a
-new dialup account.  Select the <guilabel>Dial</guilabel> tab and
-click <guibutton>Arguments</guibutton>.  Type what you want to change
+new dialup account. Select the <guilabel>Dial</guilabel> tab and
+click <guibutton>Arguments</guibutton>. Type what you want to change
 in the Argument textbox (&eg; <userinput>mtu 296</userinput>) and
-click <guibutton>Add</guibutton>.  When you are satisfied, click
+click <guibutton>Add</guibutton>. When you are satisfied, click
 <guibutton>Close</guibutton>.</para>
 <para>To check whether the options <quote>took</quote>, do one of the following:</para>
 <itemizedlist>
 <listitem>
 <para>In a terminal window, run
 <userinput><command>/sbin/ifconfig</command> ppp0</userinput> and look
-at the reported &MTU; in the output.  It should match your
+at the reported &MTU; in the output. It should match your
 request.</para>
 </listitem>
 <listitem><para>Add <option>debug</option> and <option>kdebug</option>
 (each on a separate line) to your
 <filename>/etc/ppp/options</filename> file and restart your
-&PPP; session.  You will find debugging messages in
+&PPP; session. You will find debugging messages in
 <filename>/var/log/messages</filename>, including &MRU; and &MTU;
 settings.</para></listitem>
 </itemizedlist>
@@ -68,13 +64,13 @@ normal.</term>
 <listitem><para>Try executing <command>setserial
 spd_hi</command>.</para></listitem>
 <listitem><para>The default &MTU; value is 1500,
-which maybe too large 
-for a dialup connection.  Try changing it to a smaller value like
+which maybe too large
+for a dialup connection. Try changing it to a smaller value like
 <userinput>296</userinput>
 or <userinput>576</userinput>.</para></listitem>
 <listitem><para>Check in your <filename
-class="directory">$<envar>HOME</envar>/.kde/share/config</filename> for the 
-<filename>kppprc</filename>.  Ensure the correct modem speed is
+class="directory">$<envar>HOME</envar>/.kde/share/config</filename> for the
+<filename>kppprc</filename>. Ensure the correct modem speed is
 actually defined there.</para></listitem>
 </itemizedlist></listitem>
 </varlistentry>
@@ -99,18 +95,22 @@ Dn</keycap></keycombo>.
 </varlistentry>
 
 <varlistentry>
-<term>How do I perform a simple <quote>copy</quote> from &konsole; to
+<term>How do I copy text from &konsole; to
 anything else?</term>
-<listitem><para>When I do a <command>ls</command>, first I select with
-the mouse the desired text, press 
-<keycombo action="simul">&Ctrl;<keycap>C</keycap></keycombo>,
-then I make the target application active, point the mouse to the
-relevant part and press <keycombo
+<listitem><para>Use the mouse to select the desired text. From the
+<guimenu>Edit</guimenu> menu, select <guimenuitem>Copy</guimenuitem>, or press
+<keycombo action="simul">&Ctrl;&Shift;<keycap>C</keycap></keycombo>. This places
+the text in the &tde; clipboard, &klipper;. Next select
+the target application, place the mouse pointer to the
+desired location and press <keycombo
 action="simul">&Ctrl;<keycap>V</keycap></keycombo>.
-Alternatively, highlight the text by dragging with the &LMB; down and
+Alternately, highlight the text by dragging with the &LMB; down and
 paste by clicking with the &MMB; (or both buttons if you are using a
 2 button mouse with 3 button emulation).
-</para></listitem>
+</para><note><para>Note that the copying and pasting keyboard shortcuts use the
+<keycap>&Shift;</keycap> key. That is because in traditional Unix terminals,
+<keycombo action="simul">&Ctrl;<keycap>C</keycap></keycombo> is used to break or stop
+a process from running.</para></note></listitem>
 </varlistentry>
 
 <varlistentry>
@@ -120,14 +120,14 @@ paste by clicking with the &MMB; (or both buttons if you are using a
 
 <para><application>FontConfig</application> must find the three fonts
 installed in: <filename
-class="directory">$<envar>TDEDIR</envar>/share/fonts</filename>. 
+class="directory">$<envar>TDEDIR</envar>/share/fonts</filename>.
  If
 the &tde; install does not install these fonts in a directory that
 already exists (&eg; <filename
 class="directory">/usr/share/fonts</filename>) then you must add this
 directory to the configuration file <filename
-class="directory">/etc/fonts/local.conf</filename>.  This should be
-the first line after <quote>&lt;fontconfig&gt;</quote>.  For example:
+class="directory">/etc/fonts/local.conf</filename>. This should be
+the first line after <quote>&lt;fontconfig&gt;</quote>. For example:
 <programlisting>
 &lt;fontconfig&gt;
 &lt;dir&gt;/usr/trinity/share/fonts&lt;/dir&gt;
@@ -143,7 +143,7 @@ it found the directory.</para>
 </answer>
 </qandaentry>
 
-<qandaentry>
+<!--<qandaentry>
 <question>
 <para>&kmail;</para>
 </question>
@@ -152,7 +152,7 @@ it found the directory.</para>
 url="http://kmail.kde.org">http://kmail.kde.org</ulink> where an
 <acronym>FAQ</acronym> is available.</para>
 </answer>
-</qandaentry>
+</qandaentry>-->
 
 </qandaset>
 </chapter>
diff --git a/doc/faq/tips.docbook b/doc/faq/tips.docbook
index 246751635..89c324be3 100644
--- a/doc/faq/tips.docbook
+++ b/doc/faq/tips.docbook
@@ -18,7 +18,7 @@ action="simul">&Alt;<keycap>F2</keycap></keycombo> by
 default) and type:
 <itemizedlist>
 <listitem>
-<para><command>man:<replaceable>command</replaceable></command> for man pages.  It
+<para><command>man:<replaceable>command</replaceable></command> for man pages. It
 even unpacks on the fly if the man pages are gzipped.</para>
 </listitem>
 
@@ -35,14 +35,10 @@ application help pages.</para>
 </itemizedlist>
 </para>
 
-<para>You can also enter any of these in the <guilabel>Location</guilabel> text
+<para>You can enter any of these in the <guilabel>Location</guilabel> text
 box in &konqueror;.</para>
-<para>Or you can use the <application>&tde; Help Center</application> if you are using &tde;
-2.  Simply start the <application>&tde; Help Center</application> by clicking on the icon (the blue
-book with the yellow key) on the toolbar.  Once the <application>&tde; Help Center</application> has
-loaded, the window on the left will contain an entry called
-<guilabel>Unix manual pages</guilabel>.  Click once on this entry, and
-you can browse through all the installed manual pages on your
+<para>Uou can use the <application>&tde; Help Center</application>. Start the <application>&tde; Help Center</application> by selecting <guimenuitem>Help</guimenuitem> from the <guimenu>TDE menu</guimenu>. Once the <application>&tde; Help Center</application> has loaded, the window on the left will contain an entry called
+<guilabel>Unix manual pages</guilabel>. Select that entry to browse through all the installed manual pages on your
 system.</para>
 </answer>
 </qandaentry>
@@ -54,12 +50,13 @@ system.</para>
 <answer>
 <para>To move a window, use <keycombo
 action="simul">&Alt;<mousebutton>left</mousebutton></keycombo> mouse
-button.  <keycombo
+button. <keycombo
 action="simul">&Alt;<mousebutton>right</mousebutton></keycombo> mouse
-button will resize the window.  Last but not least, <keycombo
+button will resize the window. Last but not least, <keycombo
 action="simul">&Alt;<mousebutton>middle</mousebutton></keycombo> mouse button
 raises/lowers the window. The <application>&tde; Control Center</application>
-allows you to change these mouse bindings.</para>
+allows you to change these mouse bindings. Please refer to <ulink url="help:/khelpcenter/userguide/windows-how-to-work.html">
+Windows, How To Work Them</ulink> in the Trinity user guide for more information.</para>
 </answer>
 </qandaentry>
 
@@ -69,13 +66,13 @@ allows you to change these mouse bindings.</para>
 </question>
 <answer>
 <para>There is a standard keybinding (<keycombo
-action="simul">&Ctrl;&Alt;&Esc;</keycombo>) 
-that gives you a skull &amp; crossbones cursor.  Click that cursor on a
-window to kill it.  The keybindings are viewable/changeable from the
+action="simul">&Ctrl;&Alt;&Esc;</keycombo>)
+that changes the mouse pointer to a skull &amp; crossbones cursor. Click that cursor on a
+window to kill it. The keybindings are viewable/changeable from the
 <application>&tde; Control Center</application>.
 
-<caution><para>Using this option kills the program forcibly. Data may be lost,
-and some processes related to the program may remain active. Use only as a
+<caution><para>Using this option kills the program forcibly. Data might be lost,
+and some processes related to the program might remain active. Use only as a
 last resort.</para></caution>
 <!-- fixme: use only if necessary; processes might remain --></para>
 </answer>
@@ -113,9 +110,6 @@ operating system) to see if things work again. When you press
 <keycombo action="simul">&Alt;<keycap>Tab</keycap></keycombo> you should get a
 response from the window manager. If not, you need to get back to the
 text console and try to kill another process.</para>
-
-<para>Good candidates to kill are: the application you were working
-with, &kicker;, &klipper; and &kdesktop;.</para>
 </answer>
 </qandaentry>
 
@@ -127,7 +121,7 @@ with, &kicker;, &klipper; and &kdesktop;.</para>
 <answer>
 <para>If you want to switch your window manager on the fly, type the
 following into a terminal window: <command>kwmcom
-go:<replaceable>blackbox</replaceable></command>.  This switches to
+go:<replaceable>blackbox</replaceable></command>. This switches to
 Blackbox, but you can substitute any window manager you like.</para>
 </answer>
 </qandaentry>
diff --git a/doc/faq/webbrowse.docbook b/doc/faq/webbrowse.docbook
index 7de7bbb9d..d1ee69240 100644
--- a/doc/faq/webbrowse.docbook
+++ b/doc/faq/webbrowse.docbook
@@ -4,30 +4,31 @@
 
 <chapter id="webbrowser">
 <title>Webbrowsing with &konqueror;</title>
-<para>&konqueror; is &tde;'s open source, standards compliant webbrowser.
-It's home page is
-<ulink
-url="http://www.konqueror.org">http://www.konqueror.org</ulink> where a
-&konqueror; specific <acronym>FAQ</acronym> can be found.</para>
+<para>&konqueror; is &tde;'s default web browser. Please refer to
+the <ulink url="help:/konqueror/index.html">
+Konqueror Handbook</ulink> for detailed information.</para>
 
 <qandaset>
 
 <qandaentry>
 <question><para>Where does the name &konqueror; come from?</para></question>
-<answer><para>It's a word play on the other browsers' names. After the Navigator and the Explorer comes the Conqueror; it's spelled with a K to show that it's part of &tde;. The name change also moves away from <quote>kfm</quote> (the &tde; file manager, &konqueror;'s predecessor) which represented only file management.</para></answer>
+<answer><para>It's a word play on the other browsers' names. After the Navigator
+and the Explorer comes the Conqueror.</para>
+</answer>
 </qandaentry>
 
 <qandaentry>
 <question><para>Can I run &konqueror; without running &tde;?</para></question>
-<answer><para>Yes. Just install &Qt;, tdelibs and tdebase, and from your favorite window manager just launch &konqueror;. It should work just fine, but if it doesn't (&tde; developers don't test that case often), report it to http://bugs.kde.org and try running "tdeinit" before running &konqueror;, it usually helps. 
-This is of course the same for any other &tde; application. </para>
+<answer><para>Yes. Install &Qt;, tdelibs, and tdebase. From your window manager launch &konqueror;. It should work just fine, but if it doesn't (&tde; developers don't often test that use case), report the problem to <ulink
+url="http://bugs.pearsoncomputing.net/">http://bugs.pearsoncomputing.net/</ulink>. Before reporting a bug, try running "tdeinit" before running &konqueror;. This is of course the same for any other &tde; application running in
+a non &tde; setup.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question><para>Why doesn't &konqueror; show the contents of an image's <sgmltag class="attribute">ALT</sgmltag> attribute in a tooltip?</para></question>
 <answer><para>
-There is no standard that states the <sgmltag class="attribute">ALT</sgmltag> attribute should appear as a tooltip. The specification calls for <sgmltag class="attribute">ALT</sgmltag> to be displayed in place of the image, as in text-mode only browsers such at lynx or w3m. Abusing the <sgmltag class="attribute">ALT</sgmltag> attribute is bad for accessibility. Tooltips are supposed to come from the <sgmltag class="attribute">TITLE</sgmltag> attribute and this is implemented in &konqueror;
+There is no standard that states the <sgmltag class="attribute">ALT</sgmltag> attribute should appear as a tooltip. The specification calls for <sgmltag class="attribute">ALT</sgmltag> to be displayed in place of the image, as in text-mode only browsers such at lynx or w3m. Abusing the <sgmltag class="attribute">ALT</sgmltag> attribute is bad for accessibility. Tooltips are supposed to come from the <sgmltag class="attribute">TITLE</sgmltag> attribute and this is implemented in &konqueror;.
 </para></answer>
 </qandaentry>
 
@@ -36,11 +37,11 @@ There is no standard that states the <sgmltag class="attribute">ALT</sgmltag> at
 <para>How do I use &konqueror; as a web browser with a proxy?</para>
 </question>
 <answer>
-<para>&konqueror; can be used with &HTTP; and &FTP; proxies.  To set
-up the proxy server in &konqueror;, just select
+<para>&konqueror; can be used with &HTTP; and &FTP; proxies. To set
+up the proxy server in &konqueror;, select
 <menuchoice><guimenu>Settings</guimenu><guisubmenu>Configure
 &konqueror;...</guisubmenu></menuchoice> from the &konqueror; menu and
-go to the <guilabel>Proxy</guilabel> tab.</para>
+select the <guilabel>Proxy</guilabel> option.</para>
 </answer>
 </qandaentry>
 
@@ -49,20 +50,22 @@ go to the <guilabel>Proxy</guilabel> tab.</para>
 <para>How do I import bookmarks from another browser into &konqueror; ?</para>
 </question>
 <answer>
-<para>To import bookmarks from another browser into &konqueror; select
-<guimenu>Bookmarks</guimenu><guimenuitem>Edit Bookmarks</guimenuitem>
-and then in the <application>Bookmark Editor</application> select
-<guimenu>File</guimenu><guimenuitem>Import</guimenuitem>. Then select
-the browser you would like to import bookmarks from. In the Open dialog,
+<para>To import bookmarks from another browser into &konqueror;, from the menu
+bar select <guimenu>Bookmarks</guimenu>, then select <guimenuitem>Edit Bookmarks</guimenuitem>.
+In the <application>Bookmark Editor</application>, select
+<guimenu>File</guimenu> then select <guimenuitem>Import</guimenuitem>. Select
+the browser from which you would like to import bookmarks. In the Open dialog,
 navigate to the location of the folder or file your bookmarks are
-contained in and click <guilabel>Open</guilabel>
+located.
 </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question><para>How can I make &konqueror; only show certain bookmarks in the bookmarks toolbar?</para></question>
-<answer><para>In &konqueror; go to <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &konqueror;...</guimenuitem></menuchoice>. Then select <guilabel>Web Behaviour</guilabel> from the icon list. Under the <guilabel>Bookmarks</guilabel> heading, place a check in the box next to <guilabel>Show only marked bookmarks in bookmark toolbar</guilabel>. Now in the <application>Bookmark Editor</application> an option to <guilabel>Show in Toolbar</guilabel> appears on clicking with the &RMB; on any bookmark entry or in the <guimenu>Edit</guimenu> menu when the entry is highlighted. Folders can also be shown in the bookmarks toolbar in much the same way.</para></answer>
+<answer><para>In &konqueror; select <menuchoice><guimenu>Settings</guimenu><guisubmenu>Configure
+&konqueror;...</guisubmenu></menuchoice>. Then select <guilabel>Web Behaviour</guilabel> from the icon list. Under the <guilabel>Bookmarks</guilabel> heading, place a check in the box next to <guilabel>Show only marked bookmarks in bookmark toolbar</guilabel>.</para>
+<para>In the <application>Bookmark Editor</application> an option to <guilabel>Show in Toolbar</guilabel> appears on clicking with the &RMB; on any bookmark entry or in the <guimenu>Edit</guimenu> menu when the entry is highlighted. Folders can also be shown in the bookmarks toolbar in much the same way.</para></answer>
 </qandaentry>
 
 <qandaentry>
@@ -71,21 +74,22 @@ contained in and click <guilabel>Open</guilabel>
 some other browser?</para>
 </question>
 <answer>
-<para>In &konqueror;, select
-<menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure
-Konqueror...</guimenuitem></menuchoice> and in the configuration
-dialog, select <guilabel>Browser Identification</guilabel>. Default
-and site-specific browser identifications can be set from here.</para>
+<para>That is called setting the user agent. In &konqueror;, select
+<menuchoice><guimenu>Settings</guimenu><guisubmenu>Configure
+&konqueror;...</guisubmenu></menuchoice>. In the icon list, select
+<guilabel>Browser Identification</guilabel>. Default
+and site-specific browser identifications can be set there.</para>
 </answer>
 </qandaentry>
+
 <qandaentry>
 <question>
-<para>&konqueror; is taking a really long time to load webpages, what
+<para>&konqueror; is taking a really long time to load web pages  -- mdash; what
 could cause this?</para></question>
 <answer>
-<para>Quite often &konqueror; loading webpages slowly is caused by
+<para>Quite often &konqueror; loading web pages slowly is caused by
 <acronym>DNS</acronym> servers with broken <acronym>IPV6</acronym>
-support.  Adding the following to <filename>/etc/profile</filename> or any
+support. Adding the following to <filename>/etc/profile</filename> or any
 other script that is sourced on login should solve this problem:
 <screen>
 export TDE_NO_IPV6=true
@@ -103,29 +107,25 @@ setenv TDE_NO_IPV6 true
 <para>How do I configure &konqueror; to run &Java; applets?</para>
 </question>
 <answer>
-<para>Choose
-<menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure
-&konqueror;...</guimenuitem></menuchoice> from &konqueror;'s menubar
-and then select <guilabel>Java &amp; Javascript</guilabel>. Set the
-<guilabel>Path to Java executable</guilabel> correctly. If it doesn't
-work, please check the <ulink
-url="http://www.konqueror.org/javahowto/">Konqueror + Java
-HOWTO</ulink>.</para>
+<para>From &konqueror;'s menubar choose
+<menuchoice><guimenu>Settings</guimenu><guisubmenu>Configure
+&konqueror;...</guisubmenu></menuchoice>.
+From the icon list select <guilabel>Java &amp; Javascript</guilabel>. Set the
+<guilabel>Path to Java executable</guilabel>.</para>
 </answer>
 </qandaentry>
 
-
 <qandaentry>
 <question>
 <para>How do I block unrequested popup windows in &konqueror;?</para>
 </question>
 <answer>
-<para>&konqueror; has a new 'smart' policy for JavaScript popups. From the 
-&konqueror; main window, select <menuchoice><guimenu>Settings</guimenu>
-<guimenuitem>Configure &konqueror;...</guimenuitem></menuchoice> and then
+<para>&konqueror; provides a 'smart' policy for JavaScript popups. From the
+&konqueror; main window, select<menuchoice><guimenu>Settings</guimenu><guisubmenu>Configure
+&konqueror;...</guisubmenu></menuchoice>. Then
 <guilabel>Java &amp; JavaScript</guilabel>. On the
 <guilabel>JavaScript</guilabel> tab, under <guilabel>Global JavaScript
-Policies</guilabel> set the radio button beside <guilabel>Open new
+Policies</guilabel>, set the radio button beside <guilabel>Open new
 windows:</guilabel> to <guilabel>Smart</guilabel>.
 </para>
 </answer>
@@ -133,18 +133,16 @@ windows:</guilabel> to <guilabel>Smart</guilabel>.
 
 <qandaentry>
 <question>
-<para>Why doesn't my banking site work with &konqueror;?  It pops up a new
+<para>Why doesn't my banking site work with &konqueror;? It pops up a new
 window with the login screen in other browsers, but not in
 &konqueror;.</para>
 </question>
 <answer>
 <para>
 Make sure you have Javascript enabled, and the default JavaScript web popups
-policy set to <guilabel>Ask</guilabel> or <guilabel>Allow</guilabel>.  The
+policy set to <guilabel>Ask</guilabel> or <guilabel>Allow</guilabel>. The
 <guilabel>Smart</guilabel> policy is not always sufficient for some banks.
-Many banks also require &Java; support.  You can find more help on enabling
-this at <ulink
-url="http://www.konqueror.org/">http://www.konqueror.org/</ulink>.
+Many banks also require &Java; support.
 </para>
 </answer>
 </qandaentry>
@@ -152,33 +150,28 @@ url="http://www.konqueror.org/">http://www.konqueror.org/</ulink>.
 <qandaentry>
 <question>
 <para>Can &konqueror; use user-specified stylesheets, like those in the
-Firefox adblock extention?</para>
+Firefox adblock extension?</para>
 </question>
 <answer>
 <para>Yes, you can set &konqueror; to use any kind of valid
 <acronym>css</acronym> stylesheet to filter webcontent or improve accessibility.
 From the &konqueror; main window simply click
-<menuchoice><guimenu>Settings</guimenu>
-<guimenuitem>Configure &konqueror;...</guimenuitem></menuchoice> and select 
+<menuchoice><guimenu>Settings</guimenu><guisubmenu>Configure
+&konqueror;...</guisubmenu></menuchoice> and select
 <guilabel>Stylesheets</guilabel>. Set the radio button to
 <guilabel>Use user-defined stylesheet</guilabel> and browse to where the
-stylesheet you want to use is located. Alternatively, you can select
+stylesheet you want to use is located. Alternately, select
 <guilabel>Use accessibility stylesheet defined in "Customize"
 tab</guilabel> and then set your own options.</para>
-<para>
-An example of <acronym>css</acronym> rules that implement ad blocking can be
-found at:
-<ulink url="http://www.mozilla.org/support/firefox/adblock">
-http://www.mozilla.org/support/firefox/adblock</ulink>.
-</para>
 </answer>
 </qandaentry>
+
 <qandaentry>
 <question><para>
 Why does &konqueror; display a plain grey square when I try to view flash animations, even though the flash plugin is installed?
 </para></question>
 <answer><para>
-Under the latest versions of X.org, having the composite extension loaded can cause problems with the flash plugin. Try disabling the composite extension and see if normal flash operation is restored.
+Under the latest versions of X.org, having the composite extension loaded can cause problems with the flash plugin. Try disabling the composite extension and see whether normal flash operation is restored.
 </para></answer>
 </qandaentry>
 
@@ -187,7 +180,7 @@ Under the latest versions of X.org, having the composite extension loaded can ca
 <para>Why can't &konqueror; render &GIF; images?</para>
 </question>
 <answer>
-<para>It is because you did not enable &GIF; support in &Qt;.  Please see
+<para>It is because you did not enable &GIF; support in &Qt;. Please see
 <xref linkend="gif"/> for more details.</para>
 </answer>
 </qandaentry>-->
@@ -199,14 +192,18 @@ associated Konqueror with text/html, but it cannot handle this file
 type.</quote></para>
 </question>
 <answer>
-<para>You need to make sure that the embedding settings for the text/html
+<para>Make sure the embedding settings for the text/html
 <acronym>MIME</acronym> type are correct:
 <orderedlist>
 <listitem><para>In &konqueror;, go to
-<menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure
-&konqueror;...</guimenuitem></menuchoice> and then to the <guilabel>File
-Associations</guilabel> page.</para></listitem> <listitem><para>Open
-text->html in the tree view.</para></listitem> <listitem><para>Click on the
+<menuchoice><guimenu>Settings</guimenu><guisubmenu>Configure
+&konqueror;...</guisubmenu></menuchoice>. In the icon list select <guilabel>File
+Associations</guilabel>.</para>
+</listitem>
+<listitem><para>Open
+text->html in the tree view.</para>
+</listitem>
+<listitem><para>Click on the
 <guilabel>Embedding</guilabel> tab. Make sure that <guilabel>Left Click
 Action</guilabel> is set to <guilabel>Show file in embedded
 viewer</guilabel>, and that <guilabel>KHTML (khtml)</guilabel> is at the top
@@ -218,5 +215,3 @@ of <guilabel>Services Preference Order</guilabel>.</para></listitem>
 
 </qandaset>
 </chapter>
-
-
diff --git a/doc/faq/winmng.docbook b/doc/faq/winmng.docbook
index 4bac8b636..dd79018bc 100644
--- a/doc/faq/winmng.docbook
+++ b/doc/faq/winmng.docbook
@@ -4,15 +4,12 @@
  "dtd/kdex.dtd">
 -->
 
-
-
 <chapter id="windowmanager">
 <title>The window manager</title>
 
-<para>The default window manager provided by &tde; is the K Window
-Manager (&twin;).  Please read <quote>The
-K Window Manager Handbook</quote> (which should be accessible from the
-<application>&tde; Help Center</application>) for usage information.</para>
+<para>The default window manager provided by &tde; is the Trinity Window
+Manager (&twin;). Please refer to <ulink url="help:/khelpcenter/userguide/windows-how-to-work.html">
+Windows, How To Work Them</ulink> in the Trinity user guide for more information.</para>
 
 <qandaset>
 <qandaentry>
@@ -20,8 +17,10 @@ K Window Manager Handbook</quote> (which should be accessible from the
 <para>Are there keyboard shortcuts for &twin; operations?</para>
 </question>
 <answer>
-<para>Yes.  Please refer to "The K Window Manager Handbook" for the
-list of shortcuts available.</para>
+<para>Yes. Please use to the Trinity Control Center (&kcontrol;),
+<menuchoice><guimenu>Regional &amp; Accessibility</guimenu><guimenuitem>
+Keyboard Shortcuts</guimenuitem></menuchoice>, for the
+list of available shortcuts.</para>
 </answer>
 </qandaentry>
 
@@ -30,23 +29,23 @@ list of shortcuts available.</para>
 <para>Can I define my own set of keyboard shortcuts?</para>
 </question>
 <answer>
-<para>Yes.  Launch the
+<para>Yes. Launch the
 <application>&tde; Control Center</application> and select
 <menuchoice><guimenu>Regional &amp; Accessibility</guimenu><guimenuitem>Keyboard Shortcuts</guimenuitem></menuchoice> to
-configure window manager bindings like maximizing windows, &etc;. 
+configure window manager bindings like maximizing windows, &etc;.
 </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
 <question>
-<para>When I "iconify" a window, it disappears.  Where does it
+<para>When I "iconify" a window, it disappears. Where does it
 go?</para>
 </question>
 <answer>
 <para>With many &X-Window; &GUI;s, the minimize button (a little dot) will
 erase the window that the program is running in and create, instead,
-an icon on the desktop.  &tde; does not do this.  Instead, when a
+an icon on the desktop. &tde; does not do this. Instead, when a
 window is iconified it is simply hidden (but the program is still
 running).</para>
 <para>There are a few ways to access <quote>disappeared</quote> windows:</para>
@@ -82,7 +81,7 @@ maximize fully/vertically/horizontally respectively.</para>
 </question>
 <answer>
 <para>By <quote>shading</quote> a window we mean <quote>rolling up</quote> the window leaving just
-the title bar visible.  You can do this by double clicking on the
+the title bar visible. You can do this by double clicking on the
 window title bar.</para>
 </answer>
 </qandaentry>
@@ -122,9 +121,9 @@ this feature.</para>
 placement of windows?</para>
 </question>
 <answer>
-<para>Yes.  Run <application>&tde; Control Center</application> and select <guimenu>Look and Feel</guimenu>
+<para>Yes. Run <application>&tde; Control Center</application> and select <guimenu>Look and Feel</guimenu>
 followed by <guisubmenu>Window Behavior</guisubmenu> and finally
-<guimenuitem>Advanced</guimenuitem>.  There is a dialog option that
+<guimenuitem>Advanced</guimenuitem>. There is a dialog option that
 allows you to set the placement policy you want.</para>
 </answer>
 </qandaentry>