Finish moving kinfocenter files to kcontrol.

This partially resolves bug report 289.

113 files changed, 216 insertions, 755 deletions

diff --git a/doc/kinfocenter/pci/CMakeLists.txt b/doc/kcontrol/cdinfo/CMakeLists.txt
index 5d385dcd8..e4cfd45b9 100644
--- a/doc/kinfocenter/pci/CMakeLists.txt
+++ b/doc/kcontrol/cdinfo/CMakeLists.txt
@@ -9,4 +9,4 @@
 #
 #################################################
 
-tde_create_handbook( DESTINATION kinfocenter/pci )
+tde_create_handbook( DESTINATION kcontrol/cdinfo )
diff --git a/doc/kcontrol/cdinfo/Makefile.am b/doc/kcontrol/cdinfo/Makefile.am
new file mode 100644
index 000000000..318cb35a6
--- /dev/null
+++ b/doc/kcontrol/cdinfo/Makefile.am
@@ -0,0 +1,3 @@
+
+KDE_LANG= en
+KDE_DOCS = kcontrol/cdinfo
diff --git a/doc/kinfocenter/cdinfo/index.docbook b/doc/kcontrol/cdinfo/index.docbook
index 6048e5873..6048e5873 100644
--- a/doc/kinfocenter/cdinfo/index.docbook
+++ b/doc/kcontrol/cdinfo/index.docbook
diff --git a/doc/kinfocenter/nics/CMakeLists.txt b/doc/kcontrol/devices/CMakeLists.txt
index fe31da6a2..5a747385e 100644
--- a/doc/kinfocenter/nics/CMakeLists.txt
+++ b/doc/kcontrol/devices/CMakeLists.txt
@@ -9,4 +9,4 @@
 #
 #################################################
 
-tde_create_handbook( DESTINATION kinfocenter/nics )
+tde_create_handbook( DESTINATION kcontrol/devices )
diff --git a/doc/kcontrol/devices/Makefile.am b/doc/kcontrol/devices/Makefile.am
new file mode 100644
index 000000000..f2449c0e0
--- /dev/null
+++ b/doc/kcontrol/devices/Makefile.am
@@ -0,0 +1,3 @@
+
+KDE_LANG= en
+KDE_DOCS = kcontrol/devices
diff --git a/doc/kinfocenter/devices/index.docbook b/doc/kcontrol/devices/index.docbook
index 43eac4de9..43eac4de9 100644
--- a/doc/kinfocenter/devices/index.docbook
+++ b/doc/kcontrol/devices/index.docbook
diff --git a/doc/kinfocenter/usb/CMakeLists.txt b/doc/kcontrol/dma/CMakeLists.txt
index 46f483e51..2c3752d1c 100644
--- a/doc/kinfocenter/usb/CMakeLists.txt
+++ b/doc/kcontrol/dma/CMakeLists.txt
@@ -9,4 +9,4 @@
 #
 #################################################
 
-tde_create_handbook( DESTINATION kinfocenter/usb )
+tde_create_handbook( DESTINATION kcontrol/dma )
diff --git a/doc/kcontrol/dma/Makefile.am b/doc/kcontrol/dma/Makefile.am
new file mode 100644
index 000000000..f8fd8f8e9
--- /dev/null
+++ b/doc/kcontrol/dma/Makefile.am
@@ -0,0 +1,3 @@
+
+KDE_LANG= en
+KDE_DOCS = kcontrol/dma
diff --git a/doc/kinfocenter/dma/index.docbook b/doc/kcontrol/dma/index.docbook
index 415666095..415666095 100644
--- a/doc/kinfocenter/dma/index.docbook
+++ b/doc/kcontrol/dma/index.docbook
diff --git a/doc/kinfocenter/ioports/CMakeLists.txt b/doc/kcontrol/interrupts/CMakeLists.txt
index 87a473a9b..67690437f 100644
--- a/doc/kinfocenter/ioports/CMakeLists.txt
+++ b/doc/kcontrol/interrupts/CMakeLists.txt
@@ -9,4 +9,4 @@
 #
 #################################################
 
-tde_create_handbook( DESTINATION kinfocenter/ioports )
+tde_create_handbook( DESTINATION kcontrol/interrupts )
diff --git a/doc/kcontrol/interrupts/Makefile.am b/doc/kcontrol/interrupts/Makefile.am
new file mode 100644
index 000000000..5d81a10cd
--- /dev/null
+++ b/doc/kcontrol/interrupts/Makefile.am
@@ -0,0 +1,3 @@
+
+KDE_LANG= en
+KDE_DOCS = kcontrol/interrupts
diff --git a/doc/kinfocenter/interrupts/index.docbook b/doc/kcontrol/interrupts/index.docbook
index b29611202..b29611202 100644
--- a/doc/kinfocenter/interrupts/index.docbook
+++ b/doc/kcontrol/interrupts/index.docbook
diff --git a/doc/kcontrol/ioports/CMakeLists.txt b/doc/kcontrol/ioports/CMakeLists.txt
new file mode 100644
index 000000000..c8ca4ced6
--- /dev/null
+++ b/doc/kcontrol/ioports/CMakeLists.txt
@@ -0,0 +1,12 @@
+#################################################
+#
+#  (C) 2010-2011 Serghei Amelian
+#  serghei (DOT) amelian (AT) gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION kcontrol/ioports )
diff --git a/doc/kcontrol/ioports/Makefile.am b/doc/kcontrol/ioports/Makefile.am
new file mode 100644
index 000000000..e5f86f7b3
--- /dev/null
+++ b/doc/kcontrol/ioports/Makefile.am
@@ -0,0 +1,3 @@
+
+KDE_LANG= en
+KDE_DOCS = kcontrol/ioports
diff --git a/doc/kinfocenter/ioports/index.docbook b/doc/kcontrol/ioports/index.docbook
index 65bcb1f1e..65bcb1f1e 100644
--- a/doc/kinfocenter/ioports/index.docbook
+++ b/doc/kcontrol/ioports/index.docbook
diff --git a/doc/kinfocenter/scsi/CMakeLists.txt b/doc/kcontrol/memory/CMakeLists.txt
index 26f891384..7b37cffb2 100644
--- a/doc/kinfocenter/scsi/CMakeLists.txt
+++ b/doc/kcontrol/memory/CMakeLists.txt
@@ -9,4 +9,4 @@
 #
 #################################################
 
-tde_create_handbook( DESTINATION kinfocenter/scsi)
+tde_create_handbook( DESTINATION kcontrol/memory )
diff --git a/doc/kcontrol/memory/Makefile.am b/doc/kcontrol/memory/Makefile.am
new file mode 100644
index 000000000..c63989f33
--- /dev/null
+++ b/doc/kcontrol/memory/Makefile.am
@@ -0,0 +1,3 @@
+
+KDE_LANG= en
+KDE_DOCS = kcontrol/memory
diff --git a/doc/kinfocenter/memory/index.docbook b/doc/kcontrol/memory/index.docbook
index 19d10fc57..19d10fc57 100644
--- a/doc/kinfocenter/memory/index.docbook
+++ b/doc/kcontrol/memory/index.docbook
diff --git a/doc/kinfocenter/dma/CMakeLists.txt b/doc/kcontrol/nics/CMakeLists.txt
index 461ab9da5..e30c40bf9 100644
--- a/doc/kinfocenter/dma/CMakeLists.txt
+++ b/doc/kcontrol/nics/CMakeLists.txt
@@ -9,4 +9,4 @@
 #
 #################################################
 
-tde_create_handbook( DESTINATION kinfocenter/dma )
+tde_create_handbook( DESTINATION kcontrol/nics )
diff --git a/doc/kcontrol/nics/Makefile.am b/doc/kcontrol/nics/Makefile.am
new file mode 100644
index 000000000..eb1c37098
--- /dev/null
+++ b/doc/kcontrol/nics/Makefile.am
@@ -0,0 +1,3 @@
+
+KDE_LANG= en
+KDE_DOCS = kcontrol/nics
diff --git a/doc/kinfocenter/nics/index.docbook b/doc/kcontrol/nics/index.docbook
index f82552c28..f82552c28 100644
--- a/doc/kinfocenter/nics/index.docbook
+++ b/doc/kcontrol/nics/index.docbook
diff --git a/doc/kcontrol/opengl/CMakeLists.txt b/doc/kcontrol/opengl/CMakeLists.txt
new file mode 100644
index 000000000..aac8e4360
--- /dev/null
+++ b/doc/kcontrol/opengl/CMakeLists.txt
@@ -0,0 +1,12 @@
+#################################################
+#
+#  (C) 2010-2011 Serghei Amelian
+#  serghei (DOT) amelian (AT) gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION kcontrol/opengl )
diff --git a/doc/kcontrol/opengl/Makefile.am b/doc/kcontrol/opengl/Makefile.am
new file mode 100644
index 000000000..70f023492
--- /dev/null
+++ b/doc/kcontrol/opengl/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG= en
+KDE_DOCS = kcontrol/opengl
diff --git a/doc/kinfocenter/opengl/index.docbook b/doc/kcontrol/opengl/index.docbook
index 2c972034a..2c972034a 100644
--- a/doc/kinfocenter/opengl/index.docbook
+++ b/doc/kcontrol/opengl/index.docbook
diff --git a/doc/kinfocenter/devices/CMakeLists.txt b/doc/kcontrol/partitions/CMakeLists.txt
index 431a528fb..a436214de 100644
--- a/doc/kinfocenter/devices/CMakeLists.txt
+++ b/doc/kcontrol/partitions/CMakeLists.txt
@@ -9,4 +9,4 @@
 #
 #################################################
 
