Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

42 files changed, 864 insertions, 504 deletions

diff --git a/debian/lenny/tdebase/debian/control b/debian/lenny/tdebase/debian/control
index ee49c2d46..1b2ba1ea2 100644
--- a/debian/lenny/tdebase/debian/control
+++ b/debian/lenny/tdebase/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs14-trinity, libogg-dev, libdbus-tqt-1-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-tqt-dev, libart-2.0-dev (>= 4:14.0.0~), libtool, libltdl-dev, cmake
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs14-trinity, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libart-2.0-dev (>= 4:14.0.0~), libtool, libltdl-dev, cmake
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc
 Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
 Standards-Version: 3.8.4
diff --git a/debian/lenny/tdebase/debian/kcontrol-trinity.install b/debian/lenny/tdebase/debian/kcontrol-trinity.install
index 46eb3b814..5698b6ff9 100644
--- a/debian/lenny/tdebase/debian/kcontrol-trinity.install
+++ b/debian/lenny/tdebase/debian/kcontrol-trinity.install
@@ -176,6 +176,7 @@ debian/tmp/opt/trinity/share/applications/tde/tdefontview.desktop
 debian/tmp/opt/trinity/share/applications/tde/tdehtml_behavior.desktop
 debian/tmp/opt/trinity/share/applications/tde/tdehtml_fonts.desktop
 debian/tmp/opt/trinity/share/applications/tde/tdehtml_java_js.desktop
+debian/tmp/opt/trinity/share/applications/tde/tdehtml_userinterface.desktop
 debian/tmp/opt/trinity/share/applications/tde/tderandrtray.desktop
 debian/tmp/opt/trinity/share/autostart/tderandrtray-autostart.desktop
 debian/tmp/opt/trinity/share/applications/tde/kthememanager.desktop
diff --git a/debian/lenny/tdebase/debian/khelpcenter-trinity.install b/debian/lenny/tdebase/debian/khelpcenter-trinity.install
index f3f71648e..fce9e3ec6 100644
--- a/debian/lenny/tdebase/debian/khelpcenter-trinity.install
+++ b/debian/lenny/tdebase/debian/khelpcenter-trinity.install
@@ -13,6 +13,7 @@ debian/tmp/opt/trinity/share/apps/khelpcenter/glossary.xslt
 debian/tmp/opt/trinity/share/apps/khelpcenter/index.html.in
 debian/tmp/opt/trinity/share/apps/khelpcenter/intro.html.in
 debian/tmp/opt/trinity/share/apps/khelpcenter/khelpcenterui.rc
+debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/adminguide.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/applets.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/Applications/.directory
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/contact.desktop
@@ -44,6 +45,10 @@ debian/tmp/opt/trinity/share/apps/khelpcenter/searchhandlers/htdig/htdig_long.ht
 debian/tmp/opt/trinity/share/apps/khelpcenter/searchhandlers/man.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/table-of-contents.xslt
 debian/tmp/opt/trinity/share/config.kcfg/khelpcenter.kcfg
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/adminguide/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/adminguide/groupware-kontact.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/adminguide/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/adminguide/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/background.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/bgtable.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/common
@@ -59,7 +64,6 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/install.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/intro.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/tdeapps.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/misc.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/moreinfo.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/nontdeapps.docbook
@@ -68,6 +72,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/panel.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/qt.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/questions.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/sound.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/tdeapps.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/tips.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/webbrowse.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/winmng.docbook
@@ -77,23 +82,29 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/glossary/index.cache.bz
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/glossary/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/glossary/tdeprintingglossary.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/help.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/helpnotfound/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/helpnotfound/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/helpnotfound/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/kdelogo2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/khelpcenter.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/konq.css
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/lines2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/lines.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/lines2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/pointers.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/quickstart/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/quickstart/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/quickstart/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/shadow1.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/support.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/a-window.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/accessibility.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/amarok-icon.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/amarok.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/a-window.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/base-tde-applications.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/browser-fine-tuning.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/burning-cds.docbook
@@ -109,7 +120,6 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/file-sharing.
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/font-installation.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/getting-help.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/glossary.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/groupware-kontact.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/internet-shortcuts.docbook
@@ -119,15 +129,11 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kaboodle-icon
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kaboodle.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kcalc-systray.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kcontrol.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-as-root.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-edutainment.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-for-admins.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-office.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmag.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmousetool.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmouth.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmouth2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmouth3.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmouth.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/knode-identity.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/knode-mail-account.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/knode-news-account.png
@@ -165,6 +171,10 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/shared-sessio
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/splash-screen.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/standard-menu-entries.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/switching-sessions.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-as-root.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-edutainment.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-office.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tdm.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/the-filemanager.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/titlebar-menu.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/troubleshooting-network-x.docbook
@@ -177,6 +187,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/your-tde-acco
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict1.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict10.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict11.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict12.png
@@ -187,12 +198,11 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict16.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict17.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict18.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict19.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict20.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict21.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict22.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict23.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict3.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict4.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict5.png
diff --git a/debian/lenny/tdebase/debian/tdebase-data-trinity.install b/debian/lenny/tdebase/debian/tdebase-data-trinity.install
index 9ae37a312..cda482406 100644
--- a/debian/lenny/tdebase/debian/tdebase-data-trinity.install
+++ b/debian/lenny/tdebase/debian/tdebase-data-trinity.install
@@ -144,6 +144,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/bell/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cache/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cache/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cache/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/clock/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/clock/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/clock/index.docbook
@@ -151,24 +154,39 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/colors/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/colors/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/colors/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/componentchooser/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/componentchooser/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/componentchooser/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cookies/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cookies/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cookies/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/crypto/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/crypto/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/crypto/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktop/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktop/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktop/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/display/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/display/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/display/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/displayconfig/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/displayconfig/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/displayconfig/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dnssd/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dnssd/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dnssd/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ebrowsing/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ebrowsing/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ebrowsing/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/email/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/email/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/email/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/energy/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/energy/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/energy/index.docbook
@@ -183,23 +201,44 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filetypes/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/fonts/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/fonts/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/fonts/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/helpindex.html/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/helpindex.html/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/helpindex.html/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/hwmanager/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/hwmanager/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/hwmanager/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/iccconfig/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/iccconfig/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/iccconfig/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/icons/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/icons/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/icons/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/joystick/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/joystick/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/joystick/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmaccess/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmaccess/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmaccess/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcgi/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcgi/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcgi/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcss/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcss/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcss/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmfontinst/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmfontinst/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmfontinst/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmhistory/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmhistory/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmhistory/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmkded/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmkded/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmkded/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmlaunch/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmlaunch/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmlaunch/index.docbook
@@ -215,117 +254,122 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmstyle/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmtaskbar/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmtaskbar/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmtaskbar/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdm/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdm/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdm/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keyboard/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keyboard/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keyboard/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/nsplugin.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khotkeys/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khotkeys/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khotkeys/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kthememanager/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kthememanager/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kthememanager/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/language/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/language/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/language/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/media/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/media/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/media/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/mouse/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/mouse/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/mouse/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/netpref/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/netpref/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/netpref/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/passwords/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/passwords/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/passwords/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/socks.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screenshot.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/paths/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/paths/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/paths/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/paths/paths.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/privacy/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/privacy/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/privacy/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/socks.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screenshot.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/nsplugin.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tderesources/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tderesources/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tderesources/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useraccount/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useraccount/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useraccount/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useraccount/useraccount.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/view1394/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/view1394/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/view1394/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowbehavior/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowbehavior/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowbehavior/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.docbook
diff --git a/debian/lenny/tdebase/debian/tdeprint-trinity.install b/debian/lenny/tdebase/debian/tdeprint-trinity.install
index 48bfe8565..046f35ec0 100644
--- a/debian/lenny/tdebase/debian/tdeprint-trinity.install
+++ b/debian/lenny/tdebase/debian/tdeprint-trinity.install
@@ -110,6 +110,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/rlpr.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/steinbruch_scaled.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/tech-overview.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/theory.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprintfax/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprintfax/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprintfax/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/tdeprintfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kjobviewer.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/printmgr.png
diff --git a/debian/lenny/tdebase/debian/tdm-trinity.install b/debian/lenny/tdebase/debian/tdm-trinity.install
index 5ec933662..04241c097 100644
--- a/debian/lenny/tdebase/debian/tdm-trinity.install
+++ b/debian/lenny/tdebase/debian/tdm-trinity.install
@@ -17,6 +17,7 @@ debian/tmp/opt/trinity/share/apps/tdm/pics/shutdown.jpg
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/default1.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/default2.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/default3.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/default4.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/root1.png
 debian/tmp/opt/trinity/share/apps/tdm/sessions/9wm.desktop
 debian/tmp/opt/trinity/share/apps/tdm/sessions/aewm.desktop
