diff --git a/doc/faq/install.docbook b/doc/faq/install.docbook
index 9b9bbbeb2..c21f6f70a 100644
--- a/doc/faq/install.docbook
+++ b/doc/faq/install.docbook
@@ -13,8 +13,8 @@ come along with the package. Please read them carefully and try to
help yourself if anything goes wrong. If you need further
assistance, consider joining the &tde; mailing lists
(see our web site instructions for joining the &tde;
-mailing
-lists) or newsgroups.
+mailing
+lists).
diff --git a/doc/faq/panel.docbook b/doc/faq/panel.docbook
index 52b7ae5d8..bfb2a1c7d 100644
--- a/doc/faq/panel.docbook
+++ b/doc/faq/panel.docbook
@@ -4,64 +4,50 @@
"dtd/kdex.dtd">
-->
-
The panel
-
How do I add applications to the &tde; panel (&kicker;)?
-There are several ways to add an application to the panel, of
-which the easiest is to right-click on the panel, and from the context
-menu which appears, select Panel
-MenuAdd to
-PanelApplication
-Button and then the application for which
-you want to add a link.For more ways of adding buttons
-to the panel, refer to the &kicker; Handbook.
-
+There are several ways to add an application to the panel.
+The easiest is to right-click on the panel, and from the context
+menu that appears, select Add Application to
+Panel.
+For more ways of adding buttons to the panel, refer to the
+Kicker Handbook.
-
-Is it possible to change the K button of
+How do I change the menu T button of
the panel to another picture?
-The simplest way is to download a new icon theme with a &kmenu; icon
-you prefer from
-http://www.kde-look.org and
-install it using the &kcontrolcenter;.
-In order to change only the &kmenu; icon you can overwrite the
-kmenu.png image for every size in an icon theme set.
-So, for &tde; default icons this would be $TDEDIR/share/icons/default.tde/size/apps/kmenu.png,
-where size is one of the sizes included in the
-&tde; icon theme.
+The simplest way is to right-click on the panel, from the context menu
+select Configure Panel, from the icon list on the left side,
+select Menus, then inside the TDE Menu grouping, select the TDE Menu button icon.
-
-After an upgrade my &kmenu; appears to be empty! How can I get my menu back?
+After updating &tde;, my &kmenu; appears to be empty! How can I get my menu back?
-In &tde; 3.2 and later local modifications to the &kmenu; are stored
-in
-$HOME/.config/menus/applications-kmenuedit.menu
-. Try moving this file out of the way and then issuing the
+User modifications to the &kmenu; are stored in
+$HOME/.config/menus/applications-kmenuedit.menu.
+Try moving this file out of the way and then issuing the
command kbuildsycoca. This should restore you to the
-default system menus.
+default system menus. If that is the case you'll have to recreate your customized menu.
@@ -70,38 +56,32 @@ default system menus.
My desktop panel has disappeared. How can I get it
back?
-
-
-The panel disappearing is usually due to it crashing. This is
-most often caused by loading an applet that has a fatal bug or due to
-a bad installation of &tde; and/or the panel.
-
+The panel disappearing is usually due to a crash. This might be
+caused by loading an applet that has a fatal bug or a bad installation
+of &tde; and/or the panel.The easiest way to get the panel back is to launch the
Run Command window by pressing &Alt;F2 and entering
-kicker and then pressing the
+action="simul">&Alt;F2 and entering
+kicker, and then pressing the
OK button.
-
If the panel continues to disappear, you may wish to either
remove or edit by hand your
$TDEHOME/share/config/kickerrc
file, where $TDEHOME is usually
-~/.kde. If you choose to edit
-it by hand, start by removing the applet entry groups.
-
+~/.trinity. If you choose to edit
+by hand, start by removing the applet entry groups.
-
+
How can I start an application minimized to the system
@@ -113,14 +93,14 @@ in the system tray, run ksystraycmd konsole. For
more information about ksystraycmd, see the section
Advanced Window Management in the &tde;
-User Guide.
+
+User Guide.
How do I use the &Windows; key to open the &kmenu;?
-
Previous versions of &tde; provided a trick to allow you to
use the &Windows; key both as a modifier (so you could have shortcuts
like WinR
@@ -161,7 +141,7 @@ able to popup the &kmenu; by pressing the Win key.One more step is required to save the changes across
-settings: Create a file ~/.kde/env/win-key.sh
+settings: Create a file ~/.trinity/env/win-key.sh
(create the directory if it doesn't exist), and add the
xmodmap command you used previously to it. The
change should now be applied every time you start &tde;.
diff --git a/khelpcenter/intro.html.in b/khelpcenter/intro.html.in
index b9149b8ff..64528084a 100644
--- a/khelpcenter/intro.html.in
+++ b/khelpcenter/intro.html.in
@@ -68,15 +68,15 @@