-tde_create_handbook( DESTINATION kinfocenter/devices )
+tde_create_handbook( DESTINATION kcontrol/partitions )
diff --git a/doc/kcontrol/partitions/Makefile.am b/doc/kcontrol/partitions/Makefile.am
new file mode 100644
index 000000000..fb019e7ee
--- /dev/null
+++ b/doc/kcontrol/partitions/Makefile.am
@@ -0,0 +1,3 @@
+
+KDE_LANG= en
+KDE_DOCS = kcontrol/partitions
diff --git a/doc/kinfocenter/partitions/index.docbook b/doc/kcontrol/partitions/index.docbook
index f3655a8cf..f3655a8cf 100644
--- a/doc/kinfocenter/partitions/index.docbook
+++ b/doc/kcontrol/partitions/index.docbook
diff --git a/doc/kcontrol/pci/CMakeLists.txt b/doc/kcontrol/pci/CMakeLists.txt
new file mode 100644
index 000000000..abe1d7856
--- /dev/null
+++ b/doc/kcontrol/pci/CMakeLists.txt
@@ -0,0 +1,12 @@
+#################################################
+#
+#  (C) 2010-2011 Serghei Amelian
+#  serghei (DOT) amelian (AT) gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION kcontrol/pci )
diff --git a/doc/kcontrol/pci/Makefile.am b/doc/kcontrol/pci/Makefile.am
new file mode 100644
index 000000000..45f7b2968
--- /dev/null
+++ b/doc/kcontrol/pci/Makefile.am
@@ -0,0 +1,3 @@
+
+KDE_LANG= en
+KDE_DOCS = kcontrol/pci
diff --git a/doc/kinfocenter/pci/index.docbook b/doc/kcontrol/pci/index.docbook
index 1d4d8b3f9..1d4d8b3f9 100644
--- a/doc/kinfocenter/pci/index.docbook
+++ b/doc/kcontrol/pci/index.docbook
diff --git a/doc/kcontrol/pcmcia/CMakeLists.txt b/doc/kcontrol/pcmcia/CMakeLists.txt
new file mode 100644
index 000000000..c956d5b11
--- /dev/null
+++ b/doc/kcontrol/pcmcia/CMakeLists.txt
@@ -0,0 +1,12 @@
+#################################################
+#
+#  (C) 2010-2011 Serghei Amelian
+#  serghei (DOT) amelian (AT) gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION kcontrol/pcmcia )
diff --git a/doc/kcontrol/pcmcia/Makefile.am b/doc/kcontrol/pcmcia/Makefile.am
new file mode 100644
index 000000000..b13b11f46
--- /dev/null
+++ b/doc/kcontrol/pcmcia/Makefile.am
@@ -0,0 +1,3 @@
+
+KDE_LANG= en
+KDE_DOCS = kcontrol/pcmcia
diff --git a/doc/kinfocenter/pcmcia/index.docbook b/doc/kcontrol/pcmcia/index.docbook
index 901fdf2e5..901fdf2e5 100644
--- a/doc/kinfocenter/pcmcia/index.docbook
+++ b/doc/kcontrol/pcmcia/index.docbook
diff --git a/doc/kinfocenter/memory/CMakeLists.txt b/doc/kcontrol/processor/CMakeLists.txt
index e463d2465..25f3ff798 100644
--- a/doc/kinfocenter/memory/CMakeLists.txt
+++ b/doc/kcontrol/processor/CMakeLists.txt
@@ -9,4 +9,4 @@
 #
 #################################################
 
-tde_create_handbook( DESTINATION kinfocenter/memory )
+tde_create_handbook( DESTINATION kcontrol/processor )
diff --git a/doc/kcontrol/processor/Makefile.am b/doc/kcontrol/processor/Makefile.am
new file mode 100644
index 000000000..d42fb2991
--- /dev/null
+++ b/doc/kcontrol/processor/Makefile.am
@@ -0,0 +1,3 @@
+
+KDE_LANG= en
+KDE_DOCS = kcontrol/processor
diff --git a/doc/kinfocenter/processor/index.docbook b/doc/kcontrol/processor/index.docbook
index 3794aca67..3794aca67 100644
--- a/doc/kinfocenter/processor/index.docbook
+++ b/doc/kcontrol/processor/index.docbook
diff --git a/doc/kinfocenter/cdinfo/CMakeLists.txt b/doc/kcontrol/protocols/CMakeLists.txt
index b71abcb30..51032628c 100644
--- a/doc/kinfocenter/cdinfo/CMakeLists.txt
+++ b/doc/kcontrol/protocols/CMakeLists.txt
@@ -9,4 +9,4 @@
 #
 #################################################
 