diff --git a/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install b/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install
index c3c0b9135..1485494ca 100644
--- a/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install
+++ b/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install
@@ -1760,6 +1760,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/headerbg.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/header.html
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-common.css
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-default.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-docs.css
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde_gear_64.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-localised.css.template
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde_logo_bg.png
diff --git a/debian/squeeze/tdebase/debian/control b/debian/squeeze/tdebase/debian/control
index ab3607018..6b5cd478e 100644
--- a/debian/squeeze/tdebase/debian/control
+++ b/debian/squeeze/tdebase/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs14-trinity, libogg-dev, libdbus-tqt-1-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-tqt-dev, libart-2.0-dev (>= 4:14.0.0~), libtool, libltdl-dev, cmake
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs14-trinity, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libart-2.0-dev (>= 4:14.0.0~), libtool, libltdl-dev, cmake
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc
 Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
 Standards-Version: 3.8.4
diff --git a/debian/squeeze/tdebase/debian/kcontrol-trinity.install b/debian/squeeze/tdebase/debian/kcontrol-trinity.install
index 46eb3b814..5698b6ff9 100644
--- a/debian/squeeze/tdebase/debian/kcontrol-trinity.install
+++ b/debian/squeeze/tdebase/debian/kcontrol-trinity.install
@@ -176,6 +176,7 @@ debian/tmp/opt/trinity/share/applications/tde/tdefontview.desktop
 debian/tmp/opt/trinity/share/applications/tde/tdehtml_behavior.desktop
 debian/tmp/opt/trinity/share/applications/tde/tdehtml_fonts.desktop
 debian/tmp/opt/trinity/share/applications/tde/tdehtml_java_js.desktop
+debian/tmp/opt/trinity/share/applications/tde/tdehtml_userinterface.desktop
 debian/tmp/opt/trinity/share/applications/tde/tderandrtray.desktop
 debian/tmp/opt/trinity/share/autostart/tderandrtray-autostart.desktop
 debian/tmp/opt/trinity/share/applications/tde/kthememanager.desktop
diff --git a/debian/squeeze/tdebase/debian/khelpcenter-trinity.install b/debian/squeeze/tdebase/debian/khelpcenter-trinity.install
index f3f71648e..fce9e3ec6 100644
--- a/debian/squeeze/tdebase/debian/khelpcenter-trinity.install
+++ b/debian/squeeze/tdebase/debian/khelpcenter-trinity.install
@@ -13,6 +13,7 @@ debian/tmp/opt/trinity/share/apps/khelpcenter/glossary.xslt
 debian/tmp/opt/trinity/share/apps/khelpcenter/index.html.in
 debian/tmp/opt/trinity/share/apps/khelpcenter/intro.html.in
 debian/tmp/opt/trinity/share/apps/khelpcenter/khelpcenterui.rc
+debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/adminguide.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/applets.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/Applications/.directory
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/contact.desktop
@@ -44,6 +45,10 @@ debian/tmp/opt/trinity/share/apps/khelpcenter/searchhandlers/htdig/htdig_long.ht
 debian/tmp/opt/trinity/share/apps/khelpcenter/searchhandlers/man.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/table-of-contents.xslt
 debian/tmp/opt/trinity/share/config.kcfg/khelpcenter.kcfg
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/adminguide/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/adminguide/groupware-kontact.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/adminguide/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/adminguide/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/background.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/bgtable.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/common
@@ -59,7 +64,6 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/install.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/intro.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/tdeapps.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/misc.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/moreinfo.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/nontdeapps.docbook
@@ -68,6 +72,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/panel.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/qt.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/questions.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/sound.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/tdeapps.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/tips.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/webbrowse.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/winmng.docbook
@@ -77,23 +82,29 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/glossary/index.cache.bz
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/glossary/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/glossary/tdeprintingglossary.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/help.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/helpnotfound/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/helpnotfound/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/helpnotfound/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/kdelogo2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/khelpcenter.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/konq.css
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/lines2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/lines.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/lines2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/pointers.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/quickstart/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/quickstart/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/quickstart/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/shadow1.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/support.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/a-window.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/accessibility.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/amarok-icon.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/amarok.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/a-window.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/base-tde-applications.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/browser-fine-tuning.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/burning-cds.docbook
@@ -109,7 +120,6 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/file-sharing.
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/font-installation.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/getting-help.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/glossary.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/groupware-kontact.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/internet-shortcuts.docbook
@@ -119,15 +129,11 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kaboodle-icon
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kaboodle.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kcalc-systray.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kcontrol.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-as-root.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-edutainment.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-for-admins.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-office.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmag.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmousetool.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmouth.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmouth2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmouth3.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmouth.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/knode-identity.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/knode-mail-account.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/knode-news-account.png
@@ -165,6 +171,10 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/shared-sessio
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/splash-screen.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/standard-menu-entries.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/switching-sessions.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-as-root.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-edutainment.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-office.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tdm.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/the-filemanager.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/titlebar-menu.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/troubleshooting-network-x.docbook
@@ -177,6 +187,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/your-tde-acco
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict1.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict10.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict11.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict12.png
@@ -187,12 +198,11 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict16.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict17.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict18.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict19.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict20.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict21.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict22.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict23.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict3.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict4.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict5.png
diff --git a/debian/squeeze/tdebase/debian/tdebase-data-trinity.install b/debian/squeeze/tdebase/debian/tdebase-data-trinity.install
index 9ae37a312..cda482406 100644
--- a/debian/squeeze/tdebase/debian/tdebase-data-trinity.install
+++ b/debian/squeeze/tdebase/debian/tdebase-data-trinity.install
@@ -144,6 +144,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/bell/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cache/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cache/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cache/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/clock/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/clock/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/clock/index.docbook
@@ -151,24 +154,39 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/colors/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/colors/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/colors/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/componentchooser/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/componentchooser/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/componentchooser/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cookies/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cookies/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cookies/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/crypto/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/crypto/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/crypto/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktop/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktop/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktop/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/display/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/display/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/display/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/displayconfig/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/displayconfig/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/displayconfig/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dnssd/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dnssd/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dnssd/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ebrowsing/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ebrowsing/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ebrowsing/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/email/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/email/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/email/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/energy/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/energy/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/energy/index.docbook
@@ -183,23 +201,44 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filetypes/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/fonts/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/fonts/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/fonts/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/helpindex.html/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/helpindex.html/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/helpindex.html/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/hwmanager/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/hwmanager/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/hwmanager/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/iccconfig/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/iccconfig/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/iccconfig/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/icons/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/icons/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/icons/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/joystick/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/joystick/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/joystick/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmaccess/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmaccess/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmaccess/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcgi/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcgi/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcgi/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcss/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcss/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcss/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmfontinst/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmfontinst/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmfontinst/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmhistory/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmhistory/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmhistory/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmkded/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmkded/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmkded/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmlaunch/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmlaunch/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmlaunch/index.docbook
@@ -215,117 +254,122 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmstyle/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmtaskbar/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmtaskbar/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmtaskbar/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdm/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdm/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdm/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keyboard/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keyboard/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keyboard/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/nsplugin.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khotkeys/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khotkeys/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khotkeys/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kthememanager/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kthememanager/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kthememanager/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/language/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/language/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/language/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/media/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/media/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/media/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/mouse/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/mouse/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/mouse/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/netpref/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/netpref/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/netpref/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/passwords/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/passwords/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/passwords/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/socks.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screenshot.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/paths/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/paths/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/paths/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/paths/paths.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/privacy/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/privacy/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/privacy/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/socks.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screenshot.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/nsplugin.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tderesources/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tderesources/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tderesources/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useraccount/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useraccount/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useraccount/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useraccount/useraccount.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/view1394/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/view1394/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/view1394/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowbehavior/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowbehavior/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowbehavior/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.docbook
diff --git a/debian/squeeze/tdebase/debian/tdeprint-trinity.install b/debian/squeeze/tdebase/debian/tdeprint-trinity.install
index 48bfe8565..046f35ec0 100644
--- a/debian/squeeze/tdebase/debian/tdeprint-trinity.install
+++ b/debian/squeeze/tdebase/debian/tdeprint-trinity.install
@@ -110,6 +110,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/rlpr.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/steinbruch_scaled.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/tech-overview.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/theory.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprintfax/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprintfax/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprintfax/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/tdeprintfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kjobviewer.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/printmgr.png
diff --git a/debian/squeeze/tdebase/debian/tdm-trinity.install b/debian/squeeze/tdebase/debian/tdm-trinity.install
index 5ec933662..04241c097 100644
--- a/debian/squeeze/tdebase/debian/tdm-trinity.install
+++ b/debian/squeeze/tdebase/debian/tdm-trinity.install
@@ -17,6 +17,7 @@ debian/tmp/opt/trinity/share/apps/tdm/pics/shutdown.jpg
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/default1.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/default2.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/default3.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/default4.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/root1.png
 debian/tmp/opt/trinity/share/apps/tdm/sessions/9wm.desktop
 debian/tmp/opt/trinity/share/apps/tdm/sessions/aewm.desktop
diff --git a/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install b/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install
index c3c0b9135..1485494ca 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install
+++ b/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install
@@ -1760,6 +1760,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/headerbg.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/header.html
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-common.css
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-default.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-docs.css
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde_gear_64.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-localised.css.template
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde_logo_bg.png
diff --git a/debian/wheezy/tdebase/debian/control b/debian/wheezy/tdebase/debian/control
index ab3607018..6b5cd478e 100644
--- a/debian/wheezy/tdebase/debian/control
+++ b/debian/wheezy/tdebase/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs14-trinity, libogg-dev, libdbus-tqt-1-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-tqt-dev, libart-2.0-dev (>= 4:14.0.0~), libtool, libltdl-dev, cmake
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs14-trinity, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libart-2.0-dev (>= 4:14.0.0~), libtool, libltdl-dev, cmake
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc
 Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
 Standards-Version: 3.8.4
diff --git a/debian/wheezy/tdebase/debian/kcontrol-trinity.install b/debian/wheezy/tdebase/debian/kcontrol-trinity.install
index 46eb3b814..5698b6ff9 100644
--- a/debian/wheezy/tdebase/debian/kcontrol-trinity.install
+++ b/debian/wheezy/tdebase/debian/kcontrol-trinity.install
@@ -176,6 +176,7 @@ debian/tmp/opt/trinity/share/applications/tde/tdefontview.desktop
 debian/tmp/opt/trinity/share/applications/tde/tdehtml_behavior.desktop
 debian/tmp/opt/trinity/share/applications/tde/tdehtml_fonts.desktop
 debian/tmp/opt/trinity/share/applications/tde/tdehtml_java_js.desktop
+debian/tmp/opt/trinity/share/applications/tde/tdehtml_userinterface.desktop
 debian/tmp/opt/trinity/share/applications/tde/tderandrtray.desktop
 debian/tmp/opt/trinity/share/autostart/tderandrtray-autostart.desktop
 debian/tmp/opt/trinity/share/applications/tde/kthememanager.desktop
diff --git a/debian/wheezy/tdebase/debian/khelpcenter-trinity.install b/debian/wheezy/tdebase/debian/khelpcenter-trinity.install
index f3f71648e..fce9e3ec6 100644
--- a/debian/wheezy/tdebase/debian/khelpcenter-trinity.install
+++ b/debian/wheezy/tdebase/debian/khelpcenter-trinity.install
@@ -13,6 +13,7 @@ debian/tmp/opt/trinity/share/apps/khelpcenter/glossary.xslt
 debian/tmp/opt/trinity/share/apps/khelpcenter/index.html.in
 debian/tmp/opt/trinity/share/apps/khelpcenter/intro.html.in
 debian/tmp/opt/trinity/share/apps/khelpcenter/khelpcenterui.rc
+debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/adminguide.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/applets.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/Applications/.directory
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/contact.desktop
@@ -44,6 +45,10 @@ debian/tmp/opt/trinity/share/apps/khelpcenter/searchhandlers/htdig/htdig_long.ht
 debian/tmp/opt/trinity/share/apps/khelpcenter/searchhandlers/man.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/table-of-contents.xslt
 debian/tmp/opt/trinity/share/config.kcfg/khelpcenter.kcfg
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/adminguide/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/adminguide/groupware-kontact.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/adminguide/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/adminguide/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/background.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/bgtable.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/common
@@ -59,7 +64,6 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/install.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/intro.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/tdeapps.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/misc.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/moreinfo.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/nontdeapps.docbook
@@ -68,6 +72,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/panel.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/qt.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/questions.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/sound.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/tdeapps.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/tips.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/webbrowse.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/winmng.docbook
@@ -77,23 +82,29 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/glossary/index.cache.bz
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/glossary/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/glossary/tdeprintingglossary.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/help.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/helpnotfound/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/helpnotfound/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/helpnotfound/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/kdelogo2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/khelpcenter.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/konq.css
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/lines2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/lines.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/lines2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/pointers.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/quickstart/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/quickstart/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/quickstart/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/shadow1.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/support.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/a-window.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/accessibility.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/amarok-icon.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/amarok.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/a-window.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/base-tde-applications.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/browser-fine-tuning.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/burning-cds.docbook
@@ -109,7 +120,6 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/file-sharing.
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/font-installation.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/getting-help.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/glossary.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/groupware-kontact.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/internet-shortcuts.docbook
@@ -119,15 +129,11 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kaboodle-icon
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kaboodle.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kcalc-systray.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kcontrol.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-as-root.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-edutainment.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-for-admins.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-office.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmag.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmousetool.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmouth.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmouth2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmouth3.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmouth.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/knode-identity.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/knode-mail-account.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/knode-news-account.png
@@ -165,6 +171,10 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/shared-sessio
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/splash-screen.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/standard-menu-entries.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/switching-sessions.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-as-root.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-edutainment.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-office.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tdm.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/the-filemanager.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/titlebar-menu.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/troubleshooting-network-x.docbook
@@ -177,6 +187,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/your-tde-acco
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict1.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict10.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict11.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict12.png
@@ -187,12 +198,11 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict16.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict17.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict18.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict19.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict20.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict21.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict22.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict23.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict3.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict4.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict5.png
diff --git a/debian/wheezy/tdebase/debian/tdebase-data-trinity.install b/debian/wheezy/tdebase/debian/tdebase-data-trinity.install
index 9ae37a312..cda482406 100644
--- a/debian/wheezy/tdebase/debian/tdebase-data-trinity.install
+++ b/debian/wheezy/tdebase/debian/tdebase-data-trinity.install
@@ -144,6 +144,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/bell/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cache/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cache/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cache/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/clock/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/clock/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/clock/index.docbook
@@ -151,24 +154,39 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/colors/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/colors/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/colors/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/componentchooser/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/componentchooser/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/componentchooser/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cookies/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cookies/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cookies/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/crypto/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/crypto/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/crypto/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktop/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktop/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktop/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/display/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/display/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/display/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/displayconfig/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/displayconfig/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/displayconfig/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dnssd/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dnssd/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dnssd/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ebrowsing/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ebrowsing/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ebrowsing/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/email/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/email/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/email/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/energy/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/energy/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/energy/index.docbook
@@ -183,23 +201,44 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filetypes/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/fonts/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/fonts/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/fonts/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/helpindex.html/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/helpindex.html/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/helpindex.html/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/hwmanager/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/hwmanager/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/hwmanager/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/iccconfig/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/iccconfig/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/iccconfig/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/icons/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/icons/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/icons/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/joystick/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/joystick/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/joystick/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmaccess/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmaccess/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmaccess/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcgi/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcgi/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcgi/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcss/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcss/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcss/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmfontinst/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmfontinst/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmfontinst/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmhistory/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmhistory/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmhistory/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmkded/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmkded/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmkded/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmlaunch/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmlaunch/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmlaunch/index.docbook
@@ -215,117 +254,122 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmstyle/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmtaskbar/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmtaskbar/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmtaskbar/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdm/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdm/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdm/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keyboard/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keyboard/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keyboard/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/nsplugin.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khotkeys/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khotkeys/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khotkeys/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kthememanager/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kthememanager/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kthememanager/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/language/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/language/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/language/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/media/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/media/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/media/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/mouse/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/mouse/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/mouse/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/netpref/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/netpref/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/netpref/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/passwords/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/passwords/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/passwords/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/socks.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screenshot.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/paths/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/paths/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/paths/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/paths/paths.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/privacy/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/privacy/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/privacy/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/socks.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screenshot.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/nsplugin.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tderesources/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tderesources/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tderesources/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useraccount/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useraccount/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useraccount/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useraccount/useraccount.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/view1394/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/view1394/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/view1394/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowbehavior/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowbehavior/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowbehavior/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.docbook
diff --git a/debian/wheezy/tdebase/debian/tdeprint-trinity.install b/debian/wheezy/tdebase/debian/tdeprint-trinity.install
index 48bfe8565..046f35ec0 100644
--- a/debian/wheezy/tdebase/debian/tdeprint-trinity.install
+++ b/debian/wheezy/tdebase/debian/tdeprint-trinity.install
@@ -110,6 +110,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/rlpr.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/steinbruch_scaled.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/tech-overview.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/theory.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprintfax/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprintfax/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprintfax/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/tdeprintfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kjobviewer.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/printmgr.png
diff --git a/debian/wheezy/tdebase/debian/tdm-trinity.install b/debian/wheezy/tdebase/debian/tdm-trinity.install
index 5ec933662..04241c097 100644
--- a/debian/wheezy/tdebase/debian/tdm-trinity.install
+++ b/debian/wheezy/tdebase/debian/tdm-trinity.install
@@ -17,6 +17,7 @@ debian/tmp/opt/trinity/share/apps/tdm/pics/shutdown.jpg
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/default1.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/default2.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/default3.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/default4.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/root1.png
 debian/tmp/opt/trinity/share/apps/tdm/sessions/9wm.desktop
 debian/tmp/opt/trinity/share/apps/tdm/sessions/aewm.desktop
