Merge kcontrol/panel help handbooks into kicker help handbook, delete

duplicate kcontrol/panel handbooks, and update respective *.desktop files.

8 files changed, 8 insertions, 11 deletions

diff --git a/kcontrol/kicker/kicker_config.desktop b/kcontrol/kicker/kicker_config.desktop
index f68d12082..bded79729 100644
--- a/kcontrol/kicker/kicker_config.desktop
+++ b/kcontrol/kicker/kicker_config.desktop
@@ -1,10 +1,9 @@
 [Desktop Entry]
 Icon=kcmkicker
 Type=Application
-DocPath=kcontrol/panel/index.html
+DocPath=kicker/configuring.html
 Exec=tdecmshell panel
 
-
 X-TDE-Library=kicker
 X-TDE-FactoryName=kicker
 X-TDE-ParentApp=kicker
diff --git a/kcontrol/kicker/kicker_config_appearance.desktop b/kcontrol/kicker/kicker_config_appearance.desktop
index 3becc6a76..cbe92107a 100644
--- a/kcontrol/kicker/kicker_config_appearance.desktop
+++ b/kcontrol/kicker/kicker_config_appearance.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkicker
 Type=Application
-DocPath=kcontrol/panel/index.html#panel-looknfeel
+DocPath=kicker/configuring.html#panel-appearance
 Exec=tdecmshell kicker_appearance
 
 
diff --git a/kcontrol/kicker/kicker_config_arrangement.desktop b/kcontrol/kicker/kicker_config_arrangement.desktop
index e9f6a5da4..e55ca1a81 100644
--- a/kcontrol/kicker/kicker_config_arrangement.desktop
+++ b/kcontrol/kicker/kicker_config_arrangement.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkicker
 Type=Application
-DocPath=kcontrol/panel/index.html#panel-position
+DocPath=kicker/configuring.html#panel-arrangement
 Exec=tdecmshell kicker_arrangement
 
 X-TDE-Library=kicker
diff --git a/kcontrol/kicker/kicker_config_hiding.desktop b/kcontrol/kicker/kicker_config_hiding.desktop
index 368142cc5..d5024915a 100644
--- a/kcontrol/kicker/kicker_config_hiding.desktop
+++ b/kcontrol/kicker/kicker_config_hiding.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkicker
 Type=Application
-DocPath=kcontrol/panel/index.html#panel-hiding
+DocPath=kicker/configuring.html#panel-hiding
 Exec=tdecmshell kicker_hiding
 
 X-TDE-Library=kicker
diff --git a/kcontrol/kicker/kicker_config_menus.desktop b/kcontrol/kicker/kicker_config_menus.desktop
index 4caf125f7..4fc8366b1 100644
--- a/kcontrol/kicker/kicker_config_menus.desktop
+++ b/kcontrol/kicker/kicker_config_menus.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkicker
 Type=Application
-DocPath=kcontrol/panel/index.html#panel-menus
+DocPath=kicker/configuring.html#panel-menus
 Exec=tdecmshell kicker_menus
 
 X-TDE-Library=kicker
diff --git a/kcontrol/kicker/panel.desktop b/kcontrol/kicker/panel.desktop
index 57e5e86a3..f47efecd6 100644
--- a/kcontrol/kicker/panel.desktop
+++ b/kcontrol/kicker/panel.desktop
@@ -1,10 +1,9 @@
 [Desktop Entry]
 Icon=kcmkicker
 Type=Application
-DocPath=kcontrol/panel/index.html
+DocPath=kicker/configuring.html
 Exec=tdecmshell panel
 
-
 X-TDE-Library=kicker
 X-TDE-ParentApp=kcontrol
 
diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp
index 788187ca7..80c7bf87e 100644
--- a/kcontrol/taskbar/kcmtaskbar.cpp
+++ b/kcontrol/taskbar/kcmtaskbar.cpp
@@ -104,7 +104,7 @@ const TQStringList& TaskbarConfig::actionList()
             << I18N_NOOP("Activate, Raise or Minimize Task")
             << I18N_NOOP("Activate Task") << I18N_NOOP("Raise Task")
             << I18N_NOOP("Lower Task") << I18N_NOOP("Minimize Task")
-            << I18N_NOOP("To Current Desktop")
+            << I18N_NOOP("Move To Current Desktop")
             << I18N_NOOP("Close Task") );
     return list;
 }
diff --git a/kcontrol/taskbar/kcmtaskbar.desktop b/kcontrol/taskbar/kcmtaskbar.desktop
index 91d116d89..e7afb2123 100644
--- a/kcontrol/taskbar/kcmtaskbar.desktop
+++ b/kcontrol/taskbar/kcmtaskbar.desktop
@@ -1,10 +1,9 @@
 [Desktop Entry]
 Icon=kmenu
 Type=Application
-DocPath=kcontrol/kcmtaskbar/index.html
+DocPath=kicker/taskbar-settings.html
 Exec=tdecmshell kcmtaskbar
 
-
 X-TDE-Library=taskbar
 X-TDE-FactoryName=taskbar
 X-TDE-ParentApp=kcontrol