-tde_create_handbook( DESTINATION kinfocenter/cdinfo )
+tde_create_handbook( DESTINATION kcontrol/protocols )
diff --git a/doc/kcontrol/protocols/Makefile.am b/doc/kcontrol/protocols/Makefile.am
new file mode 100644
index 000000000..f46684563
--- /dev/null
+++ b/doc/kcontrol/protocols/Makefile.am
@@ -0,0 +1,3 @@
+
+KDE_LANG= en
+KDE_DOCS = kcontrol/protocols
diff --git a/doc/kinfocenter/protocols/index.docbook b/doc/kcontrol/protocols/index.docbook
index c84aef578..c84aef578 100644
--- a/doc/kinfocenter/protocols/index.docbook
+++ b/doc/kcontrol/protocols/index.docbook
diff --git a/doc/kcontrol/samba/CMakeLists.txt b/doc/kcontrol/samba/CMakeLists.txt
new file mode 100644
index 000000000..568062e6c
--- /dev/null
+++ b/doc/kcontrol/samba/CMakeLists.txt
@@ -0,0 +1,12 @@
+#################################################
+#
+#  (C) 2010-2011 Serghei Amelian
+#  serghei (DOT) amelian (AT) gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION kcontrol/samba )
diff --git a/doc/kcontrol/samba/Makefile.am b/doc/kcontrol/samba/Makefile.am
new file mode 100644
index 000000000..126a8b41b
--- /dev/null
+++ b/doc/kcontrol/samba/Makefile.am
@@ -0,0 +1,4 @@
+
+KDE_LANG= en
+KDE_DOCS = kcontrol/samba
+
diff --git a/doc/kinfocenter/samba/index.docbook b/doc/kcontrol/samba/index.docbook
index 69d7b91b9..69d7b91b9 100644
--- a/doc/kinfocenter/samba/index.docbook
+++ b/doc/kcontrol/samba/index.docbook
diff --git a/doc/kcontrol/scsi/CMakeLists.txt b/doc/kcontrol/scsi/CMakeLists.txt
new file mode 100644
index 000000000..1ecefb528
--- /dev/null
+++ b/doc/kcontrol/scsi/CMakeLists.txt
@@ -0,0 +1,12 @@
+#################################################
+#
+#  (C) 2010-2011 Serghei Amelian
+#  serghei (DOT) amelian (AT) gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION kcontrol/scsi)
diff --git a/doc/kcontrol/scsi/Makefile.am b/doc/kcontrol/scsi/Makefile.am
new file mode 100644
index 000000000..4a0b433e5
--- /dev/null
+++ b/doc/kcontrol/scsi/Makefile.am
@@ -0,0 +1,3 @@
+
+KDE_LANG = en
+KDE_DOCS = kcontrol/scsi
diff --git a/doc/kinfocenter/scsi/index.docbook b/doc/kcontrol/scsi/index.docbook
index 87ec0934f..87ec0934f 100644
--- a/doc/kinfocenter/scsi/index.docbook
+++ b/doc/kcontrol/scsi/index.docbook
diff --git a/doc/kcontrol/sound/CMakeLists.txt b/doc/kcontrol/sound/CMakeLists.txt
new file mode 100644
index 000000000..18f11a032
--- /dev/null
+++ b/doc/kcontrol/sound/CMakeLists.txt
@@ -0,0 +1,12 @@
+#################################################
+#
+#  (C) 2010-2011 Serghei Amelian
+#  serghei (DOT) amelian (AT) gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION kcontrol/sound )
diff --git a/doc/kcontrol/sound/Makefile.am b/doc/kcontrol/sound/Makefile.am
new file mode 100644
index 000000000..a1a9b851c
--- /dev/null
+++ b/doc/kcontrol/sound/Makefile.am
@@ -0,0 +1,3 @@
+
+KDE_LANG= en
+KDE_DOCS = kcontrol/sound
diff --git a/doc/kinfocenter/sound/index.docbook b/doc/kcontrol/sound/index.docbook
index de1fd601d..de1fd601d 100644
--- a/doc/kinfocenter/sound/index.docbook
+++ b/doc/kcontrol/sound/index.docbook
diff --git a/doc/kcontrol/usb/CMakeLists.txt b/doc/kcontrol/usb/CMakeLists.txt
new file mode 100644
index 000000000..7be562cd5
--- /dev/null
+++ b/doc/kcontrol/usb/CMakeLists.txt
@@ -0,0 +1,12 @@
+#################################################
+#
+#  (C) 2010-2011 Serghei Amelian
+#  serghei (DOT) amelian (AT) gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION kcontrol/usb )
diff --git a/doc/kcontrol/usb/Makefile.am b/doc/kcontrol/usb/Makefile.am
new file mode 100644
index 000000000..2d7f2a44c
--- /dev/null
+++ b/doc/kcontrol/usb/Makefile.am
@@ -0,0 +1,3 @@
+
+KDE_LANG= en
+KDE_DOCS = kcontrol/usb
diff --git a/doc/kinfocenter/usb/index.docbook b/doc/kcontrol/usb/index.docbook
index 8936fa796..8936fa796 100644
--- a/doc/kinfocenter/usb/index.docbook
+++ b/doc/kcontrol/usb/index.docbook
diff --git a/doc/kcontrol/xserver/CMakeLists.txt b/doc/kcontrol/xserver/CMakeLists.txt
new file mode 100644
index 000000000..e33cbe3ea
--- /dev/null
+++ b/doc/kcontrol/xserver/CMakeLists.txt
@@ -0,0 +1,12 @@
+#################################################
+#
+#  (C) 2010-2011 Serghei Amelian
+#  serghei (DOT) amelian (AT) gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION kcontrol/xserver )
diff --git a/doc/kcontrol/xserver/Makefile.am b/doc/kcontrol/xserver/Makefile.am
new file mode 100644
index 000000000..9d915d89f
--- /dev/null
+++ b/doc/kcontrol/xserver/Makefile.am
@@ -0,0 +1,3 @@
+
+KDE_LANG= en
+KDE_DOCS = kcontrol/xserver
diff --git a/doc/kinfocenter/xserver/index.docbook b/doc/kcontrol/xserver/index.docbook
index a56e47fb3..a56e47fb3 100644
--- a/doc/kinfocenter/xserver/index.docbook
+++ b/doc/kcontrol/xserver/index.docbook
diff --git a/doc/kinfocenter/CMakeLists.txt b/doc/kinfocenter/CMakeLists.txt
deleted file mode 100644
index 86c913fc5..000000000
--- a/doc/kinfocenter/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-tde_auto_add_subdirectories()
-tde_create_handbook( DESTINATION kinfocenter )
diff --git a/doc/kinfocenter/Makefile.am b/doc/kinfocenter/Makefile.am
deleted file mode 100644
index 251280f85..000000000
--- a/doc/kinfocenter/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-
-SUBDIRS = $(AUTODIRS)
-
-KDE_LANG= en
-KDE_DOCS = AUTO
-
diff --git a/doc/kinfocenter/cdinfo/Makefile.am b/doc/kinfocenter/cdinfo/Makefile.am
deleted file mode 100644
index e4070c171..000000000
--- a/doc/kinfocenter/cdinfo/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-
-KDE_LANG= en
-KDE_DOCS = kinfocenter/cdinfo
diff --git a/doc/kinfocenter/devices/Makefile.am b/doc/kinfocenter/devices/Makefile.am
deleted file mode 100644
index dc255fa48..000000000
--- a/doc/kinfocenter/devices/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-
-KDE_LANG= en
-KDE_DOCS = kinfocenter/devices
diff --git a/doc/kinfocenter/dma/Makefile.am b/doc/kinfocenter/dma/Makefile.am
deleted file mode 100644
index 0e2aa88e7..000000000
--- a/doc/kinfocenter/dma/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-
-KDE_LANG= en
-KDE_DOCS = kinfocenter/dma
diff --git a/doc/kinfocenter/index.docbook b/doc/kinfocenter/index.docbook
deleted file mode 100644
index ceee75297..000000000
--- a/doc/kinfocenter/index.docbook
+++ /dev/null
@@ -1,341 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" 
-"dtd/kdex.dtd" [
-<!ENTITY kappname "&kinfocenter;">
-<!ENTITY % addindex "IGNORE">
-<!ENTITY % English "INCLUDE" > <!-- change language only here -->
-]>
-
-<book lang="&language;">
-<bookinfo>
-<title>The &infocenter;</title>
-
-<authorgroup>
-<author>
-<firstname>Michael</firstname>
-<surname>McBride</surname>
-<affiliation><address><email>[email protected]</email></address></affiliation>
-</author>
-</authorgroup>
-
-<date>2002-07-03</date>
-<releaseinfo>3.10.00</releaseinfo>
-
-<abstract>
-<para>This documentation describes &tde;'s information center.</para>
-</abstract>
-
-<keywordset>
-<keyword>KDE</keyword>
-<keyword>kinfocenter</keyword>
-<keyword>system</keyword>
-<keyword>information</keyword>
-<keyword>module</keyword>
-</keywordset>
-
-</bookinfo>
-
-<chapter id="introduction">
-<title>The &infocenter;</title>
-
-<para>
-The &infocenter; (from now on referred to simply as <quote>the
-information center</quote>) provides you with a centralized and convenient
-overview of your &tde; and system settings.
-</para>
-
-<para>
-The information center is made up of multiple modules.  Each module is a
-separate application, but the information center organizes all of these
-programs into a convenient location.
-</para>
-
-</chapter>
-
-<chapter id="info-center">
-<title>Using The &infocenter;</title>
-
-<para>
-This next section details the use of the information center itself.  For
-information on individual modules, please see <link linkend="module">Info
-Center Modules</link>
-</para>
-
-<sect1 id="information-center-starting">
-<title>Starting the &infocenter;</title>
-
-<para>
-The &infocenter; can be started 3 ways:
-</para>
-
-<orderedlist> 
-<listitem>
-<para>
-By selecting <menuchoice><guimenu>TDE
-Button</guimenu><guisubmenu>System</guisubmenu><guimenuitem>Info
-Center</guimenuitem></menuchoice> from the &tde; Panel.
-
-</para>
-</listitem>
-<listitem>
-<para>
-By pressing <keycombo
-action="simul">&Alt;<keycap>F2</keycap></keycombo>.
-</para>
-
-<para>
-This will bring up a dialog box.  Type
-<userinput><command>kinfocenter</command></userinput>, and click
-<guibutton>Run</guibutton> or press <keycap>Enter</keycap>.
-</para>
-</listitem>
-
-<listitem>
-<para>
-You can type <command>kinfocenter &amp;</command> at any command prompt.
-</para>
-</listitem> 
-</orderedlist> 
-
-<para>
-All three of these methods are equivalent, and produce the same result.
-</para>
-
-</sect1>
-
-<sect1 id="information-center-screen"> 
-<title>The &infocenter; Screen</title>
-
-<para>
-When you start the information center, you are presented with a window,
-which can be divided into 3 functional parts.
-</para>
-
-<para>
-Across the top is a menubar.  The menubar will provide you with quick
-access to most of &infocenter;'s features.  The menus are detailed in
-<link linkend="info-center-menus">The &tde; Info Center
-Menus</link>.
-</para>
-
-<para>
-Along the left hand side, is a column.  This is a where you choose which
-module to investigate.  You can learn how to navigate through the modules
-in the section called <link linkend="module-intro">Navigating
-Modules</link>.
-</para>
-
-<para>
-The main panel shows you some system information.
-</para>
-
-<!-- 
-<para>
-In this example, we are running &tde; 2.99, we started &infocenter;
-as user <systemitem class="username">adridg</systemitem>, the computer is
-named <systemitem class="systemname">aramis</systemitem>, it is a
-FreeBSD system, Version 4.4-RELEASE, on a Pentium.
-</para> -->
-
-</sect1>
-
-<sect1 id="info-center-menus">
-<title>The &infocenter; Menus</title>
-
-<para>
-This next section gives you a brief description of what each menu item
-does.
-</para>
-
-<sect2 id="info-center-menu-file">
-<title><guimenu>File</guimenu> Menu</title>
-
-<para>
-The <guimenu>File</guimenu> menu has a single entry.
-</para>
-
-<variablelist>
-
-<varlistentry>
-<term><menuchoice>
-<shortcut>
-<keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo>
-</shortcut>
-<guimenu>File</guimenu>
-<guimenuitem>Quit</guimenuitem>
-</menuchoice></term>
-<listitem>
-<para>
-<action>Closes the info center.</action>
-</para>
-</listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
-
-<sect2 id="info-center-menu-help">
-<title><guimenu>Help</guimenu> Menu</title>
-
-&help.menu.documentation;
-
-</sect2>
-
-</sect1>
-
-<sect1 id="info-center-exiting">
-<title>Exiting The &tde; Information Center</title>
-
-<para>
-You can exit the info center one of three ways:
-</para>
-
-<itemizedlist>
-<listitem>
-<para>
-Select <menuchoice><guimenu>File</guimenu>
-<guimenuitem>Quit</guimenuitem></menuchoice> from the menu bar.
-</para>
-</listitem>
-
-<listitem>
-<para>Type <keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo>
-on the keyboard.
-</para>
-</listitem>
-
-<listitem>
-<para>
-Click on the <guiicon>Close</guiicon> button on the frame surrounding
-the info center.
-</para>
-</listitem>
-</itemizedlist>
-
-</sect1>
-
-</chapter>
-
-<!--*****************************************************************-->
-
-<chapter id="module">
-<title>The &infocenter; Modules</title>
-
-<sect1 id="module-intro">
-<title>Navigating Modules</title>
-
-<para>
-This is a list of the <emphasis>standard</emphasis> configuration
-modules (sorted by category) provided by the <application
-role="package">&tde; base</application> package. Please note that there
-may be many more modules on your system if you have installed additional
-software.
-</para>
-
-<itemizedlist>
-<listitem>
-<para><ulink url="help:/kinfocenter/devices/index.html">Devices</ulink></para>
-</listitem>
-<listitem>
-<para><ulink url="help:/kinfocenter/dma/index.html">DMA-Channels</ulink></para>
-</listitem>
-<listitem>
-<para><ulink url="help:/kinfocenter/interrupts/index.html">Interrupts</ulink></para>
-</listitem>
-<listitem>
-<para><ulink url="help:/kinfocenter/ioports/index.html">IO-Ports</ulink></para>
-</listitem>
-<listitem>
-<para><ulink url="help:/kinfocenter/memory/index.html">Memory</ulink></para>
-</listitem>
-<listitem>
-<para><ulink url="help:/kinfocenter/nics/index.html">Network Interfaces</ulink></para>
-</listitem>
-<listitem>
-<para><ulink url="help:/kinfocenter/opengl/index.html">OpenGL</ulink></para>
-</listitem>
-<listitem>
-<para><ulink url="help:/kinfocenter/partitions/index.html">Partitions</ulink></para>
-</listitem>
-<listitem>
-<para><ulink url="help:/kinfocenter/pci/index.html">PCI</ulink></para>
-</listitem>
-<listitem>
-<para><ulink url="help:/kinfocenter/pcmcia/index.html">PCMCIA</ulink></para>
-</listitem>
-<listitem>
-<para><ulink url="help:/kinfocenter/processor/index.html">Processor</ulink></para>
-</listitem>
-<listitem>
-<para><ulink url="help:/kinfocenter/protocols/index.html">Protocols</ulink></para>
-</listitem>
-<listitem>
-<para><ulink url="help:/kinfocenter/samba/index.html">Samba Status Information</ulink></para>
-</listitem>
-<listitem>
-<para><ulink url="help:/kinfocenter/scsi/index.html">SCSI</ulink></para>
-</listitem>
-<listitem>
-<para><ulink url="help:/kinfocenter/sound/index.html">Sound</ulink></para>
-</listitem>
-<listitem>
-<para><ulink url="help:/kinfocenter/usb/index.html">USB Devices</ulink></para>
-</listitem>
-<listitem>
-<para><ulink url="help:/kinfocenter/xserver/index.html">X-Server</ulink></para>
-</listitem>
-</itemizedlist>
-
-</sect1>
-
-<!--****************************************-->
-
-</chapter>
-
-<chapter id="credits">
-<title>Credits and License</title>
-
-<para>&infocenter;</para>
-<para>Program copyright 1997-2001 The &infocenter; Developers</para>
-<para>Contributors:</para>
-
-<itemizedlist>
-<listitem><para>Matthias Hoelzer-Kluepfel 
-<email>[email protected]</email></para></listitem>
-<listitem><para>Matthias Elter <email>[email protected]</email></para></listitem>
-</itemizedlist>
-
-<para>Documentation <trademark class="copyright">copyright 2000 Michael
-McBride</trademark> <email>[email protected]</email></para>
-
-<para>Contributors:</para>
-
-<itemizedlist>
-<listitem><para>Paul Campbell <email>[email protected]</email></para></listitem>
-<listitem><para>Helge Deller <email>[email protected]</email></para></listitem>
-<listitem><para>Mark Donohoe </para></listitem>
-<listitem><para>Pat Dowler</para></listitem>
-<listitem><para>Duncan Haldane <email>[email protected]</email></para></listitem>
-<listitem><para>Steffen Hansen <email>[email protected]</email>.</para></listitem>
-<listitem><para>Matthias Hoelzer-Kluepfel <email>[email protected]</email></para></listitem>
-<listitem><para>Martin Jones <email>[email protected]</email></para></listitem>
-<listitem><para>Jost Schenck <email>[email protected]</email></para></listitem>
-<listitem><para>Jonathan Singer <email>[email protected]</email></para></listitem>
-<listitem><para>Thomas Tanghus <email>[email protected]</email></para></listitem>
-<listitem><para>Krishna Tateneni <email>[email protected]></email></para></listitem>
-<listitem><para>Ellis Whitehead <email>[email protected]</email></para></listitem>
-
-</itemizedlist>
-
-<!-- TRANS:CREDIT_FOR_TRANSLATORS -->
-
-&underFDL;
-&underGPL;
-</chapter>
-
-</book>
-<!--
-Local Variables:
-mode: sgml
-End:
--->
diff --git a/doc/kinfocenter/interrupts/CMakeLists.txt b/doc/kinfocenter/interrupts/CMakeLists.txt
deleted file mode 100644
index e6dbfb37d..000000000
--- a/doc/kinfocenter/interrupts/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-tde_create_handbook( DESTINATION kinfocenter/interrupts )
diff --git a/doc/kinfocenter/interrupts/Makefile.am b/doc/kinfocenter/interrupts/Makefile.am
deleted file mode 100644
index 46be8b9ce..000000000
--- a/doc/kinfocenter/interrupts/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-
-KDE_LANG= en
-KDE_DOCS = kinfocenter/interrupts
diff --git a/doc/kinfocenter/ioports/Makefile.am b/doc/kinfocenter/ioports/Makefile.am
deleted file mode 100644
index 56e830b08..000000000
--- a/doc/kinfocenter/ioports/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-
-KDE_LANG= en
-KDE_DOCS = kinfocenter/ioports
diff --git a/doc/kinfocenter/memory/Makefile.am b/doc/kinfocenter/memory/Makefile.am
deleted file mode 100644
index e9a9e23ef..000000000
--- a/doc/kinfocenter/memory/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-
-KDE_LANG= en
-KDE_DOCS = kinfocenter/memory
diff --git a/doc/kinfocenter/nics/Makefile.am b/doc/kinfocenter/nics/Makefile.am
deleted file mode 100644
index 73ab1b332..000000000
--- a/doc/kinfocenter/nics/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-
-KDE_LANG= en
-KDE_DOCS = kinfocenter/nics
diff --git a/doc/kinfocenter/opengl/CMakeLists.txt b/doc/kinfocenter/opengl/CMakeLists.txt
deleted file mode 100644
index 8639752af..000000000
--- a/doc/kinfocenter/opengl/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-tde_create_handbook( DESTINATION kinfocenter/opengl )
diff --git a/doc/kinfocenter/opengl/Makefile.am b/doc/kinfocenter/opengl/Makefile.am
deleted file mode 100644
index cc8923bc3..000000000
--- a/doc/kinfocenter/opengl/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_LANG= en
-KDE_DOCS = kinfocenter/opengl
diff --git a/doc/kinfocenter/partitions/CMakeLists.txt b/doc/kinfocenter/partitions/CMakeLists.txt
deleted file mode 100644
index 1b92782a3..000000000
--- a/doc/kinfocenter/partitions/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-tde_create_handbook( DESTINATION kinfocenter/partitions )
diff --git a/doc/kinfocenter/partitions/Makefile.am b/doc/kinfocenter/partitions/Makefile.am
deleted file mode 100644
index 7eab338b4..000000000
--- a/doc/kinfocenter/partitions/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-
-KDE_LANG= en
-KDE_DOCS = kinfocenter/partitions
diff --git a/doc/kinfocenter/pci/Makefile.am b/doc/kinfocenter/pci/Makefile.am
deleted file mode 100644
index b6702265a..000000000
--- a/doc/kinfocenter/pci/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-
-KDE_LANG= en
-KDE_DOCS = kinfocenter/pci
diff --git a/doc/kinfocenter/pcmcia/CMakeLists.txt b/doc/kinfocenter/pcmcia/CMakeLists.txt
deleted file mode 100644
index 06dbc8042..000000000
--- a/doc/kinfocenter/pcmcia/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-tde_create_handbook( DESTINATION kinfocenter/pcmcia )
diff --git a/doc/kinfocenter/pcmcia/Makefile.am b/doc/kinfocenter/pcmcia/Makefile.am
deleted file mode 100644
index 23040b3c9..000000000
--- a/doc/kinfocenter/pcmcia/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-
-KDE_LANG= en
-KDE_DOCS = kinfocenter/pcmcia
diff --git a/doc/kinfocenter/processor/CMakeLists.txt b/doc/kinfocenter/processor/CMakeLists.txt
deleted file mode 100644
index ee5d49a1c..000000000
--- a/doc/kinfocenter/processor/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-tde_create_handbook( DESTINATION kinfocenter/processor )
diff --git a/doc/kinfocenter/processor/Makefile.am b/doc/kinfocenter/processor/Makefile.am
deleted file mode 100644
index 7cdf67a93..000000000
--- a/doc/kinfocenter/processor/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-
-KDE_LANG= en
-KDE_DOCS = kinfocenter/processor
diff --git a/doc/kinfocenter/protocols/CMakeLists.txt b/doc/kinfocenter/protocols/CMakeLists.txt
deleted file mode 100644
index 66598bfdb..000000000
--- a/doc/kinfocenter/protocols/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-tde_create_handbook( DESTINATION kinfocenter/protocols )
diff --git a/doc/kinfocenter/protocols/Makefile.am b/doc/kinfocenter/protocols/Makefile.am
deleted file mode 100644
index afc73fa8a..000000000
--- a/doc/kinfocenter/protocols/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-
-KDE_LANG= en
-KDE_DOCS = kinfocenter/protocols
diff --git a/doc/kinfocenter/samba/CMakeLists.txt b/doc/kinfocenter/samba/CMakeLists.txt
deleted file mode 100644
index d59797e2a..000000000
--- a/doc/kinfocenter/samba/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-tde_create_handbook( DESTINATION kinfocenter/samba )
diff --git a/doc/kinfocenter/samba/Makefile.am b/doc/kinfocenter/samba/Makefile.am
deleted file mode 100644
index 91de8fa54..000000000
--- a/doc/kinfocenter/samba/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-
-KDE_LANG= en
-KDE_DOCS = kinfocenter/samba
-
diff --git a/doc/kinfocenter/scsi/Makefile.am b/doc/kinfocenter/scsi/Makefile.am
deleted file mode 100644
index 09cdb4e25..000000000
--- a/doc/kinfocenter/scsi/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-
-KDE_LANG = en
-KDE_DOCS = kinfocenter/scsi
diff --git a/doc/kinfocenter/sound/CMakeLists.txt b/doc/kinfocenter/sound/CMakeLists.txt
deleted file mode 100644
index dfafb5077..000000000
--- a/doc/kinfocenter/sound/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-tde_create_handbook( DESTINATION kinfocenter/sound )
diff --git a/doc/kinfocenter/sound/Makefile.am b/doc/kinfocenter/sound/Makefile.am
deleted file mode 100644
index 611f571ca..000000000
--- a/doc/kinfocenter/sound/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-
-KDE_LANG= en
-KDE_DOCS = kinfocenter/sound
diff --git a/doc/kinfocenter/usb/Makefile.am b/doc/kinfocenter/usb/Makefile.am
deleted file mode 100644
index 80cc84914..000000000
--- a/doc/kinfocenter/usb/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-
-KDE_LANG= en
-KDE_DOCS = kinfocenter/usb
diff --git a/doc/kinfocenter/xserver/CMakeLists.txt b/doc/kinfocenter/xserver/CMakeLists.txt
deleted file mode 100644
index 5636eeba7..000000000
--- a/doc/kinfocenter/xserver/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-tde_create_handbook( DESTINATION kinfocenter/xserver )
diff --git a/doc/kinfocenter/xserver/Makefile.am b/doc/kinfocenter/xserver/Makefile.am
deleted file mode 100644
index f72dcdbbf..000000000
--- a/doc/kinfocenter/xserver/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-
-KDE_LANG= en
-KDE_DOCS = kinfocenter/xserver
diff --git a/doc/userguide/migrator-applications.docbook b/doc/userguide/migrator-applications.docbook
index bd8bc93f6..8e511861e 100644
--- a/doc/userguide/migrator-applications.docbook
+++ b/doc/userguide/migrator-applications.docbook
@@ -216,12 +216,6 @@ viewer/player and web browser</para></entry>
 </row>
 
 <row>