diff --git a/debian/wheezy/tdelibs/debian/tdelibs-data-trinity.install b/debian/wheezy/tdelibs/debian/tdelibs-data-trinity.install
index c3c0b9135..1485494ca 100644
--- a/debian/wheezy/tdelibs/debian/tdelibs-data-trinity.install
+++ b/debian/wheezy/tdelibs/debian/tdelibs-data-trinity.install
@@ -1760,6 +1760,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/headerbg.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/header.html
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-common.css
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-default.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-docs.css
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde_gear_64.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-localised.css.template
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde_logo_bg.png
diff --git a/ubuntu/maverick/tdebase/debian/control b/ubuntu/maverick/tdebase/debian/control
index 6f64b7cb0..91c49ba55 100644
--- a/ubuntu/maverick/tdebase/debian/control
+++ b/ubuntu/maverick/tdebase/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs14-trinity, libogg-dev, libdbus-tqt-1-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-tqt-dev, libart-2.0-dev (>= 4:14.0.0~), libtool, libltdl-dev, cmake
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs14-trinity, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libart-2.0-dev (>= 4:14.0.0~), libtool, libltdl-dev, cmake
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc
 Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
 Standards-Version: 3.8.4
diff --git a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install
index 46eb3b814..5698b6ff9 100644
--- a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install
@@ -176,6 +176,7 @@ debian/tmp/opt/trinity/share/applications/tde/tdefontview.desktop
 debian/tmp/opt/trinity/share/applications/tde/tdehtml_behavior.desktop
 debian/tmp/opt/trinity/share/applications/tde/tdehtml_fonts.desktop
 debian/tmp/opt/trinity/share/applications/tde/tdehtml_java_js.desktop
+debian/tmp/opt/trinity/share/applications/tde/tdehtml_userinterface.desktop
 debian/tmp/opt/trinity/share/applications/tde/tderandrtray.desktop
 debian/tmp/opt/trinity/share/autostart/tderandrtray-autostart.desktop
 debian/tmp/opt/trinity/share/applications/tde/kthememanager.desktop
diff --git a/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install b/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install
index f3f71648e..fce9e3ec6 100644
--- a/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.install
@@ -13,6 +13,7 @@ debian/tmp/opt/trinity/share/apps/khelpcenter/glossary.xslt
 debian/tmp/opt/trinity/share/apps/khelpcenter/index.html.in
 debian/tmp/opt/trinity/share/apps/khelpcenter/intro.html.in
 debian/tmp/opt/trinity/share/apps/khelpcenter/khelpcenterui.rc
+debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/adminguide.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/applets.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/Applications/.directory
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/contact.desktop
@@ -44,6 +45,10 @@ debian/tmp/opt/trinity/share/apps/khelpcenter/searchhandlers/htdig/htdig_long.ht
 debian/tmp/opt/trinity/share/apps/khelpcenter/searchhandlers/man.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/table-of-contents.xslt
 debian/tmp/opt/trinity/share/config.kcfg/khelpcenter.kcfg
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/adminguide/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/adminguide/groupware-kontact.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/adminguide/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/adminguide/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/background.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/bgtable.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/common
@@ -59,7 +64,6 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/install.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/intro.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/tdeapps.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/misc.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/moreinfo.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/nontdeapps.docbook
@@ -68,6 +72,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/panel.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/qt.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/questions.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/sound.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/tdeapps.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/tips.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/webbrowse.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/winmng.docbook
@@ -77,23 +82,29 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/glossary/index.cache.bz
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/glossary/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/glossary/tdeprintingglossary.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/help.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/helpnotfound/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/helpnotfound/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/helpnotfound/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/kdelogo2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/khelpcenter.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/konq.css
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/lines2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/lines.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/lines2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/pointers.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/quickstart/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/quickstart/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/quickstart/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/shadow1.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/support.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/a-window.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/accessibility.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/amarok-icon.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/amarok.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/a-window.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/base-tde-applications.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/browser-fine-tuning.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/burning-cds.docbook
@@ -109,7 +120,6 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/file-sharing.
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/font-installation.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/getting-help.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/glossary.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/groupware-kontact.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/internet-shortcuts.docbook
@@ -119,15 +129,11 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kaboodle-icon
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kaboodle.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kcalc-systray.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kcontrol.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-as-root.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-edutainment.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-for-admins.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-office.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmag.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmousetool.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmouth.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmouth2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmouth3.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmouth.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/knode-identity.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/knode-mail-account.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/knode-news-account.png
@@ -165,6 +171,10 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/shared-sessio
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/splash-screen.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/standard-menu-entries.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/switching-sessions.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-as-root.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-edutainment.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-office.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tdm.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/the-filemanager.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/titlebar-menu.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/troubleshooting-network-x.docbook
@@ -177,6 +187,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/your-tde-acco
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict1.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict10.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict11.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict12.png
@@ -187,12 +198,11 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict16.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict17.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict18.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict19.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict20.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict21.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict22.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict23.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict3.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict4.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict5.png
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
index 9ae37a312..cda482406 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
@@ -144,6 +144,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/bell/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cache/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cache/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cache/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/clock/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/clock/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/clock/index.docbook
@@ -151,24 +154,39 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/colors/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/colors/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/colors/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/componentchooser/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/componentchooser/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/componentchooser/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cookies/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cookies/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cookies/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/crypto/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/crypto/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/crypto/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktop/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktop/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktop/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/display/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/display/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/display/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/displayconfig/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/displayconfig/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/displayconfig/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dnssd/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dnssd/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dnssd/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ebrowsing/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ebrowsing/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ebrowsing/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/email/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/email/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/email/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/energy/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/energy/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/energy/index.docbook
@@ -183,23 +201,44 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filetypes/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/fonts/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/fonts/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/fonts/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/helpindex.html/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/helpindex.html/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/helpindex.html/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/hwmanager/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/hwmanager/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/hwmanager/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/iccconfig/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/iccconfig/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/iccconfig/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/icons/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/icons/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/icons/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/joystick/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/joystick/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/joystick/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmaccess/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmaccess/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmaccess/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcgi/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcgi/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcgi/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcss/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcss/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcss/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmfontinst/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmfontinst/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmfontinst/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmhistory/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmhistory/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmhistory/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmkded/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmkded/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmkded/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmlaunch/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmlaunch/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmlaunch/index.docbook
@@ -215,117 +254,122 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmstyle/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmtaskbar/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmtaskbar/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmtaskbar/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdm/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdm/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdm/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keyboard/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keyboard/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keyboard/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/nsplugin.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khotkeys/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khotkeys/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khotkeys/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kthememanager/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kthememanager/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kthememanager/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/language/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/language/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/language/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/media/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/media/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/media/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/mouse/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/mouse/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/mouse/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/netpref/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/netpref/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/netpref/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/passwords/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/passwords/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/passwords/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/socks.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screenshot.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/paths/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/paths/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/paths/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/paths/paths.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/privacy/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/privacy/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/privacy/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/socks.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screenshot.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/nsplugin.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tderesources/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tderesources/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tderesources/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useraccount/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useraccount/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useraccount/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useraccount/useraccount.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/view1394/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/view1394/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/view1394/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowbehavior/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowbehavior/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowbehavior/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.docbook
diff --git a/ubuntu/maverick/tdebase/debian/tdeprint-trinity.install b/ubuntu/maverick/tdebase/debian/tdeprint-trinity.install
index 48bfe8565..046f35ec0 100644
--- a/ubuntu/maverick/tdebase/debian/tdeprint-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdeprint-trinity.install
@@ -110,6 +110,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/rlpr.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/steinbruch_scaled.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/tech-overview.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/theory.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprintfax/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprintfax/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprintfax/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/tdeprintfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kjobviewer.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/printmgr.png
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.install b/ubuntu/maverick/tdebase/debian/tdm-trinity.install
index 5ec933662..04241c097 100644
--- a/ubuntu/maverick/tdebase/debian/tdm-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.install
@@ -17,6 +17,7 @@ debian/tmp/opt/trinity/share/apps/tdm/pics/shutdown.jpg
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/default1.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/default2.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/default3.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/default4.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/root1.png
 debian/tmp/opt/trinity/share/apps/tdm/sessions/9wm.desktop
 debian/tmp/opt/trinity/share/apps/tdm/sessions/aewm.desktop
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
index c3c0b9135..1485494ca 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
@@ -1760,6 +1760,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/headerbg.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/header.html
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-common.css
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-default.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-docs.css
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde_gear_64.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-localised.css.template
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde_logo_bg.png
diff --git a/ubuntu/precise/tdebase/debian/control b/ubuntu/precise/tdebase/debian/control
index 6f64b7cb0..91c49ba55 100644
--- a/ubuntu/precise/tdebase/debian/control
+++ b/ubuntu/precise/tdebase/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs14-trinity, libogg-dev, libdbus-tqt-1-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-tqt-dev, libart-2.0-dev (>= 4:14.0.0~), libtool, libltdl-dev, cmake
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs14-trinity, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libart-2.0-dev (>= 4:14.0.0~), libtool, libltdl-dev, cmake
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc
 Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
 Standards-Version: 3.8.4