-	<entry morerows='3' align="center"><para>System</para></entry>
-	<entry><para>System Info Center</para></entry>
-	<entry><para>&kinfocenter;</para></entry>
-</row>
-
-<row>
 	<entry><para>Terminal</para></entry>
 	<entry><para>&konsole;</para></entry>
 	<entry><para><application>CMD</application></para></entry>
diff --git a/kcontrol/info/cdinfo.desktop b/kcontrol/info/cdinfo.desktop
index 1b71d65d0..148c88e4e 100644
--- a/kcontrol/info/cdinfo.desktop
+++ b/kcontrol/info/cdinfo.desktop
@@ -2,12 +2,12 @@
 Exec=tdecmshell cdinfo
 Icon=kcmdevices
 Type=Application
-DocPath=kinfocenter/cdinfo/index.html
+DocPath=kcontrol/cdinfo/index.html
 
 
 X-TDE-Library=info
 X-TDE-FactoryName=cdinfo
-X-TDE-ParentApp=kinfocenter
+X-TDE-ParentApp=kcontrol
 
 Name=CD-ROM Information
 Name[bg]=CD-ROM
diff --git a/kcontrol/info/devices.desktop b/kcontrol/info/devices.desktop
index 2b7ad8f4a..9083edb52 100644
--- a/kcontrol/info/devices.desktop
+++ b/kcontrol/info/devices.desktop
@@ -2,13 +2,13 @@
 Exec=tdecmshell devices
 Icon=kcmdevices
 Type=Application
-DocPath=kinfocenter/devices/index.html
+DocPath=kcontrol/devices/index.html
 Categories=Qt;TDE;X-TDE-settings-information;
 
 
 X-TDE-Library=info
 X-TDE-FactoryName=devices
-X-TDE-ParentApp=kinfocenter
+X-TDE-ParentApp=kcontrol
 
 Name=Devices
 Name[af]=Toestelle
diff --git a/kcontrol/info/dma.desktop b/kcontrol/info/dma.desktop
index cd67d6be3..e188dce29 100644
--- a/kcontrol/info/dma.desktop
+++ b/kcontrol/info/dma.desktop
@@ -2,13 +2,13 @@
 Exec=tdecmshell dma
 Icon=kcmmemory
 Type=Application
-DocPath=kinfocenter/dma/index.html
+DocPath=kcontrol/dma/index.html
 Categories=Qt;TDE;X-TDE-settings-information;
 
 
 X-TDE-Library=info
 X-TDE-FactoryName=dma
-X-TDE-ParentApp=kinfocenter
+X-TDE-ParentApp=kcontrol
 
 Name=DMA-Channels
 Name[af]=Dma-kanale
diff --git a/kcontrol/info/interrupts.desktop b/kcontrol/info/interrupts.desktop
index 84471002c..9a54832ac 100644
--- a/kcontrol/info/interrupts.desktop
+++ b/kcontrol/info/interrupts.desktop
@@ -2,13 +2,13 @@
 Exec=tdecmshell interrupts
 Icon=kcmmemory
 Type=Application