diff --git a/ubuntu/precise/tdebase/debian/kcontrol-trinity.install b/ubuntu/precise/tdebase/debian/kcontrol-trinity.install
index 46eb3b814..5698b6ff9 100644
--- a/ubuntu/precise/tdebase/debian/kcontrol-trinity.install
+++ b/ubuntu/precise/tdebase/debian/kcontrol-trinity.install
@@ -176,6 +176,7 @@ debian/tmp/opt/trinity/share/applications/tde/tdefontview.desktop
 debian/tmp/opt/trinity/share/applications/tde/tdehtml_behavior.desktop
 debian/tmp/opt/trinity/share/applications/tde/tdehtml_fonts.desktop
 debian/tmp/opt/trinity/share/applications/tde/tdehtml_java_js.desktop
+debian/tmp/opt/trinity/share/applications/tde/tdehtml_userinterface.desktop
 debian/tmp/opt/trinity/share/applications/tde/tderandrtray.desktop
 debian/tmp/opt/trinity/share/autostart/tderandrtray-autostart.desktop
 debian/tmp/opt/trinity/share/applications/tde/kthememanager.desktop
diff --git a/ubuntu/precise/tdebase/debian/khelpcenter-trinity.install b/ubuntu/precise/tdebase/debian/khelpcenter-trinity.install
index f3f71648e..fce9e3ec6 100644
--- a/ubuntu/precise/tdebase/debian/khelpcenter-trinity.install
+++ b/ubuntu/precise/tdebase/debian/khelpcenter-trinity.install
@@ -13,6 +13,7 @@ debian/tmp/opt/trinity/share/apps/khelpcenter/glossary.xslt
 debian/tmp/opt/trinity/share/apps/khelpcenter/index.html.in
 debian/tmp/opt/trinity/share/apps/khelpcenter/intro.html.in
 debian/tmp/opt/trinity/share/apps/khelpcenter/khelpcenterui.rc
+debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/adminguide.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/applets.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/Applications/.directory
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/contact.desktop
@@ -44,6 +45,10 @@ debian/tmp/opt/trinity/share/apps/khelpcenter/searchhandlers/htdig/htdig_long.ht
 debian/tmp/opt/trinity/share/apps/khelpcenter/searchhandlers/man.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/table-of-contents.xslt
 debian/tmp/opt/trinity/share/config.kcfg/khelpcenter.kcfg
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/adminguide/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/adminguide/groupware-kontact.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/adminguide/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/adminguide/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/background.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/bgtable.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/common
@@ -59,7 +64,6 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/install.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/intro.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/tdeapps.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/misc.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/moreinfo.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/nontdeapps.docbook
@@ -68,6 +72,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/panel.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/qt.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/questions.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/sound.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/tdeapps.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/tips.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/webbrowse.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/winmng.docbook
@@ -77,23 +82,29 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/glossary/index.cache.bz
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/glossary/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/glossary/tdeprintingglossary.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/help.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/helpnotfound/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/helpnotfound/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/helpnotfound/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/kdelogo2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/khelpcenter.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/konq.css
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/lines2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/lines.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/lines2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/pointers.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/quickstart/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/quickstart/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/quickstart/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/shadow1.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/support.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/a-window.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/accessibility.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/amarok-icon.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/amarok.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/a-window.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/base-tde-applications.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/browser-fine-tuning.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/burning-cds.docbook
@@ -109,7 +120,6 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/file-sharing.
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/font-installation.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/getting-help.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/glossary.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/groupware-kontact.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/internet-shortcuts.docbook
@@ -119,15 +129,11 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kaboodle-icon
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kaboodle.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kcalc-systray.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kcontrol.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-as-root.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-edutainment.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-for-admins.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-office.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmag.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmousetool.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmouth.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmouth2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmouth3.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmouth.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/knode-identity.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/knode-mail-account.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/knode-news-account.png
@@ -165,6 +171,10 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/shared-sessio
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/splash-screen.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/standard-menu-entries.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/switching-sessions.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-as-root.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-edutainment.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-office.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tdm.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/the-filemanager.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/titlebar-menu.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/troubleshooting-network-x.docbook
@@ -177,6 +187,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/your-tde-acco
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict1.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict10.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict11.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict12.png
@@ -187,12 +198,11 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict16.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict17.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict18.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict19.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict20.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict21.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict22.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict23.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict3.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict4.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict5.png
diff --git a/ubuntu/precise/tdebase/debian/tdebase-data-trinity.install b/ubuntu/precise/tdebase/debian/tdebase-data-trinity.install
index 9ae37a312..cda482406 100644
--- a/ubuntu/precise/tdebase/debian/tdebase-data-trinity.install
+++ b/ubuntu/precise/tdebase/debian/tdebase-data-trinity.install
@@ -144,6 +144,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/bell/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cache/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cache/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cache/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/clock/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/clock/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/clock/index.docbook
@@ -151,24 +154,39 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/colors/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/colors/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/colors/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/componentchooser/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/componentchooser/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/componentchooser/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cookies/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cookies/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cookies/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/crypto/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/crypto/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/crypto/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktop/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktop/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktop/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/display/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/display/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/display/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/displayconfig/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/displayconfig/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/displayconfig/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dnssd/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dnssd/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dnssd/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ebrowsing/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ebrowsing/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ebrowsing/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/email/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/email/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/email/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/energy/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/energy/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/energy/index.docbook
@@ -183,23 +201,44 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filetypes/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/fonts/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/fonts/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/fonts/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/helpindex.html/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/helpindex.html/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/helpindex.html/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/hwmanager/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/hwmanager/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/hwmanager/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/iccconfig/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/iccconfig/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/iccconfig/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/icons/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/icons/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/icons/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/joystick/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/joystick/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/joystick/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmaccess/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmaccess/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmaccess/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcgi/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcgi/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcgi/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcss/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcss/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcss/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmfontinst/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmfontinst/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmfontinst/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmhistory/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmhistory/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmhistory/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmkded/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmkded/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmkded/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmlaunch/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmlaunch/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmlaunch/index.docbook
@@ -215,117 +254,122 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmstyle/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmtaskbar/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmtaskbar/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmtaskbar/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdm/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdm/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdm/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keyboard/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keyboard/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keyboard/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/nsplugin.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khotkeys/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khotkeys/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khotkeys/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kthememanager/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kthememanager/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kthememanager/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/language/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/language/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/language/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/media/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/media/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/media/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/mouse/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/mouse/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/mouse/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/netpref/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/netpref/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/netpref/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/passwords/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/passwords/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/passwords/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/socks.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screenshot.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/paths/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/paths/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/paths/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/paths/paths.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/privacy/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/privacy/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/privacy/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/socks.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screenshot.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/nsplugin.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tderesources/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tderesources/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tderesources/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useraccount/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useraccount/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useraccount/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useraccount/useraccount.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/view1394/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/view1394/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/view1394/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowbehavior/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowbehavior/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowbehavior/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.docbook
diff --git a/ubuntu/precise/tdebase/debian/tdeprint-trinity.install b/ubuntu/precise/tdebase/debian/tdeprint-trinity.install
index 48bfe8565..046f35ec0 100644
--- a/ubuntu/precise/tdebase/debian/tdeprint-trinity.install
+++ b/ubuntu/precise/tdebase/debian/tdeprint-trinity.install
@@ -110,6 +110,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/rlpr.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/steinbruch_scaled.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/tech-overview.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/theory.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprintfax/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprintfax/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprintfax/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/tdeprintfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kjobviewer.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/printmgr.png
diff --git a/ubuntu/precise/tdebase/debian/tdm-trinity.install b/ubuntu/precise/tdebase/debian/tdm-trinity.install
index 5ec933662..04241c097 100644
--- a/ubuntu/precise/tdebase/debian/tdm-trinity.install
+++ b/ubuntu/precise/tdebase/debian/tdm-trinity.install
@@ -17,6 +17,7 @@ debian/tmp/opt/trinity/share/apps/tdm/pics/shutdown.jpg
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/default1.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/default2.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/default3.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/default4.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/root1.png
 debian/tmp/opt/trinity/share/apps/tdm/sessions/9wm.desktop
 debian/tmp/opt/trinity/share/apps/tdm/sessions/aewm.desktop
diff --git a/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install
index c3c0b9135..1485494ca 100644
--- a/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install
@@ -1760,6 +1760,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/headerbg.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/header.html
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-common.css
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-default.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-docs.css
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde_gear_64.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-localised.css.template
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde_logo_bg.png
diff --git a/ubuntu/raring/tdebase/debian/control b/ubuntu/raring/tdebase/debian/control
index 6f64b7cb0..91c49ba55 100644
--- a/ubuntu/raring/tdebase/debian/control
+++ b/ubuntu/raring/tdebase/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs14-trinity, libogg-dev, libdbus-tqt-1-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-tqt-dev, libart-2.0-dev (>= 4:14.0.0~), libtool, libltdl-dev, cmake
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, autotools-dev, gawk, gettext, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs14-trinity, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libart-2.0-dev (>= 4:14.0.0~), libtool, libltdl-dev, cmake
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc
 Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
 Standards-Version: 3.8.4
diff --git a/ubuntu/raring/tdebase/debian/kcontrol-trinity.install b/ubuntu/raring/tdebase/debian/kcontrol-trinity.install
index 46eb3b814..5698b6ff9 100644
--- a/ubuntu/raring/tdebase/debian/kcontrol-trinity.install
+++ b/ubuntu/raring/tdebase/debian/kcontrol-trinity.install
@@ -176,6 +176,7 @@ debian/tmp/opt/trinity/share/applications/tde/tdefontview.desktop
 debian/tmp/opt/trinity/share/applications/tde/tdehtml_behavior.desktop
 debian/tmp/opt/trinity/share/applications/tde/tdehtml_fonts.desktop
 debian/tmp/opt/trinity/share/applications/tde/tdehtml_java_js.desktop
+debian/tmp/opt/trinity/share/applications/tde/tdehtml_userinterface.desktop
 debian/tmp/opt/trinity/share/applications/tde/tderandrtray.desktop
 debian/tmp/opt/trinity/share/autostart/tderandrtray-autostart.desktop
 debian/tmp/opt/trinity/share/applications/tde/kthememanager.desktop
diff --git a/ubuntu/raring/tdebase/debian/khelpcenter-trinity.install b/ubuntu/raring/tdebase/debian/khelpcenter-trinity.install
index f3f71648e..fce9e3ec6 100644
--- a/ubuntu/raring/tdebase/debian/khelpcenter-trinity.install
+++ b/ubuntu/raring/tdebase/debian/khelpcenter-trinity.install
@@ -13,6 +13,7 @@ debian/tmp/opt/trinity/share/apps/khelpcenter/glossary.xslt
 debian/tmp/opt/trinity/share/apps/khelpcenter/index.html.in
 debian/tmp/opt/trinity/share/apps/khelpcenter/intro.html.in
 debian/tmp/opt/trinity/share/apps/khelpcenter/khelpcenterui.rc
+debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/adminguide.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/applets.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/Applications/.directory
 debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/contact.desktop