-DocPath=kinfocenter/interrupts/index.html
+DocPath=kcontrol/interrupts/index.html
 Categories=Qt;TDE;X-TDE-settings-information;
 
 
 X-TDE-Library=info
 X-TDE-FactoryName=irq
-X-TDE-ParentApp=kinfocenter
+X-TDE-ParentApp=kcontrol
 
 Name=Interrupts
 Name[ar]=مفاتيح الإنقطاع
diff --git a/kcontrol/info/ioports.desktop b/kcontrol/info/ioports.desktop
index a3f670ad7..2678205cb 100644
--- a/kcontrol/info/ioports.desktop
+++ b/kcontrol/info/ioports.desktop
@@ -2,13 +2,13 @@
 Exec=tdecmshell ioports
 Icon=kcmmemory
 Type=Application
-DocPath=kinfocenter/ioports/index.html
+DocPath=kcontrol/ioports/index.html
 Categories=Qt;TDE;X-TDE-settings-information;
 
 
 X-TDE-Library=info
 X-TDE-FactoryName=ioports
-X-TDE-ParentApp=kinfocenter
+X-TDE-ParentApp=kcontrol
 
 Name=IO-Ports
 Name[af]=Io-poorte
diff --git a/kcontrol/info/memory.desktop b/kcontrol/info/memory.desktop
index 1ff56664e..617a65c87 100644
--- a/kcontrol/info/memory.desktop
+++ b/kcontrol/info/memory.desktop
@@ -2,12 +2,12 @@
 Exec=tdecmshell memory
 Icon=kcmmemory
 Type=Application
-DocPath=kinfocenter/memory/index.html
+DocPath=kcontrol/memory/index.html
 
 
 X-TDE-Library=info
 X-TDE-FactoryName=memory
-X-TDE-ParentApp=kinfocenter
+X-TDE-ParentApp=kcontrol
 
 Name=Memory
 Name[af]=Geheue
diff --git a/kcontrol/info/opengl.desktop b/kcontrol/info/opengl.desktop
index c6ec67758..cf8c5d421 100644
--- a/kcontrol/info/opengl.desktop
+++ b/kcontrol/info/opengl.desktop
@@ -3,12 +3,12 @@
 Exec=tdecmshell opengl
 Icon=kcmopengl
 Type=Application
-DocPath=kinfocenter/opengl/index.html
+DocPath=kcontrol/opengl/index.html
 
 
 X-TDE-Library=info
 X-TDE-FactoryName=opengl
-X-TDE-ParentApp=kinfocenter
+X-TDE-ParentApp=kcontrol
 
 Name=OpenGL
 Name[bn]=ওপেন-জি-এল
diff --git a/kcontrol/info/partitions.desktop b/kcontrol/info/partitions.desktop
index 02e591db0..6116df413 100644
--- a/kcontrol/info/partitions.desktop
+++ b/kcontrol/info/partitions.desktop
@@ -2,12 +2,12 @@
 Exec=tdecmshell partitions
 Icon=kcmpartitions
 Type=Application
-DocPath=kinfocenter/partitions/index.html
+DocPath=kcontrol/partitions/index.html
 
 
 X-TDE-Library=info
 X-TDE-FactoryName=partitions
-X-TDE-ParentApp=kinfocenter
+X-TDE-ParentApp=kcontrol
 
 
 Name=Partitions
diff --git a/kcontrol/info/pci.desktop b/kcontrol/info/pci.desktop
index 9e2d3e635..0eee56e67 100644
--- a/kcontrol/info/pci.desktop
+++ b/kcontrol/info/pci.desktop
@@ -2,12 +2,12 @@
 Exec=tdecmshell pci
 Icon=kcmpci
 Type=Application
-DocPath=kinfocenter/pci/index.html
+DocPath=kcontrol/pci/index.html
 
 
 X-TDE-Library=info
 X-TDE-FactoryName=pci
-X-TDE-ParentApp=kinfocenter
+X-TDE-ParentApp=kcontrol
 
 Name=PCI
 Name[bn]=পি-সি-আই
diff --git a/kcontrol/info/processor.desktop b/kcontrol/info/processor.desktop
index 35cd337c7..c67fbd4ce 100644
--- a/kcontrol/info/processor.desktop
+++ b/kcontrol/info/processor.desktop
@@ -2,12 +2,12 @@
 Exec=tdecmshell processor
 Icon=kcmprocessor
 Type=Application
-DocPath=kinfocenter/processor/index.html
+DocPath=kcontrol/processor/index.html
 
 
 X-TDE-Library=info
 X-TDE-FactoryName=cpu
-X-TDE-ParentApp=kinfocenter
+X-TDE-ParentApp=kcontrol
 
 Name=Processor
 Name[af]=Verwerker
diff --git a/kcontrol/info/scsi.desktop b/kcontrol/info/scsi.desktop
index e2b6691c8..b040e20ff 100644
--- a/kcontrol/info/scsi.desktop
+++ b/kcontrol/info/scsi.desktop
@@ -2,12 +2,12 @@
 Exec=tdecmshell scsi
 Icon=kcmscsi
 Type=Application
-DocPath=kinfocenter/scsi/index.html
+DocPath=kcontrol/scsi/index.html
 
 
 X-TDE-Library=info
 X-TDE-FactoryName=scsi
-X-TDE-ParentApp=kinfocenter
+X-TDE-ParentApp=kcontrol
 
 Name=SCSI
 Name[af]=Scsi
diff --git a/kcontrol/info/sound.desktop b/kcontrol/info/sound.desktop
index 0c90238fe..0afbe74df 100644
--- a/kcontrol/info/sound.desktop
+++ b/kcontrol/info/sound.desktop
@@ -2,12 +2,12 @@
 Exec=tdecmshell sound
 Icon=kcmsound
 Type=Application
-DocPath=kinfocenter/sound/index.html
+DocPath=kcontrol/sound/index.html
 
 
 X-TDE-Library=info
 X-TDE-FactoryName=sound
-X-TDE-ParentApp=kinfocenter
+X-TDE-ParentApp=kcontrol
 
 Name=Sound
 Name[af]=Klank
diff --git a/kcontrol/info/xserver.desktop b/kcontrol/info/xserver.desktop
index b253c2b53..adcec81bc 100644
--- a/kcontrol/info/xserver.desktop
+++ b/kcontrol/info/xserver.desktop
@@ -2,12 +2,12 @@
 Exec=tdecmshell xserver
 Icon=kcmx
 Type=Application
-DocPath=kinfocenter/xserver/index.html
+DocPath=kcontrol/xserver/index.html
 
 
 X-TDE-Library=info
 X-TDE-FactoryName=xserver
-X-TDE-ParentApp=kinfocenter
+X-TDE-ParentApp=kcontrol
 
 Name=X-Server
 Name[af]=X-bediener
diff --git a/kcontrol/ioslaveinfo/ioslaveinfo.desktop b/kcontrol/ioslaveinfo/ioslaveinfo.desktop
index f545071e3..3701f1a8c 100644
--- a/kcontrol/ioslaveinfo/ioslaveinfo.desktop
+++ b/kcontrol/ioslaveinfo/ioslaveinfo.desktop
@@ -77,7 +77,7 @@ Comment[xh]=Ulwazi malunga nemithetho elandelwayo ekhoyo
 Comment[zh_CN]=可用协议的信息
 Comment[zh_TW]=可用協定的資訊
 Comment[zu]=Ulwazi mayelana nemithetho elandelwayo ekhona
-DocPath=kinfocenter/protocols/index.html
+DocPath=kcontrol/protocols/index.html
 Exec=tdecmshell ioslaveinfo
 Icon=history
 Keywords=Protocol,IO slaves,Slaves,Network,Information,Timeout
@@ -232,6 +232,6 @@ Type=Application
 X-TDE-FactoryName=ioslaveinfo
 X-TDE-Library=ioslaveinfo
 
-X-TDE-ParentApp=kinfocenter
+X-TDE-ParentApp=kcontrol
 
 Categories=Qt;TDE;X-TDE-settings-network;
diff --git a/kcontrol/kcontrol/CMakeLists.txt b/kcontrol/kcontrol/CMakeLists.txt
index b5eeb1ddd..5d7ba23f7 100644
--- a/kcontrol/kcontrol/CMakeLists.txt
+++ b/kcontrol/kcontrol/CMakeLists.txt
@@ -26,8 +26,7 @@ link_directories(
 
 tde_install_icons()
 install( FILES kcontrolui.rc DESTINATION ${DATA_INSTALL_DIR}/kcontrol )
-install( FILES kinfocenterui.rc DESTINATION ${DATA_INSTALL_DIR}/kinfocenter )
-install( FILES  KControl.desktop kinfocenter.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES  KControl.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 
 ##### kcontrol (tdeinit) ########################
@@ -46,5 +45,3 @@ tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
   LINK tdehtml-shared
 )
-
-tde_install_symlink( kcontrol ${BIN_INSTALL_DIR}/kinfocenter )
diff --git a/kcontrol/kcontrol/Makefile.am b/kcontrol/kcontrol/Makefile.am
index 9ae27d42f..f39a2ee3f 100644
--- a/kcontrol/kcontrol/Makefile.am
+++ b/kcontrol/kcontrol/Makefile.am
@@ -37,15 +37,8 @@ kcontrol_la_LDFLAGS = $(all_libraries) -module -avoid-version
 
 rccontroldir = $(kde_datadir)/kcontrol
 rccontrol_DATA = kcontrolui.rc
-rcinfodir = $(kde_datadir)/kinfocenter
-rcinfo_DATA = kinfocenterui.rc
 
-xdg_apps_DATA = KControl.desktop kinfocenter.desktop
-
-install-data-local:
-	@-rm -f $(DESTDIR)$(kde_bindir)/kinfocenter
-	$(mkinstalldirs) $(DESTDIR)$(kde_bindir)
-	@$(LN_S) kcontrol $(DESTDIR)$(kde_bindir)/kinfocenter
+xdg_apps_DATA = KControl.desktop
 
 KDE_ICON=AUTO
 
diff --git a/kcontrol/kcontrol/helpwidget.cpp b/kcontrol/kcontrol/helpwidget.cpp
index 0e8cc4844..3e4fe717f 100644
--- a/kcontrol/kcontrol/helpwidget.cpp
+++ b/kcontrol/kcontrol/helpwidget.cpp
@@ -47,16 +47,10 @@ void HelpWidget::setText(const TQString& docPath, const TQString& text)
 
 void HelpWidget::setBaseText()
 {
-  if (KCGlobal::isInfoCenter())
-     helptext = (i18n("<h1>Trinity Info Center</h1>"
-			 "There is no quick help available for the active info module."
-			 "<br><br>"
-			 "Click <a href = \"kinfocenter/index.html\">here</a> to read the general Info Center manual.") );
-  else
-     helptext = (i18n("<h1>Trinity Control Center</h1>"
-			 "There is no quick help available for the active control module."
-			 "<br><br>"
-			 "Click <a href = \"kcontrol/index.html\">here</a> to read the general Control Center manual.") );
+	 helptext = (i18n("<h1>Trinity Control Center</h1>"
+		 "There is no quick help available for the active control module."
+		 "<br><br>"
+		 "Click <a href = \"kcontrol/index.html\">here</a> to read the general Control Center manual.") );
 }
 
 TQString HelpWidget::text() const
diff --git a/kcontrol/kcontrol/kinfocenter.desktop b/kcontrol/kcontrol/kinfocenter.desktop
deleted file mode 100644
index 080459037..000000000
--- a/kcontrol/kcontrol/kinfocenter.desktop
+++ /dev/null
@@ -1,116 +0,0 @@
-[Desktop Entry]
-Exec=kinfocenter -caption "%c" %i %m
-Icon=hwinfo
-Type=Application
-# Restore the following key and remove this comment when a help handbook
-# is written. Disabling this key prevents populating the main handbook
-# table of contents with a non-existent document, which results in a
-# main handbook error message of
-# 'There is no documentation available for /xyz/index.html.'
-# Also disable this key when there exists only a useless template handbook.
-# DocPath=kinfocenter/index.html
-X-TDE-StartupNotify=true
-OnlyShowIn=TDE;
-
-Name=KInfoCenter
-Name[af]=Inligting Sentrum
-Name[be]=Цэнтр інфармацыі
-Name[bn]=কে-ইনফো-সেন্টার
-Name[csb]=Centróm wëdowiédzë
-Name[de]=Infozentrum
-Name[el]=Κέντρο πληροφοριών
-Name[et]=TDE infokeskus
-Name[he]=מרכז המידע
-Name[ja]=インフォセンター
-Name[mk]=КИнфоцентар
-Name[nds]=TDE-Infozentrum
-Name[ne]=के सूचना केन्द्र
-Name[pa]=ਜਾਣਕਾਰੀ ਕੇਂਦਰ
-Name[pl]=Centrum informacyjne
-Name[pt_BR]=Centro de Informações do TDE
-Name[ro]=Centrul de informații TDE
-Name[rw]=K-AmakuruHagati
-Name[sk]=TDE Informačné centrum
-Name[sv]=Informationscentralen
-Name[ta]=கேதகவல் மையம்
-Name[te]=కెఇన్ఫొసెంటర్
-Name[tg]=КМаркази иттилоот
-Name[th]=ศูนย์ข้อมูล K
-Name[tr]=TDE Bilgi Merkezi
-Name[uz]=Maʼlumot markazi
-Name[uz@cyrillic]=Маълумот маркази
-Name[vi]=Trung tâm Thông tin TDE
-Name[wa]=Cinte d' informåcion KInfo
-GenericName=Info Center
-GenericName[af]=Inligting Sentrum
-GenericName[be]=Цэнтр інфармацыі
-GenericName[bg]=Информационен център
-GenericName[bn]=তথ্য কেন্দ্র
-GenericName[br]=Kreizenn Titouroù
-GenericName[bs]=Info centar
-GenericName[ca]=Centre d'informació
-GenericName[cs]=Informační centrum
-GenericName[csb]=Centróm wëdowiédzë
-GenericName[cy]=Canolfan Gwybodaeth
-GenericName[da]=Infocenter
-GenericName[de]=Infozentrum
-GenericName[el]=Κέντρο πληροφοριών
-GenericName[en_GB]=Info Centre
-GenericName[eo]=Infocentro
-GenericName[es]=Centro de información
-GenericName[et]=Infokeskus
-GenericName[eu]=Info gunea
-GenericName[fa]=مرکز اطلاعات
-GenericName[fi]=Infokeskus
-GenericName[fr]=Centre d'informations
-GenericName[fy]=Ynformaasjesintrum
-GenericName[ga]=Lárionad Eolais
-GenericName[gl]=Centro de Información
-GenericName[he]=מרכז המידע
-GenericName[hr]=Info središte
-GenericName[hu]=Rendszerinformáció
-GenericName[is]=Upplýsingaborð
-GenericName[it]=Centro informazioni
-GenericName[ja]=インフォセンター
-GenericName[ka]=საინფორმაციო ცენტრი
-GenericName[kk]=Мәлімет орталығы
-GenericName[km]=មជ្ឈមណ្ឌល​ព័ត៌មាន
-GenericName[ko]=정보 센터
-GenericName[lt]=Info centras
-GenericName[mk]=Информативен центар
-GenericName[ms]=Pusat Maklumat
-GenericName[nb]=TDEs informasjonssenter
-GenericName[nds]=Infozentrum
-GenericName[ne]=सूचना केन्द्र
-GenericName[nl]=Informatiecentrum
-GenericName[nn]=TDEs informasjonssenter
-GenericName[pa]=ਜਾਣਕਾਰੀ ਕੇਂਦਰ
-GenericName[pl]=Centrum informacyjne
-GenericName[pt]=Centro de Informações
-GenericName[pt_BR]=Centro de Informações
-GenericName[ro]=Centru de informații
-GenericName[ru]=Центр информации
-GenericName[rw]=Amakuru Hagati
-GenericName[se]=Diehtoguovddáš
-GenericName[sk]=Informačné centrum
-GenericName[sl]=Informacijsko središče
-GenericName[sr]=Информациони центар
-GenericName[sr@Latn]=Informacioni centar
-GenericName[sv]=Informationscentralen
-GenericName[ta]=தகவல் மையம்
-GenericName[te]=సమాచార కేంద్రం
-GenericName[tg]=Маркази иттилоот
-GenericName[th]=ศูนย์ข้อมูล
-GenericName[tr]=Bilgi Merkezi
-GenericName[tt]=Beleşmä Üzäge
-GenericName[uk]=Центр інформації
-GenericName[uz]=Maʼlumot markazi
-GenericName[uz@cyrillic]=Маълумот маркази
-GenericName[vi]=Trung tâm Thông tin
-GenericName[wa]=Cinte di contrôle
-GenericName[zh_CN]=信息中心
-GenericName[zh_TW]=資訊中心
-
-X-DCOP-ServiceType=Unique
-Categories=Qt;TDE;System;
-NoDisplay=true
diff --git a/kcontrol/kcontrol/kinfocenterui.rc b/kcontrol/kcontrol/kinfocenterui.rc
deleted file mode 100644
index 92867beb3..000000000
--- a/kcontrol/kcontrol/kinfocenterui.rc
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE kpartgui>
-<kpartgui name="kcontrol" version="2">
-<MenuBar>
-    <Menu name="view"><text>&amp;View</text>
-        <Menu name="view_mode"><text>&amp;Mode</text>
-            <Action name="activate_iconview"/>
-            <Action name="activate_treeview"/>
-        </Menu>
-        <Menu name="view_iconsize"><text>Icon &amp;Size</text>
-            <Action name="activate_smallicons"/>
-            <Action name="activate_mediumicons"/>
-            <Action name="activate_largeicons"/>
-            <Action name="activate_hugeicons"/>
-        </Menu>
-    </Menu>
-    <Menu name="help">
-        <Action name="help_about_module" append="about_merge"/>
-    </Menu>
-</MenuBar>
-</kpartgui>
diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp
index 21824d2bf..2656359c2 100644
--- a/kcontrol/kcontrol/main.cpp
+++ b/kcontrol/kcontrol/main.cpp
@@ -105,29 +105,15 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
     KCONTROL_VERSION, I18N_NOOP("The Trinity Control Center"), TDEAboutData::License_GPL,
     I18N_NOOP("(c) 1998-2004, The TDE Control Center Developers"));
 