@@ -44,6 +45,10 @@ debian/tmp/opt/trinity/share/apps/khelpcenter/searchhandlers/htdig/htdig_long.ht
 debian/tmp/opt/trinity/share/apps/khelpcenter/searchhandlers/man.desktop
 debian/tmp/opt/trinity/share/apps/khelpcenter/table-of-contents.xslt
 debian/tmp/opt/trinity/share/config.kcfg/khelpcenter.kcfg
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/adminguide/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/adminguide/groupware-kontact.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/adminguide/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/adminguide/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/background.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/bgtable.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/common
@@ -59,7 +64,6 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/install.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/intro.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/tdeapps.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/misc.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/moreinfo.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/nontdeapps.docbook
@@ -68,6 +72,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/panel.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/qt.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/questions.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/sound.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/tdeapps.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/tips.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/webbrowse.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/faq/winmng.docbook
@@ -77,23 +82,29 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/glossary/index.cache.bz
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/glossary/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/glossary/tdeprintingglossary.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/help.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/helpnotfound/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/helpnotfound/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/helpnotfound/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/kdelogo2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/khelpcenter.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/konq.css
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/lines2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/lines.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/lines2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/pointers.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/quickstart/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/quickstart/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/quickstart/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/shadow1.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/support.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/a-window.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/accessibility.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/amarok-icon.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/amarok.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/a-window.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/base-tde-applications.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/browser-fine-tuning.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/burning-cds.docbook
@@ -109,7 +120,6 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/file-sharing.
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/font-installation.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/getting-help.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/glossary.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/groupware-kontact.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/internet-shortcuts.docbook
@@ -119,15 +129,11 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kaboodle-icon
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kaboodle.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kcalc-systray.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kcontrol.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-as-root.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-edutainment.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-for-admins.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-office.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmag.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmousetool.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmouth.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmouth2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmouth3.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/kmouth.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/knode-identity.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/knode-mail-account.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/knode-news-account.png
@@ -165,6 +171,10 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/shared-sessio
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/splash-screen.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/standard-menu-entries.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/switching-sessions.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-as-root.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-edutainment.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tde-office.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/tdm.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/the-filemanager.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/titlebar-menu.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/troubleshooting-network-x.docbook
@@ -177,6 +187,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/your-tde-acco
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict1.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict10.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict11.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict12.png
@@ -187,12 +198,11 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict16.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict17.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict18.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict19.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict20.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict21.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict22.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict23.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict2.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict3.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict4.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/visualdict/pict5.png
diff --git a/ubuntu/raring/tdebase/debian/tdebase-data-trinity.install b/ubuntu/raring/tdebase/debian/tdebase-data-trinity.install
index 9ae37a312..cda482406 100644
--- a/ubuntu/raring/tdebase/debian/tdebase-data-trinity.install
+++ b/ubuntu/raring/tdebase/debian/tdebase-data-trinity.install
@@ -144,6 +144,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/bell/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cache/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cache/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cache/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/clock/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/clock/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/clock/index.docbook
@@ -151,24 +154,39 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/colors/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/colors/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/colors/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/componentchooser/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/componentchooser/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/componentchooser/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cookies/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cookies/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cookies/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/crypto/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/crypto/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/crypto/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktop/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktop/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktop/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/desktopbehavior/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/display/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/display/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/display/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/displayconfig/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/displayconfig/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/displayconfig/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dnssd/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dnssd/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dnssd/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ebrowsing/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ebrowsing/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ebrowsing/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/email/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/email/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/email/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/energy/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/energy/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/energy/index.docbook
@@ -183,23 +201,44 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/filetypes/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/fonts/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/fonts/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/fonts/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/helpindex.html/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/helpindex.html/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/helpindex.html/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/hwmanager/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/hwmanager/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/hwmanager/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/iccconfig/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/iccconfig/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/iccconfig/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/icons/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/icons/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/icons/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/joystick/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/joystick/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/joystick/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmaccess/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmaccess/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmaccess/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcgi/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcgi/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcgi/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcss/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcss/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmcss/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmfontinst/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmfontinst/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmfontinst/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmhistory/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmhistory/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmhistory/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmkded/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmkded/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmkded/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmlaunch/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmlaunch/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmlaunch/index.docbook
@@ -215,117 +254,122 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmstyle/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmtaskbar/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmtaskbar/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kcmtaskbar/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdm/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdm/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdm/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keyboard/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keyboard/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keyboard/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/keys/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/nsplugin.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khotkeys/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khotkeys/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/khotkeys/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kthememanager/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kthememanager/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/kthememanager/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/language/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/language/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/language/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/media/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/media/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/media/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/mouse/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/mouse/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/mouse/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/netpref/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/netpref/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/netpref/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/passwords/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/passwords/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/passwords/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/socks.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screenshot.png
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.docbook
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/common
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panel/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/panelappearance/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/paths/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/paths/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/paths/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/paths/paths.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/performance/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/privacy/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/privacy/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/privacy/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/proxy/socks.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screensaver/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/screenshot.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/smb/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/spellchecking/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/nsplugin.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tderesources/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tderesources/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tderesources/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useraccount/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useraccount/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useraccount/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useraccount/useraccount.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/view1394/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/view1394/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/view1394/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowbehavior/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowbehavior/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowbehavior/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.docbook
diff --git a/ubuntu/raring/tdebase/debian/tdeprint-trinity.install b/ubuntu/raring/tdebase/debian/tdeprint-trinity.install
index 48bfe8565..046f35ec0 100644
--- a/ubuntu/raring/tdebase/debian/tdeprint-trinity.install
+++ b/ubuntu/raring/tdebase/debian/tdeprint-trinity.install
@@ -110,6 +110,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/rlpr.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/steinbruch_scaled.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/tech-overview.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprint/theory.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprintfax/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprintfax/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeprintfax/index.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/tdeprintfax.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kjobviewer.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/printmgr.png
diff --git a/ubuntu/raring/tdebase/debian/tdm-trinity.install b/ubuntu/raring/tdebase/debian/tdm-trinity.install
index 5ec933662..04241c097 100644
--- a/ubuntu/raring/tdebase/debian/tdm-trinity.install
+++ b/ubuntu/raring/tdebase/debian/tdm-trinity.install
@@ -17,6 +17,7 @@ debian/tmp/opt/trinity/share/apps/tdm/pics/shutdown.jpg
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/default1.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/default2.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/default3.png
+debian/tmp/opt/trinity/share/apps/tdm/pics/users/default4.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/root1.png
 debian/tmp/opt/trinity/share/apps/tdm/sessions/9wm.desktop
 debian/tmp/opt/trinity/share/apps/tdm/sessions/aewm.desktop
diff --git a/ubuntu/raring/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/raring/tdelibs/debian/tdelibs-data-trinity.install
index c3c0b9135..1485494ca 100644
--- a/ubuntu/raring/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/raring/tdelibs/debian/tdelibs-data-trinity.install
@@ -1760,6 +1760,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/headerbg.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/header.html
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-common.css
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-default.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-docs.css
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde_gear_64.png
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/tde-localised.css.template
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde_logo_bg.png