-  TDEAboutData aboutKInfoCenter( "kinfocenter", I18N_NOOP("Trinity Info Center"),
-    KCONTROL_VERSION, I18N_NOOP("The Trinity Info Center"), TDEAboutData::License_GPL,
-    I18N_NOOP("(c) 1998-2004, The TDE Control Center Developers"));
-
   TQCString argv_0 = argv[0];
   TDEAboutData *aboutData;
-  if (argv_0.right(11) == "kinfocenter")
-  {
-     aboutData = &aboutKInfoCenter;
-     KCGlobal::setIsInfoCenter(true);
-     kdDebug(1208) << "Running as KInfoCenter!\n" << endl;
-  }
-  else
   {
      aboutData = &aboutKControl;
      KCGlobal::setIsInfoCenter(false);
   }
 
   aboutData->addAuthor("Timothy Pearson", I18N_NOOP("Current Maintainer"), "[email protected]");
-  if (argv_0.right(11) == "kinfocenter")
-    aboutData->addAuthor("Helge Deller", I18N_NOOP("Previous Maintainer"), "[email protected]");
-  else
-    aboutData->addAuthor("Daniel Molkentin", I18N_NOOP("Previous Maintainer"), "[email protected]");
+  aboutData->addAuthor("Daniel Molkentin", I18N_NOOP("Previous Maintainer"), "[email protected]");
 
   aboutData->addAuthor("Matthias Hoelzer-Kluepfel",0, "[email protected]");
   aboutData->addAuthor("Matthias Elter",0, "[email protected]");
diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp
index a93122a26..519ec91df 100644
--- a/kcontrol/kcontrol/toplevel.cpp
+++ b/kcontrol/kcontrol/toplevel.cpp
@@ -270,12 +270,7 @@ actionCollection());
   about_module = new TDEAction(i18n("About Current Module"), 0, TQT_TQOBJECT(this), TQT_SLOT(aboutModule()), actionCollection(), "help_about_module");
   about_module->setEnabled(false);
 
-  // I need to add this so that each module can get a bug reported,
-  // and not just KControl
-  if (KCGlobal::isInfoCenter())
-    createGUI("kinfocenterui.rc");
-  else
-    createGUI("kcontrolui.rc");
+  createGUI("kcontrolui.rc");
 
   report_bug = actionCollection()->action("help_report_bug");
   report_bug->setText(i18n("&Report Bug..."));
diff --git a/kcontrol/nics/nic.desktop b/kcontrol/nics/nic.desktop
index 6ebfd7daa..ba7472161 100644
--- a/kcontrol/nics/nic.desktop
+++ b/kcontrol/nics/nic.desktop
@@ -1,13 +1,13 @@
 [Desktop Entry]
 Exec=tdecmshell nic
 Type=Application
-DocPath=kinfocenter/nics/index.html
+DocPath=kcontrol/nics/index.html
 Icon=network
 
 
 X-TDE-Library=nic
 X-TDE-FactoryName=nic
-X-TDE-ParentApp=kinfocenter
+X-TDE-ParentApp=kcontrol
 
 Name=Network Interfaces
 Name[af]=Netwerk Koppelvlakke
diff --git a/kcontrol/samba/smbstatus.desktop b/kcontrol/samba/smbstatus.desktop
index c4b32d115..99f6b9588 100644
--- a/kcontrol/samba/smbstatus.desktop
+++ b/kcontrol/samba/smbstatus.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell smbstatus
 Icon=samba
 Type=Application
-DocPath=kinfocenter/samba/index.html
+DocPath=kcontrol/samba/index.html
 
 
 X-TDE-Library=samba
diff --git a/kcontrol/usbview/kcmusb.desktop b/kcontrol/usbview/kcmusb.desktop
index f8825b7f5..38839ef99 100644
--- a/kcontrol/usbview/kcmusb.desktop
+++ b/kcontrol/usbview/kcmusb.desktop
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Icon=usb
 Type=Application
-DocPath=kinfocenter/usb/index.html
+DocPath=kcontrol/usb/index.html
 Exec=tdecmshell kcmusb
 
 X-TDE-Library=usb
-X-TDE-ParentApp=kinfocenter
+X-TDE-ParentApp=kcontrol
 
 Name=USB Devices
 Name[af]=USB Toestelle
diff --git a/kcontrol/view1394/kcmview1394.desktop b/kcontrol/view1394/kcmview1394.desktop
index e1f6bc361..978011258 100644
--- a/kcontrol/view1394/kcmview1394.desktop
+++ b/kcontrol/view1394/kcmview1394.desktop
@@ -7,11 +7,11 @@ Type=Application
 # main handbook error message of
 # 'There is no documentation available for /xyz/index.html.'
 # Also disable this key when there exists only a useless template handbook.
-# DocPath=kinfocenter/view1394/index.html
+# DocPath=kcontrol/view1394/index.html
 Exec=tdecmshell kcmview1394
 
 X-TDE-Library=view1394
-X-TDE-ParentApp=kinfocenter
+X-TDE-ParentApp=kcontrol
 
 Name=IEEE 1394 Devices
 Name[af]=IEEE 1394 Toestelle
diff --git a/khelpcenter/README.metadata b/khelpcenter/README.metadata
index c0149c8e5..adbddc106 100644
--- a/khelpcenter/README.metadata
+++ b/khelpcenter/README.metadata
@@ -88,7 +88,6 @@ X-TDE-KHelpcenter           string    If this entry is set to one of the
                                                      from the start menu
                                       'scrollkeeper' scrollkeeper docs
                                       'applets'      panel applet docs
-                                      'kinfocenter'  kinfocenter docs
                                       'kcontrol'     kcontrol module docs
                                       'konqueror'    konqueror plugin docs
                                       'tdeioslave'     tdeioslave docs
diff --git a/khelpcenter/plugins/hardwaremodules.desktop b/khelpcenter/plugins/hardwaremodules.desktop
index 05d481cb8..af716857a 100644
--- a/khelpcenter/plugins/hardwaremodules.desktop
+++ b/khelpcenter/plugins/hardwaremodules.desktop
@@ -60,4 +60,4 @@ Icon=contents2
 
 X-DOC-Weight=-400
 
-X-TDE-KHelpcenter-Special=kinfocenter
+X-TDE-KHelpcenter-Special=kcontrol
diff --git a/khelpcenter/plugintraverser.cpp b/khelpcenter/plugintraverser.cpp
index 1cafba260..ca33664df 100644
--- a/khelpcenter/plugintraverser.cpp
+++ b/khelpcenter/plugintraverser.cpp
@@ -90,8 +90,7 @@ void PluginTraverser::process( DocEntry *entry )
 
     if (entry->khelpcenterSpecial() == "applets" ) {
       mNavigator->insertAppletDocs( mCurrentItem );
-    } else if ( entry->khelpcenterSpecial() == "kinfocenter" ||
-                entry->khelpcenterSpecial() == "kcontrol" ||
+    } else if ( entry->khelpcenterSpecial() == "kcontrol" ||
                 entry->khelpcenterSpecial() == "konqueror" ) {
       mNavigator->insertParentAppDocs( entry->khelpcenterSpecial(), mCurrentItem );
     } else if ( entry->khelpcenterSpecial() == "tdeioslave" ) {